Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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}, '%' )
-    ORDER BY
-        RIGHT ( SUPERVISORY_CODE, 5 ) DESC
-        LIMIT 1
+    <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 idx_biz_jg_other_info
-    SET
-    "RECORD" = #{record}
-    <if test="supervisorCode != null and supervisorCode != ''">
-        , "SUPERVISORY_CODE" = #{supervisorCode}
-    </if>
-    <if test="code != null and code != ''">
-         , "CODE96333" = #{code}
-    </if>
-    WHERE
+    <update id="updateSupervisorCode">
+        UPDATE idx_biz_jg_other_info
+        SET
         "RECORD" = #{record}
-       </update>
+        <if test="supervisorCode != null and supervisorCode != ''">
+            , "SUPERVISORY_CODE" = #{supervisorCode}
+        </if>
+        <if test="code != null and code != ''">
+            , "CODE96333" = #{code}
+        </if>
+        WHERE
+        "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}, '%' )
-    ORDER BY
-        RIGHT ( CODE96333, 2 ) DESC
-        LIMIT 1
+    <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",
-        "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
-            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 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",
+               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));