Merge branch 'energy-manage-shiyue'

energy-manage-service/src/main/java/com/energy/manage/service/config/xxl/XxlJobConfig.java

@@ -9,46 +9,46 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @Description: xxlJob配置
  */
-//@Configuration
+@Configuration
 @Slf4j
 public class XxlJobConfig {
 
-//    @Value("${xxl.job.admin.addresses}")
-//    private String adminAddresses;
-//
-//    @Value("${xxl.job.admin.accessToken}")
-//    private String accessToken;
-//
-//    @Value("${xxl.job.executor.appname}")
-//    private String appname;
-//
-//    @Value("${xxl.job.executor.address}")
-//    private String address;
-//
-//    @Value("${xxl.job.executor.ip}")
-//    private String ip;
-//
-//    @Value("${xxl.job.executor.port}")
-//    private int port;
-//
-//    @Value("${xxl.job.executor.logpath}")
-//    private String logPath;
-//
-//    @Value("${xxl.job.executor.logretentiondays}")
-//    private int logRetentionDays;
-//
-//    @Bean
-//    public XxlJobSpringExecutor xxlJobExecutor() {
-//        log.info(">>>>>>>>>>> xxl-job config init.");
-//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-//        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-//        xxlJobSpringExecutor.setAppname(appname);
-//        xxlJobSpringExecutor.setAddress(address);
-//        xxlJobSpringExecutor.setIp(ip);
-//        xxlJobSpringExecutor.setPort(port);
-//        xxlJobSpringExecutor.setAccessToken(accessToken);
-//        xxlJobSpringExecutor.setLogPath(logPath);
-//        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-//        return xxlJobSpringExecutor;
-//    }
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.admin.accessToken}")
+    private String accessToken;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.address}")
+    private String address;
+
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        log.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setAddress(address);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+        return xxlJobSpringExecutor;
+    }
 }

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

@@ -7,7 +7,6 @@ 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.*;
 import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import io.swagger.annotations.Api;

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

