Merge remote-tracking branch 'origin/develop_tzs' into develop_tzs

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/pom.xml

@@ -21,6 +21,10 @@
             <artifactId>amos-boot-module-common-biz</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/action/WarningMsgAction.java

@@ -19,7 +19,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import liquibase.pro.packaged.L;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -176,8 +175,9 @@ public class WarningMsgAction{
           Method getMethod = null;
           try {
               for (Field field : fields) {
-                  if (field.getName().equals("serialVersionUID"))
+                  if (field.getName().equals("serialVersionUID")) {
                       continue;
+                  }
                   String fileNameInMethod = String.valueOf(field.getName().charAt(0)).toUpperCase() + field.getName().substring(1);
                   getMethod = contingencyRo.getClass().getMethod("get" + fileNameInMethod);
                   String value = String.valueOf(getMethod.invoke(contingencyRo));
@@ -200,10 +200,11 @@ public class WarningMsgAction{
 
         Object parametervalue = ELEvaluationContext
             .getValue(parameter.substring(1, parameter.length() - 1));
-        if(parametervalue != null)
+        if(parametervalue != null) {
             str = str.replace(parameter,
               parametervalue != null ? parametervalue.toString() : null);
         }
+      }
       return str;
     }
 }

amos-boot-system-tzs/amos-boot-module-jczs/pom.xml

@@ -16,8 +16,6 @@
     <modules>
         <module>amos-boot-module-jczs-api</module>
         <module>amos-boot-module-jczs-biz</module>
-        <module>amos-boot-module-jczs-api</module>
-        <module>amos-boot-module-jczs-biz</module>
     </modules>
 
 </project>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/IAlertCalledService.java

@@ -3,10 +3,9 @@ package com.yeejoin.amos.boot.module.ymt.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.DispatchPaperEnums;
-import com.yeejoin.amos.boot.module.ymt.api.dto.*;
+
 
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/flc/api/mapper/TzCylinderMapper.java

@@ -3,8 +3,6 @@ package com.yeejoin.amos.boot.module.ymt.flc.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*;
-import com.yeejoin.amos.boot.module.ymt.flc.api.dto.*;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.*;
 import com.yeejoin.amos.boot.module.ymt.flc.api.entity.CylinderInfo;
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/pom.xml

@@ -21,6 +21,10 @@
             <artifactId>amos-boot-module-common-biz</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/AmosYmtApplication.java

 package com.yeejoin.amos;
 
 import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+import com.yeejoin.amos.boot.module.ymt.biz.listener.BaseEnterpriseMqTtlListener;
+import com.yeejoin.amos.boot.module.ymt.biz.listener.CarcylUnitInspectMqTtlListener;
+import com.yeejoin.amos.boot.module.ymt.biz.listener.PrivilegeCompanyDeleteListener;
+import com.yeejoin.amos.boot.module.ymt.biz.listener.PrivilegeCompanyUpdateAddListener;
 import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.service.ICylinderInfoService;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -21,6 +25,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.net.InetAddress;
@@ -51,9 +56,24 @@ public class AmosYmtApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmosYmtApplication.class);
 
     @Autowired
+    private EmqKeeper emqKeeper;
+
+    @Autowired
     private StartPlatformTokenService startPlatformTokenService;
 
     @Autowired
+    private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener;
+
+    @Autowired
+    private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener;
+
+    @Autowired
+    private PrivilegeCompanyUpdateAddListener privilegeCompanyUpdateAddListener;
+
+    @Autowired
+    private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener;
+
+    @Autowired
     ICylinderInfoService cylinderInfoServiceImpl;
 
     public static void main(String[] args) throws UnknownHostException {
@@ -73,6 +93,13 @@ public class AmosYmtApplication {
      *
      * @throws MqttException
      */
+    @Bean
+    public void initMqtt() throws Exception {
+        emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener);
+        emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener);
+        emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener);
+        emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener);
+    }
 
     @Bean
     public void initToken() {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/action/WarningMsgAction.java

@@ -15,7 +15,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import liquibase.pro.packaged.L;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -200,10 +199,11 @@ public class WarningMsgAction{
 
         Object parametervalue = ELEvaluationContext
             .getValue(parameter.substring(1, parameter.length() - 1));
-        if(parametervalue != null)
+        if(parametervalue != null) {
             str = str.replace(parameter,
               parametervalue != null ? parametervalue.toString() : null);
         }
+      }
       return str;
     }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/listener/PlatformUserTopicMessage.java

@@ -30,7 +30,7 @@ public class PlatformUserTopicMessage extends EmqxListener {
 
     @PostConstruct
     void init() throws Exception {
-        emqKeeper.subscript(amosOperationLog, 1, this);
+        emqKeeper.subscript(amosOperationLog, 2, this);
     }
 
     @Value("${amos.agency.code}")