Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -25,4 +26,6 @@ public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChan
                                                   @Param("orgCode") String orgCode,
                                                   @Param("currentUserId") String currentUserId,
                                                   @Param("roleIds") List<String> roleIds);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -39,4 +40,6 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
 
     @Select("select name from tz_equipment_category where code=#{code}")
     String getEquCategoryNameByCode(String code);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

@@ -96,5 +96,14 @@
         order by cru.rec_date desc
     </select>
 
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select a.use_unit_credit_code as companyCode,
+               group_concat(b.equ_id) as records
+        from tzs_jg_change_vehicle_registration_unit a,
+             tzs_jg_change_vehicle_registration_unit_eq b
+        where a.sequence_nbr = b.unit_change_id
+          and a.status in ('三级待受理', '二级待受理', '一级待受理')
+        GROUP BY a.use_unit_credit_code
+    </select>
 
 </mapper>

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

@@ -192,23 +192,24 @@
         ORDER BY INSPECT_DATE desc LIMIT 1
     </select>
     <select id="getUseDetail" resultType="java.util.Map">
-        SELECT USE_UNIT_NAME as useUnitName,
-               USE_UNIT_CREDIT_CODE as useUnitCreditCode,
-               USE_PLACE as usePlace,
-               SAFETY_MANAGER as safetyManager,
-               SAFETY_MANAGER_CODE as safetyManagerCode,
-               PHONE as phone,
-               concat(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME)    as estateUnitName,
+        SELECT ibjui.USE_UNIT_NAME as useUnitName,
+                ibjui.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
+                ibjui.USE_PLACE as usePlace,
+                ibjui.SAFETY_MANAGER as safetyManager,
+                ibjui.SAFETY_MANAGER_CODE as safetyManagerCode,
+               concat(tzi.sequence_nbr,'_',SAFETY_MANAGER) as safetyManagerSeq,
+               ibjui."PHONE" as phone,
+               concat(ibjui.ESTATE_UNIT_CREDIT_CODE, '_', ibjui.ESTATE_UNIT_NAME)    as estateUnitName,
 --                ESTATE_UNIT_NAME as estateUnitName,
 --                ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
-               ADDRESS as address,
-               PROVINCE as province,
-               CITY as city,
-               COUNTY as county,
-               USE_INNER_CODE as useInnerCode,
-               LONGITUDE_LATITUDE as longitudeLatitude,
-               FACTORY_USE_SITE_STREET as factoryUseSiteStreet
-        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+                ibjui.ADDRESS as address,
+                ibjui.PROVINCE as province,
+                ibjui.CITY as city,
+                ibjui.COUNTY as county,
+                ibjui.USE_INNER_CODE as useInnerCode,
+                ibjui.LONGITUDE_LATITUDE as longitudeLatitude,
+                ibjui.FACTORY_USE_SITE_STREET as factoryUseSiteStreet
+        FROM "idx_biz_jg_use_info"  ibjui left join tzs_user_info tzi on ibjui."PHONE" = tzi."phone"  where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">
         SELECT jri.EQU_CODE as equCode,

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

@@ -261,5 +261,13 @@
         </foreach>
         ORDER BY ui.REC_DATE DESC
     </select>
