zhanghan11/zfipc_master
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

点巡检、备品备件上层平台改造

Browse Source
This commit is contained in:
zhanghan11 2024-06-13 11:59:01 +08:00
parent 1a1988a5c6
commit a523721be8
11 changed files with 47 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zfipc-server/zfipc-admin/src/main/resources/application-druid.yml
View File

@ -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
# 最小连接池数量

34
zfipc-server/zfipc-system/src/main/java/com/inspur/aspect/DeptIdAspect.java
View File

@ -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());
// }
// }
// }
// }
}

4
zfipc-ui/src/views/patrol/plan/index.vue
View File

@ -296,7 +296,7 @@
@click="handleView(scope.row)"
v-hasPermi="['patrol:plan:query']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 0"
size="mini"
type="text"
@ -327,7 +327,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['patrol:plan:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>

4
zfipc-ui/src/views/patrol/task/index.vue
View File

@ -230,14 +230,14 @@
@click="handleViewTask(scope.row)"
v-hasPermi="['patrol:task:query']"
>查看任务</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 1"
size="mini"
type="text"
icon="el-icon-view"
@click="handleReprot(scope.row)"
v-hasPermi="['patrol:task:edit']"
>报告</el-button>
>报告</el-button> -->
<el-button
v-if="scope.row.status == 2"
size="mini"

8
zfipc-ui/src/views/spareparts/inbound/index.vue
View File

@ -225,7 +225,7 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:inbound:query']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 0 || scope.row.status == 2"
size="mini"
type="text"
@ -240,7 +240,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['spareparts:inbound:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>
@ -455,13 +455,13 @@
<el-row
:gutter="10"
class="mb8"
v-if="!isView"
>
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
v-if="!isView"
@click="openPartsSelect"
>添加</el-button>
</el-col>
@ -470,7 +470,6 @@
type="danger"
icon="el-icon-delete"
size="mini"
v-if="!isView"
@click="handleDeleteIpcSparePartsInboundDetail"
>删除</el-button>
</el-col>
@ -486,6 +485,7 @@
type="selection"
width="50"
align="center"
v-if="!isView"
/>
<el-table-column
label="序号"

10
zfipc-ui/src/views/spareparts/inbound/indexAudit.vue
View File

@ -191,14 +191,14 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:inbound:query']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 1"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['spareparts:inbound:edit']"
>审核</el-button>
>审核</el-button> -->
</template>
</el-table-column>
</el-table>
@ -391,12 +391,6 @@
ref="ipcSparePartsInboundDetail"
max-height="300"
>
<el-table-column
label="序号"
align="center"
prop="index"
width="50"
/>
<el-table-column
label="备件编号"
align="center"

12
zfipc-ui/src/views/spareparts/info/index.vue
View File

@ -197,11 +197,11 @@
prop="status"
>
<template slot-scope="scope">
<!-- <dict-tag
<dict-tag
:options="dict.type.spare_parts_status"
:value="scope.row.status"
/> -->
<el-switch
/>
<!-- <el-switch
v-model="scope.row.status"
active-color="rgb(35 244 5)"
inactive-color="red"
@ -211,7 +211,7 @@
inactive-text="停用"
@change="handleStatusChange(scope.row)"
>
</el-switch>
</el-switch> -->
</template>
</el-table-column>
<el-table-column
@ -236,7 +236,7 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:info:query']"
>查看</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@ -249,7 +249,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['spareparts:info:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>

4
zfipc-ui/src/views/spareparts/inventory/index.vue
View File

@ -192,7 +192,7 @@
@click="handleDownload(scope.row)"
v-hasPermi="['spareparts:inventory:query']"
>下载数据</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 0"
size="mini"
type="text"
@ -207,7 +207,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['spareparts:inventory:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>

4
zfipc-ui/src/views/spareparts/inventory/indexFeedback.vue
View File

@ -152,7 +152,7 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:inventory:query']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 0"
size="mini"
type="text"
@ -167,7 +167,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['spareparts:inventory:edit']"
>核实反馈</el-button>
>核实反馈</el-button> -->
<el-button
v-if="scope.row.status > 0"
size="mini"

8
zfipc-ui/src/views/spareparts/outbound/index.vue
View File

@ -245,7 +245,7 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:outbound:edit']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 0 || scope.row.status == 2"
size="mini"
type="text"
@ -260,7 +260,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['spareparts:outbound:remove']"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
</el-table>
@ -487,13 +487,13 @@
<el-row
:gutter="10"
class="mb8"
v-if="!isView"
>
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
v-if="!isView"
@click="openPartsSelect"
>添加</el-button>
</el-col>
@ -502,7 +502,6 @@
type="danger"
icon="el-icon-delete"
size="mini"
v-if="!isView"
@click="handleDeleteIpcSparePartsOutboundDetail"
>删除</el-button>
</el-col>
@ -518,6 +517,7 @@
type="selection"
width="50"
align="center"
v-if="!isView"
/>
<el-table-column
label="序号"

9
zfipc-ui/src/views/spareparts/outbound/indexAudit.vue
View File

@ -206,14 +206,14 @@
@click="handleView(scope.row)"
v-hasPermi="['spareparts:outbound:edit']"
>查看</el-button>
<el-button
<!-- <el-button
v-if="scope.row.status == 1"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['spareparts:outbound:edit']"
>审核</el-button>
>审核</el-button> -->
</template>
</el-table-column>
</el-table>
@ -422,11 +422,6 @@
ref="ipcSparePartsOutboundDetail"
max-height="300"
>
<el-table-column
type="selection"
width="50"
align="center"
/>
<el-table-column
label="序号"
align="center"