Browse Source

增加参数校验

shiyue 1 year ago
parent
commit
43729e8ee5
21 changed files with 92 additions and 29 deletions
  1. 5 4
      energy-manage-service/src/main/java/com/energy/manage/service/controller/anemometertower/AnemometerTowerController.java
  2. 11 6
      energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java
  3. 3 1
      energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginegroup/WindEngineGroupController.java
  4. 8 3
      energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginemill/WindEngineMillController.java
  5. 8 7
      energy-manage-service/src/main/java/com/energy/manage/service/controller/windfield/WindFieldController.java
  6. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerByFieldDto.java
  7. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerCreateDto.java
  8. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDelDto.java
  9. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerStateDto.java
  10. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDelDto.java
  11. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDto.java
  12. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyStateDto.java
  13. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyUpdateDto.java
  14. 12 6
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCreateDto.java
  15. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCodeDto.java
  16. 3 1
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldCodeDto.java
  17. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldDto.java
  18. 3 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldResourceDelDto.java
  19. 2 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateDto.java
  20. 4 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateStateDto.java
  21. 2 1
      energy-manage-service/src/main/resources/bootstrap.properties

+ 5 - 4
energy-manage-service/src/main/java/com/energy/manage/service/controller/anemometertower/AnemometerTowerController.java

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Slf4j
@@ -34,7 +35,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/createAnemometerTower")
     @ApiOperation(value = "创建测风塔数据")
