增加树查询

energy-manage-service/src/main/java/com/energy/manage/service/controller/powerwordcriterion/PowerWordCriterionController.java

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 @Slf4j
 @RestController
 @CrossOrigin
@@ -32,29 +34,25 @@ public class PowerWordCriterionController {
     private PowerWordCriterionService powerWordCriterionService;
 
 
-        @UserLoginToken
-        @PostMapping(value = "/powerWordCriterionImportData")
-        @ApiOperation(value = " 同步标准功率,（机型编号导入功率曲线）")
-        public ResultResp powerWordCriterionImportData(@RequestPart MultipartFile file,
-                                                       @RequestParam("millTypeCode")String millTypeCode) {
-
-            PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
-            powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
-
-        boolean flg = powerWordCriterionService.powerWordCriterionImportData(file,powerWordCriterionExcelDto);
-        return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
+    @UserLoginToken
+    @PostMapping(value = "/powerWordCriterionImportData")
+    @ApiOperation(value = " 同步标准功率,（机型编号导入功率曲线）")
+    public ResultResp powerWordCriterionImportData(@RequestPart MultipartFile file,
+                                                   @RequestParam("millTypeCode") String millTypeCode) {
+
+        PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
+        powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
+        return powerWordCriterionService.powerWordCriterionImportData(file, powerWordCriterionExcelDto);
     }
 
 
-
-
     @UserLoginToken
     @PostMapping(value = "/powerWordCriterionPage")
     @ApiOperation(value = " 同步标准功率曲线分页查询")
     public ResultResp<Page<PowerWordCriterionPageVo>> powerWordCriterionPage(@RequestBody PowerWordCriterionPageDto powerWordCriterionPageDto) {
 
-        Page<PowerWordCriterionPageVo>  page = powerWordCriterionService.powerWordCriterionPage(powerWordCriterionPageDto);
-        return  ResultResp.SUCCESS(page);
+        Page<PowerWordCriterionPageVo> page = powerWordCriterionService.powerWordCriterionPage(powerWordCriterionPageDto);
+        return ResultResp.SUCCESS(page);
     }
 
 
@@ -63,22 +61,18 @@ public class PowerWordCriterionController {
     @ApiOperation(value = " 删除风机标准功率曲线")
     public ResultResp delpowerWordCriterion(@RequestBody PowerWordCriterionDelDto powerWordCriterionDelDto) {
 
-        boolean flg= powerWordCriterionService.delpowerWordCriterion(powerWordCriterionDelDto);
+        boolean flg = powerWordCriterionService.delpowerWordCriterion(powerWordCriterionDelDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
     @UserLoginToken
     @PostMapping(value = "/updatePowerWordCriterion")
     @ApiOperation(value = "编辑标准功率曲线")
     public ResultResp updatePowerWordCriterion(@RequestBody PowerWordCriterionDto powerWordCriterionDto) {
-        boolean flg= powerWordCriterionService.updatePowerWordCriterion(powerWordCriterionDto);
+        boolean flg = powerWordCriterionService.updatePowerWordCriterion(powerWordCriterionDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
 
 
-
-
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/PowerWordContractExcelVo.java

@@ -4,30 +4,34 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
- * 合同导入有功功率
+ * 合同功率曲线
  */
 @Data
 public class PowerWordContractExcelVo {
 
-    /**
-     * 风场编号
-     */
-    @ExcelProperty(value = "风场编号",index = 1)
-    private String fieldCode;
+
     /**
      * 机型编号
      */
-    @ExcelProperty(value = "机型编号",index = 2)
+    @ExcelProperty(value = "系统生成机型编号",index = 0)
     private String millTypeCode;
+
+    /**
+     * 风速
+     */
+    @ExcelProperty(value = "风速",index = 1)
+    private String windSpeed;
+
     /**
      * 有功功率
      */
-    @ExcelProperty(value = "有功功率",index = 3)
+    @ExcelProperty(value = "有功功率",index = 2)
     private String activePower;
+
     /**
-     * 风速
+     * 空气密度
      */
-    @ExcelProperty(value = "风速",index = 4)
-    private String windSpeed;
+    @ExcelProperty(value = "当地空气密度",index = 3)
+    private String density;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/PowerWordCriterionExcelVo.java

@@ -1,30 +1,31 @@
 package com.energy.manage.service.domain.vo.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
 
+/**
+ * 标准功率曲线
+ */
+@Data
 public class PowerWordCriterionExcelVo {
 
     /**
-     * 机型编号
+     * 风速
      */
-    @ExcelProperty(value = "机型编号",index = 1)
-    private String millTypeCode;
+    @ExcelProperty(value = "风速",index = 0)
+    private String windSpeed;
     /**
      * 有功功率
      */
-    @ExcelProperty(value = "有功功率",index = 2)
+    @ExcelProperty(value = "有功功率",index = 1)
     private String activePower;
 
     /**
      * 空气密度
      */
-    @ExcelProperty(value = "空气密度",index = 3)
+    @ExcelProperty(value = "标准空气密度",index = 2)
     private String density;
-    /**
-     * 风速
-     */
-    @ExcelProperty(value = "风速",index = 4)
-    private String windSpeed;
+
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcriterion/PowerWordCriterionService.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.service.powerwordcriterion;
 
 import com.energy.manage.common.base.Page;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionDelDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionExcelDto;
@@ -8,6 +9,8 @@ import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterio
 import com.energy.manage.service.domain.vo.powerwordcriterion.PowerWordCriterionPageVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * 标准功率曲线接口
  */
@@ -19,7 +22,7 @@ public interface PowerWordCriterionService {
      * @param file,fieldCode
      * @return
      */
-    boolean  powerWordCriterionImportData(MultipartFile file, PowerWordCriterionExcelDto powerWordCriterionExcelDto);
+    ResultResp powerWordCriterionImportData(MultipartFile file, PowerWordCriterionExcelDto powerWordCriterionExcelDto);
 
 
     /**

energy-manage-service/src/main/java/com/energy/manage/service/service/powerwordcriterion/impl/PowerWordCriterionServiceImpl.java

@@ -8,6 +8,7 @@ import com.energy.manage.common.base.Page;
 import com.energy.manage.common.enums.DeleteStatusEnum;
 import com.energy.manage.common.po.powerwordcontract.PowerWordContractPO;
 import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
+import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionDelDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionDto;
 import com.energy.manage.service.domain.dto.powerwordcriterion.PowerWordCriterionExcelDto;
@@ -32,7 +33,9 @@ import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -46,29 +49,46 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean powerWordCriterionImportData(MultipartFile file, PowerWordCriterionExcelDto powerWordCriterionExcelDto) {
+    public ResultResp powerWordCriterionImportData(MultipartFile file, PowerWordCriterionExcelDto powerWordCriterionExcelDto) {
 
+        if (StringUtils.isEmpty(powerWordCriterionExcelDto.getMillTypeCode())) {
+            return ResultResp.FAIL("未选择机型！");
+        }
         List<PowerWordCriterionExcelVo> powerWordCriterionExcelVos = EasyExcel.read(file.getInputStream()).head(PowerWordCriterionExcelVo.class).sheet().doReadSync();
         if (CollectionUtils.isEmpty(powerWordCriterionExcelVos)) {
-            return false;
+            return ResultResp.FAIL("未读取到文件数据，请核对数据准确性！");
         }
+
+        // 删除机型
+        PowerWordCriterionPO po = new PowerWordCriterionPO();
+        po.setDelState(DeleteStatusEnum.DELETE.getCode());
+        Example queryExample = new Example(PowerWordCriterionPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("millTypeCode", powerWordCriterionExcelDto.getMillTypeCode());
+        powerWordCriterionMapper.updateByExampleSelective(po, queryExample);
+
         PowerWordCriterionPO powerWordCriterionPO = null;
         List<PowerWordCriterionPO> list = Lists.newArrayList();
-
         for (PowerWordCriterionExcelVo powerWordCriterionExcelVo : powerWordCriterionExcelVos) {
             powerWordCriterionPO = this.createPowerWordCriterionPO();
             BeanUtil.copyProperties(powerWordCriterionExcelVo, powerWordCriterionPO);
+            powerWordCriterionPO.setMillTypeCode(powerWordCriterionExcelDto.getMillTypeCode());
             list.add(powerWordCriterionPO);
         }
         if (CollectionUtils.isEmpty(list)) {
-            return false;
+            return ResultResp.FAIL("标准功率曲线处理异常");
+
         }
-        return powerWordCriterionMapper.insertList(list) > 0;
+        if (powerWordCriterionMapper.insertList(list) > 0) {
+            return ResultResp.SUCCESS();
+        }
+        return ResultResp.FAIL();
     }
 
 
     /**
      * 创建对象
+     *
      * @param
      * @return
      */
@@ -85,8 +105,8 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
         PageHelper.startPage(powerWordCriterionPageDto.getPageNum(), powerWordCriterionPageDto.getPageSize());
         Example queryExample = new Example(PowerWordContractPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
-        if(!StringUtils.isEmpty(powerWordCriterionPageDto.getMillTypeCode())){
-            criteria.andEqualTo("millTypeCode",powerWordCriterionPageDto.getMillTypeCode());
+        if (!StringUtils.isEmpty(powerWordCriterionPageDto.getMillTypeCode())) {
+            criteria.andEqualTo("millTypeCode", powerWordCriterionPageDto.getMillTypeCode());
         }
         criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         List<PowerWordCriterionPO> list = powerWordCriterionMapper.selectByExample(queryExample);
@@ -115,9 +135,9 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updatePowerWordCriterion(PowerWordCriterionDto powerWordCriterionDto){
+    public boolean updatePowerWordCriterion(PowerWordCriterionDto powerWordCriterionDto) {
         PowerWordCriterionPO po = new PowerWordCriterionPO();
-        BeanUtil.copyProperties(powerWordCriterionDto,po);
+        BeanUtil.copyProperties(powerWordCriterionDto, po);
         Example queryExample = new Example(PowerWordCriterionPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("id", powerWordCriterionDto.getId());
@@ -125,5 +145,4 @@ public class PowerWordCriterionServiceImpl extends BaseServiceImpl<PowerWordCrit
     }
 
 
-
 }