更改bug

energy-manage-service/src/main/java/com/energy/manage/service/controller/UploadController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.energy.manage.common.reponse.RespMsg;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.PassToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.util.MinioUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,7 +29,7 @@ import java.util.Map;
 @RequestMapping(value = "/api/check")
 @CrossOrigin
 @Api(value = "UploadController", tags = "上传接口")
-public class UploadController {
+public class UploadController extends BaseServiceController {
 
   @Autowired
   private MinioUtils minioUtils;

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

@@ -5,12 +5,10 @@ import com.energy.manage.common.base.Page;
 import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.anemometertower.*;
 import com.energy.manage.service.domain.dto.windfield.WindFieldPageDto;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
+import com.energy.manage.service.domain.vo.anemometertower.*;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +24,7 @@ import java.util.List;
 @CrossOrigin
 @Api(value = "AnemometerTowerController", tags = "测风塔接口")
 @RequestMapping(value = "/api/anemometer/tower")
-public class AnemometerTowerController {
+public class AnemometerTowerController extends BaseServiceController {
 
 
     @Autowired
@@ -41,7 +39,7 @@ public class AnemometerTowerController {
         if (po != null) {
             return ResultResp.FAIL("测风塔名称已经存在！");
         }
-
+        anemometerTowerCreateDto.setCreateBy(getUserId());
         boolean flg = anemometerTowerService.createAnemometerTower(anemometerTowerCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }
@@ -72,6 +70,14 @@ public class AnemometerTowerController {
         return ResultResp.SUCCESS(page);
     }
 
+    @UserLoginToken
+    @PostMapping(value = "/getAnemometerTowerNameList")
+    @ApiOperation(value = "查询测风塔集合")
+    public ResultResp<List<AnemometerTowerNameVo> > getAnemometerTowerNameList() {
+        List<AnemometerTowerNameVo>  list = anemometerTowerService.getAnemometerTowerNameList();
+        return ResultResp.SUCCESS(list);
+    }
+
     @Deprecated
     @UserLoginToken
     @PostMapping(value = "/bathAnemometerTowerHeight")

energy-manage-service/src/main/java/com/energy/manage/service/controller/area/AreaApiController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.energy.manage.common.po.area.AreaPO;
 import com.energy.manage.common.reponse.RespMsg;
 import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.service.area.AreaApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,7 +26,7 @@ import java.util.*;
 @CrossOrigin
 @Api(value = "CustomerController", tags = "区域接口")
 @RequestMapping(value = "/api/area")
-public class AreaApiController {
+public class AreaApiController extends BaseServiceController {
 
     @Value("${spring.datasource.druid.url}")
     private String druid;

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

@@ -4,6 +4,7 @@ package com.energy.manage.service.controller.company;
 import com.energy.manage.common.po.company.WindCompanyPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.company.*;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.company.WindCompanyVo;
@@ -26,7 +27,7 @@ import java.util.Map;
 @CrossOrigin
 @Api(value = "WindCompanyController", tags = "企业管理接口")
 @RequestMapping(value = "/api/wind/company")
-public class WindCompanyController {
+public class WindCompanyController extends BaseServiceController {
 
     @Autowired
     private WindCompanyService windCompanyService;
@@ -39,7 +40,6 @@ public class WindCompanyController {
     @PostMapping(value = "/addCompany")
     @ApiOperation(value = "创建企业")
     public ResultResp addCompany(@RequestBody @Valid WindCompanyDto dto) {
-
         // 验证企业名称是否存在
         WindCompanyPO po = windCompanyService.getWindCompanyPO(dto);
         if (po != null) {
@@ -48,6 +48,7 @@ public class WindCompanyController {
         if (StringUtils.isEmpty(dto.getParentCode()) || StringUtils.isEmpty(dto.getCompanyName())) {
             return ResultResp.NOTNULLPARAM();
         }
+        dto.setCreateBy(getUserId());
         boolean flg = windCompanyService.addCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

energy-manage-service/src/main/java/com/energy/manage/service/controller/dict/DictContentsController.java

@@ -5,6 +5,7 @@ import com.energy.manage.common.constant.controller.WebApiConstant;
 import com.energy.manage.common.po.dict.DictConstantsPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.PassToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.dict.DictConstantsQueryDto;
 import com.energy.manage.service.domain.vo.dict.DictParentVo;
 import com.energy.manage.service.service.dict.DictConstantsService;
@@ -18,7 +19,7 @@ import java.util.List;
 @RestController
 @CrossOrigin
 @Api(value = "DictContentsController", tags = "字典管理")
-public class DictContentsController {
+public class DictContentsController extends BaseServiceController {
 
 
     @Autowired

energy-manage-service/src/main/java/com/energy/manage/service/controller/powerwordcontract/PowerWordContractController.java

@@ -4,6 +4,7 @@ package com.energy.manage.service.controller.powerwordcontract;
 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.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDelDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractExcelDto;
@@ -23,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 @CrossOrigin
 @Api(value = "PowerWordContractController", tags = "合同功率曲线接口")
 @RequestMapping(value = "/api/powerword/contract")
-public class PowerWordContractController {
+public class PowerWordContractController extends BaseServiceController {
 
     @Autowired
     private PowerWordContractService powerWordContractService;
@@ -37,6 +38,7 @@ public class PowerWordContractController {
 
         PowerWordContractExcelDto powerWordContractExcelDto = new PowerWordContractExcelDto();
         powerWordContractExcelDto.setFieldCode(fieldCode);
+        powerWordContractExcelDto.setCreateBy(getUserId());
         return powerWordContractService.powerWordContractImportData(file, powerWordContractExcelDto);
     }
 

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.controller.powerwordcriterion;
 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.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDelDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractDto;
 import com.energy.manage.service.domain.dto.powerwordcontract.PowerWordContractExcelDto;
@@ -28,7 +29,7 @@ import java.util.Map;
 @CrossOrigin
 @Api(value = "PowerWordCriterionController", tags = "标准功率曲线接口")
 @RequestMapping(value = "/api/powerword/criterion")
-public class PowerWordCriterionController {
+public class PowerWordCriterionController extends BaseServiceController {
 
     @Autowired
     private PowerWordCriterionService powerWordCriterionService;
@@ -42,6 +43,7 @@ public class PowerWordCriterionController {
 
         PowerWordCriterionExcelDto powerWordCriterionExcelDto = new PowerWordCriterionExcelDto();
         powerWordCriterionExcelDto.setMillTypeCode(millTypeCode);
+        powerWordCriterionExcelDto.setCreateBy(getUserId());
         return powerWordCriterionService.powerWordCriterionImportData(file, powerWordCriterionExcelDto);
     }
 

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

@@ -37,6 +37,7 @@ public class WindEngineGroupController extends BaseServiceController {
     @PostMapping(value = "/createWindEngineGroup")
     @ApiOperation(value = "创建风机机组")
     public ResultResp createWindEngineGroup(@RequestBody @Valid WindEngineGroupCreateDto windEngineGroupCreateDto) {
+        windEngineGroupCreateDto.setCreateBy(getUserId());
         boolean flg = windEngineGroupService.createWindEngineGroup(windEngineGroupCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.controller.windenginemill;
 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.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCodeDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillCreateDto;
 import com.energy.manage.service.domain.dto.windenginemill.WindEngineMillDto;
@@ -26,7 +27,7 @@ import java.util.List;
 @CrossOrigin
 @Api(value = "WindEngineMillController", tags = "风机机型管理接口")
 @RequestMapping(value = "/api/wind/engine/mill")
-public class WindEngineMillController {
+public class WindEngineMillController extends BaseServiceController {
 
     @Autowired
     private WindEngineMillService windEngineMillService;
@@ -38,6 +39,7 @@ public class WindEngineMillController {
         if(!windEngineMillService.verificationData(windEngineMillCreateDto.getMachineTypeCode(),windEngineMillCreateDto.getManufacturerCode())){
             return ResultResp.FAIL("该厂商对应机型已经存在！");
         }
+        windEngineMillCreateDto.setCreateBy(getUserId());
         boolean flg = windEngineMillService.createEngineMill(windEngineMillCreateDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

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

@@ -6,6 +6,7 @@ import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.common.po.windfield.WindFieldPO;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
 import com.energy.manage.service.domain.dto.windfield.*;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
@@ -31,7 +32,7 @@ import java.util.Map;
 @CrossOrigin
 @Api(value = "WindFieldController", tags = "风场管理接口")
 @RequestMapping(value = "/api/wind/field")
-public class WindFieldController {
+public class WindFieldController extends BaseServiceController {
 
     @Autowired
     private WindFieldService windFieldService;
@@ -47,13 +48,12 @@ public class WindFieldController {
     @PostMapping(value = "/createWindField")
     @ApiOperation(value = "创建风场信息")
     public ResultResp createWindField(@RequestBody @Valid WindFieldDto windFieldDto) {
-
         // 校验风场名称是否存在
         WindFieldPO po = windFieldService.getWindFieldPOByFieldName(windFieldDto.getFieldName());
         if (po != null) {
             return ResultResp.FAIL("风场名称已经存在！");
         }
-
+        windFieldDto.setCreateBy(getUserId());
         boolean flg = windFieldService.createWindField(windFieldDto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

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

@@ -34,6 +34,8 @@ public class AnemometerTowerCreateDto {
     @ApiModelProperty("纬度")
     private Double latitude;
 
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
 
     @ApiModelProperty("测风塔高度集合")
     private List<AnemometerTowerHeightListDto> anemometerTowerHeightDtoList;

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

@@ -54,5 +54,7 @@ public class WindCompanyDto {
     @ApiModelProperty("资源父id （父编号0，子编号为上级编号）")
     private String parentCode;
 
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcontract/PowerWordContractExcelDto.java

@@ -17,7 +17,8 @@ public class PowerWordContractExcelDto {
     @ApiModelProperty("风场编号")
     private String fieldCode;
 
-
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/powerwordcriterion/PowerWordCriterionExcelDto.java

@@ -17,4 +17,8 @@ public class PowerWordCriterionExcelDto {
     @ApiModelProperty("机型编号")
     private String millTypeCode;
 
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
 }

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

@@ -95,5 +95,8 @@ public class WindEngineGroupCreateDto {
     @ApiModelProperty("切出风速")
     private Double ratedCutOutWindspeed;
 
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillCreateDto.java

@@ -69,4 +69,7 @@ public class WindEngineMillCreateDto {
     @ApiModelProperty("传动比-转速比（无单位）")
     private Double rotationalSpeedRatio;
 
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
 }

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

@@ -103,6 +103,10 @@ public class WindFieldDto {
     private List<AnemometerTowerRelationDto> anemometerTowerRelationDtos;
 
 
+    @ApiModelProperty(value = "创建人")
+    private Integer createBy;
+
+
     @Setter
     @Getter
     @ApiModel

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/anemometertower/AnemometerTowerNameVo.java

@@ -0,0 +1,21 @@
+package com.energy.manage.service.domain.vo.anemometertower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AnemometerTowerNameVo {
+
+    /**
+     * 测风塔编号
+     */
+    @ApiModelProperty("测风塔编号")
+    private String anemometerCode;
+    /**
+     * 测风塔名称
+     */
+    @ApiModelProperty("测风塔名称")
+    private String anemometerName;
+}

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/AnemometerTowerService.java

@@ -4,10 +4,7 @@ package com.energy.manage.service.service.anemometertower;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.po.anemometertower.AnemometerTowerPO;
 import com.energy.manage.service.domain.dto.anemometertower.*;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
+import com.energy.manage.service.domain.vo.anemometertower.*;
 
 import java.util.List;
 
@@ -110,7 +107,11 @@ public interface AnemometerTowerService {
     AnemometerTowerPO getAnemometerTowerPOByanemometerTowerName(String anemometerTowerName);
 
 
-
+    /**
+     * 查询测风塔集合
+     * @return
+     */
+    List<AnemometerTowerNameVo> getAnemometerTowerNameList();
 
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/anemometertower/impl/AnemometerTowerServiceImpl.java

@@ -15,10 +15,7 @@ import com.energy.manage.common.po.windenginemill.WindEngineMillPO;
 import com.energy.manage.common.util.IdGeneratorUtil;
 import com.energy.manage.service.domain.dto.anemometertower.*;
 import com.energy.manage.service.domain.dto.company.WindCompanyDto;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerByFieldVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerHeightVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerPageVo;
-import com.energy.manage.service.domain.vo.anemometertower.AnemometerTowerVo;
+import com.energy.manage.service.domain.vo.anemometertower.*;
 import com.energy.manage.service.domain.vo.windenginemill.WindEngineMillPageVo;
 import com.energy.manage.service.mappers.anemometertower.AnemometerTowerDataMapper;
 import com.energy.manage.service.mappers.anemometertower.AnemometerTowerHeightMapper;
@@ -261,6 +258,19 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
         return anemometerTowerMapper.selectOneByExample(queryExample);
     }
 
+    @Override
+    public List<AnemometerTowerNameVo> getAnemometerTowerNameList() {
+
+        AnemometerTowerNameVo anemometerTowerNameVo = null;
+        List<AnemometerTowerNameVo> list = Lists.newArrayList();
+        List<AnemometerTowerPO> anemometerTowerPOList =  anemometerTowerMapper.selectAll();
+        for(AnemometerTowerPO po : anemometerTowerPOList){
+            anemometerTowerNameVo = new AnemometerTowerNameVo();
+            BeanUtil.copyProperties(po,anemometerTowerNameVo);
+            list.add(anemometerTowerNameVo);
+        }
+        return list;
+    }
 
 
 }