平台升级:mapper文件修改，启动类修改

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java

@@ -166,13 +166,13 @@ public interface IEmInfoClient {
 	R<List<String>> getChildrenByEmCode(@RequestParam("emCode") String emCode);
 
 	@GetMapping(value = GET_VIDEO_DEVICE_BY_EM_CODE)
-	 List<EmInfoEntity> getVideoDeviceByEmCode(EmInfoEntity emInfo);
+	 List<EmInfoEntity> getVideoDeviceByEmCode(@RequestParam("emInfo") EmInfoEntity emInfo);
 
 	@GetMapping(DEVICE_BY_PATH)
 	List<EmInfoEntity> deviceByPath(@RequestParam("emCode") String emCode);
 
 	@GetMapping(EM_INFO_LIST)
-	R<List<EmInfoEntity>> emInfoList(EmInfoEntity req);
+	R<List<EmInfoEntity>> emInfoList(@RequestParam("req")EmInfoEntity req);
 
 	@GetMapping(RIDE_DEVICES)
 	List<RideDeviceVo> rideDevices(@RequestParam("deptIds") List<Long> deptIds);

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmVideoClient.java

@@ -26,7 +26,7 @@ public interface IEmVideoClient {
      * @return 视频列表
      */
     @GetMapping(GET_EM_BANDING_VIDEOS)
-    R<List<EmVideoBandingEntity>> getEmBandingVideos(@RequestParam String emCodes);
+    R<List<EmVideoBandingEntity>> getEmBandingVideos(@RequestParam("emCodes") String emCodes);
 
     /**
      * 验证设备编号是否绑定视频
@@ -34,6 +34,6 @@ public interface IEmVideoClient {
      * @return 是否绑定视频结果
      */
     @GetMapping(IS_BANDING_VIDEO_BY_EM_CODES)
-    R isBandingVideoByEmCode(@RequestParam String emCode);
+    R isBandingVideoByEmCode(@RequestParam("emCode") String emCode);
 
 }

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IWorkshopInfoClient.java

@@ -5,6 +5,7 @@ import com.hnac.hzims.equipment.entity.WorkshopInfoEntity;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface IWorkshopInfoClient {
 	String GET_ALL_WORKSHOP = API_PREFIX + "/getAllWorkshop";
 
 	@GetMapping(LIST)
-	R<List<WorkshopInfoEntity>> list(WorkshopInfoEntity req);
+	R<List<WorkshopInfoEntity>> list(@RequestParam("req") WorkshopInfoEntity req);
 
 	@GetMapping(GET_ALL_WORKSHOP)
 	R<List<WorkshopInfoEntity>> getAllWorkshop();

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/feign/IFdpMonitorClient.java

@@ -36,5 +36,5 @@ public interface IFdpMonitorClient {
 	String getFaultList(@RequestParam(value = "stations",required = false) List<String> stations);
 
 	@GetMapping(UPDATE_FAULT_STATE)
-	String updateFaultState(UpdateFaultStateVo state);
+	String updateFaultState(@RequestParam("state") UpdateFaultStateVo state);
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/defect/feign/IOperPhenomenonClient.java

@@ -54,7 +54,7 @@ public interface IOperPhenomenonClient {
 	boolean updateBatchById(@RequestBody List<OperPhenomenonEntity> req);
 
 	@GetMapping(DETAIL)
-	R<OperPhenomenonVO> detail(OperPhenomenonEntity phenomenon);
+	R<OperPhenomenonVO> detail(@RequestParam("phenomenon") OperPhenomenonEntity phenomenon);
 
 	@GetMapping(QUERY_PHENOMENT_BY_HANDLE_TASK_ID)
 	R<OperPhenomenonEntity> queryPhenomentByHandleTaskId(@RequestParam("taskId") Long taskId);

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/feign/IMaintenanceTaskClient.java

@@ -8,6 +8,8 @@ import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author hx
@@ -28,7 +30,7 @@ public interface IMaintenanceTaskClient extends ITaskClient<OperMaintenanceTaskE
 	 */
 	@Override
 	@GetMapping(START_TASK)
-	R<Boolean> startTask(Long taskId, String startTime);
+	R<Boolean> startTask(@RequestParam("taskId") Long taskId, @RequestParam("startTime") String startTime);
 
 	/**
 	 * 结束执行任务
@@ -37,5 +39,5 @@ public interface IMaintenanceTaskClient extends ITaskClient<OperMaintenanceTaskE
 	 */
 	@Override
 	@PostMapping(FINISH_TASK)
-	R<String> finishTask(OperMaintenanceTaskDTO taskDto);
+	R<String> finishTask(@RequestBody OperMaintenanceTaskDTO taskDto);
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/feign/ITaskClient.java

@@ -37,5 +37,5 @@ public interface ITaskClient {
 	R doUpdateTaskById(@RequestBody OperMaintenanceTaskDTO taskDTO);
 
 	@GetMapping(EXECUTE_TASK)
-	R executeTask(@RequestParam Long taskId, @RequestParam Integer actHours);
+	R executeTask(@RequestParam("taskId") Long taskId, @RequestParam("actHours") Integer actHours);
 }

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationPushConfigClient.java

@@ -24,5 +24,5 @@ public interface IStationPushConfigClient {
      * @return
      */
     @GetMapping(GET_FDP_STATION_TYPE_BY_CODE)
-    Integer getFdpStationTypeByCode(@RequestParam String stationCode);
+    Integer getFdpStationTypeByCode(@RequestParam("stationCode") String stationCode);
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentClient.java

@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface IContentClient {
      * @return
      */
     @GetMapping(DETAIL)
-    R<ContentVO> detail(Long id);
+    R<ContentVO> detail(@RequestParam("id") Long id);
 
     /**
      * 批量更新巡检内容

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IContentDefinitionClient.java

@@ -34,7 +34,7 @@ public interface IContentDefinitionClient {
      * @return
      */
     @GetMapping(DETAIL)
-    R<ContentDefinitionVO> detail(@RequestParam Long id);
+    R<ContentDefinitionVO> detail(@RequestParam("id") Long id);
 
     /**
      * 批量保存巡检内容定义
@@ -50,7 +50,7 @@ public interface IContentDefinitionClient {
      * @return
      */
     @GetMapping(LIST)
-    R<List<ContentDefinitionVO>> list(ContentDefinitionDTO request);
+    R<List<ContentDefinitionVO>> list(@RequestParam ("request") ContentDefinitionDTO request);
 
     /**
      * 批量更新

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/feign/IProjectClient.java

@@ -44,6 +44,6 @@ public interface IProjectClient {
      * @return 设备编号列表
      */
     @GetMapping(GET_EM_CODES_BY_DEPT_ID)
-    R<List<String>> getEmCodesByDeptId(@RequestParam Long deptId);
+    R<List<String>> getEmCodesByDeptId(@RequestParam("deptId") Long deptId);
 
 }

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/threedimensional/fegin/RouteFeignClient.java

@@ -69,5 +69,5 @@ public interface RouteFeignClient {
     @PostMapping("/st_re_route/remove")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+    R remove(@ApiParam(value = "主键集合", required = true) @RequestParam("ids") String ids);
 }

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageClient.java

@@ -17,8 +17,8 @@ import javax.annotation.Resource;
  * @author hx
  */
 @FeignClient(
-        value = MessageConstants.APP_NAME,
+        value = MessageConstants.APP_NAME
-        fallback = MessageClientFallback.class
+//        fallback = MessageClientFallback.class
 )
 public interface IMessageClient {
     String API_PREFIX = "/feign/message";
@@ -38,7 +38,7 @@ public interface IMessageClient {
      * @return
      */
     @PostMapping(SEND_SMS_MESSAGE)
-    R sendSmsMessage(SmsPushDto pushDto);
+    R sendSmsMessage(@RequestBody SmsPushDto pushDto);
 
     @PostMapping(SEND_MESSAGE)
     R<Boolean> sendMessage(@RequestBody MessagePushRecordDto request);

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/IMessageConfigClient.java

@@ -39,7 +39,7 @@ public interface IMessageConfigClient {
 	 * @return
 	 */
 	@GetMapping(GET_MAIL_CONFIG_BY_BUSINESS_KEY)
-	MailConfigEntity getMailConfigByBusinessKey(@RequestParam String businessKey);
+	MailConfigEntity getMailConfigByBusinessKey(@RequestParam("businessKey") String businessKey);
 
 	/**
 	 * 根据业务关键字获取app推送配置
@@ -47,7 +47,7 @@ public interface IMessageConfigClient {
 	 * @return
 	 */
 	@GetMapping(GET_APP_CONFIG_BY_BUSINESS_KEY)
-	PushConfigEntity getAppConfigByBusinessKey(@RequestParam String businessKey);
+	PushConfigEntity getAppConfigByBusinessKey(@RequestParam("businessKey") String businessKey);
 
 	/**
 	 * 根据业务关键字获取app推送配置
@@ -55,7 +55,7 @@ public interface IMessageConfigClient {
 	 * @return
 	 */
 	@GetMapping(GET_SMS_CONFIG_BY_BUSINESS_KEY)
-	SmsConfigEntity getSmsConfigByBusinessKey(@RequestParam String businessKey);
+	SmsConfigEntity getSmsConfigByBusinessKey(@RequestParam("businessKey") String businessKey);
 
 	/**
 	 * 根据业务关键字获取web推送配置
@@ -63,7 +63,7 @@ public interface IMessageConfigClient {
 	 * @return
 	 */
 	@GetMapping(GET_WS_CONFIG_BY_BUSINESS_KEY)
-	WsConfigEntity getWsConfigByBusinessKey(@RequestParam String businessKey);
+	WsConfigEntity getWsConfigByBusinessKey(@RequestParam("businessKey") String businessKey);
 
 	/**
 	 * 根据app推送配置推送消息

hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/fegin/MessageClientFallback.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 /**
  * @author hx
  */
-@Component
+//@Component
 public class MessageClientFallback implements IMessageClient {
 
 	@Override

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java

@@ -57,5 +57,5 @@ public interface ITicketInfoAllClient {
 	List<DoublePassVO> getDoublePassQuantity(@RequestBody TicketStatisticDTO ticketStatisticDTO);
 
 	@GetMapping(GET_TICKET_PASS_RATE)
-	R<DoublePassRateVO> getTicketPassRate(TicketStatisticDTO ticketStatisticDTO);
+	R<DoublePassRateVO> getTicketPassRate(@RequestParam("ticketStatisticDTO") TicketStatisticDTO ticketStatisticDTO);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/AssetsApplication.java

@@ -28,11 +28,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Chill
  */
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@EnableScheduling
-@ComponentScan(basePackages = {"com.hnac.hzims.*"})
 public class AssetsApplication {
 
 	public static void main(String[] args) {

hzims-service/assets/src/main/resources/template/template.yml

@@ -27,7 +27,7 @@ spring:
       password: ${hzinfo.db.busines.password}
 #swagger扫描路径配置
 swagger:
-  base-packages: com.hnac.hzims.spare
+  base-packages: com.hnac.hzims.spare,org.springbalde,com.hnac
 
 #oss配置
 oss:
@@ -39,17 +39,17 @@ oss:
 
 
 
-xxl:
+blade:
-  job:
+  data-scope:
-    accessToken: ''
+    enabled: false
-    admin:
+  lock:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+    enabled: true
-    executor:
+    address: redis://192.168.60.29:3577
-      appname: hzims-safeproduct
+    password: 1qaz2WSX@redis
-      ip: "${hzims.server.ip}"
+    database: 2
-      logpath: /data/applogs/xxl-job/jobhandler
+    ssl: false
-      logretentiondays: 7
+settings:
-      port: 28599
+  logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 
 
@@ -65,5 +65,3 @@ xxl:
 #      logretentiondays: -1
 #      port: 28210
 
-demo:
-  name: aaa

hzims-service/equipment/pom.xml

@@ -54,21 +54,21 @@
             <artifactId>hutool-http</artifactId>
             <version>5.7.16</version>
         </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.hnac.hzinfo</groupId>
+<!--            <groupId>com.hnac.hzinfo</groupId>-->
-            <artifactId>read-data</artifactId>
+<!--            <artifactId>read-data</artifactId>-->
-            <version>1.0.0</version>
+<!--            <version>1.0.0</version>-->
-            <exclusions>
+<!--            <exclusions>-->
-                <exclusion>
+<!--                <exclusion>-->
-                    <groupId>org.slf4j</groupId>
+<!--                    <groupId>org.slf4j</groupId>-->
-                    <artifactId>slf4j-log4j12</artifactId>
+<!--                    <artifactId>slf4j-log4j12</artifactId>-->
-                </exclusion>
+<!--                </exclusion>-->
-                <exclusion>
+<!--                <exclusion>-->
-                    <groupId>io.swagger</groupId>
+<!--                    <groupId>io.swagger</groupId>-->
-                    <artifactId>swagger-annotations</artifactId>
+<!--                    <artifactId>swagger-annotations</artifactId>-->
-                </exclusion>
+<!--                </exclusion>-->
-            </exclusions>
+<!--            </exclusions>-->
-        </dependency>
+<!--        </dependency>-->
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>

hzims-service/equipment/src/main/java/com/hnac/hzims/EquipmentApplication.java

@@ -33,12 +33,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author Chill
  */
 
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@SpringCloudApplication
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@MapperScan("com.hnac.hzims.**.mapper")
-@EnableScheduling
-@ComponentScan(basePackages = {"com.hnac.hzims.*"})
 public class EquipmentApplication  {
 
 	public static void main(String[] args) {

hzims-service/equipment/src/main/resources/template/template.yml

@@ -20,14 +20,25 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
         slave:
-          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          username: ${hzinfo.db.busines.username}
+          password: ${hzinfo.db.busines.password}
+        inspect:
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          username: ${hzinfo.db.busines.username}
+          password: ${hzinfo.db.busines.password}
+        hzims:
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          username: ${hzinfo.db.busines.username}
+          password: ${hzinfo.db.busines.password}
+        bladex:
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
-
 
 #oss配置
 oss:
@@ -46,7 +57,7 @@ mybatis-plus:
 
 #swagger扫描路径配置
 swagger:
-  base-packages: com.hnac.hzims
+  base-packages: com.hnac.hzims,org.springbalde,com.hnac
 
 
 
@@ -62,5 +73,92 @@ xxl:
       logretentiondays: -1
       port: 28300
 
-demo:
+fdp:
-  name: aaa
+  monitor:
+    rateRange: 0.3
+  tenantId: 200000
+  service:
+    url: http://192.168.60.70:8086
+    # url: 140.210.218.236
+
+hzinfo:
+  model:
+    # 公用
+    commonSignage: power_station_public
+    # 机组
+    deviceSignage: power_station_unit
+
+hzims:
+  equipment:
+    emInfo:
+      code-prefix: hzims
+      code: hzims:equipment:emInfo:deviceCode.stationDeviceCode
+      emInfoList: hzims:equipment:emInfo:deviceCode.emInfoList
+    fdp:
+      redisData: hzims:equipment:fdp:fault.data.realIdAndValueList
+      fdpReturnValuePath: hzims:equipment:fdp:fdpReturnValue
+
+blade:
+  data:
+    sdk:
+      enabled: true
+      url: http://192.168.60.29/api/hzinfo-data-config
+      appId: '1635888805125099521'
+      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
+  data-scope:
+    enabled: false
+
+url:
+  getAutoFault: http://175.6.40.69:9196/diagnose/getAutoFault
+  getMonitorFault: http://175.6.40.69:9196/diagnose/getMonitorFault
+  getFaultAndMonitor: http://175.6.40.69:9196/diagnose/getFaultAndMonitor
+  updateFaultState_Auto: http://175.6.40.69:9196/diagnose/updateFaultState_Auto
+  updateFaultState_All: http://175.6.40.69:9196/diagnose/updateFaultState_All
+  updateFaultState: http://175.6.40.69:9196/diagnose/updateFaultState_Manual
+  listAll: http://175.6.40.69:9196/api/listAll
+  searchFaultState: http://175.6.40.69:9196/diagnose/searchFaultState
+  getGraph: http://175.6.40.69:9196/diagnose/getGraph
+  nextstep: http://175.6.40.69:9196/diagnose/nextstep
+  searchFaultStateByFaults: http://175.6.40.69:9196/diagnose/searchFaultStateByFaults
+  getStations: http://175.6.40.69:9196/diagnose/getStations
+  getMonitorByFaultStatus: http://175.6.40.69:9196/diagnose/getMonitorByFaultStatus
+  getStatisticStatus: http://175.6.40.69:9196/diagnose/getStatisticStatus
+  getNextStepWithTree: http://175.6.40.69:9196/diagnose/nextstepwithtree
+  getFaultStatusTableData: http://175.6.40.69:9196/diagnose/GetFaultStatusTableData
+  getNeoFaultPropertyList: http://175.6.40.69:9196/diagnose/GetNeoFaultPropertyList
+  getNeoFaultTableData: http://175.6.40.69:9196/diagnose/GetNeoFaultTableData
+  setFaultStatusInfo: http://175.6.40.69:9196/diagnose/setFaultStatusInfo
+  # 获取需更新的预测模型
+  getOutdatePredictModel: http://175.6.40.69:9196/diagnose/getOutdatePredictModel
+  # 训练预测模型
+  trainPredictModel: http://175.6.40.69:9196/diagnose/trainPredictModel
+  # fdp监测点与数据平台监测点绑定关系推送
+  setDataLink: http://175.6.40.69:9196/diagnose/setDataLink
+  #提交站点消息
+  submitStationInfo: http://175.6.40.69:9196/qa/submitStationInfo
+  #删除站点信息
+  deleteStationInfo: http://175.6.40.69:9196/qa/deleteStationInfo
+  #获取机组问题
+  getDevsetQuestion: http://175.6.40.69:9196/qa/getDevsetQuestion
+  #获取站点问题
+  getStationQuestion: http://175.6.40.69:9196/qa/getStationQuestion
+  #提交机组问题的答案
+  submitDevsetAnswer: http://175.6.40.69:9196/qa/submitDevsetAnswer
+  #提交站点问题的答案
+  submitStationAnswer: http://175.6.40.69:9196/qa/submitStationAnswer
+  #实例化站点图谱
+  generateGraphInstance: http://175.6.40.69:9196/qa/generateGraphInstance
+  #按物模型实例编号获取问题答案
+  getInstanceAnswer: http://175.6.40.69:9196/qa/getInstanceAnswer
+  #按物模型实例编号删除问题答案
+  deleteInstanceAnswer: http://175.6.40.69:9196/qa/deleteInstanceAnswer
+  #删除站点问题的答案
+  deleteStationAnswer: http://175.6.40.69:9196/qa/deleteStationAnswer
+  # 删除机组问题答案
+  deleteDevsetAnswer: http://175.6.40.69:9196/qa/deleteDevsetAnswer
+  # 提交问题答案
+  submitResult: http://175.6.40.69:9196/diagnose/submitResult
+  # 获取智能诊断历史趋势图
+  searchFaultHistoryState: http://175.6.40.69:9196/diagnose/searchFaultHistoryState
+  # 获取故障相关的实时数据
+  getRealByFault: http://175.6.40.69:9196/diagnose/getRealByFault

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java

@@ -16,11 +16,9 @@ import javax.annotation.Resource;
 /**
  * @author ysj
  */
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzims"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan(basePackages = {"com.hnac.hzims.**.mapper"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@SpringCloudApplication
-@ComponentScan(basePackages = {"com.hnac.hzims.alarm.*","com.hnac.hzims.business.*"})
 public class AlarmApplication {
 
     public static void main(String[] args) {

hzims-service/hzims-basic/src/main/java/com/hnac/hzims/basic/BasicApplication.java

@@ -16,13 +16,9 @@ import javax.annotation.Resource;
 /**
  * @author ty
  */
-@EnableBladeFeign
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@SpringCloudApplication
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@ComponentScan(basePackages = {"com.hnac.hzims.basic.*"})
-@Resource
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
 public class BasicApplication extends SpringBootServletInitializer {
     public static void main(String[] args) {
         BladeApplication.run(BasicConstants.APP_NAME, BasicApplication.class, args);

hzims-service/hzims-basic/src/main/resources/template/template.yml

@@ -13,11 +13,10 @@ spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  dynamic:
+  datasource:
-    datasource:
+    url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-      url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+    username: ${hzinfo.db.busines.username}
-      username: ${hzinfo.db.busines.username}
+    password: ${hzinfo.db.busines.password}
-      password: ${hzinfo.db.busines.password}
 #
 #  datasource:
 #    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java

@@ -8,17 +8,15 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import javax.annotation.Resource;
 
-@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@SpringCloudApplication
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@ComponentScan(basePackages = {"com.hnac.hzims.bigmodel.*"})
-@Resource
-@ComponentScan(basePackages = {"com.hnac.hzims.*"})
 public class HzimsBigModelApplication {
 
     public static void main(String[] args) {

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/MiddleApplication.java

@@ -11,11 +11,9 @@ import org.springframework.context.annotation.ComponentScan;
 
 
 
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@ComponentScan(basePackages = {"com.hnac.*"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@ComponentScan(basePackages = {"com.hnac.hzims.*"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
 public class MiddleApplication {
 //    static {
 //        System.setProperty("spring.cloud.nacos.discovery.server-addr", "http://175.6.40.67:10042");

hzims-service/hzims-middle/src/main/resources/template/template.yml

@@ -13,10 +13,10 @@ spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-    datasource:
+  datasource:
-     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_middle?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_middle?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-     username: ${hzinfo.db.busines.username}
+    username: ${hzinfo.db.busines.username}
-     password: ${hzinfo.db.busines.password}
+    password: ${hzinfo.db.busines.password}
 #
 #  datasource:
 #    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"

hzims-service/hzims-scheduled/pom.xml

@@ -54,6 +54,10 @@
             <artifactId>equipment-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.hnac.hzims</groupId>
             <artifactId>message-api</artifactId>
         </dependency>
@@ -75,11 +79,6 @@
         </dependency>
 
         <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>2.9.3</version>
-        </dependency>
-        <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
         </dependency>
@@ -160,7 +159,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>2.5.6</version>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-core</artifactId>
+            <version>2.0.30.Final</version>
         </dependency>
     </dependencies>
 

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/ScheduledApplication.java

@@ -3,9 +3,11 @@ package com.hnac.hzims.scheduled;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
 import javax.annotation.Resource;
@@ -14,18 +16,16 @@ import javax.annotation.Resource;
 /**
  * @author ysj
  */
-@EnableBladeFeign
+@SpringBootApplication(scanBasePackages = {"org.springblade.*", "com.hnac.*"})
-@SpringCloudApplication
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@ComponentScan(basePackages = {"com.hnac.*"})
+public class ScheduledApplication {
-@Resource
-public class ScheduledApplication  extends SpringBootServletInitializer {
     public static void main(String[] args) {
         BladeApplication.run("hzims-scheduled", ScheduledApplication.class, args);
     }
 
-    @Override
+//    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return BladeApplication.createSpringApplicationBuilder(builder, "hzims-scheduled", ScheduledApplication.class);
+//        return BladeApplication.createSpringApplicationBuilder(builder, "hzims-scheduled", ScheduledApplication.class);
-    }
+//    }
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/InterruptionAlarmServiceImpl.java

@@ -2,7 +2,6 @@ package com.hnac.hzims.scheduled.service.alarm.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hnac.hzims.alarm.config.entity.AlarmEntity;
 import com.hnac.hzims.business.interruption.entity.InterruptionEntity;
 import com.hnac.hzims.scheduled.mapper.alarm.InterruptionAlrmMapper;
 import com.hnac.hzims.scheduled.service.alarm.InterruptionAlarmService;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java

@@ -39,6 +39,7 @@ import com.hnac.hzinfo.sdk.core.response.Result;
 import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient;
 import com.hnac.hzinfo.sdk.v5.device.dto.ReductionDataDTO;
 import com.hnac.hzinfo.sdk.v5.device.vo.ReductionDataVO;
+import io.undertow.util.CopyOnWriteMap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/safeproduct/impl/TrialServiceImpl.java

@@ -49,6 +49,7 @@ public class TrialServiceImpl extends ServiceImpl<TrialMapper, SafeEquipmentTria
                 lt("create_time", trial.getEndTime());
             }
         }};
-        return this.baseMapper.selectCount(queryWrapper);
+        Long l = this.baseMapper.selectCount(queryWrapper);
+        return l.intValue();
     }
 }

hzims-service/hzims-scheduled/src/main/resources/template/template.yml

@@ -14,7 +14,7 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_operation?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_operation?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
         equipment:
@@ -30,7 +30,7 @@ spring:
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
         inspect:
-          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
         basic:
@@ -50,19 +50,19 @@ spring:
 
 #mybatis-plus配置
 mybatis-plus:
-  mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
+  mapper-locations: classpath:mapper/**/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.hnac.hzims.**.entity
 
 #swagger扫描路径配置
 swagger:
-  base-packages: com.hnac.hzims.scheduled
+  base-packages: com.hnac.hzims.scheduled,org.springbalde
 
 xxl:
   job:
     accessToken: ''
     admin:
-      addresses: http://192.168.60.29:7009/xxl-job-admin
+      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
     executor:
       appname: hzims-scheduled
       ip: 172.31.0.12
@@ -110,7 +110,7 @@ blade:
       ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler
       appId: '1635888805125099521'
       appSecret: f4b6a4dc696b36445d2e5d38bbab2417
-      redisIp: 192.168.60.29
+      redisIp: 192.168.60.34
       redisPort: 3577
-      password: 1qaz2WSX@redis
+      password: L_MM&h=+Nm&p)U9sk.uH
       maxKeys: 1000

hzims-service/hzims-scheduled/src/test/java/com/hnac/hzims/scheduled/ScheduledApplicationTest.java

@@ -1,17 +0,0 @@
-package com.hnac.hzims.scheduled;
-
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springblade.core.test.BladeSpringRunner;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest(classes = ScheduledApplication.class)
-// @BladeBootTest
-public class ScheduledApplicationTest {
-
-
-    @Test
-    public  void testScheduled(){
-        System.out.println(1);
-    }
-}

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

@@ -16,11 +16,9 @@ import org.springframework.context.annotation.ComponentScan;
  *
  * @author ninglong
  */
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade.*", "com.hnac.*"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"})
-@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@MapperScan({"org.springblade.**.mapper.**","com.hnac.**.mapper.**"})
-@ComponentScan(basePackages = {"com.hnac"})
 public class InspectApplication  {
 
 	public static void main(String[] args) {

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

@@ -6,19 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient;
-import com.hnac.hzinfo.datasearch.analyse.IAnalyseInstanceClient;
-import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData;
-import com.hnac.hzinfo.datasearch.device.IDeviceClient;
-import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO;
-import com.hnac.hzinfo.inspect.Constants;
 import com.hnac.hzinfo.inspect.ai.dto.robot.RobotInstanceDTO;
 import com.hnac.hzinfo.inspect.ai.vo.RobotVO;
 import com.hnac.hzinfo.inspect.ai.vo.robot.RobotRealDataVO;
 import com.hnac.hzinfo.inspect.ai.wrapper.RobotWrapper;
 import com.hnac.hzinfo.inspect.constants.ParamConstants;
-import com.hnac.hzinfo.log.annotation.Business;
-import com.hnac.hzinfo.log.annotation.Operate;
-import com.hnac.hzinfo.log.contants.BusinessType;
 import com.hnac.hzinfo.sdk.core.response.Result;
 import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient;
 import com.hnac.hzinfo.sdk.v5.device.client.DeviceClient;
@@ -83,7 +75,7 @@ public class RobotServiceImpl extends ServiceImpl<RobotMapper, RobotEntity> impl
 
 	@Override
 	public Boolean generateDeviceInstance(RobotInstanceDTO device) {
-		if(deviceClient.isDeviceCodeExist(device.getDeviceCode()).getData()) {
+		if(deviceClient.isDeviceCodeExist(device.getDeviceCode()).isSuccess()) {
 			throw new ServiceException("该机器人已经创建过设备实例，无需再创建！");
 		}
 		else {

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

@@ -41,7 +41,7 @@ public class XxlJobConfig {
 		log.info(">>>>>>>>>>> xxl-job config init.");
 		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
 		xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-		xxlJobSpringExecutor.setAppName(appName);
+		xxlJobSpringExecutor.setAppname(appName);
 		xxlJobSpringExecutor.setIp(ip);
 		xxlJobSpringExecutor.setPort(port);
 		System.out.println(">>>>>>>>>>> xxl-rpc, port " + port);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ContentController.java

@@ -107,7 +107,7 @@ public class ContentController {
 		List<Long> delIdList = Func.toLongList(ids);
 		QueryWrapper<ProjectContentEntity> qw = new QueryWrapper<ProjectContentEntity>();
 		qw.lambda().in(ProjectContentEntity::getContentId,delIdList);
-		int count = projectContentService.count(qw);
+		Long count = projectContentService.count(qw);
         if(count>0) {
         	return R.fail("该巡检内容已被巡检项目引用，无法删除。");
         }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ObjectController.java

@@ -171,7 +171,7 @@ public class ObjectController extends BladeController {
 		List<Long> delIdList = Func.toLongList(ids);
 		QueryWrapper<PlanObjectTemplateEntity> qw = new QueryWrapper<>();
 		qw.lambda().in(PlanObjectTemplateEntity::getObjectId,delIdList);
-		int count = planObjectTemplateService.count(qw);
+		Long count = planObjectTemplateService.count(qw);
 		if(count>0) {
 			return R.fail("该巡检对象已被巡检计划引用，无法删除");
 		}
@@ -190,7 +190,7 @@ public class ObjectController extends BladeController {
 	public R<Boolean> disableOrEnable(@RequestParam Long id,@RequestParam Integer status) {
 		QueryWrapper<PlanObjectTemplateEntity> qw = new QueryWrapper<>();
 		qw.lambda().eq(PlanObjectTemplateEntity::getObjectId,id);
-		int count = planObjectTemplateService.count(qw);
+		Long count = planObjectTemplateService.count(qw);
 		if(count>0) {
 			return R.fail("该巡检对象已被巡检计划引用，无法停用");
 		}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java

@@ -80,8 +80,8 @@ public class ProjectController {
 		pages.getRecords().forEach(entity->{
 			QueryWrapper<ProjectContentEntity> qw = new QueryWrapper<>();
 			qw.lambda().eq(ProjectContentEntity::getProjectId, entity.getId());
-			int contentNum = projectContentService.count(qw);
+			Long contentNum = projectContentService.count(qw);
-			entity.setContentNum(contentNum);
+			entity.setContentNum(contentNum.intValue());
 		});
 		return R.data(pages);
 	}
@@ -126,7 +126,7 @@ public class ProjectController {
 		List<Long> delIdList = Func.toLongList(ids);
 		QueryWrapper<TemplateProjectEntity> qw = new QueryWrapper<TemplateProjectEntity>();
 		qw.lambda().in(TemplateProjectEntity::getProjectId,delIdList);
-		int count = templateProjectService.count(qw);
+		Long count = templateProjectService.count(qw);
         if(count>0) {
         	return R.fail("该巡检项目已被巡检模板引用，无法删除。");
         }
@@ -150,7 +150,7 @@ public class ProjectController {
 	public R<Boolean> disableOrEnable(@RequestParam Long id,@RequestParam Integer status) {
 		QueryWrapper<TemplateProjectEntity> qw = new QueryWrapper<TemplateProjectEntity>();
 		qw.lambda().eq(TemplateProjectEntity::getProjectId,id);
-		int count = templateProjectService.count(qw);
+		Long count = templateProjectService.count(qw);
         if(count>0) {
         	return R.fail("请取消关联巡检模板后进行巡检项目停用操作");
         }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateController.java

@@ -102,7 +102,7 @@ public class TemplateController extends BladeController {
 	public R<Boolean> disableOrEnable(@RequestParam Long id,@RequestParam Integer status) {
 		QueryWrapper<PlanObjectTemplateEntity> qw = new QueryWrapper<>();
 		qw.lambda().eq(PlanObjectTemplateEntity::getTemplateId,id);
-		int count = planObjectTemplateService.count(qw);
+		Long count = planObjectTemplateService.count(qw);
 		if(count>0) {
 			return R.fail("该巡检模板已被巡检项目引用，无法停用。");
 		}
@@ -129,7 +129,7 @@ public class TemplateController extends BladeController {
 		List<Long> delIdList = Func.toLongList(ids);
 		QueryWrapper<PlanObjectTemplateEntity> qw = new QueryWrapper<>();
 		qw.lambda().in(PlanObjectTemplateEntity::getTemplateId,delIdList);
-		int count = planObjectTemplateService.count(qw);
+		Long count = planObjectTemplateService.count(qw);
 		if(count>0) {
 			return R.fail("该巡检模板已被巡检计划引用，无法删除。");
 		}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java

@@ -418,7 +418,7 @@ public class TaskJobService {
         task.setStartRemindFlag(true);
         task.setStartRemindTime(task.getPlanStartTime().minusMinutes(plan.getStartRemind()));
 		task.setEndRemindTime(task.getPlanEndTime().minusMinutes(plan.getEndRemind()));
-		int taskCount = taskService.count(Wrappers.<TaskEntity>query().lambda().eq(TaskEntity::getPlanId,task.getPlanId()).eq(TaskEntity::getBatchNumber, task.getBatchNumber()));
+		Long taskCount = taskService.count(Wrappers.<TaskEntity>query().lambda().eq(TaskEntity::getPlanId,task.getPlanId()).eq(TaskEntity::getBatchNumber, task.getBatchNumber()));
 		XxlJobLogger.log("该计划已生成计划批次：{},数量：{}",task.getBatchNumber(),taskCount);
 		if(taskCount>=totalTaskNum){
 			log.info("计划id={}本周期batchNumber={}的任务已生成",plan.getId(),task.getBatchNumber());

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HttpClientUtils.java

@@ -1,6 +1,11 @@
 package com.hnac.hzinfo.inspect.utils;
 
+import com.alibaba.fastjson.JSON;
 import lombok.extern.log4j.Log4j2;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
@@ -9,6 +14,8 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springblade.core.log.exception.ServiceException;
+import org.springframework.util.Assert;
 
 import javax.net.ssl.*;
 import java.io.File;
@@ -73,6 +80,24 @@ public abstract class HttpClientUtils {
 			cm.setDefaultMaxPerRoute(20);
 		}
 	}
+	public static <T,B extends RequestBody> T post(String uri, B body, Class<T> clazz) {
+		OkHttpClient client = new OkHttpClient();
+		Request request = new Request.Builder().url(uri).post(body).build();
+		try {
+			Response response = client.newCall(request).execute();
+			Assert.isTrue(response.isSuccessful(),() -> {
+				throw new ServiceException(uri + "接口远程调用接口失败！状态码：" + response.code());
+			});
+			try {
+				return JSON.parseObject(response.body().toString(),clazz);
+			} catch(Exception e) {
+				throw new ServiceException(uri + "接口返回的数据解析失败！");
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new ServiceException(uri + "接口远程调用接口失败！");
+		}
+	}
 
 	/**
 	 * 下载文件

hzims-service/inspect/src/main/resources/template/template.yml

@@ -2,7 +2,7 @@
 server:
   port: 8200
 
-#oss配置
+##oss配置
 oss:
   enabled: true
   name: minio
@@ -11,16 +11,25 @@ oss:
   endpoint: "${hzinfo.oss.endpoint}"
   access-key: "${hzinfo.oss.access-key}"
   secret-key: "${hzinfo.oss.secret-key}"
+#oss配置
+#oss:
+#  enabled: true
+#  name: minio
+#  tenant-mode: false
+#  bucket-name: prd200000
+#  endpoint: https://ops.hnaccloud.com:8000
+#  access-key: hzinfo
+#  secret-key: JKyro3z#yqChgkKtFuq
 
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-    datasource:
+  datasource:
-       url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
-       username: ${hzinfo.db.busines.username}
+    username: ${hzinfo.db.busines.username}
-       password: ${hzinfo.db.busines.password}
+    password: ${hzinfo.db.busines.password}
 #
 #  datasource:
 #    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
@@ -65,6 +74,8 @@ hzinfo:
       # file-path: D:/data/hzinfo/file # windows
 
 
+
+
 hzims:
   tasks:
     flag: 1

hzims-service/message/pom.xml

@@ -62,6 +62,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.5</version>
+        </dependency>
         <!-- spring-boot-websocket end -->
         <!--邮件推送-->
         <dependency>

hzims-service/message/src/main/java/com/hnac/hzims/message/MessageApplication.java

@@ -7,11 +7,9 @@ import org.springblade.core.launch.BladeApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
-
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo", "com.hnac.hzims"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper", "com.hnac.hzims.**.mapper"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
-@ComponentScan(basePackages = {"com.hnac.*"})
 public class MessageApplication {
 
 	public static void main(String[] args) {

hzims-service/message/src/main/resources/application.yml

@@ -1,42 +0,0 @@
-#服务器端口
-server:
-  port: 8215
-
-#mybatis-plus配置
-mybatis-plus:
-  mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.hnac.hzims.**.entity
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-#swagger扫描路径配置
-swagger:
-  base-packages:
-    - org.springbalde
-    - com.hnac
-
-#数据源配置
-spring:
-  #排除DruidDataSourceAutoConfigure
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    dynamic:
-      #设置默认的数据源或者数据源组,默认值即为master
-      primary: master
-      datasource:
-        master:
-          url: jdbc:mysql://175.6.40.67:5816/dev_hzims_message?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          username: root
-          password: 123
-        slave:
-          url: jdbc:mysql://175.6.40.67:5816/dev_hzims_message?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          username: root
-          password: 123
-
-hzims:
-  message:
-    redis-key:
-      # APP消息推送记录存入redis的key
-      app-push: hzims:message:appPush

hzims-service/message/src/main/resources/template/template.yml

@@ -68,4 +68,8 @@ hzims:
   # 推送策略
   push-strategy:
     concentrateDuration: 10
-    concentrateUnit: minuter
+    concentrateUnit: minuter
+  message:
+    redis-key:
+      # APP消息推送记录存入redis的key
+      app-push: hzims:message:appPush

hzims-service/operational/src/main/java/com/hnac/hzims/operational/OperationApplication.java

@@ -17,13 +17,10 @@
 package com.hnac.hzims.operational;
 
 import org.mybatis.spring.annotation.MapperScan;
-import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
+
 
 import javax.annotation.Resource;
 
@@ -32,22 +29,16 @@ import javax.annotation.Resource;
  *
  * @author Chill
  */
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
+//@ComponentScan(basePackages = {"com.hnac.*"})
-@ComponentScan(basePackages = {"com.hnac.*"})
+//@Resource
-@Resource
 public class OperationApplication  {
 
 
 	public static void main(String[] args) {
 		BladeApplication.run(OperationalConstants.APP_NAME, OperationApplication.class, args);
 	}
-
-//	@Override
-//	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-//		return BladeApplication.createSpringApplicationBuilder(builder, OperationalConstants.APP_NAME, OperationApplication.class);
-//	}
 }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/SafeproductApplication.java

@@ -32,11 +32,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Chill
  */
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan(basePackages = {"com.hnac.hzims.*.**.mapper.**"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@EnableScheduling
-@ComponentScan(basePackages = {"com.hnac.*"})
 public class SafeproductApplication {
 
 	public static void main(String[] args) {

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

@@ -42,7 +42,8 @@ public class XxlJobConfig {
 		log.info(">>>>>>>>>>> xxl-job config init.");
 		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
 		xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-		xxlJobSpringExecutor.setAppName(appName);
+//		xxlJobSpringExecutor.setAppName(appName);
+		xxlJobSpringExecutor.setAppname(appName);
 		xxlJobSpringExecutor.setIp(ip);
 		xxlJobSpringExecutor.setPort(port);
 		System.out.println(">>>>>>>>>>> xxl-rpc, port " + port);

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/flow/service/IInnerDangerFlowService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.flow.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.safeproduct.dto.InnerDangerDTO;
 import com.hnac.hzims.safeproduct.entity.InnerDangerEntity;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IDangerSourceService.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.hazard.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.common.support.constants.Order;
 import com.hnac.hzims.common.support.utils.Condition;
 import com.hnac.hzims.safeproduct.hazard.dto.DangerSourceDTO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/service/IHazardLibraryService.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.safeproduct.hazard.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.common.utils.Condition;
 import com.hnac.hzims.safeproduct.hazard.dto.HazardLibraryDTO;
 import com.hnac.hzims.safeproduct.hazard.entity.HazardLibraryEntity;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerPlanService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.hiddenDanger.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDPlanDTO;
 import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDPlanEntity;
 import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDPlanVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskCheckItemService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.hiddenDanger.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDTaskCheckItemDTO;
 import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDTaskCheckItemEntity;
 import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDTaskCheckItemVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IHiddenDangerTaskService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.hiddenDanger.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.hiddenDanger.dto.HDTaskDTO;
 import com.hnac.hzims.safeproduct.hiddenDanger.entity.HDTaskEntity;
 import com.hnac.hzims.safeproduct.hiddenDanger.vo.HDTaskVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/IPlanCheckItemService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.hiddenDanger.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.hiddenDanger.dto.PlanCheckItemDTO;
 import com.hnac.hzims.safeproduct.hiddenDanger.entity.PlanCheckItemEntity;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hiddenDanger/service/impl/HiddenDangerTaskCheckItemService.java

@@ -29,7 +29,7 @@ import java.util.List;
 @Service
 @AllArgsConstructor
 @Slf4j
-public class HiddenDangerTaskCheckItemService extends IService<HiddenDangerTaskCheckItemMapper, HDTaskCheckItemEntity> implements IHiddenDangerTaskCheckItemService {
+public class HiddenDangerTaskCheckItemService extends ServiceImpl<HiddenDangerTaskCheckItemMapper, HDTaskCheckItemEntity> implements IHiddenDangerTaskCheckItemService {
 
     @Override
     public List<HDTaskCheckItemVO> getList(HDTaskCheckItemDTO req) {

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/CorrelationService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.dto.CorrelationDTO;
 import com.hnac.hzims.safeproduct.risk.entity.Correlation;
 import com.hnac.hzims.safeproduct.risk.vo.CorrelationDetailsVo;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimatePointService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.RiskEstimatePoint;
 
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/EstimateService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.RiskEstimate;
 import com.hnac.hzims.safeproduct.risk.entity.RiskEstimatePoint;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardCategoryService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.HazardCategory;
 import com.hnac.hzims.safeproduct.risk.entity.HazardSource;
 import com.hnac.hzims.safeproduct.risk.vo.CategorySourceVo;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardEstimateService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.HazardEstimate;
 import com.hnac.hzims.safeproduct.risk.vo.ExportEstimateVo;
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardLevelService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.HazardLevel;
 
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardSourceService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.operational.access.dto.OperAccessTaskDTO;
 import com.hnac.hzims.safeproduct.risk.dto.HazardSourceDTO;
 import com.hnac.hzims.safeproduct.risk.entity.HazardSource;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardTaskService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.safeproduct.risk.dto.HazardRiskProcessDTO;
 import com.hnac.hzims.safeproduct.risk.entity.HazardTask;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/HazardWorkService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.HazardWork;
 import com.hnac.hzims.safeproduct.risk.vo.HazardWorkVO;
 import com.hnac.hzims.safeproduct.risk.vo.PersonalCheckItemVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/risk/service/IRiskCheckService.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.risk.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.risk.entity.RiskCheckEntity;
 
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/riskhazards/service/IRiskHazardsScreeningService.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.safeproduct.riskhazards.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.hnac.hzims.safeproduct.riskhazards.entity.RiskHazardsScreening;
 
 

hzims-service/safeproduct/src/main/resources/template/template.yml

@@ -13,13 +13,19 @@ spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  dynamic:
+  datasource:
-    primary: hzims
+    dynamic:
-    datasource:
+      #设置默认的数据源或者数据源组,默认值即为master
-      hzims:
+      primary: master
-       url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+      datasource:
-       username: ${hzinfo.db.busines.username}
+        master:
-       password: ${hzinfo.db.busines.password}
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          username: ${hzinfo.db.busines.username}
+          password: ${hzinfo.db.busines.password}
+        slave:
+          url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+          username: ${hzinfo.db.busines.username}
+          password: ${hzinfo.db.busines.password}
 #
 #  datasource:
 #    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/TicketApplication.java

@@ -16,13 +16,9 @@ import javax.annotation.Resource;
  * @author hx
  */
 
-@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.hzinfo"})
+@SpringBootApplication(scanBasePackages = {"org.springblade", "com.hnac.*"})
-@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper"})
+@MapperScan(basePackages = {"com.hnac.hzinfo.**.mapper","com.hnac.hzims.**.mapper"})
-@EnableFeignClients(basePackages = {"org.springblade", "com.hnac.hzinfo"})
+@EnableFeignClients(basePackages = {"org.springblade", "com.hnac"})
-@MapperScan("com.hnac.hzims.**.mapper.**")
-@ComponentScan(basePackages = {"com.hnac"})
-@Resource
-@EnableAspectJAutoProxy(exposeProxy = true)
 public class TicketApplication  {
 
 	public static void main(String[] args) {

pom.xml

@@ -58,11 +58,11 @@
                 <version>${data.sdk.version}</version>
             </dependency>
 
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.xuxueli</groupId>
+<!--                <groupId>com.xuxueli</groupId>-->
-                <artifactId>xxl-job-core</artifactId>
+<!--                <artifactId>xxl-job-core</artifactId>-->
-                <version>2.1.2</version>
+<!--                <version>2.1.2</version>-->
-            </dependency>
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>dynamic-datasource-spring-boot-starter</artifactId>