1.增加设备代码重置方法便于运维重置设备代码

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -29,6 +30,7 @@ public class CodeGenerateDto {
 
 
     @ApiModelProperty(value = "制造日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date produceDate;
 
 

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

@@ -22,7 +22,9 @@ 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 io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -467,18 +469,41 @@ public class CommonController extends BaseController {
 
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @GetMapping(value = "/test-code")
-    @ApiOperation(httpMethod = "GET", value = "code生成", notes = "code生成")
-    public ResponseModel<String> codeTest() {
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/test-code")
+    @ApiOperation(httpMethod = "PUT", value = "code生成测试", notes = "code生成测试")
+    public ResponseModel<String> codeTest(@ApiParam("设备种类") @RequestParam String equList,
+                                          @ApiParam("设备类别") @RequestParam String equCategory,
+                                          @ApiParam("设备品种") @RequestParam(required = false) String equDefine,
+                                          @ApiParam("接收机构行政区划") @RequestParam String receiveCompanyCode,
+                                          @ApiParam("制造日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date produceDate) {
         CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
-        codeGenerateDto.setEquList("2100");
-        codeGenerateDto.setEquCategory("2110");
-        codeGenerateDto.setEquDefine("2111");
-        codeGenerateDto.setProduceDate(new Date());
-        codeGenerateDto.setReceiveCompanyCode("610202");
+        codeGenerateDto.setEquList(equList);
+        codeGenerateDto.setEquCategory(equCategory);
+        codeGenerateDto.setEquDefine(equDefine);
+        codeGenerateDto.setProduceDate(produceDate);
+        codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
         return ResponseHelper.buildResponse(codeUtil.generateEquipmentCode(codeGenerateDto));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/init-code")
+    @ApiOperation(httpMethod = "PUT", value = "设备代码初始化", notes = "设备代码初始化")
+    public ResponseModel<String> initEquCode(@ApiParam("设备种类") @RequestParam String equList,
+                                             @ApiParam("设备类别") @RequestParam String equCategory,
+                                             @ApiParam("设备品种") @RequestParam(required = false) String equDefine,
+                                             @ApiParam("接收机构行政区划") @RequestParam String receiveCompanyCode,
+                                             @ApiParam("制造日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date produceDate,
+                                             @ApiParam("重置的序列号") @RequestParam(required = false, defaultValue = "0") Long intNumber){
+        CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
+        codeGenerateDto.setEquList(equList);
+        codeGenerateDto.setEquCategory(equCategory);
+        codeGenerateDto.setEquDefine(equDefine);
+        codeGenerateDto.setProduceDate(produceDate);
+        codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
+        codeUtil.initCode(codeGenerateDto, intNumber);
+        return ResponseHelper.buildResponse("succese");
+    }
+
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/CodeUtil.java

@@ -64,6 +64,19 @@ public class CodeUtil {
         }
     }
 
+    public void initCode(CodeGenerateDto codeGenerateDto ,Long intNumber){
+        // 根据区县或者地市级的接收机构代码获取地市级的行政区域代码
+        String regionCode = this.getCityRegionCode(codeGenerateDto.getReceiveCompanyCode());
+        String lockKey = this.buildLockKey(codeGenerateDto.getEquipBaseCode(), regionCode, codeGenerateDto.getYear());
+        RBucket<Long> rBucket = redissonClient.getBucket(this.buildManufactureNumberKey(lockKey));
+        // 初始化逻辑，初始化为0（编号1开始）
+        if(intNumber != null){
+            rBucket.set(intNumber);
+        } else {
+            rBucket.set(0L);
+        }
+    }
+
     /**
      * 获取地市级的行政审批区域代码
      *