项目上报和进程上班bug修改

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -931,7 +931,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         Result<DeptCodeOption> deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO);
         if(deptCodeResult.getData()!=null){
             DeptCodeOption deptCodeOption = deptCodeResult.getData();
-            redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption);
+            redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption,RedisUtils.MINUTE_TEN_EXPIRE);
         }
     }
 

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java

@@ -193,6 +193,16 @@ public interface EpmetConstant {
      */
     String EPMET_PROJECT_ORG_MONTHLY =  "/data/stats/project/quantity-org-monthly";
 
+    /**
+     * 项目信息上报
+     */
+    String EPMET_PROJECT_UPLOAD_PROJECT_INFO =  "/data/stats/project/uploadprojectinfo";
+
+    /**
+     * 项目处理进展上报
+     */
+    String EPMET_PROJECT_UPLOAD_PROJECT_PROCESS =  "/data/stats/project/uploadprojectprocess";
+
 
      /**
      * 行政地区编码查询 - 平阴县

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenIndexDataController.java

@@ -126,4 +126,18 @@ public class ScreenIndexDataController {
         return screenIndexDataService.deptGovernAbility(formDto.getYearMonth());
     }
 
+    /**
+     * 指标数据传输完毕通知接口
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/17 10:26
+     */
+    @PostMapping("all")
+    public Result all(@RequestBody ScreenJobFormDTO formDto) {
+        return screenIndexDataService.all(formDto.getYearMonth());
+    }
+
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java

@@ -28,22 +28,24 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     public Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO) {
         // 数据统计
         List<UploadProjectInfoDTO> data = baseDao.uploadProjectInfo(screenProjectFormDTO);
-        if (data.size() > 1000) {
-            List<List<UploadProjectInfoDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
-            if (formList != null && formList.size() > NumConstant.ZERO) {
-                for (int i = NumConstant.ZERO; i < formList.size(); i++) {
-                    String dataJson = "";
-                    // 数据格式化
-                    dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
-                    // 数据上报
-                    epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson);
+        if(data.size()!=0) {
+            if (data.size() > 1000) {
+                List<List<UploadProjectInfoDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
+                if (formList != null && formList.size() > NumConstant.ZERO) {
+                    for (int i = NumConstant.ZERO; i < formList.size(); i++) {
+                        String dataJson = "";
+                        // 数据格式化
+                        dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
+                        // 数据上报
+                        epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
+                    }
                 }
+            } else {
+                // 数据格式化
+                String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
+                // 数据上报
+                epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
             }
-        } else {
-            // 数据格式化
-            String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
-            // 数据上报
-            epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson);
         }
         return new Result();
     }
@@ -52,22 +54,24 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     public Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO) {
         // 数据统计
         List<UploadProjectProcessDTO> data = baseDao.uploadProjectProcess(screenProjectFormDTO);
-        if (data.size() > 1000) {
-            List<List<UploadProjectProcessDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
-            if (formList != null && formList.size() > NumConstant.ZERO) {
-                for (int i = NumConstant.ZERO; i < formList.size(); i++) {
-                    String dataJson = "";
-                    // 数据格式化
-                    dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
-                    // 数据上报
-                    epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson);
+        if(data.size()!=0){
+            if (data.size() > 1000) {
+                List<List<UploadProjectProcessDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
+                if (formList != null && formList.size() > NumConstant.ZERO) {
+                    for (int i = NumConstant.ZERO; i < formList.size(); i++) {
+                        String dataJson = "";
+                        // 数据格式化
+                        dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
+                        // 数据上报
+                        epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
+                    }
                 }
+            } else {
+                // 数据格式化
+                String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
+                // 数据上报
+                epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
             }
-        } else {
-            // 数据格式化
-            String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
-            // 数据上报
-            epmetUtils.httpPost(EpmetConstant.EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA, dataJson);
         }
         return new Result();
     }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -50,10 +50,11 @@
                                     FROM `esua_epdc_admin`.`sys_dept_config` t
                                     WHERE t.`del_flag`= 0)
         order by ID)a group by a.EVENT_ID) t1
-        left join esua_epdc_events.epdc_img t2 on t1.ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0'
+        left join esua_epdc_events.epdc_img t2 on t1.EVENT_ID = t2.REFERENCE_ID and t1.DEL_FLAG = '0'
         left join esua_epdc_events.epdc_item_handle_process t3 on t3.ITEM_ID = t1.ID and t3.DEL_FLAG = '0' and t3.STATE = 10
         where date_format(t1.UPDATED_TIME, '%Y-%m-%d') >= STR_TO_DATE(#{yearMonthDay}, '%Y-%m-%d')
         and date_format(t1.UPDATED_TIME, '%Y-%m-%d')  <= date_sub(curdate(),interval 1 day)
+        order by t2.CREATED_TIME
     </select>
     <resultMap type="com.elink.esua.epdc.dto.screen.result.UploadProjectProcessDTO" id="uploadprojectprocessMap">
         <result property="processId" column="processId"/>
@@ -78,7 +79,7 @@
             resultMap="uploadprojectprocessMap">
         select t.*,
         t3.ID as attachmentId,
-        case t3.IMG_TYPE when 'itemHandle' then 'internal' when 'itemOutHandle' then 'public' else '' End as filePlace,
+        case t3.IMG_TYPE when 'itemHandle' then 'internal' when 'itemOutHandle' then 'public' else null End as filePlace,
         t3.IMG_URL as attachmentUrl,
         t3.DEL_FLAG
         from (

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -104,6 +104,16 @@ public interface AnalysisFeignClient {
     @PostMapping("analysis/data/stats/indexcollect/deptgovrnability")
     Result deptGovernAbility(ScreenJobFormDTO formDto);
 
+    /**
+     * 指标数据传输完毕通知接口
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/9/17 10:08
+     */
+    @PostMapping("analysis/data/stats/indexcollect/all")
+    Result all(ScreenJobFormDTO formDto);
+
     /**
      * 014、组织层级
      *

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -54,6 +54,11 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "deptGovernAbility");
     }
 
+    @Override
+    public Result all(ScreenJobFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "all");
+    }
+
     @Override
     public Result customerAgency() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "customerAgency");

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java

@@ -47,6 +47,8 @@ public class ScreenIndexDataPushTaskImpl implements ScreenIndexDataPushTask {
         orgGovernAbility(paramDto.getOrgGovernAbility());
         // 08、治理能力-部门相关指标
         deptGovernAbility(paramDto.getDeptGovernAbility());
+        // 指标数据传输完毕通知接口
+        all(paramDto.getAll());
     }
 
     /**
@@ -192,5 +194,22 @@ public class ScreenIndexDataPushTaskImpl implements ScreenIndexDataPushTask {
         analysisFeignClient.deptGovernAbility(formDto);
         logger.info("<" + methodName + "|治理能力-部门相关指标>定时任务执行结束");
     }
+    /**
+     * 指标数据传输完毕通知接口
+     *
+     * @param yearMonth 计算月份
+     * @return void
+     * @author Liuchuang
+     * @since 2020/9/17 10:05
+     */
+    public void all(String yearMonth) {
+        ScreenJobFormDTO formDto = new ScreenJobFormDTO();
+        formDto.setYearMonth(yearMonth);
+        //方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|指标数据传输完毕通知接口>定时任务开始执行");
+        analysisFeignClient.all(formDto);
+        logger.info("<" + methodName + "|指标数据传输完毕通知接口>定时任务执行结束");
+    }
 
 }