修改风机模块

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

@@ -4,11 +4,9 @@ package com.energy.manage.service.controller.windenginegroup;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCodeDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupStateDto;
+import com.energy.manage.service.domain.dto.windenginegroup.*;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
+import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,11 +58,19 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/windEngineGrouPage")
     @ApiOperation(value = "风机分页查询")
-    public ResultResp< Page<WindEngineGroupPageVo>> windEngineGrouPage(WindEngineGroupPageDto windEngineGroupPageDto) {
+    public ResultResp< Page<WindEngineGroupPageVo>> windEngineGrouPage (@RequestBody WindEngineGroupPageDto windEngineGroupPageDto) {
         Page<WindEngineGroupPageVo> page = windEngineGroupService.windEngineGrouPage(windEngineGroupPageDto);
         return ResultResp.SUCCESS(page);
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getWindEngineGroup")
+    @ApiOperation(value = "查询风机对象")
+    public ResultResp<WindEngineGroupVo> getWindEngineGroup(@RequestBody WindEngineGroupCodeDto windEngineGroupCodeDto) {
+        WindEngineGroupVo vo = windEngineGroupService.getWindEngineGroup(windEngineGroupCodeDto);
+        return ResultResp.SUCCESS(vo);
+    }
+
 
     @UserLoginToken
     @PostMapping(value = "/delWindEngineGroup")
@@ -78,22 +84,20 @@ public class WindEngineGroupController {
     @UserLoginToken
     @PostMapping(value = "/updateStateWindEngineGroup")
     @ApiOperation(value = "更改状态")
-    public ResultResp delFieldWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
+    public ResultResp updateStateWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
         boolean flg = windEngineGroupService.updateStateWindEngineGroup(windEngineGroupStateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
-
     @UserLoginToken
-    @PostMapping(value = "/getWindEngineGroup")
-    @ApiOperation(value = "更改状态")
-    public ResultResp getWindEngineGroup(@RequestBody WindEngineGroupStateDto windEngineGroupStateDto) {
-        boolean flg = windEngineGroupService.updateStateWindEngineGroup(windEngineGroupStateDto);
+    @PostMapping(value = "/updateWindEngineGroup")
+    @ApiOperation(value = "更改风机数据")
+    public ResultResp updateWindEngineGroup(@RequestBody WindEngineGroupUpdateDto dto) {
+        boolean flg = windEngineGroupService.updateWindEngineGroup(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
 
 
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupPageDto.java

@@ -35,11 +35,11 @@ public class WindEngineGroupPageDto extends BaseDto {
     private String fieldCode;
 
 
+    @ApiModelProperty("开始时间")
+    private String beginTime;
 
-
-
-
-
+    @ApiModelProperty("结束时间")
+    private String endTime;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupStateDto.java

@@ -13,14 +13,14 @@ import lombok.Setter;
 @Getter
 @Setter
 @ApiModel
-public class WindEngineGroupStateDto extends BaseDto {
+public class WindEngineGroupStateDto {
 
 
 
     /**
      * 风机编号
      */
-    @ApiModelProperty("是否风机编号标杆风机")
+    @ApiModelProperty("风机编号")
     private String engineCode;
 
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginegroup/WindEngineGroupUpdateDto.java

@@ -0,0 +1,75 @@
+package com.energy.manage.service.domain.dto.windenginegroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@ApiModel
+public class WindEngineGroupUpdateDto {
+
+    /**
+     * 风场编号
+     */
+    @NotNull(message = "风场编号不能为空")
+    @ApiModelProperty("风场编号")
+    private String fieldCode;
+    /**
+     * 风机名称
+     */
+    @NotNull(message = "风机名称不能为空")
+    @ApiModelProperty("风机名称")
+    private String engineName;
+    /**
+     * 风机编号
+     */
+    @ApiModelProperty("风机编号系统生成")
+    private String engineCode;
+    /**
+     * 机型编号uuid
+     */
+    @NotEmpty(message = "机型编号不能为空")
+    @ApiModelProperty("机型编号uuid")
+    private String millTypeCode;
+    /**
+     * 额定容量
+     */
+    @ApiModelProperty("额定容量")
+    private Double ratedCapacity;
+    /**
+     * 海拔高度
+     */
+    @ApiModelProperty("海拔高度")
+    private Double elevationHeight;
+    /**
+     * 轮毂高度
+     */
+    @ApiModelProperty("轮毂高度")
+    private Double hubHeight;
+    /**
+     * 经度
+     */
+    @ApiModelProperty("经度")
+    private Double longitude;
+    /**
+     * 维度
+     */
+    @ApiModelProperty("维度")
+    private Double latitude;
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Integer state;
+    /**
+     * 是否标杆风机
+     */
+    @ApiModelProperty("是否标杆风机")
+    private Integer sightcing;
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/windenginegroup/WindEngineGroupPageVo.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.domain.vo.windenginegroup;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,6 +22,9 @@ public class WindEngineGroupPageVo {
      */
     @ApiModelProperty("风场编号")
     private String fieldCode;
+
+    @ApiModelProperty("风场名称")
+    private String fieldName;
     /**
      * 风机编号
      */
@@ -32,11 +36,6 @@ public class WindEngineGroupPageVo {
     @ApiModelProperty("风机名称")
     private String engineName;
     /**
-     * 机型编号
-     */
-    @ApiModelProperty("机型编号")
-    private String millTypeCode;
-    /**
      * 额定容量
      */
     @ApiModelProperty("额定容量")
@@ -72,6 +71,18 @@ public class WindEngineGroupPageVo {
     @ApiModelProperty("是否标杆风机")
     private Integer sightcing;
 
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty(value = "机型型号")
+    private String machineTypeCode;
+
+    @ApiModelProperty(value = "厂商名字")
+    private String manufacturerName;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/WindEngineGroupService.java

@@ -2,10 +2,7 @@ package com.energy.manage.service.service.windenginegroup;
 
 
 import com.energy.manage.common.base.Page;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCodeDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupStateDto;
+import com.energy.manage.service.domain.dto.windenginegroup.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldImportDataDto;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupPageVo;
 import com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo;
@@ -79,6 +76,12 @@ public interface WindEngineGroupService {
      */
     boolean updateStateWindEngineGroup(WindEngineGroupStateDto windEngineGroupStateDto);
 
+    /**
+     * 更新数据
+     * @param windEngineGroupUpdateDto
+     * @return
+     */
+    boolean updateWindEngineGroup(WindEngineGroupUpdateDto windEngineGroupUpdateDto);
 
     /**
      * 查询风机对象

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginegroup/impl/WindEngineGroupServiceImpl.java

@@ -12,10 +12,7 @@ import com.energy.manage.common.po.windenginegroup.WindEngineGroupPO;
 import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
 import com.energy.manage.common.po.windfield.WindFieldPO;
 import com.energy.manage.common.util.IdGeneratorUtil;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCodeDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupCreateDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupPageDto;
-import com.energy.manage.service.domain.dto.windenginegroup.WindEngineGroupStateDto;
+import com.energy.manage.service.domain.dto.windenginegroup.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldImportDataDto;
 import com.energy.manage.service.domain.vo.excel.WindEngineGroupExcelVo;
 import com.energy.manage.service.domain.vo.excel.WindFieldExceVo;
@@ -76,10 +73,6 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
         windEngineGroupPO.setState(Constants.GLOBAL_IN_USE);
         windEngineGroupPO.setDelState(DeleteStatusEnum.NODELETE.getCode());
 
-
-
-
-
         return windEngineGroupMapper.insertUseGeneratedKeys(windEngineGroupPO) > 0;
     }
 
@@ -157,22 +150,13 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     @Override
     public boolean delWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
 
-        WindEngineGroupPO windEngineGroupPO = new WindEngineGroupPO();
-        windEngineGroupMapper.selectOne(windEngineGroupPO);
-
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setDelState(DeleteStatusEnum.DELETE.getCode());
         Example queryExample = new Example(WindEngineGroupPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("engineCode", windEngineGroupCodeDto.getEngineCode());
 
-        // 删除风机
-        if (windEngineGroupMapper.updateByExampleSelective(po, queryExample) <= 0) {
-            return false;
-        }
-
-        // 更新风场下风机数量
-        return windFieldService.updateWindFieldNumber(windEngineGroupPO.getFieldCode());
+        return windEngineGroupMapper.updateByExampleSelective(po, queryExample)> 0;
     }
 
     @Override
@@ -186,6 +170,16 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
     @Override
+    public boolean updateWindEngineGroup(WindEngineGroupUpdateDto windEngineGroupUpdateDto) {
+        WindEngineGroupPO po = new WindEngineGroupPO();
+        BeanUtil.copyProperties(windEngineGroupUpdateDto,po);
+        Example queryExample = new Example(WindEngineGroupPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("engineCode", windEngineGroupUpdateDto.getEngineCode());
+        return windEngineGroupMapper.updateByExampleSelective(po, queryExample) > 0;
+    }
+
+    @Override
     public WindEngineGroupVo getWindEngineGroup(WindEngineGroupCodeDto windEngineGroupCodeDto) {
         WindEngineGroupPO po = new WindEngineGroupPO();
         po.setEngineCode(windEngineGroupCodeDto.getEngineCode());

energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -14,14 +14,17 @@
         weg.hub_height as hubHeight,
         weg.longitude,
         weg.latitude,
-        weg.sightcing
+        weg.sightcing,
+        wem.machine_type_code as machineTypeCode,
+        wem.manufacturer_name as manufacturerName,
+        weg.create_time as createTime
         from
         wind_field wf
         inner join
         wind_engine_group weg on wf.field_code = weg.field_code
         inner JOIN
-        wind_engine_mill wem on weg.mill_type_code = wem.mill_type_code
-        where 1=1
+        wind_engine_mill wem on weg.mill_type_code = wem.mill_type_code and wem.del_state = 0
+        where 1=1 and weg.del_state = 0
         <if test="item.engineName!=null">
             and
             weg.engine_name = #{item.engineName}
@@ -34,6 +37,12 @@
             AND
             wf.field_code = #{item.fieldCode}
         </if>
+        <if test="item.beginTime != null and item.beginTime != ''">
+            and weg.create_time  <![CDATA[>= ]]>  #{item.beginTime}
+        </if>
+        <if test="item.endTime != null and item.endTime != ''">
+            and weg.create_time <![CDATA[<= ]]> #{item.endTime}
+        </if>
     </select>