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

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -518,8 +518,10 @@
     <select id="selectMtByAlertId" resultType="java.util.Map">
         SELECT
             SEQUENCE_NBR AS sequenceNbr,
-            ME_MASTER AS userName,
-            EMERGENCYCALL AS phone,
+            ME_MASTER AS userName1,
+            ME_MASTER_PHONE AS phone1,
+            ME_MASTER1 AS userName2,
+            ME_MASTER1_PHONE AS phone2,
             '' AS address,
             ME_UNIT_NAME AS unitName,
             ME_UNIT_CREDIT_CODE AS useCode

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

@@ -402,15 +402,15 @@ public class MaintenanceUnitController extends BaseController {
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");
-        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone")) ? null : String.valueOf(list.get(0).get("phone")));
+        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone1")) ? null : String.valueOf(list.get(0).get("phone1")));
         principal.setUserId(null);
-        principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName")) ? null : String.valueOf(list.get(0).get("userName")));
+        principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName1")) ? null : String.valueOf(list.get(0).get("userName1")));
         dutyPersonList.add(principal);
         DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("主要负责人2");
-        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
+        manager.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone2")) ? null : String.valueOf(list.get(0).get("phone2")));
         manager.setUserId(null);
-        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
+        manager.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName2")) ? null : String.valueOf(list.get(0).get("userName2")));
         dutyPersonList.add(manager);
         maintenanceUnitVo.setDutyPersonList(dutyPersonList);
 

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

@@ -8,6 +8,8 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,17 +20,18 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 装备分类
+ * 监管公共Api
  *
  * @author system_generator
  * @date 2021-10-20
  */
 @RestController
-@Api(tags = "装备分类Api")
+@Api(tags = "监管公共Api")
 @RequestMapping(value = "/common")
 public class CommonController extends BaseController {
     @Autowired
@@ -68,6 +71,7 @@ public class CommonController extends BaseController {
 
     /**
      * 工作台接收机构树
+     *
      * @param bizType 业务类型：notice-告知类， register-登记类
      * @return 树
      */
@@ -79,8 +83,6 @@ public class CommonController extends BaseController {
     }
 
 
-
-
     /**
      * 获取行政审批局树
      *
@@ -102,7 +104,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUnitList")
     @ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表", notes = "通过单位类型获取单位列表")
-	public ResponseModel<List<Map<String,Object>>> getUnitList(@RequestParam(value = "type") String type) {
+    public ResponseModel<List<Map<String, Object>>> getUnitList(@RequestParam(value = "type") String type) {
         return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
     }
 
@@ -115,8 +117,8 @@ public class CommonController extends BaseController {
     @GetMapping(value = "/getSecurityAdmin")
     @ApiOperation(httpMethod = "GET", value = "查找当前公司下所属的安全管理员", notes = "查找当前公司下所属的安全管理员")
     public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type,
-																	@RequestParam(value = "useUnitCode",required = false)String useUnitCode) {
-		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type,useUnitCode));
+                                                                     @RequestParam(value = "useUnitCode", required = false) String useUnitCode) {
+        return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type, useUnitCode));
     }
 
 
@@ -128,9 +130,10 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserPhone")
     @ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式", notes = "查询用户对应联系方式")
-	public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+    public ResponseModel<Map<String, Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getUserInfoSplit")
     @ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
@@ -140,6 +143,7 @@ public class CommonController extends BaseController {
         }
         return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
     }
+
     /**
      * 查询企业的基本信息
      *
@@ -148,7 +152,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEnterpriseInfo")
     @ApiOperation(httpMethod = "GET", value = "查询企业的基本信息", notes = "查询企业的基本信息")
-	public ResponseModel<Map<String,Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
+    public ResponseModel<Map<String, Object>> getEnterpriseInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(commonService.getEnterpriseInfo(sequenceNbr));
     }
 
@@ -160,14 +164,14 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getEnterpriseEmployee")
     @ApiOperation(httpMethod = "GET", value = "查询企业的下面的人员", notes = "查询企业的下面的人员")
-	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
+    public ResponseModel<List<Map<String, Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
         String companyCode = unitCode.split("_")[0];
         return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(companyCode));
     }
 
-	@TycloudOperation (ApiLevel = UserType.AGENCY)
-	@ApiOperation (httpMethod = "GET", value = "流程状态枚举列表", notes = "流程状态枚举列表")
-	@GetMapping (value = "/flow-status/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "流程状态枚举列表", notes = "流程状态枚举列表")
+    @GetMapping(value = "/flow-status/list")
     public ResponseModel<List<Map<String, Object>>> selectForFlowStatusList() {
         return ResponseHelper.buildResponse(Arrays.stream(FlowStatusEnum.values()).map(this::mapPointTypeToMap).filter(Objects::nonNull).collect(Collectors.toList()));
     }
@@ -215,13 +219,12 @@ public class CommonController extends BaseController {
 
     /**
      * 根据公司id获取公司下人员
-	 *
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCompanyUser")
     @ApiOperation(httpMethod = "get", value = "根据公司id获取公司下人员", notes = "根据公司id获取公司下人员")
-	public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId",required = false) Long companyId) {
-		if(ObjectUtils.isEmpty(companyId)){
+    public ResponseModel<Object> getCompanyUser(@RequestParam(value = "companyId", required = false) Long companyId) {
+        if (ObjectUtils.isEmpty(companyId)) {
             return null;
         }
         Object result = commonService.getCompanyUser(companyId);
@@ -237,6 +240,7 @@ public class CommonController extends BaseController {
     public ResponseModel<Object> getCompanyType() {
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.getCompanyType());
     }
+
     /**
      * 获取管辖分局树
      *
@@ -297,10 +301,11 @@ public class CommonController extends BaseController {
 
     /**
      * 校验EQUCODE的唯一性
+     *
      * @param equCode EQUCODE
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/checkUniquenessOfEQUCODE")
     @ApiOperation(httpMethod = "GET", value = "校验EQUCODE的唯一性", notes = "校验EQUCODE的唯一性")
     public ResponseModel<Object> checkUniquenessOfEQUCODE(String equCode) {
@@ -309,14 +314,14 @@ public class CommonController extends BaseController {
     }
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/test-file")
     @ApiOperation(httpMethod = "GET", value = "文件测试", notes = "文件测试")
     public ResponseModel<String> testFile() {
         return ResponseHelper.buildResponse(pdfService.signToPdf("upload/tzs/pdf/1708911268708_temp.pdf", "已作废"));
     }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/water-print")
     @ApiOperation(httpMethod = "GET", value = "文件测试", notes = "文件测试")
     public ResponseModel<String> signToPdfWaterPrint() {
@@ -324,4 +329,25 @@ public class CommonController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equList")
+    @ApiOperation(httpMethod = "GET", value = "按照业务类型查询设备种类，工作台使用", notes = "按照业务类型查询设备种类，工作台使用")
+    public ResponseModel<List<DictionarieValueModel>> equList(@RequestParam(value = "type") String bizType) {
+        // 在平台字典配置的自定义业务的设备种类：格式{bizType}_SBZL,如BF_YZ_SBZL==》移装注销-设备种类
+        String suffix = "_SBZL";
+        String dictCode = bizType + suffix;
+        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(dictCode).getResult());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equ-category/{categoryCode}/list")
+    @ApiOperation(httpMethod = "GET", value = "按照业务类型、设备种类查询设备类别", notes = "按照业务类型、设备种类查询设备类别")
+    public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "type") String bizType,
+                                                                      @PathVariable String categoryCode) {
+        // 在平台字典配置的自定义业务的设备种类：格式{bizType}_{categoryCode},如BF_YZ_1000==》移装注销-锅炉
+        String dictCode = String.format("%s_%s", bizType, categoryCode);
+        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(dictCode).getResult());
+    }
+
+
 }

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

@@ -1090,6 +1090,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(elBuilder);
         }
 
+        // 设备类别
+        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
+            pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE",test));
+            boolMust.must(pBuilder);
+        }
+
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);

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

@@ -146,7 +146,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Value("classpath:/json/urlInfo.json")
     public Resource bizTypeInfo;
 
-    @Value("${tzs.domain}")
+    @Value("${tzs.domain:http://sxtzsb.sxsei.com}")
     String TZSDOMAIN ;
 
     @Autowired

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

@@ -513,32 +513,24 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     private void updateEquipMessage(Long id) {
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(id);
-        ArrayList<String[]> maintenanceManager = new ArrayList<>();
-        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerOneName(), jgMaintenanceContract.getMaintenanceManagerOnePhone()});
-        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerTwoName(), jgMaintenanceContract.getMaintenanceManagerTwoPhone()});
-
-
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-
         ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
-            // 循环添加两条维保备案信息表数据，存储两个维保负责人
-            for (int i = 0; i < 2; i++) {
             IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
             info.setRecord(item.getEquId());
             info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
             info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
-                String[] manager = maintenanceManager.get(i);
-                info.setMeMaster(ObjectUtils.isEmpty(manager[0]) ? null : manager[0]);
-                info.setEmergencycall(ObjectUtils.isEmpty(manager[1]) ? null : manager[1]);
+            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
+            info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
+            info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
+            info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
             info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
             info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
             info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
             data.add(info);
-            }
         });
         idxBizJgMaintenanceRecordInfoService.saveBatch(data);
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -74,18 +74,41 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
     private Date informEnd;
 
     /**
-     *
+     *维保负责人1姓名
      */
 	@TableField("\"ME_MASTER\"")
     private String meMaster;
 
     /**
-     *
+     *维保负责人2姓名
+     */
+	@TableField("\"ME_MASTER1\"")
+    private String meMaster1;
+
+    /**
+     *维保负责人1身份证
      */
 	@TableField("\"ME_MASTER_ID\"")
     private String meMasterId;
 
     /**
+     *维保负责人2身份证
+     */
+	@TableField("\"ME_MASTER1_ID\"")
+    private String meMaster1Id;
+
+    /**
+     *维保负责人2电话
+     */
+	@TableField("\"ME_MASTER1_PHONE\"")
+    private String meMaster1Phone;
+    /**
+     *维保负责人1电话
+     */
+	@TableField("\"ME_MASTER_PHONE\"")
+    private String meMasterPhone;
+
+    /**
      *
      */
 	@TableField("\"EMERGENCYCALL\"")