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

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

@@ -846,8 +846,8 @@ public class AlertCalledController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/callRecords/{id}")
 	@ApiOperation(httpMethod = "GET", value = "根据id获取通话记录信息", notes = "根据id获取通话记录信息")
-	public ResponseModel<Object> getCallRecords(@PathVariable Long id) {
-		return ResponseHelper.buildResponse(iAlertCalledService.getCallRecords(id));
+	public ResponseModel<Object> getCallRecords(@PathVariable Long id, @RequestParam int number, @RequestParam int size) {
+		return ResponseHelper.buildResponse(iAlertCalledService.getCallRecords(id, number, size));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -981,7 +981,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         return alertCalledMapper.getCountNum(userName, startTime, endTime, groupCode);
     }
 
-    public Object getCallRecords(Long id) {
+    public Object getCallRecords(Long id, int number, int size) {
+        Page<VoiceRecordFileDto> voiceRecordFileDtoPage = new Page<>();
         HashMap<String, Object> map = new HashMap<>();
         LambdaQueryWrapper<VoiceRecordFile> queryWrapper = new LambdaQueryWrapper<VoiceRecordFile>();
         queryWrapper.eq(VoiceRecordFile::getAlertId, id).orderByDesc(VoiceRecordFile::getRecDate);
@@ -994,8 +995,15 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             BeanUtils.copyProperties(voiceRecord, target);
             dtoList.add(target);
         });
-        map.put("dataList", dtoList);
-        return map;
+//        map.put("dataList", dtoList);
+        List<VoiceRecordFileDto> collect = dtoList.stream()
+                .skip((long) (number - 1) * size)
+                .limit(size)
+                .collect(Collectors.toList());
+        voiceRecordFileDtoPage.setRecords(collect);
+        voiceRecordFileDtoPage.setCurrent(number);
+        voiceRecordFileDtoPage.setSize(size);
+        return voiceRecordFileDtoPage;
     }
 
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
@@ -1026,15 +1034,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         first.put("columns", columns);
         first.put("displayName", "一级调派");
         List<Map<String, Object>> list = elevatorServiceImpl.selectMtByAlertId(String.valueOf(map.get("sequenceNbr")));
-//        if (!ObjectUtils.isEmpty(list)) {
-//            firstData.put("companyName", ObjectUtils.isEmpty(list.get(0).get("unitName")) ? null : String.valueOf(list.get(0).get("unitName")));
-//            firstData.put("companyCode", ObjectUtils.isEmpty(list.get(0).get("useCode")) ? null : String.valueOf(list.get(0).get("useCode")));
-//            firstData.put("companyType", "维保单位");
-//            firstData.put("responseStatus", "已派遣");
-//        }
         firstDatas.add(firstData);
-        first.put("datas", list);
-
+        first.put("dataList", list);
+        first.put("rowKey", "sequenceNbr");
         // 二级调派
         String secondJson;
         try {
@@ -1049,14 +1051,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         String latitude = String.valueOf(map2.get("latitude"));
         // 根据经纬度和距离返回救援机构信息
         HashMap<String, Object> second = new HashMap<>();
-        ArrayList<Map> secondDatas = new ArrayList<>();
         second.put("key", "secondLevelDispatch");
         second.put("renderType", "table");
         second.put("columns", secondColumns);
         second.put("displayName", "二级调派");
         List<RescueStationDto> listByLatLonDistance = iRescueStationService.getListByLatLonDistance(latitude, longitude, 1000);
-        second.put("datas", listByLatLonDistance);
-
+        second.put("dataList", listByLatLonDistance);
+        second.put("rowKey", "sequenceNbr");
         // 力量调派
         String powerJson;
         try {
@@ -1069,7 +1070,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         queryWrapper.eq(DispatchTask::getAlertId, id);
         HashMap<String, Object> power = new HashMap<>();
         ArrayList<Map> powerDatas = new ArrayList<>();
-        power.put("key", "firstLevelDispatch");
+        power.put("key", "powerLevelDispatch");
         power.put("renderType", "table");
         power.put("columns", powerColumns);
         power.put("displayName", "使用单位");
@@ -1086,7 +1087,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 powerDatas.add(objectMap);
             });
         }
