From 6d78c9615f47bd73be45b488ef978a7cbf956fce Mon Sep 17 00:00:00 2001
From: Jone <515616805@qq.com>
Date: Fri, 11 Aug 2023 16:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=EF=BC=8C=E5=B9=B6?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hzims-service/equipment/pom.xml | 4 +
.../controller/UpdateDeptIdController.java | 294 ++++++++++-----------
.../message/service/impl/WxMessageServiceImpl.java | 2 +-
.../controller/MaintenanceController.java | 1 +
4 files changed, 153 insertions(+), 148 deletions(-)
diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml
index 5838c4a..90808d8 100644
--- a/hzims-service/equipment/pom.xml
+++ b/hzims-service/equipment/pom.xml
@@ -55,6 +55,10 @@
org.slf4j
slf4j-log4j12
+
+ io.swagger
+ swagger-annotations
+
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java
index 3549cca..146866a 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/UpdateDeptIdController.java
@@ -51,152 +51,152 @@ public class UpdateDeptIdController {
private IUpdateDeptIdService bladexUpdateDataService;
- @PostMapping("/updateDeptId")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "更新所有业务数据部门机构字段", notes = "传入数据库相关信息")
- public R updateDeptId(@RequestBody UpdateDeptVo updateDeptVo) {
- if(StringUtils.isBlank(updateDeptVo.getDbName())) {
- return R.fail("请输入数据库名");
- }
- if(null == updateDeptVo.getDataMappingList() || updateDeptVo.getDataMappingList().isEmpty()) {
- return R.fail("请输入机构ID映射信息");
- }
- boolean result = false;
- switch (updateDeptVo.getDbName()) {
- case "equipment" :
- // 设备管理
- result = equipmentUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "hzims_inspect":
- // 巡检管理
- result = inspectUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "hzims_operation":
- result = operationUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "hzims":
- result = hzimsUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "duty":
- result = dutyUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "message":
- result = messageUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "realmonitor":
- result = realMonitorUpdateDeptIdService.updateDeptId(updateDeptVo);
- break;
- case "bladex":
- result = bladexUpdateDataService.updateDeptId(updateDeptVo);
- break;
- default:
- break;
-
- }
- if(result) {
- return R.success("成功");
- } else {
- return R.fail("更新失败");
- }
- }
-
- @PostMapping("/updateTenantId")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "更新所有业务数据租户ID字段", notes = "传入数据库相关信息")
- public R updateTenantId(@RequestBody UpdateTenantVo updateTenantVo) {
- if(StringUtils.isBlank(updateTenantVo.getDbName())) {
- return R.fail("请输入数据库名");
- }
- if(null == updateTenantVo.getDataMappingList() || updateTenantVo.getDataMappingList().isEmpty()) {
- return R.fail("请输入机构ID映射信息");
- }
- boolean result = false;
- switch (updateTenantVo.getDbName()) {
- case "equipment" :
- // 设备管理
- result = equipmentUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "hzims_inspect":
- // 巡检管理
- result = inspectUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "hzims_operation":
- result = operationUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "hzims":
- result = hzimsUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "duty":
- result = dutyUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "message":
- result = messageUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "realmonitor":
- result = realMonitorUpdateDeptIdService.updateTenantId(updateTenantVo);
- break;
- case "bladex" :
- result = bladexUpdateDataService.updateTenantId(updateTenantVo);
- break;
- default:
- break;
-
- }
- if(result) {
- return R.success("成功");
- } else {
- return R.fail("更新失败");
- }
- }
-
- @PostMapping("/updateDeptIdByTenantId")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "根据租户ID更新机构ID", notes = "传入数据库相关信息")
- public R updateDeptIdByTenantId(@RequestBody UpdateDeptIdByTenantIdVO updateDeptIdByTenantIdVO) {
- if(StringUtils.isBlank(updateDeptIdByTenantIdVO.getDbName())) {
- return R.fail("请输入数据库名");
- }
- if(null == updateDeptIdByTenantIdVO.getDeptAndTenantIdList() || updateDeptIdByTenantIdVO.getDeptAndTenantIdList().isEmpty()) {
- return R.fail("请输入机构ID映射信息");
- }
- boolean result = false;
-
- switch (updateDeptIdByTenantIdVO.getDbName()) {
- case "equipment" :
- // 设备管理
- result = equipmentUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "hzims_inspect":
- // 巡检管理
- result = inspectUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "hzims_operation":
- result = operationUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "hzims":
- result = hzimsUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "duty":
- result = dutyUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "message":
- result = messageUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "realmonitor":
- result = realMonitorUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- case "bladex" :
- result = bladexUpdateDataService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
- break;
- default:
- break;
-
- }
- if(result) {
- return R.success("成功");
- } else {
- return R.fail("更新失败");
- }
- }
+// @PostMapping("/updateDeptId")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "更新所有业务数据部门机构字段", notes = "传入数据库相关信息")
+// public R updateDeptId(@RequestBody UpdateDeptVo updateDeptVo) {
+// if(StringUtils.isBlank(updateDeptVo.getDbName())) {
+// return R.fail("请输入数据库名");
+// }
+// if(null == updateDeptVo.getDataMappingList() || updateDeptVo.getDataMappingList().isEmpty()) {
+// return R.fail("请输入机构ID映射信息");
+// }
+// boolean result = false;
+// switch (updateDeptVo.getDbName()) {
+// case "equipment" :
+// // 设备管理
+// result = equipmentUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "hzims_inspect":
+// // 巡检管理
+// result = inspectUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "hzims_operation":
+// result = operationUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "hzims":
+// result = hzimsUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "duty":
+// result = dutyUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "message":
+// result = messageUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "realmonitor":
+// result = realMonitorUpdateDeptIdService.updateDeptId(updateDeptVo);
+// break;
+// case "bladex":
+// result = bladexUpdateDataService.updateDeptId(updateDeptVo);
+// break;
+// default:
+// break;
+//
+// }
+// if(result) {
+// return R.success("成功");
+// } else {
+// return R.fail("更新失败");
+// }
+// }
+//
+// @PostMapping("/updateTenantId")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "更新所有业务数据租户ID字段", notes = "传入数据库相关信息")
+// public R updateTenantId(@RequestBody UpdateTenantVo updateTenantVo) {
+// if(StringUtils.isBlank(updateTenantVo.getDbName())) {
+// return R.fail("请输入数据库名");
+// }
+// if(null == updateTenantVo.getDataMappingList() || updateTenantVo.getDataMappingList().isEmpty()) {
+// return R.fail("请输入机构ID映射信息");
+// }
+// boolean result = false;
+// switch (updateTenantVo.getDbName()) {
+// case "equipment" :
+// // 设备管理
+// result = equipmentUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "hzims_inspect":
+// // 巡检管理
+// result = inspectUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "hzims_operation":
+// result = operationUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "hzims":
+// result = hzimsUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "duty":
+// result = dutyUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "message":
+// result = messageUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "realmonitor":
+// result = realMonitorUpdateDeptIdService.updateTenantId(updateTenantVo);
+// break;
+// case "bladex" :
+// result = bladexUpdateDataService.updateTenantId(updateTenantVo);
+// break;
+// default:
+// break;
+//
+// }
+// if(result) {
+// return R.success("成功");
+// } else {
+// return R.fail("更新失败");
+// }
+// }
+//
+// @PostMapping("/updateDeptIdByTenantId")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "根据租户ID更新机构ID", notes = "传入数据库相关信息")
+// public R updateDeptIdByTenantId(@RequestBody UpdateDeptIdByTenantIdVO updateDeptIdByTenantIdVO) {
+// if(StringUtils.isBlank(updateDeptIdByTenantIdVO.getDbName())) {
+// return R.fail("请输入数据库名");
+// }
+// if(null == updateDeptIdByTenantIdVO.getDeptAndTenantIdList() || updateDeptIdByTenantIdVO.getDeptAndTenantIdList().isEmpty()) {
+// return R.fail("请输入机构ID映射信息");
+// }
+// boolean result = false;
+//
+// switch (updateDeptIdByTenantIdVO.getDbName()) {
+// case "equipment" :
+// // 设备管理
+// result = equipmentUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "hzims_inspect":
+// // 巡检管理
+// result = inspectUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "hzims_operation":
+// result = operationUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "hzims":
+// result = hzimsUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "duty":
+// result = dutyUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "message":
+// result = messageUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "realmonitor":
+// result = realMonitorUpdateDeptIdService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// case "bladex" :
+// result = bladexUpdateDataService.updateDeptIdByTenantId(updateDeptIdByTenantIdVO);
+// break;
+// default:
+// break;
+//
+// }
+// if(result) {
+// return R.success("成功");
+// } else {
+// return R.fail("更新失败");
+// }
+// }
}
diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java
index ddd2be3..337983d 100644
--- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java
+++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* @author hx
*/
-@Service("pushMessageService")
+@Service("wxMessageService")
@Slf4j
@AllArgsConstructor
public class WxMessageServiceImpl implements IMessageService {
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java
index de1371d..1def60a 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java
@@ -33,6 +33,7 @@ public class MaintenanceController {
/**
* 日常维护生成任务
+ * @TODO 待改进业务流程（需先整理业务流程后在整理）
* @param ids
* @return
*/