diff --git a/hzims-service/assets/pom.xml b/hzims-service/assets/pom.xml index f5fecc0..c18d520 100644 --- a/hzims-service/assets/pom.xml +++ b/hzims-service/assets/pom.xml @@ -15,6 +15,11 @@ org.springblade + blade-common + ${bladex.projet.common.version} + + + org.springblade blade-core-boot diff --git a/hzims-service/equipment/pom.xml b/hzims-service/equipment/pom.xml index 753c1ce..e16a363 100644 --- a/hzims-service/equipment/pom.xml +++ b/hzims-service/equipment/pom.xml @@ -118,7 +118,7 @@ org.springblade blade-common - ${bladex.project.version} + ${bladex.projet.common.version} com.hnac.hzims diff --git a/hzims-service/inspect/pom.xml b/hzims-service/inspect/pom.xml index 4786b00..0cd8536 100644 --- a/hzims-service/inspect/pom.xml +++ b/hzims-service/inspect/pom.xml @@ -26,6 +26,11 @@ org.springblade + blade-common + 4.5.6.RELEASE + + + org.springblade blade-starter-datascope ${bladex.project.version} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java index d1a8713..a757c26 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java @@ -544,6 +544,7 @@ public class RobotTaskServiceImpl extends BaseServiceImpl0){ + //logger.info("addTaskEventAuto:EventRecordEntityList:list","传参为:"+ JSON.toJSONString(list)); success = eventRecordService.saveBatch(list); } if(success && taskObjectProjectContentEntityList.size()>0){ diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index f2b5db0..826aef1 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -32,6 +32,13 @@ + org.springblade + blade-common + + ${bladex.projet.common.version} + + + ognl ognl 3.1.12 diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index a3ed1b7..cd6ffd1 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -47,7 +47,8 @@ org.springblade blade-common - ${bladex.project.version} + + ${bladex.projet.common.version} org.springblade diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java index fb543e7..c6a26ee 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ControlUsersController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/station/controlUsers") @AllArgsConstructor -@Api("遥控权限管理") +@Api(value="遥控权限管理",tags = "遥控权限管理") public class ControlUsersController extends BladeController { private final IControlUsersService controlUsersService; @@ -31,7 +31,7 @@ public class ControlUsersController extends BladeController { return R.status(controlUsersService.save(req)); } - @GetMapping("/listPage") + @GetMapping("/listPage") @ApiOperation("分页查询") @ApiOperationSupport(order = 2) public R> listPage(ControlUsersEntity req, Query query) { diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index f4231c0..0421103 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -24,7 +24,7 @@ equipment safeproduct operational - + inspect message ticket weather diff --git a/hzims-service/safeproduct/pom.xml b/hzims-service/safeproduct/pom.xml index c5c6431..c589276 100644 --- a/hzims-service/safeproduct/pom.xml +++ b/hzims-service/safeproduct/pom.xml @@ -17,6 +17,11 @@ org.springblade + blade-common + ${bladex.projet.common.version} + + + org.springblade blade-core-boot diff --git a/hzims-service/ticket/pom.xml b/hzims-service/ticket/pom.xml index 5f5d5ee..20273f8 100644 --- a/hzims-service/ticket/pom.xml +++ b/hzims-service/ticket/pom.xml @@ -25,6 +25,11 @@ + + org.springblade + blade-common + ${bladex.projet.common.version} + diff --git a/hzims-service/topvision/pom.xml b/hzims-service/topvision/pom.xml index 1f28104..d781fda 100644 --- a/hzims-service/topvision/pom.xml +++ b/hzims-service/topvision/pom.xml @@ -19,6 +19,11 @@ org.springblade + blade-common + ${bladex.projet.common.version} + + + org.springblade blade-core-boot diff --git a/hzims-service/weather/pom.xml b/hzims-service/weather/pom.xml index f1c2d6d..ebbb395 100644 --- a/hzims-service/weather/pom.xml +++ b/hzims-service/weather/pom.xml @@ -25,6 +25,11 @@ + + org.springblade + blade-common + ${bladex.projet.common.version} + org.springblade @@ -50,11 +55,6 @@ org.springblade - blade-common - ${bladex.project.version} - - - org.springblade blade-starter-swagger