shiyue преди 6 месеца
родител
ревизия
d887e404b5

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

@@ -3,6 +3,7 @@ package com.energy.manage.service.controller.homepage;
 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.vo.homepage.WaitTaskVo;
 import com.energy.manage.service.service.homepage.HomePageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,4 +44,20 @@ public class HomePageController extends BaseServiceController {
     }
 
 
+    @ApiOperation("待办任务")
+    @UserLoginToken
+    @GetMapping("/queryWaitTask")
+    public ResultResp<WaitTaskVo> queryWaitTask(){
+        return success(homePageService.getWaitTask(getRoleId()));
+    }
+
+
+
+
+
+
+
+
+
+
 }

+ 25 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/homepage/WaitTaskVo.java

@@ -0,0 +1,25 @@
+package com.energy.manage.service.domain.vo.homepage;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WaitTaskVo {
+
+    /**
+     * 未关联数
+     */
+    private Integer uncorrelatedCount = 0;
+
+    /**
+     * 异常数量
+     */
+    private Integer errCount = 0;
+
+
+
+
+
+
+}

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

@@ -5,6 +5,7 @@ import com.energy.manage.common.mapper.MyMapper;
 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;
+import com.energy.manage.service.domain.vo.homepage.WaitTaskVo;
 import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -26,4 +27,7 @@ public interface SysOrganizationAuthMapper extends MyMapper<SysOrganizationAuthP
 
     List<CompanyFieldGroupNumberVo> selectFieldAndGrooupNumberByRoleId(@Param("roleId") Integer roleId);
 
+
+    WaitTaskVo selectFieldAnalysisResultByroleId(@Param("roleId") Integer roleId);
+
 }

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.service.homepage;
 
 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;
 
 import java.util.List;
 
@@ -28,5 +29,12 @@ public interface HomePageService {
      */
     List<AnalysisOptionRecordsVo> queryOptionRecords(Integer roleId, String codeNumber, String codeType);
 
+    /**
+     * 待办任务统计数量接口
+     * @param roleId
+     * @return
+     */
+    WaitTaskVo getWaitTask(Integer roleId);
+
 
 }

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

@@ -7,6 +7,7 @@ import com.energy.manage.service.constant.analysis.AnalysisStatusConstants;
 import com.energy.manage.service.domain.vo.analysis.AnalysisOptionRecordsVo;
 import com.energy.manage.service.domain.vo.analysis.AnalysisResultVo;
 import com.energy.manage.service.domain.vo.homepage.HomePageVo;
+import com.energy.manage.service.domain.vo.homepage.WaitTaskVo;
 import com.energy.manage.service.domain.vo.system.SysOrganizationAuthVo;
 import com.energy.manage.service.domain.vo.windexceptioncount.WindExceptionCountVo;
 import com.energy.manage.service.mappers.analysis.AnalysisOptionRecordsMapper;
@@ -103,6 +104,11 @@ public class HomePageServiceImpl implements HomePageService {
         return analysisOptionRecordsMapper.selectAllByTimeDesc(fieldCodes);
     }
 
+    @Override
+    public WaitTaskVo getWaitTask(Integer roleId) {
+        return authMapper.selectFieldAnalysisResultByroleId(roleId);
+    }
+
     /**
      * 根据角色权限过滤fieldCode
      * @param roleId

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

@@ -147,4 +147,47 @@
         </select>
 
 
+        <!-- 首页待办任务 -->
+        <select id="selectFieldAnalysisResultByroleId" resultType="com.energy.manage.service.domain.vo.homepage.WaitTaskVo">
+            select
+            sum(uncorrelatedCount) as uncorrelatedCount,
+            sum(errCount) as errCount
+            from
+            (select
+            soa.role_id as roleId,
+            soa.code_number as codeNumber,
+            soa.parent_code as parentCode,
+            soa.code_type as codeType,
+            wf.field_name as fieldName,
+            uar.uncorrelatedCount as uncorrelatedCount,
+            uer.errCount as errCount
+            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}  and wr.type = 'field') soa
+            left join
+            wind_field wf on soa.code_number = wf.field_code
+            left join
+            (select field_code as fieldCode,count(1) as uncorrelatedCount from analysis_result where analysis_state = -1  group by field_code) uar
+            on soa.code_number = uar.fieldCode
+            left join
+            (select field_code as fieldCode,count(1) as errCount from analysis_result where 	err_state = 1  group by field_code) uer
+            on soa.code_number = uer.fieldCode) wait_task
+        </select>
+
+
+
+        <!-- 分析未关联任务列表 -->
+        <select id="" >
+            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')
+        </select>
+
+        <!-- 分析异常数列表 -->
+
 </mapper>