-        power.put("datas", powerDatas);
+        power.put("dataList", powerDatas);
+        power.put("rowKey", "sequenceNbr");
         group.add(power);
         group.add(first);
         group.add(second);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/json/dispatchRecordFirst.json

    [
     {
       "dataIndex": "unitName",
-      "width": 150,
+      "width": "33%",
       "align": "left",
       "title": "维保单位",
       "key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"
     },
     {
       "dataIndex": "address",
-      "width": 160,
+      "width": "33%",
       "align": "left",
       "title": "地址",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"
     },
     {
       "dataIndex": "userName1",
-      "width": 160,
+      "width": "15%",
       "align": "left",
       "title": "主要负责人",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA2"
     },
     {
       "dataIndex": "phone1",
-      "width": 160,
+      "width": "15%",
       "align": "left",
       "title": "主要负责人电话",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA3"

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/json/dispatchRecordPower.json

    [
     {
       "dataIndex": "orgType",
-      "width": 150,
+      "width": "15%",
       "align": "left",
       "title": "响应级别",
       "key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"
     },
     {
       "dataIndex": "responseOrgName",
-      "width": 150,
+      "width": "26%",
       "align": "left",
       "title": "单位名称",
       "key": "D1CB84A4-E037-446A-9469-65B76E381585"
     },
     {
       "dataIndex": "responseUserName",
-      "width": 160,
+      "width": "10%",
       "align": "left",
       "title": "联系人",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"
     },
     {
       "dataIndex": "responseUserTel",
-      "width": 160,
+      "width": "15%",
       "align": "left",
       "title": "联系电话",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA1"
     },
     {
       "dataIndex": "dispatchTime",
-      "width": 160,
+      "width": "15%",
       "align": "left",
       "title": "派遣时间",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA2"
     },
     {
       "dataIndex": "arriveTime",
-      "width": 160,
+      "width": "15%",
       "align": "left",
       "title": "到达时间",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA3"

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/json/dispatchRecordSecond.json

    [
     {
       "dataIndex": "name",
-      "width": 150,
+      "width": "23%",
       "align": "left",
       "title": "名称",
       "key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"
     },
     {
       "dataIndex": "address",
-      "width": 150,
+      "width": "33%",
       "align": "left",
       "title": "地址",
       "key": "D1CB84A4-E037-446A-9469-65B76E381585"
     },
     {
       "dataIndex": "distance",
-      "width": 160,
+      "width": "20%",
       "align": "left",
       "title": "距离",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"
     },
     {
       "dataIndex": "rescueLeader",
-      "width": 160,
+      "width": "10%",
       "align": "left",
       "title": "救援负责人",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA1"
     },
     {
       "dataIndex": "rescueLeaderPhone",
-      "width": 160,
+      "width": "10%",
       "align": "left",
       "title": "电话",
       "key": "611DAF3D-5B79-466C-BEF2-CC91580091FA2"

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -268,4 +268,18 @@ public class JgUseRegistrationManageController extends BaseController {
         }
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
     }
+
+    /**
+     * 根据sequenceNbr查询---大屏使用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/detail/dp")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询---大屏使用", notes = "根据sequenceNbr查询---大屏使用")
+    public ResponseModel<Object> getDetail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.getDetail(sequenceNbr));
+    }
+
 }

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

@@ -1595,8 +1595,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 工程装置名称模糊查询
         if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString(PROJECT_CONTRAPTION));
-            pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", test.toLowerCase()));
+            pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION).toLowerCase()));
             boolMust.must(pBuilder);
         }
         builder.query(boolMust);
@@ -2188,6 +2187,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
         // 其他信息
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
+        // 检验检测
+        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
 
         // 使用信息
         useInfo.setRecord(record);
@@ -2293,19 +2294,24 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 
-        if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory) || "8300".equals(equCategory)) {
-            IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
-            List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
-            Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
-            Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
-            inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
-            inspectionDetectionInfo.setRecord(record);
-            inspectionDetectionInfo.setRecDate(date);
-            inspectionDetectionInfo.setInspectType("8300".equals(equCategory) ? "AZJDJY" : "ZZJDJY");
-            // inspectionDetectionInfo.setInspectConclusion("6040");
-            inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
-            iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
-        }
+        // 检验检测信息
+        inspectionDetectionInfo.setRecord(record);
+        inspectionDetectionInfo.setRecDate(date);
+        iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
+        // if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory) || "8300".equals(equCategory)) {
+        //     IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
+        //     List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
+        //     Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
+        //     Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
+        //     inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
+        //     inspectionDetectionInfo.setRecord(record);
+        //     inspectionDetectionInfo.setRecDate(date);
+        //     inspectionDetectionInfo.setInspectType("8300".equals(equCategory) ? "AZJDJY" : "ZZJDJY");
+        //     // inspectionDetectionInfo.setInspectConclusion("6040");
+        //     inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+        //     iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+        // }
 
         // 八大类技术参数和主要零部件和安全附件表
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();

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

@@ -947,7 +947,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 //修改各类告知列表，置为废弃
                 this.updateInvalidStatusByHistory(device.getEquId(), device.getEquipTransferId());
                 //修改证管理表数据
-                this.updateUseRegistrationManage(transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get());
+                this.updateUseRegistrationManage(device, transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get());
             });
         }
 
@@ -963,7 +963,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         this.updateTransferByBaseInfo(transfer);
     }
 
-    private void updateUseRegistrationManage(JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
+    private void updateUseRegistrationManage(JgChangeRegistrationTransferEq device, JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
         JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
         List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
                 .in(BaseEntity::getSequenceNbr,
@@ -971,12 +971,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                 .map(obj -> ((JSONObject) obj).getString("sequenceNbr"))
                                 .collect(Collectors.toList())
                 ).list();
+
         registrationList.forEach(registrationManage -> {
             registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
             registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
             registrationManage.setAuditPassDate(new Date());
             registrationManage.setEquUseAddress(transfer.getFullAddress());
-            if (isUpdateRegistrationCode) {
+            if (isUpdateRegistrationCode && !StringUtils.isEmpty(registrationManage.getUseRegistrationCode())
+                    && device.getUseRegistrationCode() != null && device.getUseRegistrationCode().equals(registrationManage.getUseRegistrationCode())) {
                 registrationManage.setUseRegistrationCode(useRegistrationCode);
             }
             registrationManage.setCertificateStatus("已登记");

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import org.apache.commons.io.IOUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
@@ -31,19 +33,25 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.alibaba.fastjson.JSON.parseArray;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
 
 /**
@@ -95,6 +103,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     @Autowired
     private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
 
+    @Value("classpath:/json/registrationBasic.json")
+    private Resource registrationBasicJson;
+
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
      */
@@ -548,4 +559,59 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMasterPhone()) ? idxBizJgMaintenanceRecordInfo.getMeMasterPhone() : StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMaster1Phone()) ? idxBizJgMaintenanceRecordInfo.getMeMaster1Phone() : "";
     }
 
+
+    /**
+     * 根据sequenceNbr查询---大屏使用
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    public Object getDetail(String sequenceNbr) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        List<FormValue> jsonData = getJsonData(registrationBasicJson);
+        HashMap<String, Object> result = new HashMap<>();
+        // 基本信息
+        JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
+        Map<String, Object> objectMap = Bean.BeantoMap(jgUseRegistrationManage);
+        jsonData.forEach(f -> {
+            Object o = objectMap.get(f.getKey());
+            if (!ObjectUtils.isEmpty(o)) {
+                f.setValue(o.toString());
+                if ("auditPassDate".equals(f.getKey())){
+                    f.setValue(simpleDateFormat.format(jgUseRegistrationManage.getAuditPassDate()));
+                }
+            }
+        });
+        // 流水信息
+        List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
+                .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode())
+                .or().eq(JgCertificateChangeRecord::getCertificateNo, jgUseRegistrationManage.getCertificateNo())
+                .orderByDesc(JgCertificateChangeRecord::getCreateDate));
+        List<Map<String, String>> collect = changeRecordList.stream()
+                .map(x -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("operatingTime", simpleDateFormat.format(x.getRecDate()));
+                    map.put("operater", x.getChangeContent());
+                    map.put("label", simpleDateFormat.format(x.getRecDate()));
+                    return map;
+                }).collect(Collectors.toList());
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("datas", collect);
+        map.put("title", "使用登记证流水");
+        map.put("renderType", "timeline");
+        result.put("keyParams", jsonData);
+        result.put("deviceRecords", map);
+        return result;
+    }
+
+
+    private List<FormValue> getJsonData(Resource resource) {
+        String json;
+        try {
+            json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return parseArray(json, FormValue.class);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/registrationBasic.json

+[
+  {
+    "key": "useRegistrationCode",
+    "label": "使用登记证编号",
+    "type": "text"
+  },
+  {
+    "key": "useUnitName",
+    "label": "使用单位名称",
+    "type": "text"
+  },
+  {
+    "key": "useUnitAddress",
+    "label": "使用单位地址",
+    "type": "text"
+  },
+  {
+    "key": "receiveOrgName",
+    "label": "登记机关",
+    "type": "text"
+  },
+  {
+    "key": "equList",
+    "label": "设备种类",
+    "type": "text"
+  },
+  {
+    "key": "equCategory",
+    "label": "设备类别",
+    "type": "text"
+  },
+  {
+    "key": "equDefine",
+    "label": "设备品种",
+    "type": "text"
+  },
+  {
+    "key": "equUseAddress",
+    "label": "设备使用地址",
+    "type": "text"
+  },
+  {
+    "key": "certificateStatus",
+    "label": "使用登记证状态",
+    "type": "text"
+  },
+  {
+    "key": "auditPassDate",
+    "label": "办理日期",
+    "type": "text"
+  }
+]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -153,8 +153,8 @@
     </select>
     <select id="countEmergencyEventsByOrgCodeAndDate2" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
         SELECT
-        ifnull (SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS total as longValue,
-        alarm_type_code as keyStr,
+        ifnull (SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS longValue,
+        alarm_type_code as keyStr
         FROM
         tz_alert_called
         WHERE

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ZLDPStatisticsController.java

@@ -84,7 +84,7 @@ public class ZLDPStatisticsController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/region/info")
-    @ApiOperation(httpMethod = "POST", value = "查询区域统计信息", notes = "查询区域统计信息")
+    @ApiOperation(httpMethod = "POST", value = "大屏-总览-安全监管 (近7天)", notes = "安全监管 (近7天)")
     public ResponseModel<JSONArray> statisticsRegionInfo(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/AQZSDPStatisticsServiceImpl.java

@@ -117,7 +117,7 @@ public class AQZSDPStatisticsServiceImpl {
         }
         BigDecimal bigTotalUnitNumber = new BigDecimal(String.valueOf(totalUnitNumber));
         BigDecimal bigOkUnitNumberNumber = new BigDecimal(String.valueOf(okUnitNumberNumber));
-        BigDecimal result = bigOkUnitNumberNumber.divide(bigTotalUnitNumber, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2);
+        BigDecimal result = bigOkUnitNumberNumber.divide(bigTotalUnitNumber, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2,RoundingMode.HALF_UP);
         return result.toPlainString();
     }
 
@@ -175,12 +175,12 @@ public class AQZSDPStatisticsServiceImpl {
         List<String> xdata = stCommonService.buildXData(regionModels);
         regionModels.forEach(r -> {
             SecurityIndexCountItemDto countItemDto = regionCodeSecurityIndexMap.get(r.getRegionCode().toString());
-            xuke.add(countItemDto.getXuke());
-            shiyongdengji.add(countItemDto.getShiyongdengji());
-            jianyanchaoqi.add(countItemDto.getJianyanchaoqi());
-            jianyanhege.add(countItemDto.getJianyanhege());
-            czjc.add(countItemDto.getCzjc());
-            czjchege.add(countItemDto.getCzjchege());
+            xuke.add(this.castScore2Percent(countItemDto.getXuke()));
+            shiyongdengji.add(this.castScore2Percent(countItemDto.getShiyongdengji()));
+            jianyanchaoqi.add(this.castScore2Percent(countItemDto.getJianyanchaoqi()));
+            jianyanhege.add(this.castScore2Percent(countItemDto.getJianyanhege()));
+            czjc.add(this.castScore2Percent(countItemDto.getCzjc()));
+            czjchege.add(this.castScore2Percent(countItemDto.getCzjchege()));
         });
         Map<String, Object> result = new HashMap<>();
         result.put("xdata", xdata);
@@ -194,6 +194,12 @@ public class AQZSDPStatisticsServiceImpl {
         return result;
     }
 
+    private String castScore2Percent(String score) {
+        BigDecimal big = new BigDecimal(score);
+        BigDecimal percent = big.divide(new BigDecimal("100"),2,RoundingMode.HALF_UP);
+        return percent.toPlainString();
+    }
+
     private Set<String> getLegendForCyArea() {
         Set<String> legendData = new HashSet<>();
         legendData.add("许可有效率");

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubBizServiceImpl.java

@@ -46,11 +46,11 @@ public class DPSubBizServiceImpl {
 
     /**
      * 问题记录列表
-     * @param equipId
+     * @param sourceId
      * @return
      */
-    public List<Map<String, String>> queryProblemListByEquipId(String equipId) {
-        return dpSubBizMapper.queryForSafetyProblemTracingList(equipId).stream()
+    public List<Map<String, String>> queryProblemListBySourceId(String sourceId) {
+        return dpSubBizMapper.queryForSafetyProblemTracingList(sourceId).stream()
                 .map(x -> {
                     Map<String, String> map = new HashMap<>();
                     map.put("key", x.get("sequence_nbr"));

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

@@ -32,9 +32,7 @@ import javax.script.Invocable;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,7 +133,7 @@ public class DPSubServiceImpl {
             log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
         }
 
-        if (tab.getString("template").contains("emergency")){
+        if (tab.getString("template").contains("emergency") && tab.getString("key").equals("keyinfo")){
             content.put(tab.getString("key"), JSONObject.parseObject(apiResult.toString()));
             return;
         }
@@ -240,10 +238,10 @@ public class DPSubServiceImpl {
             this.processLabel(status, param.getString("EQU_STATE"));
 
             // 处理问题列表
-            List<Map<String, String>> problem = dpSubBizService.queryProblemListByEquipId(param.getString("record"));
+            List<Map<String, String>> problem = dpSubBizService.queryProblemListBySourceId(param.getString("record"));
             if (!ValidationUtil.isEmpty(problem)){
                 JSONObject qrcode = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.qrcode");
-                qrcode.put("problem", problem);
+                qrcode.put("problem", problem.subList(0, 1));
             }
 
             // 处理监管履历
@@ -251,6 +249,23 @@ public class DPSubServiceImpl {
             if (!ValidationUtil.isEmpty(datas)){
                 JSONObject infoRecords = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.infoRecords");
                 infoRecords.put("datas", datas);
+                if (!ValidationUtil.isEmpty(problem)){ // 设备业务履历跟问题履历需要合并
+                    List<Map<String, String>> list = new ArrayList<>();
+                    list.addAll(datas);
+                    List<Map<String, String>> collect = problem.stream().map(x -> {
+                        Map<String, String> map = new HashMap<>();
+                        map.put("label", x.get("type"));
+                        map.put("operater", x.get("descr"));
+                        map.put("operatingTime", x.get("createDate"));
+                        return map;
+                    }).collect(Collectors.toList());
+                    list.addAll(collect);
+                    list.sort(Comparator.comparing(
+                            (Map<String, String> map) -> map.get("operatingTime"),
+                            Comparator.comparing(String::toString).reversed()
+                    ));
+                    infoRecords.put("datas", list);
+                }
                 param.put("reghistory", datas);
             }
         } else if(tab.getString("template").contains("company")){
@@ -258,7 +273,25 @@ public class DPSubServiceImpl {
             JSONArray status = (JSONArray)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.status");
             this.processLabel(status, result.getString("unitType"));
             this.processLabel(status, result.getString("operatingStatus"));
-
+            // 处理问题列表
+            List<Map<String, String>> problem = dpSubBizService.queryProblemListBySourceId(param.getString("sequenceNbr"));
+            if (!ValidationUtil.isEmpty(problem)){
+                JSONObject qrcode = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.qrcode");
+                qrcode.put("problem", problem.subList(0, 1));
+                // 企业时间轴显示问题履历
+                List<Map<String, String>> list = problem.stream().map(x -> {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("label", x.get("type"));
+                    map.put("operater", x.get("descr"));
+                    map.put("operatingTime", x.get("createDate"));
+                    return map;
+                }).sorted(Comparator.comparing(
+                        (Map<String, String> map) -> map.get("operatingTime"),
+                        Comparator.comparing(String::toString).reversed()
+                )).collect(Collectors.toList());
+                JSONObject infoRecords = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.infoRecords");
+                infoRecords.put("datas", list);
+            }
             // 处理图片
             JSONArray jsonArray = result.getJSONArray("unitBusinessLicense");
             if (!ValidationUtil.isEmpty(jsonArray)){

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
@@ -58,17 +62,20 @@ public class StCommonServiceImpl {
 
     private EquipmentCategoryMapper equipmentCategoryMapper;
 
+    private ZLStatisticsMapper zlStatisticsMapper;
+
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static List<RegionModel> regionModels = new ArrayList<>();
 
     private static List<EquipmentCategoryDto> equipmentCategoryDtos;
 
-    public StCommonServiceImpl(CommonBaseMapper commonMapper, RestHighLevelClient restHighLevelClient, EquipTechParamPipelineMapper techParamsPipelineMapper, EquipmentCategoryMapper equipmentCategoryMapper) {
+    public StCommonServiceImpl(CommonBaseMapper commonMapper, RestHighLevelClient restHighLevelClient, EquipTechParamPipelineMapper techParamsPipelineMapper, EquipmentCategoryMapper equipmentCategoryMapper, ZLStatisticsMapper zlStatisticsMapper) {
         this.commonMapper = commonMapper;
         this.restHighLevelClient = restHighLevelClient;
         this.techParamsPipelineMapper = techParamsPipelineMapper;
         this.equipmentCategoryMapper = equipmentCategoryMapper;
+        this.zlStatisticsMapper = zlStatisticsMapper;
     }
 
     public static Map<String, String> getRegionCodeOrgCodeMap() {
@@ -233,4 +240,32 @@ public class StCommonServiceImpl {
         result.put(DPMapStatisticsItemEnum.PRESSURE_PIPELINES.getCode(), length);
     }
 
+
+    public CountDto getYellowStatusCompany(DPFilterParamDto dpFilterParamDto) {
+        CountDto countDto = new CountDto();
+        countDto.setLongValue(this.countCompanyForCertDateTimeOut(dpFilterParamDto));
+        countDto.setLabel("资质临期");
+        return countDto;
+    }
+
+    public CountDto getRedStatusCompany(DPFilterParamDto dpFilterParamDto) {
+        CountDto countDto = new CountDto();
+        countDto.setLongValue(this.countCompanyForCertDateTemporary(dpFilterParamDto));
+        countDto.setLabel("资质超期");
+        return countDto;
+    }
+
+    private long countCompanyForCertDateTemporary(DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        // 临期6个月
+        String limitDate = DateUtil.offset(DateUtil.date(), DateField.DAY_OF_MONTH, 6).toDateStr();
+        return zlStatisticsMapper.countCompanyForCertDateTemporary(dpFilterParamDto, orgCode, limitDate);
+    }
+
+    private long countCompanyForCertDateTimeOut(DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        String limitDate = DateUtil.today();
+        return zlStatisticsMapper.countCompanyForCertDateTimeOut(dpFilterParamDto, orgCode, limitDate);
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
-import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,14 +7,12 @@ import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertRescueStatistics;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics;
-import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertUseUnitStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.ymt.api.entity.MainParts;
 import com.yeejoin.amos.boot.module.ymt.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -135,14 +132,18 @@ public class YJDPStatisticsServiceImpl {
         return jsonObject;
     }
 
-    public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) throws Exception {
+    public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) {
         List<RegionModel> regionList = stCommonService.setRegionIfRootParent(dpFilterParamDto);
-        List<String> xdata = regionList.stream().map(r -> r.getRegionName().toString()).collect(Collectors.toList());
+        List<String> xdata = regionList.stream().map(RegionModel::getRegionName).collect(Collectors.toList());
 
         List<Long> ydata = new ArrayList<>();
         regionList.forEach(x -> {
             String orgCode = stCommonService.getAndSetOrgCode(x.getRegionCode().toString());
-            ydata.add(elevatorCountByES(orgCode));
+            if(!ValidationUtil.isEmpty(orgCode)) {
+                ydata.add(elevatorCountByES(orgCode));
+            }else{
+                ydata.add(0L);
+            }
         });
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("xdata", xdata);
@@ -366,12 +367,15 @@ public class YJDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
-        return stCommonService.setRegionIfRootParent(dpFilterParamDto).parallelStream().map(r -> {
+        return stCommonService.setRegionIfRootParent(dpFilterParamDto).stream().map(r -> {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
             filterParamDto.setCityCode(r.getRegionCode().toString());
             String orgCode = stCommonService.getAndSetOrgCode(filterParamDto);
-            this.setDefaultFilter(filterParamDto);
-            Map<String, Object> itemResult = getCenterMapOverviewData(orgCode, filterParamDto);
+            Map<String, Object> itemResult = new HashMap<>();
+            if (StringUtils.isNotEmpty(orgCode)) {
+                this.setDefaultFilter(filterParamDto);
+                itemResult = getCenterMapOverviewData(orgCode, filterParamDto);
+            }
             itemResult.put("regionCode", r.getRegionCode());
             itemResult.put("regionName", r.getRegionName());
             return itemResult;
@@ -385,37 +389,37 @@ public class YJDPStatisticsServiceImpl {
         Map<String, Long> alertTypeNumMap = countDtos.stream().collect(Collectors.toMap(CountDto::getKeyStr, CountDto::getLongValue));
         Map<String, Long> equDefineNumMap = staticsElevatorByEquDefine(filterParamDto.getCityCode());
         // 电梯总量(台)
-        result.put("dtCount", equDefineNumMap.values().stream().mapToLong(e->e).sum());
+        result.put("dtCount", equDefineNumMap.values().stream().mapToLong(e -> e).sum());
         // 曳引驱动乘客电梯(台)
-        result.put("zyqdcjdtCount", equDefineNumMap.getOrDefault("3110",0L));
+        result.put("zyqdcjdtCount", equDefineNumMap.getOrDefault("3110", 0L));
         // 曳引驱动载货电梯(台)
-        result.put("zyqdzhdtCount",equDefineNumMap.getOrDefault("3120",0L));
+        result.put("zyqdzhdtCount", equDefineNumMap.getOrDefault("3120", 0L));
         // 强制驱动载货电梯(台)
-        result.put("qzqdzgdtCount", equDefineNumMap.getOrDefault("3130",0L));
+        result.put("qzqdzgdtCount", equDefineNumMap.getOrDefault("3130", 0L));
         // 液压乘客电梯(台)
-        result.put("yackdtount", equDefineNumMap.getOrDefault("3210",0L));
+        result.put("yackdtount", equDefineNumMap.getOrDefault("3210", 0L));
         // 液压载货电梯(台)
-        result.put("yyzhdtCount", equDefineNumMap.getOrDefault("3220",0L));
+        result.put("yyzhdtCount", equDefineNumMap.getOrDefault("3220", 0L));
         // 自动扶梯(台)
-        result.put("zdftCount", equDefineNumMap.getOrDefault("3310",0L));
+        result.put("zdftCount", equDefineNumMap.getOrDefault("3310", 0L));
         // 自动人行道(台)
-        result.put("zdrxdCount", equDefineNumMap.getOrDefault("3320",0L));
+        result.put("zdrxdCount", equDefineNumMap.getOrDefault("3320", 0L));
         // 防爆电梯(台)
-        result.put("fbdtCount", equDefineNumMap.getOrDefault("3410",0L));
+        result.put("fbdtCount", equDefineNumMap.getOrDefault("3410", 0L));
         // 消防员电梯(台)
-        result.put("xfydtCount", equDefineNumMap.getOrDefault("3420",0L));
+        result.put("xfydtCount", equDefineNumMap.getOrDefault("3420", 0L));
         // 杂物电梯(台)
-        result.put("zhdtCount", equDefineNumMap.getOrDefault("3430",0L));
+        result.put("zhdtCount", equDefineNumMap.getOrDefault("3430", 0L));
         // 应急事件(起)
-        result.put("alarmCount", alertTypeNumMap.get(DispatchPaperEnums.KRJY.getId()) + alertTypeNumMap.get(DispatchPaperEnums.GZWX.getId()));
+        result.put("alarmCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(), 0L) + alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
         // 困人救援事件(起)
-        result.put("krjysjCount", alertTypeNumMap.get(DispatchPaperEnums.KRJY.getId()));
+        result.put("krjysjCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(), 0L));
         // 故障维修(起)
-        result.put("gzwxCount", alertTypeNumMap.get(DispatchPaperEnums.GZWX.getId()));
+        result.put("gzwxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
         // 投诉咨询(起)
-        result.put("tszxCount", alertTypeNumMap.get(DispatchPaperEnums.TSZX.getId()));
+        result.put("tszxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.TSZX.getId(), 0L));
         // 解救被困乘客数(人)
-        result.put("jjbkcksCount", alertStatisticsMapper.countRescuedPersonNum(orgCode,filterParamDto));
+        result.put("jjbkcksCount", alertStatisticsMapper.countRescuedPersonNum(orgCode, filterParamDto));
         return result;
     }
 
@@ -423,7 +427,10 @@ public class YJDPStatisticsServiceImpl {
     public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
         this.setDefaultFilter(dpFilterParamDto);
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
-        return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);
+        if (StringUtils.isNotEmpty(orgCode)) {
+            return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);
+        }
+        return new HashMap<>();
     }
 
     private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
@@ -475,7 +482,7 @@ public class YJDPStatisticsServiceImpl {
             Terms terms = response.getAggregations().get("count_by_equ_define_code");
             for (Terms.Bucket bucket : terms.getBuckets()) {
                 // 按照真实的过滤，防止有脏数据
-                if(ELEVATOR_EQU_DEFINE_CODES.contains(bucket.getKeyAsString())){
+                if (ELEVATOR_EQU_DEFINE_CODES.contains(bucket.getKeyAsString())) {
                     countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
                 }
             }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
@@ -590,6 +593,17 @@ public class ZLDPStatisticsServiceImpl {
             jsonObject9.put("key", "csjsynx");
             jsonObject9.put("value", this.getQuestionNumber("超设计使用年限",params, orgCode));
             jsonObject9.put("name", "超设计使用年限");
+
+            JSONObject jsonObject10 = new JSONObject();
+            jsonObject10.put("key", "csjsynx");
+            jsonObject10.put("value", stCommonService.getYellowStatusCompany(params));
+            jsonObject10.put("name", "许可超期");
+
+            JSONObject jsonObject11 = new JSONObject();
+            jsonObject11.put("key", "csjsynx");
+            jsonObject11.put("value", stCommonService.getRedStatusCompany(params));
+            jsonObject11.put("name", "资质超期");
+
             jsonArray.add(jsonObject0);
             jsonArray.add(jsonObject1);
             jsonArray.add(jsonObject2);
@@ -600,6 +614,9 @@ public class ZLDPStatisticsServiceImpl {
             jsonArray.add(jsonObject7);
             jsonArray.add(jsonObject8);
             jsonArray.add(jsonObject9);
+            jsonArray.add(jsonObject10);
+            jsonArray.add(jsonObject11);
+
         }
         return jsonArray;
     }

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

@@ -52,7 +52,7 @@
           "apiPath":"/jg/equipment-register/page",
           "params": {
             "number": 1,
-            "size": 14,
+            "size": 10,
             "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
           }
         }
@@ -60,14 +60,15 @@
       "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"},
-          {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 150,"align": "left","title": "设备品种","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
-          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 180,"align": "left","title": "设备名称","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
-          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
-          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "EADCED1C-C761-4209-B6C6-16298B53DD2E"},
-          {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "BA4FB9F0-7F44-473F-A977-5C36A69CD541"}
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备种类","key": "1"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 160,"align": "left","title": "设备类别","key": "2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 150,"align": "left","title": "设备品种","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 180,"align": "left","title": "设备名称","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "5"},
+          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "7"},
+          {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "8"},
+          {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9"}
         ]
       }
     }
@@ -89,7 +90,12 @@
         { "key": "useContact", "label": "单位联系人" },
         { "key": "contactPhone", "label": "联系电话" },
         { "key": "keyUnit", "label": "是否重点监控单位" }
-      ]
+      ],
+      "infoRecords": {
+        "title": "问题记录",
+        "renderType": "timeline",
+        "datas": []
+      }
     },
     "basic": {
       "columns": 2,

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/emergency.json

@@ -15,6 +15,7 @@
       "key": "basic",
       "displayName": "救援过程",
       "renderType": "basic",
+      "useAloneApi": true,
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
@@ -25,7 +26,8 @@
     {
       "key": "dispatchRecord",
       "displayName": "调派记录",
-      "renderType": "table",
+      "renderType": "basic",
+      "useAloneApi": true,
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
@@ -37,6 +39,7 @@
       "key": "followRecords",
       "displayName": "回访记录",
       "renderType": "basic",
+      "useAloneApi": true,
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
@@ -51,18 +54,22 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/elevator/alert-called/callRecords/{sequenceNbr}"
-
+          "apiPath":"/elevator/alert-called/callRecords/{sequenceNbr}",
+          "params": {
+            "number": 1,
+            "size": 10
+          }
         }
       },
       "visualParams": {
-        "rowKey": "record",
-        "showPage" : false,
+        "rowKey": "sequenceNbr",
+        "showPage" : true,
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "recDate","width": 150,"align": "left","title": "通话时间","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
-          {"dataRenderingMode": "defaultText","dataIndex": "fileType","width": 160,"align": "left","title": "通话类型","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
-          {"dataRenderingMode": "defaultText","dataIndex": "tel","width": 150,"align": "left","title": "电话号码","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
-          {"dataRenderingMode": "defaultText","dataIndex": "telTime","width": 180,"align": "left","title": "通话时长","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"}
+          {"dataRenderingMode": "defaultText","dataIndex": "recDate","width": 200,"align": "left","title": "通话时间","key": "1"},
+          {"dataRenderingMode": "defaultText","dataIndex": "fileType","width": 200,"align": "left","title": "通话类型","key": "2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "tel","width": 200,"align": "left","title": "电话号码","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "telTime","width": 200,"align": "left","title": "通话时长","key": "4"},
+          {"dataRenderingMode": "audioDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "5"}
         ]
       }
     }

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

@@ -111,7 +111,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -115,7 +115,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -111,7 +111,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -107,7 +107,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -103,7 +103,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -97,7 +97,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -103,7 +103,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

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

@@ -103,7 +103,7 @@
           "apiPath":"/jg/safety-problem-tracing/equipId/page",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "record": "{record}"
           }
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json

@@ -26,7 +26,7 @@
           "apiPath":"/jg/safety-problem-tracing/equip/list",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "sequenceNbr": "{sequenceNbr}"
           }
         }
@@ -54,7 +54,7 @@
           "apiPath":"/jg/safety-problem-tracing/unit/list",
           "params": {
             "current": 1,
-            "size": 14,
+            "size": 10,
             "sequenceNbr": "{sequenceNbr}"
           }
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/registration.json

+{
+  "tabs": [
+    {
+      "key": "keyinfo",
+      "displayName": "基本信息",
+      "renderType": "keyinfo",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-use-registration-manage/detail/dp",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          }
+        }
+      }
+    },
+    {
+      "key": "deviceRecords",
+      "displayName": "设备信息",
+      "renderType": "table",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-use-registration-manage/detail/equList",
+          "params": {
+            "current": 1,
+            "size": 10,
+            "sequenceNbr": "{sequenceNbr}"
+          }
+        }
+      },
+      "visualParams": {
+        "rowKey": "record",
+        "showPage" : true,
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 150,"align": "left","title": "设备类别","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 160,"align": "left","title": "设备品种","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 150,"align": "left","title": "产品名称","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
+          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "产品编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "USE_INNER_CODE","width": 180,"align": "left","title": "单位内编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "0BB7318F-5134-42B6-A835-FC86D68066C4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "SUPERVISORY_CODE","width": 180,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C5"}
+        ]
+      }
+    }
+  ],
+  "content": {
+  }
+}
+

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -554,7 +554,7 @@
 			</otherwise>
 
 		</choose>
-		<if test="regionCodes != null">
+		<if test="regionCodes != null and regionCodes.size > 0">
 			AND
 			<foreach collection="regionCodes" index="index" item="item" open="(" separator=" OR " close=")">
 				a.region_code LIKE CONCAT('%', #{item}, '%')