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

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -785,6 +786,17 @@ public class AlertCalledController extends BaseController {
 
 
 
-
+	/**
+	 * 应急大屏使用
+	 *
+	 * @param id 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/detail/{id}")
+	@ApiOperation(httpMethod = "GET", value = "根据id获取详细信息", notes = "根据id获取详细信息")
+	public ResponseModel<Object> getDetail(@PathVariable Long id) {
+		return ResponseHelper.buildResponse(iAlertCalledService.getDetail(id));
+	}
 
 }

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

@@ -34,6 +34,7 @@ import com.yeejoin.amos.boot.module.elevator.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.elevator.api.service.TzsAuthService;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.logging.log4j.LogManager;
@@ -44,12 +45,16 @@ import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 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.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 java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -58,6 +63,8 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.alibaba.fastjson.JSON.parseArray;
+
 /**
  * 警情接警填报记录服务实现类
  *
@@ -127,6 +134,12 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
     private RAtomicLong rAtomicLong;
 
+    @Autowired
+    ElevatorServiceImpl elevatorServiceImpl;
+    @Value("classpath:/json/emergencyInformation.json")
+    private Resource emergencyInformation;
+
+
     public AlertCalledServiceImpl(RedissonClient client){
         this.redissonClient = client;
         rAtomicLong = redissonClient.getAtomicLong("AUTO_INCR_LONG");
@@ -944,4 +957,98 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
         return alertCalledMapper.getCountNum(userName, startTime, endTime, groupCode);
     }
+
+    public Object getDetail(Long id) {
+        HashMap<String, Object> map = new HashMap<>();
+        // 基本信息
+        Map<String, Object> keyInfo = getKeyInfo(id);
+//        map.put("keyinfo", keyInfo);
+        return keyInfo;
+    }
+
+    public Map<String, Object> getKeyInfo(Long id) {
+        HashMap<String, Object> keyinfoData = new HashMap<>();
+        // 基本信息
+        List<FormValue> jsonData = getJsonData(emergencyInformation);
+        AlertCalledFormDto alertCalledFormVo = getAlertCalledFormDto(id);
+        Map<String, Object> objectMap = Bean.BeantoMap(alertCalledFormVo.getAlertCalledDto());
+        List<FormValue> dynamicFormAlert = alertCalledFormVo.getDynamicFormAlert();
+        jsonData.forEach(f -> {
+            Object o = objectMap.get(f.getKey());
+            if (!ObjectUtils.isEmpty(o)) {
+                f.setValue(o.toString());
+            }
+            dynamicFormAlert.add(f);
+        });
+
+        // 使用单位信息
+        // 获取根据警情获取电梯信息
+        Map<String, Object> map = elevatorServiceImpl.selectByAlertId(id);
+        // 根据设备id 获取使用单位信息
+        Map<String, Object> useUnitMap = elevatorServiceImpl.selectUseUnitByAlertId(String.valueOf(map.get("sequenceNbr")));
+        if (!ObjectUtils.isEmpty(useUnitMap)) {
+            jsonData.forEach(f -> {
+                // 单位名称
+                if ("useUnitName".equals(f.getKey())) {
+                    f.setValue(ObjectUtils.isEmpty(useUnitMap.get("useUnitName")) ? null : String.valueOf(useUnitMap.get("useUnitName")));
+                }
+                // 单位电话
+//               if ("principalPhone".equals(f.getKey())){
+//
+//               }
+                // 单位地址
+                if ("unitAddress".equals(f.getKey())) {
+                    f.setValue(ObjectUtils.isEmpty(useUnitMap.get("address")) ? null : String.valueOf(useUnitMap.get("address")));
+                }
+                // 安全管理员
+                if ("securityAdministrator".equals(f.getKey())) {
+                    f.setValue(ObjectUtils.isEmpty(useUnitMap.get("manager")) ? null : String.valueOf(useUnitMap.get("manager")));
+                }
+                // 安全管理员电话
+                if ("securityAdministratorPhone".equals(f.getKey())) {
+                    f.setValue(ObjectUtils.isEmpty(useUnitMap.get("managerPhone")) ? null : String.valueOf(useUnitMap.get("managerPhone")));
+                }
+            });
+        }
+        // 处置记录
+        LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<RepairConsult>();
+        queryWrapper.eq(RepairConsult::getParentId, id).orderByDesc(RepairConsult::getRecDate);
+        List<RepairConsult> list = repairConsultServiceImpl.list(queryWrapper);
+        HashMap<String, Object> datas = new HashMap<>();
+        ArrayList<Map<String, Object>> records = new ArrayList<>();
+        list.forEach(r -> {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("label", r.getAlertStatus());
+            data.put("operatingTime", r.getRecDate());
+            data.put("operater", r.getDescription());
+            records.add(data);
+        });
+        // 监管码
+        HashMap<String, Object> qrcode = new HashMap<>();
+        if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
+            qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getRegistrationCode());
+        }
+        // 96333码
+        HashMap<String, Object> qrcode2 = new HashMap<>();
+        if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
+            qrcode2.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
+        }
+        datas.put("datas", records);
+        keyinfoData.put("keyParams", dynamicFormAlert);
+        keyinfoData.put("infoRecords", datas);
+        keyinfoData.put("qrcode", qrcode);
+        keyinfoData.put("qrcode2", qrcode2);
+        return keyinfoData;
+    }
+
+
+    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-96333/amos-boot-module-96333-biz/src/main/resources/json/emergencyInformation.json

+[
+  {
+    "key": "emergencyPerson",
+    "label": "救援人姓名",
+    "type": "text"
+  },
+  {
+    "key": "callTime",
+    "label": "接警时间",
+    "type": "text"
+  },
+  {
+    "key": "contactPhone",
+    "label": "联系人电话",
+    "type": "text"
+  },
+  {
+    "key": "useSiteCategory",
+    "label": "使用场所分类",
+    "type": "text"
+  },
+  {
+    "key": "deviceId",
+    "label": "电梯识别码",
+    "type": "text"
+  },
+  {
+    "key": "useStatus",
+    "label": "使用情况",
+    "type": "text"
+  },
+  {
+    "key": "address",
+    "label": "地址",
+    "type": "text"
+  },
+  {
+    "key": "useUnitName",
+    "label": "单位名称",
+    "type": "text"
+  },
+  {
+    "key": "principalPhone",
+    "label": "单位电话",
+    "type": "text"
+  },
+  {
+    "key": "unitAddress",
+    "label": "单位地址",
+    "type": "text"
+  },
+  {
+    "key": "securityAdministrator",
+    "label": "电梯安全管理员",
+    "type": "text"
+  },
+  {
+    "key": "securityAdministratorPhone",
+    "label": "电梯安全管理员电话",
+    "type": "text"
+  }
+]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/DPMapStatisticsItemEnum.java

@@ -30,6 +30,9 @@ public enum DPMapStatisticsItemEnum {
     GAS_UNITS("充装单位 (家)", "gasUnits", ""),
     OPERATORS("作业人员 (人)", "operators", ""),
     DEVICE_COUNT("已纳管设备数", "deviceCount", ""),
+    PERSON_ISSUES_COUNT("个人问题数", "个人", ""),
+    COMPANY_ISSUES_COUNT("企业问题数", "企业", ""),
+    EQU_ISSUES_COUNT("设备数", "设备", ""),
     CERTIFICATE_COUNT("登记证总量", "certificateCount", "");
     private String label;
     private String code;

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

@@ -930,12 +930,12 @@ public class CommonServiceImpl implements ICommonService {
             String docTitle = pdfFile.getName();
             FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), docTitle, bytes, response);
         } catch (Exception e) {
-            log.error("pdf文件转换失败：{}", e);
+            log.error("pdf文件转换失败", e);
         } finally {
             try {
                 Files.deleteIfExists(pdfFile.toPath());
             } catch (Exception e) {
-                log.error("文件找不到，删除失败：{}", e);
+                log.error("文件找不到，删除失败", e);
             }
         }
     }

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.ImmutableMap;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
@@ -59,6 +60,7 @@ 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 org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -66,8 +68,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
+
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
 /**
  * 移装变更登记登记服务实现类
@@ -207,7 +209,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                         throw new BadRequest("区内移装只能选择与设备地址中相同地市进行移装！");
                     }
                 });
-            } else{
+            } else {
                 deviceList.forEach(device -> {
                     String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#"))
                             .skip(1)
@@ -923,14 +925,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     useRegistrationCode.set(commonServiceImpl.generateRegistrationCode(device.getEquId(), supervisoryCode, transfer.getReceiveCompanyCode(), false));
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
-                }else{
-                    IdxBizJgUseInfo useInfo = useInfoService.getOneData(device.getEquId());
+                } else {
                     JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
                     String county = newPosition.getString("transferCounty").split("_")[0];
                     boolean shouldUpdateCode = Arrays.stream(ReginStepEnum.values())
                             .map(ReginStepEnum::getCode)
                             .anyMatch(code -> code.equals(county));
-                    if (shouldUpdateCode){
+                    if (shouldUpdateCode) {
                         Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");
                         code96333 = supervisoryCodeMap.get("code96333");
@@ -979,6 +980,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 registrationManage.setUseRegistrationCode(useRegistrationCode);
             }
             registrationManage.setCertificateStatus("已登记");
+            registrationManage.setApplyNo(transfer.getApplyNo());
         });
         List<JSONObject> updatedRegistrationList = registrationList.stream()
                 .map(registrationManage -> {
@@ -1004,7 +1006,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param record  设备Id
      * @param newData 设备移装的新数据
      */
-    public void replacementHistoryData(String record, JgChangeRegistrationTransfer transfer, JgRegistrationHistory newData, String supervisoryCode, String code96333) {
+    public void replacementHistoryData(String record, JgChangeRegistrationTransfer transfer,
+                                       JgRegistrationHistory newData, String supervisoryCode, String code96333) {
 
         if (!ValidationUtil.isEmpty(record) && !ValidationUtil.isEmpty(transfer.getApplyNo())) {
             //查询设备旧数据
@@ -1110,7 +1113,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 }
                 useInfo.setEquState("1");
                 useInfoService.saveOrUpdateData(useInfo);
+                if (!StringUtils.isEmpty(supervisoryCode)) {
                     otherInfo.setSupervisoryCode(supervisoryCode);
+                }
                 otherInfo.setCode96333(code96333);
                 otherInfoService.saveOrUpdateData(otherInfo);
             }
@@ -1143,7 +1148,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param useRegistrationCode      使用注册登记证编号
      * @param isUpdateRegistrationCode 是否更新使用登记证编号
      */
-    public void updateRegisterInfoAndEsData(String equId, JgRegistrationHistory newData, String useRegistrationCode, String supervisoryCode, String code96333, AtomicBoolean isUpdateRegistrationCode) {
+    public void updateRegisterInfoAndEsData(String equId, JgRegistrationHistory newData, String useRegistrationCode,
+                                            String supervisoryCode, String code96333, AtomicBoolean isUpdateRegistrationCode) {
         //更新使用注册登记证编号
         if (isUpdateRegistrationCode.get()) {
             idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equId, useRegistrationCode);
@@ -1215,7 +1221,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         if (isUpdateRegistrationCode.get()) {
             map1.put("EQU_STATE", "1");
             map1.put("USE_ORG_CODE", useRegistrationCode);
+            if (!StringUtils.isEmpty(supervisoryCode)) {
                 map1.put("SUPERVISORY_CODE", supervisoryCode);
+            }
             map1.put("CODE96333", code96333);
         }
         resultMap.put(equId, map1);

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

@@ -944,7 +944,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                                 useInfoMapper.updateById(useInfo);
                             }
-                            //es中的编号信息
+                            //修改ES中使用单位信息和使用单位代码
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
@@ -964,6 +964,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
                     List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
                     for (JgUseRegistrationManage registrationManage : list) {
+                        //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
                         registrationManage.setUseUnitName(registration.getNewUseUnitName());
                         registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                         registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
@@ -973,7 +974,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
                             if (useCodeResult != null) {
                                 registrationManage.setUseUnitAddress(useCodeResult.getAddress());
-                                registrationManage.setEquUseAddress(useCodeResult.getAddress());
                             }
                         }
                     }

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

@@ -67,7 +67,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
- * 移装造告知服务实现类
+ * 移装告知服务实现类
  *
  * @author system_generator
  * @date 2023-12-19
@@ -114,6 +114,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     private RedissonClient redissonClient;
     @Autowired
     ESEquipmentCategory esEquipmentCategory;
+    @Autowired
+    JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
+    @Autowired
+    JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
+    @Autowired
+    ESElavtorRepository esElavtorRepository;
 
     /**
      * 根据sequenceNbr查询
@@ -450,8 +456,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
     }
 
-    @Autowired
-    ESElavtorRepository esElavtorRepository;
+
 
     /**
      * 分页查询
@@ -828,7 +833,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             // 检查实际状态是否不等于期望状态
             commonService.checkExpectedStatus(jgTransferNotice.getNoticeStatus());
 
-
             // 执行工作流并返回组装好的工作流信息
             WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, opinion, jgTransferNotice);
 
@@ -848,8 +852,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     jgTransferNotice.setPromoter("");
                     jgTransferNotice.setHandleDate(new Date());
                     jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-
-
+                    //修改设备ES设备使用场所和设备详细使用地址
                     Map<String, Map<String, Object>> objMap = new HashMap<>();
                     for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
                         Map<String, Object> map1 = new HashMap<>();
@@ -966,9 +969,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
     }
 
-    @Autowired
-    JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
-
     private void updateEq(JgTransferNotice jgTransferNotice) {
         // 组装设备注册代码
         String ym = null;
@@ -990,9 +990,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgTransferNoticeEqService.updateBatchById(eqList);
     }
 
-    @Autowired
-    JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
-
     private void saveHisDataBeforeUpdate(JgTransferNotice jgTransferNotice, List<JgTransferNoticeEq> jgTransferNoticeEqs) {
         String seq = jgTransferNotice.getSequenceNbr().toString();
         JSONObject json = (JSONObject) JSONObject.toJSON(jgTransferNotice);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SecurityIndexCountItemDto.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SecurityIndexCountItemDto {
+
+    private String regionCode;
+
+    private String regionName;
+
+    /**
+     * 充装检查率
+     */
+    private String czjc;
+
+    /**
+     * 许可有效率
+     */
+    String xuke;
+
+    /**
+     * 使用登记办理率
+     */
+    String shiyongdengji;
+
+
+    /**
+     * 检验超期率
+     */
+    String jianyanchaoqi;
+
+    /**
+     * 检验合格率
+     */
+    String jianyanhege;
+
+    /**
+     * 充装检查率
+     */
+    String czjchege;
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/AQZSDPStatisticsMapper.java

@@ -46,10 +46,10 @@ public interface AQZSDPStatisticsMapper {
     /**
      * 单位按照资质状态分组下的统计数量
      *
-     * @param regionCode 区域
+     * @param orgCode 区域
      * @return List<KeyValueDto>
      */
-    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "regionCode") String regionCode);
+    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "orgCode") String orgCode);
     /**
      * 查询单个单位的有效期信息
      *
@@ -58,8 +58,9 @@ public interface AQZSDPStatisticsMapper {
      */
     KeyValueDto queryLicenseEfficiencyOneCompany(@Param(value = "appId") String appId);
 