-    public ResultResp createAnemometerTower(@RequestBody AnemometerTowerCreateDto anemometerTowerCreateDto) {
+    public ResultResp createAnemometerTower(@RequestBody  @Valid AnemometerTowerCreateDto anemometerTowerCreateDto) {
         boolean flg = anemometerTowerService.createAnemometerTower(anemometerTowerCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -44,7 +45,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/delAnemometerTower")
     @ApiOperation(value = "删除测风塔数据")
-    public ResultResp delAnemometerTower(@RequestBody AnemometerTowerDelDto anemometerTowerDelDto) {
+    public ResultResp delAnemometerTower(@RequestBody  @Valid AnemometerTowerDelDto anemometerTowerDelDto) {
         boolean flg = anemometerTowerService.delAnemometerTower(anemometerTowerDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -53,7 +54,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/updateAnemometerTowerState")
     @ApiOperation(value = "修改测风塔状态")
-    public ResultResp updateAnemometerTowerState(@RequestBody AnemometerTowerStateDto anemometerTowerStateDto) {
+    public ResultResp updateAnemometerTowerState(@RequestBody  @Valid AnemometerTowerStateDto anemometerTowerStateDto) {
         boolean flg = anemometerTowerService.updateAnemometerTowerState(anemometerTowerStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -89,7 +90,7 @@ public class AnemometerTowerController {
     @UserLoginToken
     @PostMapping(value = "/getAnemometerTowerByField")
     @ApiOperation(value = "通过风场编号查询测风塔信息")
-    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
+    public ResultResp<List<AnemometerTowerByFieldVo>> getAnemometerTowerByField(@RequestBody  @Valid AnemometerTowerByFieldDto anemometerTowerByFieldDto) {
         List<AnemometerTowerByFieldVo> anemometerTowerByField  = anemometerTowerService.getAnemometerTowerByField(anemometerTowerByFieldDto.getFieldCode());
         return ResultResp.SUCCESS(anemometerTowerByField);
     }

+ 11 - 6
energy-manage-service/src/main/java/com/energy/manage/service/controller/company/WindCompanyController.java

@@ -12,9 +12,11 @@ import com.energy.manage.service.service.windfield.WindFieldService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -35,7 +37,11 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/addCompany")
     @ApiOperation(value = "创建企业")
-    public ResultResp addCompany(@RequestBody WindCompanyDto dto) {
+    public ResultResp addCompany(@RequestBody @Valid WindCompanyDto dto) {
+
+        if(StringUtils.isEmpty(dto.getParentCode())||StringUtils.isEmpty(dto.getCompanyName())){
+            return ResultResp.NOTNULLPARAM();
+        }
         boolean flg = windCompanyService.addCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -44,7 +50,7 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/delCompany")
     @ApiOperation(value = "删除企业")
-    public ResultResp delCompany(@RequestBody WindCompanyDelDto dto) {
+    public ResultResp delCompany(@RequestBody @Valid WindCompanyDelDto dto) {
 
         List<WindFieldVo> list = windFieldService.getWindFieldVos(dto.getCompanyCode());
         if (list.size() > 0) {
@@ -57,7 +63,7 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/updateStateCompany")
     @ApiOperation(value = "更新企业状态")
-    public ResultResp updateStateCompany(@RequestBody WindCompanyStateDto dto) {
+    public ResultResp updateStateCompany(@RequestBody @Valid WindCompanyStateDto dto) {
         boolean flg = windCompanyService.updateStateCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -65,7 +71,7 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/getWindCompany")
     @ApiOperation(value = "查询企业对象")
-    public ResultResp<WindCompanyVo> getWindCompany(@RequestBody WindCompanyDelDto dto) {
+    public ResultResp<WindCompanyVo> getWindCompany(@RequestBody @Valid WindCompanyDelDto dto) {
         WindCompanyVo vo = windCompanyService.getWindCompany(dto);
         return ResultResp.SUCCESS(vo) ;
     }
@@ -73,7 +79,7 @@ public class WindCompanyController {
     @UserLoginToken
     @PostMapping(value = "/updateCompany")
     @ApiOperation(value = "更新企业")
-    public ResultResp updateCompany(@RequestBody WindCompanyUpdateDto dto) {
+    public ResultResp updateCompany(@RequestBody @Valid WindCompanyUpdateDto dto) {
         boolean flg = windCompanyService.updateCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -83,7 +89,6 @@ public class WindCompanyController {
     @PostMapping(value = "/getAllWindCompany")
     @ApiOperation(value = "查询企业树")
     public ResultResp<List<Map<String, Object>>> getAllWindCompany(@RequestBody WindCompanyPageDto windCompanyPageDto) {
-
         List<Map<String, Object>> list = windCompanyService.getAllWindCompany(windCompanyPageDto.getState(), windCompanyPageDto.getCompanyName());
         return ResultResp.SUCCESS(list);
     }

+ 3 - 1
energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginegroup/WindEngineGroupController.java

@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -31,7 +33,7 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/createWindEngineGroup")
     @ApiOperation(value = "创建风机机组")
-    public ResultResp createWindEngineGroup(@RequestBody WindEngineGroupCreateDto windEngineGroupCreateDto) {
+    public ResultResp createWindEngineGroup(@RequestBody @Valid WindEngineGroupCreateDto windEngineGroupCreateDto) {
         boolean flg = windEngineGroupService.createWindEngineGroup(windEngineGroupCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

+ 8 - 3
energy-manage-service/src/main/java/com/energy/manage/service/controller/windenginemill/WindEngineMillController.java

@@ -12,10 +12,13 @@ import com.energy.manage.service.service.windenginemill.WindEngineMillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -60,7 +63,7 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/delWindEngineMill")
     @ApiOperation(value = "删除机型")
-    public ResultResp delWindEngineMill(@RequestBody WindEngineMillCodeDto windEngineMillCodeDto) {
+    public ResultResp delWindEngineMill(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
 
         boolean flg = windEngineMillService.delWindEngineMill(windEngineMillCodeDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
@@ -70,7 +73,7 @@ public class WindEngineMillController {
     @UserLoginToken
     @PostMapping(value = "/getWindEngineMillPageVo")
     @ApiOperation(value = "查询机型对象")
-    public ResultResp getWindEngineMillPageVo(@RequestBody WindEngineMillCodeDto windEngineMillCodeDto) {
+    public ResultResp getWindEngineMillPageVo(@RequestBody @Valid WindEngineMillCodeDto windEngineMillCodeDto) {
 
         WindEngineMillPageVo windEngineMillPageVo = windEngineMillService.getWindEngineMillPageVo(windEngineMillCodeDto);
         return  ResultResp.SUCCESS(windEngineMillPageVo) ;
@@ -81,7 +84,9 @@ public class WindEngineMillController {
     @PostMapping(value = "/updateWindEngineMill")
     @ApiOperation(value = "更新机型")
     public ResultResp updateWindEngineMill(@RequestBody WindEngineMillDto windEngineMillDto) {
-
+        if(StringUtils.isEmpty(windEngineMillDto.getMillTypeCode())){
+            return ResultResp.NOTNULLPARAM();
+        }
         boolean flg = windEngineMillService.updateWindEngineMill(windEngineMillDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

+ 8 - 7
energy-manage-service/src/main/java/com/energy/manage/service/controller/windfield/WindFieldController.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -38,7 +39,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/createWindField")
     @ApiOperation(value = "创建风场信息")
-    public ResultResp createWindField(@RequestBody WindFieldDto windFieldDto) {
+    public ResultResp createWindField(@RequestBody @Valid WindFieldDto windFieldDto) {
         boolean flg = windFieldService.createWindField(windFieldDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -104,7 +105,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/delWindFieldById")
     @ApiOperation(value = "删除风场")
-    public ResultResp delWindFieldById(@RequestBody WindFieldCodeDto windFieldCodeDto) {
+    public ResultResp delWindFieldById(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
 
         boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
@@ -122,7 +123,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/updateWindFieldStateById")
     @ApiOperation(value = "修改状态")
-    public ResultResp updateWindFieldStateById(@RequestBody WindFieldUpdateStateDto windFieldUpdateStateDto) {
+    public ResultResp updateWindFieldStateById(@RequestBody @Valid WindFieldUpdateStateDto windFieldUpdateStateDto) {
 
         boolean flg = windFieldService.updateWindFieldStateById(windFieldUpdateStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
@@ -131,7 +132,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/getWindFieldVo")
     @ApiOperation(value = "查询风场对象")
-    public ResultResp<WindFieldVo> getWindFieldVo(@RequestBody WindFieldCodeDto windFieldCodeDto) {
+    public ResultResp<WindFieldVo> getWindFieldVo(@RequestBody @Valid WindFieldCodeDto windFieldCodeDto) {
         WindFieldVo vo = windFieldService.getWindFieldVo(windFieldCodeDto);
         return ResultResp.SUCCESS(vo);
     }
@@ -139,7 +140,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/WindFieldDto")
     @ApiOperation(value = "更新风场信息")
-    public ResultResp updateWindField(@RequestBody WindFieldUpdateDto windFieldUpdateDto) {
+    public ResultResp updateWindField(@RequestBody @Valid WindFieldUpdateDto windFieldUpdateDto) {
         boolean flg = windFieldService.updateWindField(windFieldUpdateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -156,7 +157,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/saveWindFieldResource")
     @ApiOperation(value = "保存上传风场资源文件")
-    public ResultResp saveWindFieldResource(@RequestBody WindFieldResourceCreateDto windFieldResourceCreateDto) {
+    public ResultResp saveWindFieldResource(@RequestBody @Valid WindFieldResourceCreateDto windFieldResourceCreateDto) {
         boolean flg = windFieldResourceService.saveWindFieldResource(windFieldResourceCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -165,7 +166,7 @@ public class WindFieldController {
     @UserLoginToken
     @PostMapping(value = "/delWindFieldResource")
     @ApiOperation(value = "删除风场资源文件")
-    public ResultResp delWindFieldResource(@RequestBody WindFieldResourceDelDto windFieldResourceDelDto) {
+    public ResultResp delWindFieldResource(@RequestBody @Valid WindFieldResourceDelDto windFieldResourceDelDto) {
         boolean flg = windFieldResourceService.delWindFieldResource(windFieldResourceDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerByFieldDto.java

@@ -4,10 +4,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 public class AnemometerTowerByFieldDto {
 
+    @NotNull(message = "风场编号不能为空")
     @ApiModelProperty("风场编号")
     private  String fieldCode;
 

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerCreateDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,6 +20,7 @@ public class AnemometerTowerCreateDto {
     /**
      * 测风塔名称
      */
+    @NotNull(message = "测风塔名称不能为null")
     @ApiModelProperty("测风塔名称")
     private String anemometerName;
     /**

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerDelDto.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 删除测风塔
  */
@@ -17,6 +19,7 @@ public class AnemometerTowerDelDto {
     /**
      * 测风塔编号
      */
+    @NotNull(message = "测风塔名称不能为null")
     @ApiModelProperty("测风塔编号")
     private String anemometerCode;
 

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerStateDto.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 修改测风塔状态
  */
@@ -17,6 +19,7 @@ public class AnemometerTowerStateDto {
     /**
      * 测风塔编号
      */
+    @NotNull(message = "测风塔编号不能null")
     @ApiModelProperty("测风塔编号")
     private String anemometerCode;
 

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDelDto.java

@@ -5,11 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("删除企业参数")
 public class WindCompanyDelDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
 

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("风场企业信息")
@@ -13,6 +15,7 @@ public class WindCompanyDto {
     /**
      * 企业名称
      */
+    @NotNull(message = "企业名称不能为空")
     @ApiModelProperty("企业名称")
     private String companyName;
     /**
@@ -47,6 +50,7 @@ public class WindCompanyDto {
     /**
      * 资源父id (父编号0,子编号为上级编号)
      */
+    @NotNull(message = "父编号不能为空")
     @ApiModelProperty("资源父id (父编号0,子编号为上级编号)")
     private String parentCode;
 

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyStateDto.java

@@ -5,14 +5,18 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("修改企业信息状态")
 public class WindCompanyStateDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
 
+    @NotNull(message ="状态不能为空")
     @ApiModelProperty("状态")
     private Integer state;
 

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/company/WindCompanyUpdateDto.java

@@ -5,11 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("修改企业信息")
 public class WindCompanyUpdateDto {
 
+    @NotNull(message ="企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String  companyCode;
     /**

+ 12 - 6
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupCreateDto.java

@@ -8,6 +8,9 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 /**
  * 创建风机参数
  */
@@ -19,48 +22,51 @@ public class WindEngineGroupCreateDto {
     /**
      * 风场编号
      */
+    @NotNull(message = "风场编号不能为空")
     @ApiModelProperty("风场编号")
     private String fieldCode;
     /**
      * 风机名称
      */
+    @NotNull(message = "风机名称不能为空")
     @ApiModelProperty("风机名称")
     private String engineName;
     /**
      * 风机编号
      */
-    @ApiModelProperty("风机编号")
+    @ApiModelProperty("风机编号系统生成")
     private String engineCode;
     /**
      * 机型编号uuid
      */
+    @NotEmpty(message = "机型编号不能为空")
     @ApiModelProperty("机型编号uuid")
     private String millTypeCode;
     /**
      * 额定容量
      */
     @ApiModelProperty("额定容量")
-    private String ratedCapacity;
+    private Double ratedCapacity;
     /**
      * 海拔高度
      */
     @ApiModelProperty("海拔高度")
-    private String elevationHeight;
+    private Double elevationHeight;
     /**
      * 轮毂高度
      */
     @ApiModelProperty("轮毂高度")
-    private String hubHeight;
+    private Double hubHeight;
     /**
      * 经度
      */
     @ApiModelProperty("经度")
-    private String longitude;
+    private Double longitude;
     /**
      * 维度
      */
     @ApiModelProperty("维度")
-    private String latitude;
+    private Double latitude;
     /**
      * 状态
      */

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCodeDto.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel
@@ -14,6 +16,7 @@ public class WindEngineMillCodeDto {
     /**
      * 机型编号
      */
+    @NotNull(message = "机型编号不能为null")
     @ApiModelProperty("机型编号")
     private String millTypeCode;
 

+ 3 - 1
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldCodeDto.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 风场code参数
  */
@@ -12,7 +14,7 @@ import lombok.Setter;
 @Setter
 public class WindFieldCodeDto {
 
-
+    @NotNull(message = "风场编号不能为空")
     @ApiModelProperty("编号")
     private String fieldCode;
 

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -21,6 +22,7 @@ public class WindFieldDto {
     /**
      * 企业编号
      */
+    @NotNull(message = "企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
     /**
@@ -31,6 +33,7 @@ public class WindFieldDto {
     /**
      * 风场名称
      */
+    @NotNull(message = "风场名称不能为空")
     @ApiModelProperty("风场名称")
     private String fieldName;
     /**

+ 3 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldResourceDelDto.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 @Getter
 @Setter
 @ApiModel("删除风场资源参数")
@@ -14,6 +16,7 @@ public class WindFieldResourceDelDto {
     /**
      * 资源文件id
      */
+    @NotNull(message = "编号不能为null")
     @ApiModelProperty("编号")
     private Integer id;
 

+ 2 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Getter
@@ -15,6 +16,7 @@ public class WindFieldUpdateDto {
     /**
      * 企业编号
      */
+    @NotNull(message = "企业编号不能为空")
     @ApiModelProperty("企业编号")
     private String companyCode;
     /**

+ 4 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windfield/WindFieldUpdateStateDto.java

@@ -3,6 +3,8 @@ package com.energy.manage.service.domain.dto.windfield;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 修改状态
  */
@@ -11,8 +13,10 @@ public class WindFieldUpdateStateDto {
 
 
     @ApiModelProperty("编号")
+    @NotNull(message = "编号不能为null")
     private String fieldCode;
 
+    @NotNull(message = "状态不能为null")
     @ApiModelProperty("状态")
     private Integer state;
 

+ 2 - 1
energy-manage-service/src/main/resources/bootstrap.properties

@@ -42,7 +42,8 @@ logging.level.com.energy.manage.service.mappers= debug
 # 接口文档
 knife4j.enable=true
 
-
+spring.jackson.date-format = yyyy-MM-dd HH:mm
+spring.jackson.time-zone= GMT+8
 
 template.bzpower = http://192.168.50.234:6900/bucket-zhzn/template/%E6%A0%87%E5%87%86%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx
 template.htpower = http://192.168.50.234:6900/bucket-zhzn/template/%E5%90%88%E5%90%8C%E5%8A%9F%E7%8E%87%E6%9B%B2%E7%BA%BF%E6%A8%A1%E7%89%88.xlsx