diff --git a/zfipc-server/zfipc-admin/src/main/resources/application-druid.yml b/zfipc-server/zfipc-admin/src/main/resources/application-druid.yml index 0c36a91..ed6f6af 100644 --- a/zfipc-server/zfipc-admin/src/main/resources/application-druid.yml +++ b/zfipc-server/zfipc-admin/src/main/resources/application-druid.yml @@ -9,16 +9,16 @@ spring: # url: jdbc:mysql://117.73.8.43:3306/phm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: phm # password: Y123456a - url: jdbc:mysql://117.73.2.117:3306/zfipc_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://117.73.2.117:3306/zfipc_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: zfipc password: Y123456a # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: true - url: jdbc:mysql://localhost:3306/zfipc_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: 123456 + url: jdbc:mysql://117.73.2.117:3306/zfipc_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: zfipc + password: Y123456a # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/zfipc-server/zfipc-system/src/main/java/com/inspur/aspect/DeptIdAspect.java b/zfipc-server/zfipc-system/src/main/java/com/inspur/aspect/DeptIdAspect.java index ba7fd78..e315144 100644 --- a/zfipc-server/zfipc-system/src/main/java/com/inspur/aspect/DeptIdAspect.java +++ b/zfipc-server/zfipc-system/src/main/java/com/inspur/aspect/DeptIdAspect.java @@ -25,22 +25,22 @@ public class DeptIdAspect { * 在service层前添加tanentId的值 */ //@Before(value = "execution(* com.inspur..*.*ServiceImpl.*(..))") - @Before(value = "execution(* com.inspur.equip..*.*ServiceImpl.*(..)) || execution(* com.inspur.industrial..*.*ServiceImpl.*(..))" + - "|| execution(* com.inspur.sensor..*.*ServiceImpl.*(..)) || execution(* com.inspur.patrol..*.*ServiceImpl.*(..)) " + - "|| execution(* com.inspur.spareparts..*.*ServiceImpl.*(..))") - public void beforeService(JoinPoint point) { - Object[] args = point.getArgs(); - for (Object arg : args) { - if (arg instanceof DeptId) { - LOGGER.info("匹配到需要注入部门id", arg); - DeptId entity = (DeptId) arg; - if (StringUtils.isNotNull(SecurityUtils.getAuthentication()) && !"anonymousUser".equals(SecurityUtils.getAuthentication().getPrincipal()) - && StringUtils.isNotNull(SecurityUtils.getLoginUser().getDeptId())) { - LOGGER.info("部门id注入", entity); - entity.setDeptId(SecurityUtils.getLoginUser().getDeptId()); - } - } - } - } +// @Before(value = "execution(* com.inspur.equip..*.*ServiceImpl.*(..)) || execution(* com.inspur.industrial..*.*ServiceImpl.*(..))" + +// "|| execution(* com.inspur.sensor..*.*ServiceImpl.*(..)) || execution(* com.inspur.patrol..*.*ServiceImpl.*(..)) " + +// "|| execution(* com.inspur.spareparts..*.*ServiceImpl.*(..))") +// public void beforeService(JoinPoint point) { +// Object[] args = point.getArgs(); +// for (Object arg : args) { +// if (arg instanceof DeptId) { +// LOGGER.info("匹配到需要注入部门id", arg); +// DeptId entity = (DeptId) arg; +// if (StringUtils.isNotNull(SecurityUtils.getAuthentication()) && !"anonymousUser".equals(SecurityUtils.getAuthentication().getPrincipal()) +// && StringUtils.isNotNull(SecurityUtils.getLoginUser().getDeptId())) { +// LOGGER.info("部门id注入", entity); +// entity.setDeptId(SecurityUtils.getLoginUser().getDeptId()); +// } +// } +// } +// } } diff --git a/zfipc-ui/src/views/patrol/plan/index.vue b/zfipc-ui/src/views/patrol/plan/index.vue index a3bbddf..ddfa0be 100644 --- a/zfipc-ui/src/views/patrol/plan/index.vue +++ b/zfipc-ui/src/views/patrol/plan/index.vue @@ -296,7 +296,7 @@ @click="handleView(scope.row)" v-hasPermi="['patrol:plan:query']" >查看 - 删除 + >删除 --> diff --git a/zfipc-ui/src/views/patrol/task/index.vue b/zfipc-ui/src/views/patrol/task/index.vue index a4aff85..2ad6eea 100644 --- a/zfipc-ui/src/views/patrol/task/index.vue +++ b/zfipc-ui/src/views/patrol/task/index.vue @@ -230,14 +230,14 @@ @click="handleViewTask(scope.row)" v-hasPermi="['patrol:task:query']" >查看任务 - 报告 + >报告 --> 查看 - 删除 + >删除 --> @@ -455,13 +455,13 @@ 添加 @@ -470,7 +470,6 @@ type="danger" icon="el-icon-delete" size="mini" - v-if="!isView" @click="handleDeleteIpcSparePartsInboundDetail" >删除 @@ -486,6 +485,7 @@ type="selection" width="50" align="center" + v-if="!isView" /> 查看 - 审核 + >审核 --> @@ -391,12 +391,6 @@ ref="ipcSparePartsInboundDetail" max-height="300" > - 查看 - 删除 + >删除 --> diff --git a/zfipc-ui/src/views/spareparts/inventory/index.vue b/zfipc-ui/src/views/spareparts/inventory/index.vue index b056eb1..edbb25b 100644 --- a/zfipc-ui/src/views/spareparts/inventory/index.vue +++ b/zfipc-ui/src/views/spareparts/inventory/index.vue @@ -192,7 +192,7 @@ @click="handleDownload(scope.row)" v-hasPermi="['spareparts:inventory:query']" >下载数据 - 删除 + >删除 --> diff --git a/zfipc-ui/src/views/spareparts/inventory/indexFeedback.vue b/zfipc-ui/src/views/spareparts/inventory/indexFeedback.vue index f19749d..4096e8d 100644 --- a/zfipc-ui/src/views/spareparts/inventory/indexFeedback.vue +++ b/zfipc-ui/src/views/spareparts/inventory/indexFeedback.vue @@ -152,7 +152,7 @@ @click="handleView(scope.row)" v-hasPermi="['spareparts:inventory:query']" >查看 - 核实反馈 + >核实反馈 --> 查看 - 删除 + >删除 --> @@ -487,13 +487,13 @@ 添加 @@ -502,7 +502,6 @@ type="danger" icon="el-icon-delete" size="mini" - v-if="!isView" @click="handleDeleteIpcSparePartsOutboundDetail" >删除 @@ -518,6 +517,7 @@ type="selection" width="50" align="center" + v-if="!isView" /> 查看 - 审核 + >审核 --> @@ -422,11 +422,6 @@ ref="ipcSparePartsOutboundDetail" max-height="300" > -