-    Map<String, Object> getInspectionExpiredRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+    Map<String, Object> getInspectionExpiredRate(@Param(value = "orgCode") String orgCode, @Param(value = "appId") String appId);
 
-    Map<String, Object> getInspectionResultRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+    Map<String, Object> getInspectionResultRate(@Param(value = "orgCode") String orgCode, @Param(value = "appId") String appId);
 
+    List<Map<String, Object>> selectByOrg(String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/CylinderStatisticsMapper.java

@@ -13,4 +13,11 @@ import org.apache.ibatis.annotations.Param;
 public interface CylinderStatisticsMapper {
 
     Long countEnterpriseNumForCylinder(@Param("orgCode") String orgCode);
+
+    /**
+     * 按照管辖维度，统计充装单位使用登记证的办理率
+     * @param orgCode 区域对应的单位orgCode
+     * @return 办理率*100
+     */
+    String queryUserRegisterCertAppPercent(@Param("orgCode") String orgCode);
 }

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

@@ -246,8 +246,8 @@
 		<where>
 			cu.data_sources = '陕西省内企业'
 			AND cu.unit_type LIKE '%充装单位%'
-			<if test="regionCode != null and regionCode != ''">
-				and cu.org_code like concat(#{regionCode}, '%')
+			<if test="orgCode != null and orgCode != ''">
+				and cu.supervise_org_code like concat(#{orgCode}, '%')
 			</if>
 			<if test="appId != null and appId != ''">
 				and cu.app_id = #{appId}
@@ -264,8 +264,8 @@
 		<where>
 			cu.data_sources = '陕西省内企业'
 			AND cu.unit_type LIKE '%充装单位%'
-			<if test="regionCode != null and regionCode != ''">
-				and cu.org_code like concat( #{regionCode}, '%')
+			<if test="orgCode != null and orgCode != ''">
+				and cu.supervise_org_code like concat( #{orgCode}, '%')
 			</if>
 			<if test="appId != null and appId != ''">
 				and cu.app_id = #{appId}
@@ -303,9 +303,21 @@
         where
              cu.data_sources = '陕西省内企业'
           AND cu.unit_type LIKE '%充装单位%'
-          and cu.org_code like concat('%', #{regionCode}, '%')
+          and cu.supervise_org_code like concat(#{orgCode}, '%')
         GROUP BY strKey
     </select>
+
+	<select id="selectByOrg" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			source_type AS sourceType
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		GROUP BY
+			source_type
+	</select>
 </mapper>
 
 

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

@@ -10,4 +10,25 @@
             unit_type LIKE'%充装单位%'
             and supervise_org_code like concat(#{orgCode},'%')
     </select>
+    <select id="queryUserRegisterCertAppPercent" resultType="java.lang.String">
+            select
+	            case when s2.total= 0 then 0 else round(s1.num/s2.total * 100, 2) end as percent
+            from
+                (SELECT
+                 count(DISTINCT(a.use_unit_credit_code)) as num
+                FROM
+                 "tzs_jg_use_registration_manage" a,
+                  privilege_company c
+                where
+                a.receive_company_code = c.company_code
+                and  a.certificate_status='已登记'
+                and c.org_code  like concat(#{orgCode},'%')) s1,
+                (SELECT
+                   count(1) as total
+                FROM "tz_base_enterprise_info"
+                where
+                    unit_type LIKE'%充装单位%'
+                    and supervise_org_code like concat(#{orgCode},'%')
+                ) s2
+    </select>
 </mapper>

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

@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@Api(tags = "大屏-安全追溯统计Api")
+@Api(tags = "大屏-安全追溯及气瓶统计Api")
 @RequestMapping(value = "/dp/aqzs")
 public class AQZSDPStatisticsController {
 
@@ -33,20 +33,19 @@ public class AQZSDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "大屏-气瓶-区域安全指数")
     @PostMapping(value = "/security-index")
-    public ResponseModel<Map<String, Object>> getSecurityIndex(@RequestBody Map<String, Object> map) throws Exception {
-        Object regionCode = map.get("cityCode");
-        if (ObjectUtils.isEmpty(regionCode)) {
-            regionCode = "610000";
+    public ResponseModel<Map<String, Object>> getSecurityIndex(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult bindingResult) throws Exception {
+        List<FieldError> fieldErrors = bindingResult.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-
-        Map<String, Object> result = statisticsService.getSecurityIndex(regionCode.toString());
+        Map<String, Object> result = statisticsService.getSecurityIndex(dpFilterParamDto);
         return ResponseHelper.buildResponse(result);
     }
 
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/earlyWarning/child", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "大屏-气瓶-区域安全指数统计")
+    @RequestMapping(value = "/earlyWarning/child", method = RequestMethod.POST)
     public ResponseModel<Map<String, Object>> getChildEarlyWarning(@RequestBody Map<String, Object> map) throws Exception {
         Object regionCode = map.get("cityCode");
         if (ObjectUtils.isEmpty(regionCode)) {
@@ -244,4 +243,26 @@ public class AQZSDPStatisticsController {
         List<Map<String, Object>> result = statisticsService.issueCountTopByProblemType(regionCode.toString());
         return ResponseHelper.buildResponse(result);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-中间地图左右两侧8大类、单位、人员数量、问题数量全局统计", notes = "大屏中间-地图左右两侧8大类、单位、人员数量、问题数量全局统计")
+    @PostMapping(value = "/center-map/legend")
+    public ResponseModel<Map<String, Object>> centerMapCountForGlobal(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForGlobal(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "安全追溯大屏-中间地图地市统计", notes = "安全追溯大屏中间-地图地市统计")
+    @PostMapping(value = "/center-map/overview")
+    public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForOverview(dpFilterParamDto));
+    }
 }

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

@@ -38,7 +38,9 @@ public class DPSubController {
     public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
         if (template.equals("company")) {
             Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
-        } else if (template.equals("equip")) {
+        } else if (template.equals("emergency")){
+            Assert.notNull(param.get("id"), "id不能为空");
+        }else if(template.equals("equip")) {
             param.put("record", param.get("SEQUENCE_NBR"));
             param.put("equList", param.get("EQU_LIST_CODE"));
             Assert.notNull(param.get("record"), "设备ID不能为空");

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

 package com.yeejoin.amos.boot.module.statistcs.biz.init;
 
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.AQZSDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -16,14 +17,17 @@ public class DataInitAfterRuning implements ApplicationRunner {
 
     private JGDPStatisticsServiceImpl jgdpStatisticsService;
 
+    private AQZSDPStatisticsServiceImpl aqzsdpStatisticsService;
+
     private StCommonServiceImpl stCommonService;
 
     private AmosRequestContext amosRequestContext;
 
-    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext) {
+    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext, AQZSDPStatisticsServiceImpl aqzsdpStatisticsService) {
         this.jgdpStatisticsService = jgdpStatisticsService;
         this.stCommonService = stCommonService;
         this.amosRequestContext = amosRequestContext;
+        this.aqzsdpStatisticsService = aqzsdpStatisticsService;
     }
 
     @Override
@@ -34,5 +38,6 @@ public class DataInitAfterRuning implements ApplicationRunner {
         RequestContext.setToken(amosRequestContext.getToken());
         jgdpStatisticsService.init();
         stCommonService.init();
+        aqzsdpStatisticsService.init();
     }
 }

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

@@ -165,6 +165,10 @@ public class DPSubServiceImpl {
 
     public JSONObject buildContentKeyinfoData(JSONObject tab, JSONObject content, Object apiResult){
         JSONObject result = JSONObject.parseObject(apiResult.toString());
+        if (tab.getString("template").contains("emergency")){
+            content.put("keyinfo", result);
+            return content;
+        }
         JSONObject param = tab.getJSONObject("param");
         Object keyParams = JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.keyParams");
         if (ValidationUtil.isEmpty(keyParams)){
@@ -190,9 +194,10 @@ public class DPSubServiceImpl {
         ((JSONArray) keyParams).stream().forEach(x -> {
             JSONObject xobj = (JSONObject) x;
             xobj.put("type", "text");
-            xobj.put("value", result.get(xobj.getString("key")));
+            xobj.put("value", "param".equals(xobj.getString("source")) ? param.get(xobj.getString("key")) : result.get(xobj.getString("key")));
         });
         this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
+        this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
 
         if (tab.getString("template").contains("equip")){
             // 处理问题列表

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

@@ -8,7 +8,10 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/jczs/baseEnterprise/{sequenceNbr}"
+          "apiPath":"/tcm/baseEnterprise/getInfoByUseCode/map",
+          "params": {
+            "useCode": "{useUnitCode}"
+          }
         }
       }
     },
@@ -71,9 +74,15 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "unitType", "label": "", "icon": "", "value": "success" },
+        { "key": "2", "label": "", "icon": "", "value": "success" },
+        { "key": "3", "label": "否", "icon": "", "value": "error" },
+        { "key": "4", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
         { "key": "unitType", "label": "单位类型" },

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

+{
+  "tabs": [
+    {
+      "key": "keyinfo",
+      "displayName": "基本信息",
+      "renderType": "keyinfo",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/elevator/alert-called/detail/{id}"
+        }
+      }
+    }
+  ],
+  "content": {
+  }
+}
+

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -122,20 +122,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -126,43 +126,44 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams_default": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_true": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备类别" },
-        { "key": "useUnitCode", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_false": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "使用单位地址" },
-        { "key": "useUnit", "label": "车牌号" },
-        { "key": "useUnitCode", "label": "车辆VIN码" },
-        { "key": "useUnitCode", "label": "气瓶品种" },
-        { "key": "useUnitCode", "label": "产品名称" },
-        { "key": "useUnitCode", "label": "气瓶数量" },
-        { "key": "useUnitCode", "label": "充装介质" },
-        { "key": "useUnitCode", "label": "下次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "CAR_NUMBER", "label": "车牌号" },
+        { "key": "IDENTIFICATION_CODE", "label": "车辆VIN码" },
+        { "key": "EQU_TYPE", "label": "气瓶品种" },
+        { "key": "PRODUCT_NAME", "label": "产品名称" },
+        { "key": "GAS_NUM", "label": "气瓶数量" },
+        { "key": "FILLING_MEDIUM", "label": "充装介质" },
+        { "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -122,22 +122,23 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "维保单位名称" },
-        { "key": "governingBody", "label": "维保备案有效期" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "ME_UNIT_NAME", "label": "维保单位名称" },
+        { "key": "INFORM_END", "label": "维保备案有效期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -118,20 +118,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,20 +114,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -108,20 +108,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,29 +114,30 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams_default": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_8300": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备类别" },
-        { "key": "useUnitCode", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,20 +114,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -2,8 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
     /**
      * 在用的最新需求整理的技术参数--需求未出

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseUnitCreditCodeCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -19,6 +20,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-10-20
  */
+@Mapper
 public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +18,7 @@ import java.util.List;
  * @author duanwei
  * @date 2022-08-10
  */
+@Mapper
 public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
 
     /**

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);