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

amos-boot-data/amos-boot-data-accessapi/src/main/resources/application-dev.properties

@@ -26,16 +26,18 @@ spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
 
+localhost=${spring.cloud.client.ip-address}
+
 #注册中心地址
 eureka.client.service-url.defaultZone =http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/swagger-ui.html
-eureka.instance.ip-address=172.16.3.89
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/swagger-ui.html
+eureka.instance.ip-address=${localhost}
 eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
 
 ##emqx

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java

@@ -44,7 +44,13 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
     @Select("select name from tz_equipment_category  where code=#{code}")
     String getEquiplistNameByEquiplist(String code);
 
-    List<Map<String, Object>> getDetailById(@Param("id") Long id);
+    /**
+     *
+     * @param id 主键
+     * @param equListCode 设备种类
+     * @return 压力管道或者其他详情
+     */
+    List<Map<String, Object>> getDetailById(@Param("id") Long id, @Param("equListCode") String equListCode);
 
     List<CompanyEquipCountDto> queryForFlowingEquipList();
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -241,6 +241,33 @@
 
 
     <select id="getDetailById" resultType="java.util.Map">
+       <choose>
+           <when test='equListCode != null and equListCode == "8000"'>
+               select ur.sequence_nbr as sequenceNbr,
+               ur.audit_status as auditStatus,
+               ur.use_unit_name as useUnitName,
+               ur.use_registration_code as useRegistrationCode,
+               ur.status,
+               ur.receive_org_name as receiveOrgName,
+               DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+               DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
+               pc.equ_category_name as equCategory,
+               pc.project_contraption as productName,
+               pc.equ_code as equCode,
+               concat_ws('',pc.PROVINCE_NAME,pc.CITY_NAME,pc.COUNTY_NAME,pc.STREET_NAME, pc."ADDRESS") as place,
+               ifnull(ur.instance_id, '') as instanceId,
+               ur.apply_no as applyNo,
+               ifnull(ur.next_executor_ids,'') as nextExecutorIds,
+               ur.promoter,
+               ur.supervisory_code  as supervisoryCode,
+               ur.next_execute_user_ids as nextExecuteUserIds
+               from tzs_jg_change_registration_reform ur,
+               idx_biz_jg_project_contraption pc
+               where
+               ur.project_contraption_id = pc.sequence_nbr
+               and ur.sequence_nbr = #{id}
+           </when>
+          <otherwise>
               select ur.sequence_nbr as sequenceNbr,
               ur.audit_status as auditStatus,
               ur.use_unit_name as useUnitName,
@@ -266,6 +293,8 @@
               LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
               LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
               where ur.sequence_nbr = #{id}
+          </otherwise>
+       </choose>
     </select>
     <select id="queryForFlowingEquipList"
             resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -2336,7 +2336,7 @@ public class CommonServiceImpl implements ICommonService {
                 {
                     productName = String.join(",", sortedProductNameList);
                 }
-                formData.put("productName",equips.get(0).get("productName"));
+                formData.put("productName",productName);
 
             }else if (manageType.equals(VEHICLE) && !CollectionUtils.isEmpty(equips)){
                 //气瓶数量

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -336,7 +336,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                         commonServiceImpl.buildTaskModel(taskModelDtoList);
                     }
                 }
-                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
+                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), null);
             } else {
                 List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
                 if (CollectionUtils.isEmpty(equipmentLists)) {
@@ -434,7 +434,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                         commonServiceImpl.buildTaskModel(taskModelDtoList);
                     }
                 }
-                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
+                return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr(), "8000");
             }
         } catch (BadRequest |
                 LocalBadRequest e) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/application-dev.properties

+localhost=${spring.cloud.client.ip-address}
 #DB properties:
 spring.datasource.url=jdbc:postgresql://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
@@ -6,11 +7,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.6:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.6:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.6:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.6
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${localhost}
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application-dev.properties

@@ -29,16 +29,18 @@ spring.datasource.dynamic.datasource.cyl.hikari.max-lifetime=120000
 spring.datasource.dynamic.datasource.cyl.hikari.connection-timeout=30000
 spring.datasource.dynamic.datasource.cyl.hikari.connection-test-query=SELECT 1
 
+localhost=${spring.cloud.client.ip-address}
+
 ## eureka properties:
 eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.20:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.20
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${localhost}
 
 #redis properties:
 spring.redis.database=1
@@ -73,3 +75,5 @@ eureka.instance.metadata-map.user.password=a1234560
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 management.security.enabled=true
+
+regulatory_code_prefix=https://sxtzsb.sxsei.com:19435/tzs?code=
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties

+localhost=${spring.cloud.client.ip-address}
+
 #DB properties:
 spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
@@ -6,11 +8,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.20:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.20
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${localhost}
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-dev.properties

+localhost=${spring.cloud.client.ip-address}
+
 #DB properties:
 spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
@@ -6,11 +8,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.68:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.68:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.68:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.68
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${localhost}
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456