首页待办任务

energy-manage-service/src/main/java/com/energy/manage/service/controller/homepage/HomePageController.java

@@ -52,6 +52,21 @@ public class HomePageController extends BaseServiceController {
     }
 
 
+    @ApiOperation("未关联数据集合")
+    @UserLoginToken
+    @GetMapping("/getAnalysisResultStateList")
+    public ResultResp getAnalysisResultStateList(){
+        return success(homePageService.getAnalysisResultStateList(getRoleId()));
+    }
+
+    @ApiOperation("分析异常数集合")
+    @UserLoginToken
+    @GetMapping("/getAnalysisResultErrStateList")
+    public ResultResp getAnalysisResultErrStateList(){
+        return success(homePageService.getAnalysisResultErrStateList(getRoleId()));
+    }
+
+
 
 
 

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.mappers.system;
 
 
 import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.common.po.system.SysOrganizationAuthPO;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo;
 import com.energy.manage.service.domain.vo.cockpit.CompanyFieldTreeRoleVo;
@@ -21,7 +22,7 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
 
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
 
-    List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
+//    List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthTreeByRoleId(@Param("roleId") Integer roleId);
 
 
     List<CompanyFieldTreeRoleVo> selectSysOrganizationAuthListByRoleId(@Param("roleId") Integer roleId);
@@ -32,4 +33,7 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
 
     WaitTaskVo selectFieldAnalysisResultByroleId(@Param("roleId") Integer roleId);
 
+    List<AnalysisResultPo> selectWindRelationByAnalysisState(@Param("roleId") Integer roleId);
+
+    List<AnalysisResultPo> selectWindRelationByErrState(@Param("roleId") Integer roleId);
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/homepage/HomePageService.java

@@ -1,5 +1,6 @@
 package com.energy.manage.service.service.homepage;
 
+import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import com.energy.manage.service.domain.vo.homepage.HomePageVo;
 import com.energy.manage.service.domain.vo.homepage.WaitTaskVo;
@@ -36,5 +37,17 @@ public interface HomePageService {
      */
     WaitTaskVo getWaitTask(Integer roleId);
 
+    /**
+     * 未关联数据集合
+     * @param roleId
+     * @return
+     */
+    List<AnalysisResultPo> getAnalysisResultStateList(Integer roleId);
 
+    /**
+     * 分析异常数
+     * @param roleId
+     * @return
+     */
+    List<AnalysisResultPo> getAnalysisResultErrStateList(Integer roleId);
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/homepage/impl/HomePageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.energy.manage.service.service.homepage.impl;
 
 import com.energy.manage.common.enums.TypeRelationEnum;
+import com.energy.manage.common.po.analysis.AnalysisResultPo;
 import com.energy.manage.common.po.windrelation.WindRelationPO;
 import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
@@ -108,6 +109,18 @@ public class HomePageServiceImpl implements HomePageService {
         return authMapper.selectFieldAnalysisResultByroleId(roleId);
     }
 
+    @Override
+    public List<AnalysisResultPo> getAnalysisResultStateList(Integer roleId) {
+        List<AnalysisResultPo> list = authMapper.selectWindRelationByAnalysisState(roleId);
+        return list;
+    }
+
+    @Override
+    public List<AnalysisResultPo> getAnalysisResultErrStateList(Integer roleId) {
+        List<AnalysisResultPo> list =authMapper.selectWindRelationByErrState(roleId);
+        return list;
+    }
+
     /**
      * 根据角色权限过滤fieldCode
      * @param roleId

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

@@ -193,13 +193,21 @@
 
 
         <!-- 分析未关联任务列表 -->
-        <select id="" >
+        <select id="selectWindRelationByAnalysisState" resultType="com.energy.manage.common.po.analysis.AnalysisResultPo">
             select * from analysis_result where field_code in (select
             wr.code_number
             from sys_organization_auth a
-            inner join wind_relation wr on a.code_number = wr.code_number where 1=1 and a.role_id =1 and wr.type = 'field')
+            inner join wind_relation wr on a.code_number = wr.code_number where 1=1 and a.role_id =  #{roleId} and wr.type = 'field')
+            and analysis_state = -1
         </select>
 
         <!-- 分析异常数列表 -->
+        <select id="selectWindRelationByErrState" resultType="com.energy.manage.common.po.analysis.AnalysisResultPo">
+            select * from analysis_result where field_code in (select
+            wr.code_number
+            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} and wr.type = 'field')
+        and err_state = 1
+        </select>
 
 </mapper>