更改bug

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysOrganizationAuthController.java

@@ -7,9 +7,10 @@ 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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author chy
@@ -30,4 +31,14 @@ public class SysOrganizationAuthController extends BaseServiceController {
     public ResultResp queryCodeNunByRoleId() {
         return success(sysOrganizationAuthService.queryCodeNunByRoleId(getRoleId()));
     }
+
+
+    @ApiOperation(value = "根据角色查询风场树（驾驶仓）")
+    @PostMapping("/getSysOrganizationAuthTreeByRoleId")
+    public ResultResp<List<Map<String, Object>>> getSysOrganizationAuthTreeByRoleId() {
+        return success(sysOrganizationAuthService.getSysOrganizationAuthTreeByRoleId(getRoleId()));
+    }
+
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/cockpit/CompanyFieldTreeRoleVo.java

@@ -0,0 +1,43 @@
+package com.energy.manage.service.domain.vo.cockpit;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel
+public class CompanyFieldTreeRoleVo {
+
+    @ApiModelProperty("")
+    private Integer roleId;
+    @ApiModelProperty("")
+    private String codeNumber;
+    @ApiModelProperty("")
+    private String parentCode;
+    @ApiModelProperty("")
+    private String codeType;
+    @ApiModelProperty("")
+    private String companyName;
+    @ApiModelProperty("")
+    private String fieldName;
+    @ApiModelProperty("")
+    private Double longitude;
+    @ApiModelProperty("")
+    private Double latitude;
+    @ApiModelProperty("")
+    private Double density;
+    @ApiModelProperty("")
+    private Double ratedCapacityNumber;
+    @ApiModelProperty("")
+    private Double elevationHeight;
+    @ApiModelProperty("")
+    private String batchCode;
+    @ApiModelProperty("")
+    private String batchName;
+    @ApiModelProperty("")
+    private Integer analysisState = -1;
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/filter/LoginVerifyInterceptor.java

@@ -61,6 +61,7 @@ public class LoginVerifyInterceptor implements HandlerInterceptor {
         // 从 http 请求头中取出 token
         String token = request.getHeader("token");
         log.info("token === >" + token);
+
         // 如果不是映射到方法直接通过
         if (!(object instanceof HandlerMethod)) {
             return true;
@@ -75,7 +76,7 @@ public class LoginVerifyInterceptor implements HandlerInterceptor {
             }
         }
         // 执行认证
-//        if (StringUtils.isEmpty(token)) {
+        if (StringUtils.isEmpty(token)) {
 //            //如果dev环境并且 token为空,那么可以请求,否则会进行验证
 //            if ("dev".equalsIgnoreCase(env)) {
 //                if ("dev".equalsIgnoreCase(env)) {
@@ -87,10 +88,10 @@ public class LoginVerifyInterceptor implements HandlerInterceptor {
 //                request.setAttribute("tokenUserId", 9999999L);
 //                return true;
 //            }
-//
-//            logger.info("========token不能为null========");
-//            throw new TokenInvalidException();
-//        }
+
+            logger.info("========token不能为null========");
+            throw new TokenInvalidException();
+        }
         // 获取 token 中的 user 信息
         Map<String, String> userMap = null;
         try {

energy-manage-service/src/main/java/com/energy/manage/service/mappers/system/SysOrganizationAuthMapper.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.mappers.system;
 
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,4 +14,11 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
 
 
     List<SysOrganizationAuthPO> selectByRoleId(@Param("roleId") Integer roleId);
+
+
+    List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
+
+
+
+
 }

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

@@ -29,4 +29,15 @@ public interface SysOrganizationAuthService {
      * @return
      */
     boolean verifySysOrganizationAuthByType(String codeName,String type);
+
+
+    /**
+     * 驾驶舱通过roleid查询树
+     * @param roleId
+     * @return
+     */
+    List<Map<String, Object>> getSysOrganizationAuthTreeByRoleId(Integer roleId);
+
+
+
 }

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

@@ -3,8 +3,12 @@ package com.energy.manage.service.service.system.impl;
 import com.energy.manage.common.enums.TypeRelationEnum;
 import com.energy.manage.common.po.powerwordcriterion.PowerWordCriterionPO;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
+import com.energy.manage.common.po.windrelation.WindRelationPO;
+import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
 import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
 import com.energy.manage.service.service.system.SysOrganizationAuthService;
+import com.energy.manage.service.util.BeanMapUtils;
+import com.energy.manage.service.util.TreeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -56,5 +60,17 @@ public class SysOrganizationAuthServiceImpl implements SysOrganizationAuthServic
         return sysOrganizationAuthMapper.selectCountByExample(queryExample) > 0 ? false : true;
     }
 
+    @Override
+    public List<Map<String, Object>> getSysOrganizationAuthTreeByRoleId(Integer roleId) {
+
+        List<CompanyFieldTreeRoleVo> list =  sysOrganizationAuthMapper.selectSysOrganizationAuthTreeByRoleId(roleId);
+        // 转化为Map集合
+        List<Map<String, Object>> mapList = BeanMapUtils.listBeanToListMap(list);
+        // 获取树形结构
+        List<Map<String, Object>> java8ResultTree = TreeUtil.getJava8ResultTree(mapList);
+
+        return java8ResultTree;
+    }
+
 
 }

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -20,4 +20,47 @@
         from sys_organization_auth
         where role_id = #{roleId}
     </select>
+
+    <select id="selectSysOrganizationAuthTreeByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo">
+        select
+        soa.role_id as roleId,
+        soa.code_number as codeNumber,
+        soa.parent_code as parentCode,
+        soa.code_type as codeType,
+        wc.company_name as companyName,
+        wf.field_name as fieldName,
+        wf.longitude as longitude,
+        wf.latitude as latitude,
+        wf.density,
+        wf.rated_capacity_number as ratedCapacityNumber,
+        wf.elevation_height as elevationHeight,
+        wfbr.batch_code as batchCode,
+        wfbr.batch_name as batchName,
+        wfbr.analysis_state as analysisState
+        from
+        (select a.role_id,
+        wr.code_number,
+        wr.parent_code,
+        wr.type as code_type
+        from sys_organization_auth a
+        inner join wind_relation wr on a.code_number = wr.code_number where 1=1 and a.role_id =#{roleId}) soa
+        left join
+        wind_company wc on soa.code_number = wc.company_code
+        left join
+        wind_field wf on soa.code_number = wf.field_code
+        left join
+        (select
+        wfb.batch_code,
+        wfb.batch_name,
+        wfb.field_code,
+        ar.analysis_state
+        from
+        wind_field_batch wfb
+        left join
+        analysis_result ar on wfb.batch_code = ar.batch_code
+        where 1=1
+        and wfb.is_delete = 0
+        order by wfb.create_time desc limit 1) wfbr on wf.field_code = wfbr.field_code
+        where 1=1
+        </select>
 </mapper>