Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationNameMapper.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.JgChangeRegistrationNameDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -30,4 +31,6 @@ public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegis
                                           @Param("roleIds") List<String> roleIds,
                                           @Param("companyCode") String companyCode,
                                           @Param("currentUserId") String exeUserId);
+
+    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/service/IEquipUsedCheck.java

@@ -16,6 +16,13 @@ public interface IEquipUsedCheck {
     void equipRepeatUsedCheck(String record, String companyCode);
 
     /**
+     * 并发校验（页面同时提交或者页面同时打开多个时，某些使用登记证都是为使用状态）校验使用登记证流程在用状态及更新不在用为再使用状态
+     * @param record 设备唯一标识
+     * @param companyCode 登录人的公司代码
+     */
+    void registrationRepeatUsedCheck(String record, String companyCode);
+
+    /**
      * 删除流程中的数据，释放redis空间（异常处理及驳回到发起节点、撤回到发起节点、完成时时进行）
      * @param records 设备唯一标识
      * @param companyCode 登录人的公司代码

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationNameMapper">
-
-<select id="getEquipInfoByOrgCode" resultType="java.util.Map">
-    SELECT
-        u.RECORD AS equipId,
+    <select id="getEquipInfoByOrgCode" resultType="java.util.Map">
+        SELECT u.RECORD           AS equipId,
                o.SUPERVISORY_CODE AS supervisoryCode,
                b.USE_ORG_CODE     AS useOrgCode
-    FROM
-        idx_biz_jg_use_info u
+        FROM idx_biz_jg_use_info u
                  LEFT JOIN idx_biz_jg_register_info b ON u.RECORD = b.RECORD
                  LEFT JOIN idx_biz_jg_other_info o ON u.RECORD = o.RECORD
-    WHERE
-        USE_UNIT_CREDIT_CODE = #{code}
+        WHERE USE_UNIT_CREDIT_CODE = #{code}
     </select>
 
-<delete id="deleteByChangeRegistrationId">
-    delete from tzs_jg_change_registration_name_eq where name_change_registration_id = #{changeRegistrationId}
+    <delete id="deleteByChangeRegistrationId">
+        delete
+        from tzs_jg_change_registration_name_eq
+        where name_change_registration_id = #{changeRegistrationId}
     </delete>
 
-<select id="getListPage" resultType="java.util.Map">
+    <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.instance_id as instanceId,
         ur.audit_status as auditStatus,
@@ -38,7 +36,8 @@
         ur.next_execute_user_ids as nextExecuteUserIds,
         ur.next_task_id as nextTaskId,
         (SELECT group_concat(use_registration_code) from tzs_jg_use_registration_manage where sequence_nbr in (SELECT
-    certificate_seq	from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr)) as certificateCodes
+        certificate_seq from tzs_jg_change_registration_name_eq where name_change_registration_id = ur.sequence_nbr)) as
+        certificateCodes
         from tzs_jg_change_registration_name ur
         <where>
             and ur.is_delete = 0
@@ -66,11 +65,13 @@
                 </foreach>
             </if>
             <if test="dto.type == 'supervision'">
-            AND (ur.receive_company_code = #{companyCode} or ur.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%'))
+                AND (ur.receive_company_code = #{companyCode} or ur.transfer_to_user_ids LIKE concat ('%',
+                #{currentUserId}, '%'))
                 AND ur.instance_id is not null
             </if>
             <if test="dto.type == 'company'">
-            and (ur.use_unit_credit_code = #{dto.useUnitCreditCode} or ur.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%'))
+                and (ur.use_unit_credit_code = #{dto.useUnitCreditCode} or ur.transfer_to_user_ids LIKE concat ('%',
+                #{currentUserId}, '%'))
             </if>
         </where>
         order by
@@ -80,7 +81,18 @@
         ur.rec_date desc
     </select>
 
-<delete id="deleteHistoryInfoById">
-    delete from tzs_jg_registration_history where current_document_id = #{code}
+    <delete id="deleteHistoryInfoById">
+        delete
+        from tzs_jg_registration_history
+        where current_document_id = #{code}
     </delete>
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select a.use_unit_credit_code as companyCode,
+               group_concat(b.certificate_seq) as records
+        from tzs_jg_change_registration_name a,
+             tzs_jg_change_registration_name_eq b
+        where a.sequence_nbr = b.name_change_registration_id
+          and a.audit_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/controller/JgChangeRegistrationReformController.java

@@ -149,7 +149,8 @@ public class JgChangeRegistrationReformController extends BaseController {
 																		 @RequestParam(value = "EQU_LIST_CODE", required = false) String EQU_LIST_CODE,
 																		 @RequestParam(value = "EQU_CATEGORY_CODE", required = false) String EQU_CATEGORY_CODE,
 																		 @RequestParam(value = "equList", required = false) String equList,
-																		 @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode
+																		 @RequestParam(value = "receiveCompanyCode") String receiveCompanyCode,
+																		 @RequestParam(value = "certificateStatus", required = false) String certificateStatus
 																		 ) {
 		JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
 		Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
@@ -182,7 +183,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 				dto.setReceiveCompanyCode(codes[0]);
 			}
 		}
-		dto.setCertificateStatus("已登记");
+		dto.setEquCategoryCode(!ObjectUtils.isEmpty(certificateStatus) ? certificateStatus : "已登记");
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
 	}
 }

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

@@ -36,12 +36,40 @@ public abstract class BaseEquipUsedCheckService implements IEquipUsedCheck {
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
             if (!isLocked) {
                 log.error("设备：{}在被其他业务使用，加锁失败", record);
-                throw new BadRequest("存在其他业务在使用设备，请刷新后重试！");
+                throw new BadRequest("设备已被其他流程使用，请刷新后重试！");
             }
             RBucket<Set<String>> RBucket = getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()));
             Set<String> equipListOfUsed = RBucket.get();
             if (equipListOfUsed != null && equipListOfUsed.contains(record)) {
-                throw new BadRequest("存在设备正在被其他流程使用，不允许重复提交！");
+                throw new BadRequest("设备已被其他流程使用，不允许重复提交！");
+            }
+            if (equipListOfUsed == null || equipListOfUsed.isEmpty()) {
+                equipListOfUsed = new TreeSet<>();
+            }
+            equipListOfUsed.add(record);
+            getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType())).set(equipListOfUsed);
+            FlowingEquipRedisContext.setRedisKeyInfo(new FlowingEquipRedisKeyDTO(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()), Collections.singletonList(record)));
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } finally {
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+    @Override
+    public void registrationRepeatUsedCheck(String record, String companyCode) {
+        RLock lock = getRedisClient().getLock(this.getRepeatUsedCheckLockKey(companyCode, getApplyBizType(), record));
+        try {
+            boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
+            if (!isLocked) {
+                log.error("使用登记证：{}在被其他业务使用，加锁失败", record);
+                throw new BadRequest("使用登记证已被其他流程使用，请刷新后重试！");
+            }
+            RBucket<Set<String>> RBucket = getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()));
+            Set<String> equipListOfUsed = RBucket.get();
+            if (equipListOfUsed != null && equipListOfUsed.contains(record)) {
+                throw new BadRequest("使用登记证已被其他流程使用，不允许重复提交！");
             }
             if (equipListOfUsed == null || equipListOfUsed.isEmpty()) {
                 equipListOfUsed = new TreeSet<>();

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

@@ -1363,17 +1363,17 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper;
         String queryType = map.getString("QUERY_TYPE");
         if (!ObjectUtils.isEmpty(queryType)) {
             // 查询 安装告知【可告知设备列表】【USE_UNIT_CREDIT_CODE=== null ||  ""】
-            if (ValidationUtil.equals(queryType, "AZ")) {
+            if (ValidationUtil.equals(queryType, "AZ")) {//安装
                 BoolQueryBuilder nullOrEmptyQuery = QueryBuilders.boolQuery()
                         .mustNot(QueryBuilders.wildcardQuery("USE_UNIT_CREDIT_CODE", "*"));
                 boolMust.must(nullOrEmptyQuery);
                 this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "installNotice");
-            } else if (ValidationUtil.equals(queryType, "WB")) {
+            } else if (ValidationUtil.equals(queryType, "WB")) {//维保
                 // 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null ||  ""）】
                 BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
                 wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
                 boolMust.must(wbBuilder);
-            } else if (ValidationUtil.equals(queryType, "SY")) {
+            } else if (ValidationUtil.equals(queryType, "SY")) {//使用
                 // 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE（使用登记证编号） ==="" || null)】
                 BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
                 syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
@@ -1393,6 +1393,7 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper;
                 syBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
                 boolMust.must(syBuilder);
             }
+//            this.setRepeatUsedCheckFilterByType(boolMust,companyCode,queryType);
         }
 
         // 通用匹配规则，其他条件构建
@@ -1635,6 +1636,44 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper;
         return result;
     }
 
+    private void setRepeatUsedCheckFilterByType(BoolQueryBuilder boolMust, String companyCode, String queryType) {
+        if("AZ".equals(queryType)){//安装告知
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "installNotice");
+        }else if("GZ_GZ".equals(queryType)){//改造告知
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "renovationNoticeNew");
+        }else if("GZ_WX".equals(queryType)){//维修告知
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "maintainInfo");
+        }else if("GZ_YZ".equals(queryType)){//移装告知
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "transferNotice");
+        }else if("SY".equals(queryType)){//使用登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister");
+        }else if("DJ_GZ".equals(queryType)){//改造变更登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "changeRegistration");
+        }else if("DJ_YZ".equals(queryType)){//移装变更登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "changeRegistrationTransfer");
+        }else if("DJ_DW".equals(queryType)){//单位变更登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "unitChange");
+        }else if("DJ_GM".equals(queryType)){//更名变更登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "changeName");
+        }else if("BF_YZ".equals(queryType)){//注销
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "");
+        }else if("BF_ZX".equals(queryType)){//报废
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "");
+        }else if("SB_QY".equals(queryType)){//启用
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "");
+        }else if("SB_TY".equals(queryType)){//停用
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "");
+        }else if("WB_BA".equals(queryType)){//维保备案
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "maintenanceFiling");
+        }else if("SB_YJ".equals(queryType)){//设备移交
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "equipmentHandover");
+        }else if("QP_BG".equals(queryType)){//车用气瓶变更
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "vehicleGasCylinderChange");
+        }else if("QP_DJ".equals(queryType)){//车用气瓶登记
+            this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "vehicleInformation");
+        }
+    }
+
     /**
      * 设备注册信息分页查询
      *
@@ -2205,7 +2244,8 @@ private SafetyProblemTracingMapper safetyProblemTracingMapper;
             inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
             inspectionDetectionInfo.setRecord(record);
             inspectionDetectionInfo.setRecDate(date);
-            inspectionDetectionInfo.setInspectConclusion(null);
+            inspectionDetectionInfo.setInspectType("ZZJDJY");
+            inspectionDetectionInfo.setInspectConclusion("6040");
             inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
             iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
         }

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/JgChangeRegistrationNameRegistrationUsedCheckImpl.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.JgChangeRegistrationNameMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationUnitMapper;
+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 JgChangeRegistrationNameRegistrationUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "changeName";
+
+    private JgChangeRegistrationNameMapper mapper;
+
+    public JgChangeRegistrationNameRegistrationUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationNameMapper 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/JgChangeRegistrationReformServiceImpl.java

@@ -322,7 +322,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("使用登记保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -421,7 +421,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -642,7 +642,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -353,7 +353,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -538,7 +538,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -268,7 +268,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("改造告知保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -471,7 +471,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("知保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -404,7 +404,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -483,7 +483,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("安装告知保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -607,7 +607,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("使用登记保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -814,7 +814,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("使用登记保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }
@@ -2796,7 +2796,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             this.rollBackForDelRedisData();
-            throw new BadRequest("使用登记保存失败！");
+            throw new BadRequest("保存失败！");
         } finally {
             FlowingEquipRedisContext.clean();
         }

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

@@ -85,20 +85,23 @@ public class DPSubServiceImpl {
         Object apiResult = null;
 
         if (!ValidationUtil.isEmpty(api)) {
+            long s = System.currentTimeMillis();
             ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null);
             if (!ValidationUtil.isEmpty(responseModel.getResult())) {
                 apiResult = responseModel.getResult();
             }
+            long e = System.currentTimeMillis();
+            log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
         }
 
         if (!ValidationUtil.isEmpty(formSeq)) {
+            long s = System.currentTimeMillis();
             FormSceneModel formPage = Morphic.formSceneClient.seleteOne(formSeq).getResult();
             // 1、排除表单隐藏字段
             JSONArray children = (JSONArray) JsonValueUtils.getValueByKey(JSONObject.parseObject(formPage.getContent()), "children", "children");
             Object showHideRules = JsonValueUtils.getValueByKey(JSONObject.parseObject(formPage.getContent()), "formConfig", "formConfig.showHideRules");
 
             // 处理显隐逻辑
-            long s = System.currentTimeMillis();
             this.processShowHideRules(children, showHideRules, apiResult);
             long e = System.currentTimeMillis();
             log.info("{}tab页处理显隐逻辑，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
@@ -140,7 +143,7 @@ public class DPSubServiceImpl {
                 map.put("dataList", apiResult);
                 map.put("showPage", true);
                 map.put("api", api);
-                map.put("rowKey", "record");
+                map.put("rowKey", JsonValueUtils.getValueByKey(tab, "visualParams", "visualParams.rowKey"));
                 content.put(tab.getString("key"), map);
             }
         }

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

@@ -34,6 +34,7 @@
         }
       },
       "visualParams": {
+        "rowKey": "record",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备种类","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 160,"align": "left","title": "设备类别","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }

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

@@ -74,16 +74,17 @@
         }
       },
       "visualParams": {
+        "rowKey": "key",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
-          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
-          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+          {"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"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
         ]
       }
     }