版本更新

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDetailDto.java

@@ -7,7 +7,8 @@ import java.util.List;
 
 @Data
 public class InstallDetailDto {
-    @ApiModelProperty(value="小区名称",position = 1)
+
+    @ApiModelProperty(value="小区名称1",position = 1)
     private String communityName;
 
     @ApiModelProperty(value="是否启用单元 0：否 1：是", position = 2)
@@ -20,5 +21,9 @@ public class InstallDetailDto {
     private Integer totalNumber = 0;
 
     @ApiModelProperty(value="安装数据", position = 101)
-    List<InstallPlanDataDto> InstallPlanDataList;
+    List<InstallPlanDataDto> installPlanDataList;
+
+    public static void main(String[] args) {
+        System.out.println("11");
+    }
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/RmcpErrorEnum.java

@@ -7,22 +7,49 @@ import lombok.Getter;
 @Getter
 public enum RmcpErrorEnum implements RespCode {
 
+    /**
+     * 小区名字已经存在
+     */
     RMCP_COMMUNITY_NAME_UNIQUE_ERROR(201001,"小区名字已经存在!"),
 
+    /**
+     * 设备编号已经存在!
+     */
     RMCP_DEVICE_NO_UNIQUE_ERROR(201002,"设备编号已经存在!"),
 
+    /**
+     * 水表电子号已经存在!
+     */
     RMCP_METER_NO_UNIQUE_ERROR(201003,"水表电子号已经存在!"),
 
+    /**
+     * 设备编号已经存在
+     */
     RMCP_DEVICE_NO_NOT_EXISTED(201004,"设备编号已经存在"),
 
+    /**
+     * 您输入的水表电子号已存在，请重新输入
+     */
     RMCP_DEVICE_ELECTRONIC_NO_NOT_EXISTED(201005,"您输入的水表电子号已存在，请重新输入"),
 
+    /**
+     * 更新失败！
+     */
     RMCP_UPDATE_FAIL(201006,"更新失败！"),
 
+    /**
+     * 未找到相关数据
+     */
     RMCP_NOT_FOUND(201404,"未找到相关数据"),
 
+    /**
+     * 未找到指定的code
+     */
     RMCP_NOT_FOUND_CODE(201405,"未找到指定的code"),
 
+    /**
+     * 下载失败
+     */
     RMCP_DOWNLOAD_ERROR(201406,"下载失败"),
     ;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/ValveStatusEnum.java

@@ -11,13 +11,30 @@ import java.util.Optional;
  */
 @Getter
 public enum ValveStatusEnum {
+    /**
+     * 关阀
+     */
     OFF(0,"关阀"),
+
+    /**
+     * 开阀
+     */
     ON(1,"开阀"),
+
+    /**
+     * 异常
+     */
     ABNORMAL(2,"异常"),
     ;
 
+    /**
+     * code
+     */
     private final Integer code;
 
+    /**
+     * 消息
+     */
     private final String message;
 
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -116,7 +116,7 @@ public class DeviceController {
     @ApiOperation(value = "下载Execl模板", notes = "下载Execl模板")
     public void downTemplate(
             @ApiParam(value = "分类id", required = true) @RequestParam(required = true) Integer categoryId,
-            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,
+            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String accessToken,
             HttpServletRequest request, HttpServletResponse response
     ) {
         deviceService.downTemplate(categoryId, response);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ImportController.java

@@ -39,7 +39,7 @@ public class ImportController {
     @ApiOperation(value = "下载失败列表")
     public void downloadFailFile(
             @ApiParam(value = "id", required = true) @RequestParam(required = true) Integer objId,
-            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,
+            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String accessToken,
             HttpServletRequest request, HttpServletResponse response
     ) {
         importFileService.downloadFailFile(objId,response);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/InstallController.java

@@ -71,7 +71,7 @@ public class InstallController {
     @ApiOperation(value = "下载装表模板", notes = "下载装表模板")
     public void downInstallMeterTemplate(
             @ApiParam(value = "安装计划id", required = true) @RequestParam(required = true) Integer planId,
-            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,
+            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String accessToken,
             HttpServletRequest request, HttpServletResponse response
     ) {
         installPlanService.downInstallMeterTemplate(planId, response);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/InstallPlanController.java

@@ -113,7 +113,7 @@ public class InstallPlanController {
     @GetMapping("downPlanTemplate")
     @ApiOperation(value = "下载计划模板", notes = "下载计划模板")
     public void planDownTemplate(
-            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String access_token,
+            @ApiParam(value = "access_token", required = true) @RequestParam(required = true) String accessToken,
             HttpServletRequest request, HttpServletResponse response
     ) {
         installPlanService.downPlanTemplate(response);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/excel/resolver/HandleExcelService.java

@@ -4,7 +4,7 @@ package com.zcxk.rmcp.web.excel.resolver;
 import com.zcxk.rmcp.web.excel.model.ExcelData;
 
 public interface HandleExcelService {
-    public void Handle(ExcelData data);
+    public void handle(ExcelData data);
 
 }