-
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select a.use_unit_credit_code as companyCode,
+               group_concat(b.equ_id) as records
+        from tzs_jg_vehicle_information a,
+             tzs_jg_vehicle_information_eq b
+        where a.sequence_nbr = b.vehicle_id
+          and a.status in ('三级待受理', '二级待受理', '一级待受理')
+        GROUP BY a.use_unit_credit_code
+    </select>
 </mapper>

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/JgChangeVehicleRegistrationUnitEquipUsedCheckImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class JgChangeVehicleRegistrationUnitEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "vehicleGasCylinderChange";
+
+    private JgChangeVehicleRegistrationUnitMapper mapper;
+
+    public JgChangeVehicleRegistrationUnitEquipUsedCheckImpl(RedissonClient redissonClient, JgChangeVehicleRegistrationUnitMapper mapper) {
+        this.redissonClient = redissonClient;
+        this.mapper = mapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中安装告知的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = mapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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/JgUseRegistrationServiceImpl.java

@@ -1696,6 +1696,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
+            useDetail.put("safetyManager", useDetail.get("safetyManagerSeq"));
             detail.putAll(useDetail);
         }
         if (!ObjectUtils.isEmpty(desDetail)) {

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/JgVehicleInformationEquipUsedCheckImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class JgVehicleInformationEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "vehicleInformation";
+
+    private JgVehicleInformationMapper mapper;
+
+    public JgVehicleInformationEquipUsedCheckImpl(RedissonClient redissonClient, JgVehicleInformationMapper mapper) {
+        this.redissonClient = redissonClient;
+        this.mapper = mapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中安装告知的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = mapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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

@@ -326,7 +326,7 @@ public class DPSubServiceImpl {
         mergedArray.stream().forEach(x -> {
             Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey");
             if (!ValidationUtil.isEmpty(fieldKey)) {
-                this.processWidgets(tab, datas, x, fieldKey.toString(), result, matinfo);
+                this.processWidgets(tab, datas, x, null, fieldKey.toString(), result, matinfo);
             }
         });
         map.put("datas", datas);
@@ -343,7 +343,8 @@ public class DPSubServiceImpl {
 
         JSONObject subObj = new JSONObject();
         subObj.put("key", "key" + i);
-        subObj.put("displayName", JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title"));
+        Object displayName = JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title");
+        subObj.put("displayName", displayName);
         subObj.put("renderType", "basic");
         subObj.put("columns", columnsArray.size());
 
@@ -351,7 +352,7 @@ public class DPSubServiceImpl {
         mergedArray.stream().forEach(x -> {
             Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey");
             if (!ValidationUtil.isEmpty(fieldKey)) {
-                this.processWidgets(tab, datas, x, fieldKey.toString(), JSONObject.parseObject(apiResult.toString()), matinfo);
+                this.processWidgets(tab, datas, x, displayName, fieldKey.toString(), JSONObject.parseObject(apiResult.toString()), matinfo);
                 subObj.put("datas", datas);
             }
         });
@@ -368,7 +369,7 @@ public class DPSubServiceImpl {
      * @param apiResult
      * @return
      */
-    public JSONArray processWidgets(JSONObject tab, JSONArray datas, Object x, String fieldKey, JSONObject apiResult, JSONObject matinfo) {
+    public JSONArray processWidgets(JSONObject tab, JSONArray datas, Object x, Object displayName, String fieldKey, JSONObject apiResult, JSONObject matinfo) {
         JSONObject jsonObject = new JSONObject();
 
         JSONObject xObj = (JSONObject) x;
@@ -380,10 +381,8 @@ public class DPSubServiceImpl {
         JSONObject param = tab.getJSONObject("param");
         jsonObject.put("type", "text");
         jsonObject.put("value", value);
-        if (!ValidationUtil.isEmpty(paramFieldKeys)){
-            if (((JSONArray) paramFieldKeys).contains(fieldKey)){
-                jsonObject.put("value", param.getString(fieldKey));
-            }
+        if (!ValidationUtil.isEmpty(paramFieldKeys) && ((JSONArray) paramFieldKeys).contains(fieldKey)){
+            jsonObject.put("value", param.getString(fieldKey));
         } else {
             if ("upload".equals(xObj.getString("componentKey"))) {
                 jsonObject.put("type", "img");
@@ -395,15 +394,17 @@ public class DPSubServiceImpl {
                 if (!ValidationUtil.isEmpty(value)) {
                     JSONObject attachmentUploadDatasObj = new JSONObject();
                     attachmentUploadDatasObj.put("value", value);
-                    String accept = JsonValueUtils.getValueByKey(xObj, "visualParams", "visualParams.accept").toString();
-                    if (accept.contains("doc") || accept.contains("docx") || accept.contains("pdf") || accept.contains("xls") || accept.contains("xlsx")) {
-                        attachmentUploadDatasObj.put("label", "附件");
+                    String accept = visualParams.getString("accept");
+                    String label = visualParams.getString("label");
+                    if (!ValidationUtil.isEmpty(displayName) && ("附件".equals(label) || "其他附件".equals(label))){
+                        label = label + "(" + displayName + ")";
+                    }
+                    attachmentUploadDatasObj.put("label", label);
+                    if (accept.equals(".*") || accept.contains("doc") || accept.contains("docx") || accept.contains("pdf") || accept.contains("xls") || accept.contains("xlsx")){
                         attachmentUploadDatasObj.put("type", "file");
-                    } else if (accept.contains("png") || accept.contains("img")) {
-                        attachmentUploadDatasObj.put("label", "证照");
+                    } else if(accept.contains("png") || accept.contains("img")){
                         attachmentUploadDatasObj.put("type", "img");
-                    } else if (accept.contains("mp4") || accept.contains("flv")) {
-                        attachmentUploadDatasObj.put("label", "视频");
+                    } else if(accept.contains("mp4") || accept.contains("flv")){
                         attachmentUploadDatasObj.put("type", "video");
                     }
                     attachmentUploadDatas.add(attachmentUploadDatasObj);
@@ -430,7 +431,9 @@ public class DPSubServiceImpl {
                 }
             }
         }
-        datas.add(jsonObject);
+        if (!"attachmentUpload".equals(xObj.getString("componentKey"))){
+            datas.add(jsonObject);
+        }
         return datas;
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json

 {
-  "name": "检验检测机构模板",
+  "name": "企业模板",
   "tabs": [
     {
       "key": "basic",

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json

@@ -74,7 +74,7 @@
         }
       },
       "visualParams": {
-        "rowKey": "key",
+        "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
           {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},

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

@@ -19,5 +19,5 @@ public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamP
      * @param orgCode 区域code对应的管辖机构
      * @return 数量
      */
-    String sumPipeLengthByOrgCode(String orgCode);
+    String sumPipeLengthByOrgCode(@Param("orgCode") String orgCode);
 }