@@ -13,6 +13,7 @@ import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.service.company.WindCompanyService;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.windfield.WindFieldService;
+import com.energy.manage.service.service.windrelation.WindRelationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +39,7 @@ public class WindCompanyController extends BaseServiceController {
     private WindFieldService windFieldService;
 
     @Autowired
-    private SysOrganizationAuthService sysOrganizationAuthService;
+    private WindRelationService windRelationService;
 
 
     @UserLoginToken
@@ -68,9 +69,11 @@ public class WindCompanyController extends BaseServiceController {
         if (list.size() > 0) {
             return ResultResp.FAIL("项目公司有绑定风场不可删除！");
         }
-        if(!sysOrganizationAuthService.verifySysOrganizationAuthByType(dto.getCompanyCode(), TypeRelationEnum.COMPANY_NUMBER.getCode())){
-            return ResultResp.FAIL("企业有绑定数据权限不可删除！");
+        int number = windRelationService.getCountParentCode(dto.getCompanyCode());
+        if(number>0){
+            return ResultResp.FAIL("该项目公司下有子公司不可删除！");
         }
+
         boolean flg = windCompanyService.delCompany(dto);
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();
     }

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

@@ -43,6 +43,10 @@ public class WindEngineGroupController extends BaseServiceController {
         if (!windEngineGroupCreateDto.getFieldCode().contains(IdPrefixEnum.WIND_FIELD_NUMBER.getCode())) {
             return ResultResp.FAIL("未绑定风场信息！");
         }
+        int count = windEngineGroupService.getCountWindEngineGroupByCode(windEngineGroupCreateDto.getEngineName());
+        if (count > 0) {
+            return ResultResp.FAIL("风机名称已存在！");
+        }
         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/windfield/WindFieldController.java

@@ -9,11 +9,13 @@ 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.anemometertower.AnemometerTowerByFieldVo;
 import com.energy.manage.service.domain.vo.company.WindCompanyPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldNameVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldPageVo;
 import com.energy.manage.service.domain.vo.windfield.WindFieldVo;
 import com.energy.manage.service.domain.vo.windrelation.WindRelationVo;
+import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.windenginegroup.WindEngineGroupService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
@@ -22,6 +24,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -48,6 +51,10 @@ public class WindFieldController extends BaseServiceController {
     @Autowired
     private SysOrganizationAuthService sysOrganizationAuthService;
 
+    @Autowired
+    private AnemometerTowerService anemometerTowerService;
+
+
 
     @UserLoginToken
     @PostMapping(value = "/createWindField")
@@ -104,8 +111,9 @@ public class WindFieldController extends BaseServiceController {
         if (windEngineGroupService.getWindEngineGroupCountByField(windFieldCodeDto.getFieldCode()) > 0) {
             return ResultResp.FAIL("风场下有绑定风机，不可删除！");
         }
-        if(!sysOrganizationAuthService.verifySysOrganizationAuthByType(windFieldCodeDto.getFieldCode(), TypeRelationEnum.WIND_FIELD_NUMBER.getCode())){
-            return ResultResp.FAIL("风场有绑定数据权限不可删除！");
+        List<AnemometerTowerByFieldVo>  list = anemometerTowerService.getAnemometerTowerByField(windFieldCodeDto.getFieldCode());
+        if(!CollectionUtils.isEmpty(list)){
+            return ResultResp.FAIL("风场有绑定测风塔不可删除！");
         }
         boolean flg = windFieldService.delWindFieldById(windFieldCodeDto.getFieldCode());
         return flg ? ResultResp.SUCCESS() : ResultResp.FAIL();

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

@@ -119,6 +119,7 @@ public class AnemometerTowerServiceImpl extends BaseServiceImpl<AnemometerTowerP
                 anemometerTowerHeightPO = new AnemometerTowerHeightPO();
                 BeanUtil.copyProperties(anemometerTowerHeightListDto, anemometerTowerHeightPO);
                 anemometerTowerHeightPO.setAnemometerCode(anemometerTowerUpdateDto.getAnemometerCode());
+                anemometerTowerHeightPO.setCreateTime(new Date());
                 anemometerTowerHeightPO.setUpdateTime(new Date());
                 anemometerTowerHeightPOS.add(anemometerTowerHeightPO);
             }

energy-manage-service/src/main/java/com/energy/manage/service/service/company/impl/WindCompanyServiceImpl.java

@@ -24,6 +24,7 @@ import com.energy.manage.service.mappers.system.SysPermissionMapper;
 import com.energy.manage.service.mappers.system.SysRolePermissionMapper;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.company.WindCompanyService;
+import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.system.SysPermissionService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
 import com.energy.manage.service.util.BeanMapUtils;
@@ -54,6 +55,9 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
     @Autowired
     private WindCompanyMapper windCompanyMapper;
 
+    @Autowired
+    private SysOrganizationAuthService sysOrganizationAuthService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -83,6 +87,11 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
         if (windCompanyMapper.updateByExampleSelective(po, queryExample) <= 0) {
             return false;
         }
+
+        // 删除数据权限
+        sysOrganizationAuthService.delSysOrganizationAuth(dto.getCompanyCode(),TypeRelationEnum.COMPANY_NUMBER.getCode());
+
+        // 删除树形结构
         WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
         windRelationDelDto.setCodeNumber(dto.getCompanyCode());
         windRelationDelDto.setType(TypeRelationEnum.COMPANY_NUMBER.getCode());
@@ -167,6 +176,7 @@ public class WindCompanyServiceImpl extends BaseServiceImpl<WindCompanyPO> imple
         Example queryExample = new Example(WindCompanyPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("companyName", dto.getCompanyName());
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         return windCompanyMapper.selectOneByExample(queryExample);
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/SysOrganizationAuthService.java

@@ -57,5 +57,11 @@ public interface SysOrganizationAuthService {
     CompanyFieldNumberVo getCompanyFieldNumberVo(Integer roleId);
 
 
+    /**
+     * 删除数据权限对应codee
+     * @param codeNumber
+     * @return
+     */
+    int delSysOrganizationAuth(String codeNumber,String type);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/system/impl/SysOrganizationAuthServiceImpl.java

@@ -132,5 +132,14 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
         return companyFieldNumberVo;
     }
 
+    @Override
+    public int delSysOrganizationAuth(String codeNumber,String type) {
+        Example queryExample = new Example(SysOrganizationAuthPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("codeNumber", codeNumber);
+        criteria.andEqualTo("codeType", type);
+        return sysOrganizationAuthMapper.deleteByExample(queryExample);
+    }
+
 
 }

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

@@ -98,4 +98,11 @@ public interface WindEngineGroupService {
     List<WindEngineGroupVo> getWindEngineGroupByRoleId(Integer roleId);
 
 
+    /**
+     * 通过code查询未删除风机个数
+     * @param engineName
+     * @return
+     */
+    int getCountWindEngineGroupByCode(String engineName);
+
 }

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

@@ -374,4 +374,16 @@ public class WindEngineGroupServiceImpl extends BaseServiceImpl<WindEngineGroupP
     }
 
 
+    @Override
+    public int getCountWindEngineGroupByCode(String engineName) {
+
+        Example queryExample = new Example(WindEngineGroupPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("engineName", engineName);
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
+        return windEngineGroupMapper.selectCountByExample(queryExample);
+
+    }
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windfield/impl/WindFieldServiceImpl.java

@@ -39,6 +39,7 @@ import com.energy.manage.service.service.anemometertower.AnemometerTowerService;
 import com.energy.manage.service.service.area.AreaApiService;
 import com.energy.manage.service.service.cache.CacheService;
 import com.energy.manage.service.service.company.WindCompanyService;
+import com.energy.manage.service.service.system.SysOrganizationAuthService;
 import com.energy.manage.service.service.windfield.WindFieldResourceService;
 import com.energy.manage.service.service.windfield.WindFieldService;
 import com.energy.manage.service.service.windrelation.WindRelationService;
@@ -90,6 +91,10 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
     private WindRelationService windRelationService;
 
 
+    @Autowired
+    private SysOrganizationAuthService sysOrganizationAuthService;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean createWindField(WindFieldDto windFieldDto) {
@@ -287,6 +292,10 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         if (windFieldMapper.updateByExampleSelective(windFieldPO, queryExample) <= 0) {
             return false;
         }
+
+        // 删除数据权限
+        sysOrganizationAuthService.delSysOrganizationAuth(fieldCode,TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
+
         WindRelationDelDto windRelationDelDto = new WindRelationDelDto();
         windRelationDelDto.setCodeNumber(fieldCode);
         windRelationDelDto.setType(TypeRelationEnum.WIND_FIELD_NUMBER.getCode());
@@ -428,6 +437,7 @@ public class WindFieldServiceImpl extends BaseServiceImpl<WindFieldPO> implement
         Example queryExample = new Example(WindFieldPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("fieldName", fieldName);
+        criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         return windFieldMapper.selectOneByExample(queryExample);
 
     }

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/WindRelationService.java

@@ -60,4 +60,11 @@ public interface WindRelationService {
      */
     List<Map<String, Object>> getWindRelationTree();
 
+    /**
+     * 通过企业code查询下级单位
+     * @param fieldCode
+     * @return
+     */
+    int getCountParentCode(String fieldCode);
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windrelation/impl/WindRelationServiceImpl.java

@@ -122,4 +122,14 @@ public class WindRelationServiceImpl extends BaseServiceImpl<WindRelationPO> imp
     }
 
 
+    @Override
+    public int getCountParentCode(String fieldCode) {
+        Example queryExample = new Example(WindRelationPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("parentCode",fieldCode);
+        criteria.andEqualTo("type",TypeRelationEnum.COMPANY_NUMBER.getCode());
+        return  windRelationMapper.selectCountByExample(queryExample);
+    }
+
+
 }

energy-manage-service/src/main/resources/config/application.properties → energy-manage-service/src/main/resources/confback/application.properties

@@ -99,14 +99,14 @@ logging.level.com.energy.manage.service.mappers= debug
 knife4j.enable=true
 
 #xxl-job
-xxl.job.admin.addresses = http://192.168.50.241:16800/xxl-job-admin
-xxl.job.accessToken =
-xxl.job.executor.appname = xxl-job-executor-sample
-xxl.job.executor.address =
-xxl.job.executor.ip =
-xxl.job.executor.port = 9999
-xxl.job.executor.logpath = /Users/shiyue/Downloads/logs/xxl
-xxl.job.executor.logretentiondays = 30
+#xxl.job.admin.addresses = http://192.168.50.241:16800/xxl-job-admin
+#xxl.job.accessToken =
+#xxl.job.executor.appname = xxl-job-executor-sample
+#xxl.job.executor.address =
+#xxl.job.executor.ip =
+#xxl.job.executor.port = 9999
+#xxl.job.executor.logpath = /Users/shiyue/Downloads/logs/xxl
+#xxl.job.executor.logretentiondays = 30
 
 
 #kafka

energy-manage-service/src/main/resources/mybatis/anemometertower/AnemometerTowerMapper.xml

@@ -37,6 +37,7 @@
         <if test="item.endTime != null and item.endTime != ''">
             and at.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
+        order by id desc
      </select>
 
 

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

@@ -44,6 +44,7 @@
         <if test="item.endTime != null and item.endTime != ''">
             and weg.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
+        order by id desc
     </select>
 
     <select id="selectWindEngineGroupByRoleId" parameterType="java.lang.Integer" resultType="com.energy.manage.service.domain.vo.windenginegroup.WindEngineGroupVo">

energy-manage-service/src/main/resources/mybatis/windfield/WindFieldMapper.xml

@@ -36,24 +36,25 @@
             and
             wf.field_name like CONCAT("%", #{item.fieldName} ,"%")
         </if>
-        <if test="item.fieldCode!=null">
-        and
-        wf.field_code = #{item.fieldCode}
-        </if>
-        <if test="item.companyCode!=null">
-        and
-        wf.company_code = #{item.companyCode}
-        </if>
         <if test="item.beginTime != null and item.beginTime != ''">
             and wf.create_time  <![CDATA[>= ]]>  #{item.beginTime}
         </if>
         <if test="item.endTime != null and item.endTime != ''">
             and wf.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
-        and
-        wf.create_by = #{item.userId}
-        or
-        wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type = 'field')
+        <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null">
+            and
+            wf.create_by = #{item.userId}
+            and
+            wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type = 'field')
+        </if>
+        <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null">
+            and
+            wf.create_by = #{item.userId}
+            or
+            wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type = 'field')
+        </if>
+        order by id desc
     </select>
 
 
@@ -66,8 +67,7 @@
         and wf.del_state = 0
         and wf.state = 1
         and wf.create_by = #{userId}
-        or
-        wf.field_code in (select code_number from sys_organization_auth where role_id = #{roleId} and code_type = 'field')
+         or wf.field_code in (select code_number from sys_organization_auth where role_id = #{roleId} and code_type = 'field')
     </select>
 
     <select id="selectByCodeNumber" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.windfield.WindFieldVo">

energy-manage-service/src/main/resources/mybatis/windrelation/WindRelationMapper.xml

@@ -55,8 +55,19 @@
         and wc.company_name like CONCAT("%", #{companyName} ,"%")
         </if>
         and wc.del_state = 0
-        and wc.company_code in (select code_number from sys_organization_auth where role_id =#{roleId} and code_type = 'company')
-        or wc.create_by = #{userId}
+        <if test="state!=null or companyName!=null">
+            and
+            wc.company_code in (select code_number from sys_organization_auth where role_id =#{roleId} and code_type = 'company')
+            and
+            wc.create_by = #{userId}
+        </if>
+        <if test="state==null and companyName==null">
+            and
+            wc.create_by = #{userId}
+            or
+            wc.company_code in (select code_number from sys_organization_auth where role_id =#{roleId} and code_type = 'company')
+
+        </if>
     </select>
 
     <select id="selectByCodeNumber" parameterType="java.lang.String" resultType="com.energy.manage.common.po.windrelation.WindRelationPO">