openApi赋码

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -8,7 +8,6 @@ import com.yeejoin.amos.api.openapi.face.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.sf.json.JSONObject;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.component.event.RestEventTrigger;
@@ -16,6 +15,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 监管业务数据对接
@@ -75,6 +75,9 @@ public class SuperviseController {
     @Autowired
     private TechInfoService techInfoService;
 
+    @Autowired
+    private CreateCodeService createCodeService;
+
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "新增设计信息")
     @PostMapping(value = "/designInfo")
@@ -217,4 +220,13 @@ public class SuperviseController {
     {
         return ResponseHelper.buildResponse(techInfoService.saveTechInfo(techInfo));
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "赋码")
+    @PostMapping(value = "/generation/code")
+    @RestEventTrigger(value = "openapiLogEventHandler")
+    public ResponseModel<Map<String,Object>> createCode (@RequestBody Map<String,Object> map){
+        return ResponseHelper.buildResponse(createCodeService.createCode(map));
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CreateCodeService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class CreateCodeService {
+    @Autowired
+    TzsServiceFeignClient tzsServiceFeignClient;
+
+    public Map<String,Object> createCode(Map<String, Object> map) {
+        return tzsServiceFeignClient.createCode(map).getResult();
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UnitLicenceService.java

@@ -4,7 +4,6 @@ import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
 import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.api.openapi.feign;
 
 import com.yeejoin.amos.api.openapi.config.MultipartSupportConfig;
 import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
-import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = "TZS", path = "/tzs", configuration =
         {MultipartSupportConfig.class})
@@ -24,4 +24,13 @@ public interface TzsServiceFeignClient {
      */
     @RequestMapping(value = "/baseUnitLicence/licences", method = RequestMethod.GET)
     ResponseModel<List<UnitLicenceModel>> getLicenceByUnitCode(@RequestParam String unitCode);
+
+
+    /**
+     * 创建监管码及96333
+     * @param map 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
+    ResponseModel<Map<String,Object>> createCode(@RequestBody Map<String,Object> map);
 }

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

@@ -44,4 +44,8 @@ public class EquInfoDto {
      */
     private String status;
 
+    /**
+     * 设备状态
+     */
+    private String equState;
 }

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

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+* 八大类其他信息
+*
+*/
+@Data
+@Accessors(chain = true)
+@TableName("biz_jg_supervisory_code")
+@ApiModel(value="SupervisoryCodeInfo", description="监管码")
+public class SupervisoryCodeInfo extends BaseEntity {
+
+	@ApiModelProperty(value = "监管码")
+    @TableField("supervisory_code")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "电梯救援码")
+    @TableField("code96333")
+    private String code96333;
+
+    @ApiModelProperty(value = "使用状态（0-初始，1-已使用，2-未使用）")
+    @TableField("status")
+    private String status;
+}

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

@@ -18,7 +18,10 @@ public enum EquipmentCategoryEnum {
     XZQH("行政区划","XZQH"),
     BLW("补零位","0"),
     JGM("监管码初始码","0000001"),
-    CSM("96333初始码","00001");
+    CSM("96333初始码","00001"),
+    CSZT("初始状态","0"),
+    YSY("已使用","1"),
+    WSY("未使用","2");
 
     private String name;
     private String code;

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

@@ -17,7 +17,10 @@ public interface CategoryOtherInfoMapper extends BaseMapper<CategoryOtherInfo> {
 
     CategoryOtherInfo selectSupervisorCode(@Param("supervisorCode") String supervisorCode);
 
-    CategoryOtherInfo selectElevatorCode(@Param("elevatorCode") String elevatorCode);
+    CategoryOtherInfo selectElevatorCode(@Param("elevatorCode") String elevatorCode,String status);
 
     EquInfoDto selectEquipInfo(String record);
+
+    int updateCode(String supervisorCode, String equState);
+
 }

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

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.SupervisoryCodeInfo;
+
+/**
+ * 装备分类 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-10-20
+ */
+public interface SupervisoryCodeInfoMapper extends BaseMapper<SupervisoryCodeInfo> {
+
+}

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEquipmentCategoryService.java

@@ -19,12 +19,11 @@ public interface IEquipmentCategoryService {
 
     Page equipClaimOverview();
 
-    int createSupervisorCode(Map<String,Object> map,String record);
+    Map<String, String> createSupervisorCode(Map<String,Object> map,String record);
 
     List<LinkedHashMap> getTree();
     List<LinkedHashMap> creatTree();
 
-//    List<LinkedHashMap> getRegion(String level, String parentId);
     List<LinkedHashMap> getRegion(String level, String parentId);
 
     Map<String,Object> getCategoryAndDefineByRecord(String rowId);

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper">
-
-<select id="selectSupervisorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
-    SELECT
-        SUPERVISORY_CODE
-    FROM
-        idx_biz_jg_other_info oi
-    WHERE
-        SUPERVISORY_CODE LIKE CONCAT ( #{supervisorCode}, '%' )
+    <select id="selectSupervisorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
+        SELECT SUPERVISORY_CODE
+        FROM biz_jg_supervisory_code bjsc
+        WHERE SUPERVISORY_CODE LIKE CONCAT(#{supervisorCode}, '%')
         ORDER BY
             RIGHT ( SUPERVISORY_CODE, 5 ) DESC
             LIMIT 1
     </select>
 
-<update id="updateSupervisorCode">
-
+    <update id="updateSupervisorCode">
         UPDATE idx_biz_jg_other_info
         SET
         "RECORD" = #{record}
@@ -29,32 +24,37 @@
         "RECORD" = #{record}
     </update>
 
-<select id="selectElevatorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
-    SELECT
-        CODE96333 code
-    FROM
-        idx_biz_jg_other_info oi
-    WHERE
-        CODE96333 LIKE CONCAT ( #{elevatorCode}, '%' )
+    <select id="selectElevatorCode" resultType="com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo">
+        SELECT CODE96333 code
+        FROM biz_jg_supervisory_code bjsc
+        WHERE CODE96333 LIKE CONCAT(#{elevatorCode}, '%')
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
         ORDER BY
             RIGHT ( CODE96333, 2 ) DESC
             LIMIT 1
     </select>
 
-<select id="selectEquipInfo" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquInfoDto">
-    SELECT
-        "CITY",
+    <select id="selectEquipInfo" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.EquInfoDto">
+        SELECT "CITY",
                "COUNTY",
                "EQU_LIST"               equipList,
                "EQU_CATEGORY"           equipCategory,
                ibjoi."CODE96333"        code,
                ibjoi."CLAIM_STATUS"     status,
                ibjoi."SUPERVISORY_CODE" supervisor,
-        ibjoi."RECORD"
-    FROM
-        idx_biz_jg_other_info ibjoi
+               ibjoi."RECORD",
+               ibjui."EQU_STATE"        equState
+        FROM idx_biz_jg_other_info ibjoi
                  LEFT JOIN idx_biz_jg_register_info ibjri ON ibjoi.RECORD = ibjri.RECORD
                  LEFT JOIN idx_biz_jg_use_info ibjui ON ibjoi.RECORD = ibjui.RECORD
         WHERE ibjoi."RECORD" = #{record}
     </select>
+
+    <update id="updateCode">
+        UPDATE biz_jg_supervisory_code bjsc
+        SET status = #{equState}
+        WHERE SUPERVISORY_CODE = #{supervisorCode}
+    </update>
 </mapper>

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

@@ -77,7 +77,7 @@
         cb_data_dictionary
     WHERE
         type= #{division}
-      AND extend = #{county}
+      AND extend LIKE CONCAT('%',#{county},'%')
     </select>
 
 

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

@@ -189,8 +189,8 @@ public class EquipmentCategoryController extends BaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/createSupervisorCode")
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@RequestMapping(value = "/createSupervisorCode", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "生成监管码和96333码", notes = "生成监管码和96333码")
 	public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String,Object> map) {
 		return ResponseHelper.buildResponse(equipmentCategoryService.createSupervisorCode(map,null));

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

@@ -9,11 +9,13 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EquInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
+import com.yeejoin.amos.boot.module.tzs.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.tzs.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.SupervisoryCodeInfoMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
@@ -54,6 +56,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     CategoryOtherInfoMapper categoryOtherInfoMapper;
 
     @Autowired
+    SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
+
+    @Autowired
     PrivilegeFeginService privilegeFeginService;
     @Autowired
     IdxFeignService idxFeignService;
@@ -123,16 +128,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         String orgCode = object.getString("orgCode");
         String companyCode = object.getString("companyCode");
         for (Map map : mapList) {
-            Map<String, Object> resultMap = new HashMap<>();
-            Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(), level, orgCode, companyCode);
-            resultMap.put("name", map.get("name"));
-            resultMap.put("image", map.get("image"));
-            resultMap.put("waitClaim", map1.get("waitClaim"));
-            resultMap.put("alreadyClaim", map1.get("alreadyClaim"));
-            resultMap.put("refuseClaim", map1.get("refuseClaim"));
-            Long sum = Long.valueOf(map1.get("waitClaim").toString()) + Long.valueOf(map1.get("alreadyClaim").toString()) + Long.valueOf(map1.get("refuseClaim").toString());
-            resultMap.put("sum", sum);
-            list.add(resultMap);
+            Map<String, Object> categoryCountMap = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(), level, orgCode, companyCode);
+            categoryCountMap.put("name", map.get("name"));
+            categoryCountMap.put("image", map.get("image"));
+            Long sum = Long.valueOf(categoryCountMap.get("waitClaim").toString()) + Long.valueOf(categoryCountMap.get("alreadyClaim").toString()) + Long.valueOf(categoryCountMap.get("refuseClaim").toString());
+            categoryCountMap.put("sum", sum);
+            list.add(categoryCountMap);
         }
         page.setCurrent(1);
         page.setTotal(list.size());
@@ -144,38 +145,53 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      * 生成监管码和电梯96333识别码
      */
     @Override
-    public int createSupervisorCode(Map<String, Object> map, String record) {
-        String city, county, equipCategory, equipList;
+    public Map<String, String> createSupervisorCode(Map<String, Object> map, String record) {
+        String city, county, equipCategory;
         if (ObjectUtils.isEmpty(record)) {
-            //获取对应城市、区县值
-            city = map.get("CITY").toString();
-            county = map.get("COUNTY").toString();
-            //获取对应种类、类别值
-            equipCategory = map.get("EQU_CATEGORY").toString();
-            equipList = map.get("EQU_LIST").toString();
+            //获取对应行政区划
+            county = EquipmentCategoryEnum.XZQH.getCode();
+            city = map.get("regionCode").toString();
+            //获取对应设备分类
+            equipCategory = map.get("equCategory").toString();
         } else {
             EquInfoDto equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
             //判断这条数据认领状态是否为已认领(6035)，且是否已经有电梯96333码和监管码
             //如果都满足则直接返回不做生成码操作
-            if (!ObjectUtils.isEmpty(equInfoDto) && "6035".equals(equInfoDto.getStatus()) && (ObjectUtils.isEmpty(equInfoDto.getSupervisor()) || ObjectUtils.isEmpty(equInfoDto.getCode()))) {
+            if (!ObjectUtils.isEmpty(equInfoDto) && "6035".equals(equInfoDto.getStatus())) {
                 city = equInfoDto.getCity();
                 county = equInfoDto.getCounty();
                 equipCategory = equInfoDto.getEquipCategory();
-                equipList = equInfoDto.getEquipList();
             } else {
-                return 0;
+                return new HashMap<>();
             }
         }
         //生成码
         Map<String, String> codeMap;
         synchronized (EquipmentCategoryServiceImpl.class) {
-            codeMap = creatCode(city, county, equipCategory, equipList, record);
+            codeMap = creatCode(city, county, equipCategory, record);
         }
         if (ObjectUtils.isEmpty(codeMap)) {
-            return 0;
+            return new HashMap<>();
         }
         log.info(record + "已生成对应监管码或96333电梯识别码");
-        return categoryOtherInfoMapper.updateSupervisorCode(codeMap.get("supervisorCode"), codeMap.get("elevatorCode"), record);
+        String equState = EquipmentCategoryEnum.CSZT.getCode();
+
+        if (!ObjectUtils.isEmpty(record)) {
+            EquInfoDto equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
+            String supervisorCode, elevatorCode;
+            equState = EquipmentCategoryEnum.WSY.getCode().equals(equInfoDto.getEquState()) ? EquipmentCategoryEnum.WSY.getCode() : EquipmentCategoryEnum.YSY.getCode();
+            supervisorCode = EquipmentCategoryEnum.WSY.getCode().equals(equInfoDto.getEquState()) ? null : codeMap.get("supervisorCode");
+            elevatorCode = EquipmentCategoryEnum.WSY.getCode().equals(equInfoDto.getEquState()) ? null : codeMap.get("elevatorCode");
+            categoryOtherInfoMapper.updateCode(equInfoDto.getCode(), equState);
+            categoryOtherInfoMapper.updateSupervisorCode(supervisorCode, elevatorCode, record);
+        } else {
+            SupervisoryCodeInfo supervisoryCodeInfo = new SupervisoryCodeInfo();
+            supervisoryCodeInfo.setCode96333(codeMap.get("elevatorCode"));
+            supervisoryCodeInfo.setSupervisoryCode(codeMap.get("supervisorCode"));
+            supervisoryCodeInfo.setStatus(equState);
+            supervisoryCodeInfoMapper.insert(supervisoryCodeInfo);
+        }
+        return codeMap;
     }
 
     @Override
@@ -310,22 +326,69 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     /**
      * 具体生成监管码和电梯96333识别码逻辑
      */
-    private Map<String, String> creatCode(String city, String county, String equipCategory, String equipList, String record) {
+    private Map<String, String> creatCode(String city, String county, String equipCategory, String record) {
         Map<String, String> resultMap = new HashMap<>();
-        //生成监管码前缀
-        Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
-        String division = ObjectUtils.isEmpty(divisionMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), city).get("code").toString() : divisionMap.get("code").toString();
         StringBuilder supervisorCode = new StringBuilder();
-        supervisorCode.append(division).append(equipCategory).append("-");
-        //获取行政区划区县、市是否存在历史监管码
-        CategoryOtherInfo supervisor = categoryOtherInfoMapper.selectSupervisorCode(supervisorCode.toString());
+        StringBuilder elevatorCode = new StringBuilder();
+        CategoryOtherInfo otherInfo;
+        String prefix = getPrefix(EquipmentCategoryEnum.XZQHDT.getCode(), city);
+        CategoryOtherInfo categoryOtherInfo = categoryOtherInfoMapper.selectElevatorCode(prefix, EquipmentCategoryEnum.WSY.getCode());
+        if (!ObjectUtils.isEmpty(record)) {
             //查询对应record对应数据
-        CategoryOtherInfo otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().eq("RECORD", record));
+            otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().eq("RECORD", record));
             if (!ObjectUtils.isEmpty(otherInfo)) {
                 //判断原数据是否存在监管码，存在则用原监管码即可，不存在则生成
                 if (!ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
                     supervisorCode = new StringBuilder(otherInfo.getSupervisoryCode());
                 } else {
+                    String supervisor = createSupervisorCode(city, county, equipCategory);
+                    supervisorCode.append(supervisor);
+                }
+                //判断是否是否需要生成96333电梯码、这个record对应的otherInfo不为空
+                if (equipCategory.startsWith("3") && !XIAN.equals(city)) {
+                    if (!ObjectUtils.isEmpty(otherInfo.getCode())) {
+                        elevatorCode.append(new StringBuilder(otherInfo.getCode()));
+                    } else {
+                        String elevator = ObjectUtils.isEmpty(categoryOtherInfo) ? createElevatorCode(city, county) : categoryOtherInfo.getCode();
+                        elevatorCode.append(elevator);
+                    }
+                }
+            }
+        } else {
+            String supervisor = createSupervisorCode(city, county, equipCategory);
+            supervisorCode.append(supervisor);
+            if (equipCategory.startsWith("3") && !XIAN.equals(city)) {
+                String elevator = ObjectUtils.isEmpty(categoryOtherInfo) ? createElevatorCode(city, county) : categoryOtherInfo.getCode();
+                elevatorCode.append(elevator);
+            }
+        }
+        if (ObjectUtils.isEmpty(supervisorCode) && ObjectUtils.isEmpty(elevatorCode)) {
+            return new HashMap<>();
+        }
+        resultMap.put("supervisorCode", ObjectUtils.isEmpty(supervisorCode) ? null : supervisorCode.toString());
+        resultMap.put("elevatorCode", ObjectUtils.isEmpty(elevatorCode) ? null : elevatorCode.toString());
+        return resultMap;
+    }
+
+    private String getPrefix(String type, String county) {
+        return equipmentCategoryMapper.getAdministrativeDivision(type, county).get("code").toString();
+    }
+
+    /**
+     * 生成监管码
+     *
+     * @param city   行政区划市
+     * @param county 行政区划区
+     * @return 监管码
+     */
+    private String createSupervisorCode(String city, String county, String equipCategory) {
+        StringBuilder supervisorCode = new StringBuilder();
+        //生成监管码前缀
+        Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
+        String division = ObjectUtils.isEmpty(divisionMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), city).get("code").toString() : divisionMap.get("code").toString();
+        supervisorCode.append(division).append(equipCategory).append("-");
+        //获取行政区划区县、市是否存在历史监管码
+        CategoryOtherInfo supervisor = categoryOtherInfoMapper.selectSupervisorCode(supervisorCode.toString());
         //生成对应监管码
         if (!ObjectUtils.isEmpty(supervisor) && supervisor.getSupervisoryCode() != null) {
             //获取补零位长度
@@ -342,23 +405,24 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         } else {
             supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
         }
-            }
-        } else {
-            supervisorCode = null;
+        return supervisorCode.toString();
     }
 
+    /**
+     * 生成96333电梯识别码
+     *
+     * @param city   行政区划市
+     * @param county 行政区划区
+     * @return 96333电梯识别码
+     */
+    private String createElevatorCode(String city, String county) {
         StringBuilder elevatorCode = new StringBuilder();
-        //判断是否是否需要生成96333电梯码、这个record对应的otherInfo不为空
-        if (EquipmentClassifityEnum.DT.getCode().equals(equipList) && !XIAN.equals(city) && !ObjectUtils.isEmpty(otherInfo)) {
-            if (!ObjectUtils.isEmpty(otherInfo.getCode())) {
-                elevatorCode.append(new StringBuilder(otherInfo.getCode()));
-            } else {
         //生成生成96333电梯码前缀
         Map<String, Object> elevatorMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), county);
         String elevator = ObjectUtils.isEmpty(elevatorMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), city).get("code").toString() : elevatorMap.get("code").toString();
         elevatorCode.append(elevator);
         //获取行政区划区县、市是否存在历史96333电梯码
-                CategoryOtherInfo elevatorOtherInfo = categoryOtherInfoMapper.selectElevatorCode(elevatorCode.toString());
+        CategoryOtherInfo elevatorOtherInfo = categoryOtherInfoMapper.selectElevatorCode(elevatorCode.toString(), null);
         //生成对应96333电梯码
         if (!ObjectUtils.isEmpty(elevatorOtherInfo) && elevatorOtherInfo.getCode() != null) {
             //获取补零位长度
@@ -375,15 +439,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         } else {
             elevatorCode.append(EquipmentCategoryEnum.CSM.getCode());
         }
+        return elevatorCode.toString();
     }
-        }
-        if (ObjectUtils.isEmpty(supervisorCode) && ObjectUtils.isEmpty(elevatorCode)) {
-            return new HashMap<>();
-        }
-        resultMap.put("supervisorCode", ObjectUtils.isEmpty(supervisorCode) ? null : supervisorCode.toString());
-        resultMap.put("elevatorCode", ObjectUtils.isEmpty(elevatorCode) ? null : elevatorCode.toString());
-        return resultMap;
-    }
+
 
     /**
      * 获取当前登录人单位类型