# 所有服务blade-common包升级

hzims-service/assets/pom.xml

@@ -15,6 +15,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
         </dependency>
         <dependency>

hzims-service/equipment/pom.xml

@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>${bladex.projet.common.version}</version>
         </dependency>
         <dependency>
             <groupId>com.hnac.hzims</groupId>

hzims-service/inspect/pom.xml

@@ -26,6 +26,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>4.5.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
             <artifactId>blade-starter-datascope</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java

@@ -544,6 +544,7 @@ public class RobotTaskServiceImpl extends BaseServiceImpl<RobotTaskMapper, Robot
 	 * @param object
 	 */
 	public void handleThermalData(MultipartFile file,JSONObject object){
+		//logger.info("inspect:handleThermalData:object",JSON.toJSONString(object));
 		if(!file.getContentType().equals(DAT_TYPE)){
 			throw new ServiceException("机器人巡检热成像返回文件格式不正确 —— " + file.getOriginalFilename());
 		}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java

@@ -24,8 +24,8 @@ public class XxlJobConfig {
 	@Value("${xxl.job.executor.ip}")
 	private String ip;
 
-//	@Value("${xxl.job.executor.port}")
+	@Value("${xxl.job.executor.port}")
-	private int port = 28121;
+	private int port;
 	@Value("${xxl.job.accessToken}")
 	private String accessToken;
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/EventServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hnac.hzinfo.inspect.task.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.hnac.hzims.operational.defect.constants.DefectConstant;
@@ -180,6 +181,7 @@ public class EventServiceImpl extends BaseServiceImpl<TaskEventMapper, EventEnti
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean addTaskEventAuto(EventAddVO eventVO){
+		//logger.info("addTaskEventAuto:eventVO:"+eventVO.getProjectId(),"传参为："+ JSON.toJSONString(eventVO));
 		BladeUser user = AuthUtil.getUser();
 
 		//第一次登记时，需领用任务
@@ -251,6 +253,7 @@ public class EventServiceImpl extends BaseServiceImpl<TaskEventMapper, EventEnti
 
 		}
 		if(success && list.size()>0){
+			//logger.info("addTaskEventAuto:EventRecordEntityList:list","传参为："+ JSON.toJSONString(list));
 			success = eventRecordService.saveBatch(list);
 		}
 		if(success && taskObjectProjectContentEntityList.size()>0){

hzims-service/message/pom.xml

@@ -32,6 +32,13 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <!--            <version>${bladex.project.version}</version>-->
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
             <version>3.1.12</version>

hzims-service/operational/pom.xml

@@ -47,7 +47,8 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
+<!--            <version>${bladex.project.version}</version>-->
+            <version>${bladex.projet.common.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>

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<IPage<ControlUsersEntity>> listPage(ControlUsersEntity req, Query query) {

hzims-service/pom.xml

@@ -24,7 +24,7 @@
         <module>equipment</module>
         <module>safeproduct</module>
         <module>operational</module>
-<!--        <module>inspect</module>-->
+        <module>inspect</module>
         <module>message</module>
         <module>ticket</module>
         <module>weather</module>

hzims-service/safeproduct/pom.xml

@@ -17,6 +17,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
         </dependency>
         <dependency>

hzims-service/ticket/pom.xml

@@ -25,6 +25,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
 
         <!--转pdf-->
         <dependency>

hzims-service/topvision/pom.xml

@@ -19,6 +19,11 @@
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
         </dependency>
         <dependency>

hzims-service/weather/pom.xml

@@ -25,6 +25,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+            <version>${bladex.projet.common.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
@@ -50,11 +55,6 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
         <dependency>