解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/PatrolDataSyncTopicEnum.java

@@ -7,6 +7,7 @@ public enum PatrolDataSyncTopicEnum {
     CHECK_SHOT("checkShot", "patrol/sync/checkShot"),
     PLAN_TASK("planTask", "patrol/sync/planTask"),
     PLAN_TASK_DETAIL("planTaskDetail", "patrol/sync/planTaskDetail"),
+    PATROL_CHECK_INPUT_TO_DATASYS ("11", "patrol/checkinput"),
     CHECK_INPUT_BO("checkInputBo", "patrol/sync/checkInputBo");
 
     private String type;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -50,7 +50,7 @@ public class PersonIdentifyAspect {
             ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
             if (reginParam != null) {
-                if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getBizOrgCode() == null) {
+                if (reginParam.getPersonIdentity() == null || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode()) || StringUtils.isEmpty(reginParam.getPersonIdentity().getCompanyBizOrgCode())) {
                     String userId = reginParam.getUserModel().getUserId();
                     if (userId != null) {
                         FeignClientResult responseModel = jcsFeignClient.selectById(userId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -706,7 +706,7 @@ public class ConfigureController extends AbstractBaseController {
             ReginParams reginParams = getSelectedOrgInfo();
             ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
             if (!ValidationUtil.isEmpty(personIdentity)) {
-                bizOrgCode = personIdentity.getBizOrgCode();
+                bizOrgCode = personIdentity.getCompanyBizOrgCode();
             }
         }
         if (ObjectUtils.isEmpty(bizOrgCode)){

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PatrolDataSyncServiceImpl.java

@@ -157,6 +157,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
             if (checkInputSyncBo != null) {
                 String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), checkInputSyncBo);
                 webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                webMqttComponent.publish(PatrolDataSyncTopicEnum.PATROL_CHECK_INPUT_TO_DATASYS.getTopic(), JSON.toJSONString(checkInputSyncBo, SerializerFeature.WriteMapNullValue));
                 if (patrolSyncSwitch) {
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), JSON.toJSONString(checkInputSyncBo, SerializerFeature.WriteMapNullValue));
                 }
@@ -173,6 +174,7 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
                 checkInputSyncBoList.forEach(x -> {
                     String message = buildSyncMessage(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), x);
                     webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
+                    webMqttComponent.publish(PatrolDataSyncTopicEnum.PATROL_CHECK_INPUT_TO_DATASYS.getTopic(), JSON.toJSONString(x, SerializerFeature.WriteMapNullValue));
                     if (patrolSyncSwitch) {
                         webMqttComponent.publish(PatrolDataSyncTopicEnum.CHECK_INPUT_BO.getTopic(), JSON.toJSONString(x, SerializerFeature.WriteMapNullValue));
                     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

@@ -56,7 +56,7 @@ public class PersonIdentifyAspect {
         }else {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (reginParam != null ) {
-            if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getCompanyBizOrgCode() == null) {
+            if (reginParam.getPersonIdentity() == null || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode()) || StringUtils.isEmpty(reginParam.getPersonIdentity().getCompanyBizOrgCode())) {
                 String userId = reginParam.getUserModel().getUserId();
 
                 if (userId != null) {

amos-boot-system-equip/src/main/resources/ftl/iotMonthReport.ftl

@@ -1021,7 +1021,7 @@
                         <w:sz-cs w:val="36"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t> ${station}换流站</w:t>
+                    <w:t> ${station}</w:t>
                 </w:r>
 <#--                <w:r>-->
 <#--                    <w:rPr>-->

amos-boot-system-patrol/src/main/resources/application-dev.properties

@@ -20,7 +20,7 @@ ribbon.MaxAutoRetries = 1
 xiy_amos_satety_business
 spring.reactor.debug-agent.enabled=true
 #DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.215:3306/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.10.215:3307/dl_business_v3.0.1.3?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name = com.mysql.jdbc.Driver

amos-boot-system-patrol/src/main/resources/application.properties

@@ -21,6 +21,9 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml
 mybatis-plus.mapper-locations=classpath:db/mapper/*.xml
 mybatis.type-aliases-package = com.yeejoin.amos.patrol.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
 spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled=true