产品分类编码代码提交

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

@@ -172,6 +172,14 @@ public interface EpmetConstant {
      * 行政地区编码查询
      */
     String EPMET_SCREEN_COLL_DEPT_CODE = "/data/report/screen/agency/areacodedict";
+    /**
+     * 分类编码查询
+     */
+    String EPMET_SCREEN_COLL_CATEGORY_CODE = "/data/report/project/categorydict";
+    /**
+     * 分类字典上报
+     */
+    String EPMET_SCREEN_COLL_CATEGORY_CODE_UPLOAD = "/data/stats/project/uploadcategorydict";
 
     /**
      * 【事件/项目分析】网格内事件

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeTree.java

@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.dto.category;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2021-01-07
+ */
+@Data
+public class CategoryCodeTree implements Serializable {
+
+    /**
+     * 部门区域编码
+     */
+    private String categoryCode;
+
+    /**
+     * 部门区域编码
+     */
+    private String categoryName;
+
+    /**
+     * 下一级
+     */
+    private List<CategoryCodeTree> children;
+
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeUpload.java

@@ -0,0 +1,57 @@
+package com.elink.esua.epdc.dto.category;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2021-01-07
+ */
+@Data
+public class CategoryCodeUpload implements Serializable {
+
+    /**
+     * 客户内自己的分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 客户内自己的分类名称
+     */
+    private String categoryName;
+    /**
+     * 父类分类编码，如果是一级分类，此列赋值为0
+     */
+    private String parentCategoryCode;
+    /**
+     * 分类等级：1、2....；对应关系：领域：1，大类 ：2，小类：3  ，细分类：4   具体问题：5
+     */
+    private String level;
+    /**
+     * 排序
+     */
+    private String sort;
+    /**
+     * 当前分类对应产品内的分类编码，如果对应不上，此列传空
+     */
+    private String epmetCategoryCode;
+    /**
+     * 原始创建时间yyyy-MM-dd HH:mm:ss
+     */
+    private String originCreatedTime;
+
+    /**
+     * 原始更新时间yyyy-MM-dd HH:mm:ss
+     */
+    private String orginUpdatedTime;
+    /**
+     * 分类字典表主键
+     */
+    private String categoryId;
+
+
+
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/EpmetCategoryCodeOption.java

@@ -0,0 +1,18 @@
+package com.elink.esua.epdc.dto.category;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 部门节点
+ *
+ * @author work@yujt.net.cn
+ * @date 2019/11/27 10:03
+ */
+@Data
+public class EpmetCategoryCodeOption<T> {
+
+    private List<T> options;
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDTO.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author：liuchuang
+ * @Date：2020/9/10 14:51
+ */
+@Data
+public class ScreenDataDTO implements Serializable {
+    private static final long serialVersionUID = 8161588041384645877L;
+
+    /**
+     * 当为true时后台将先删除当前维度的数据，后新增
+     */
+    private Boolean isFirst;
+
+    /**
+     * 上报数据
+     */
+    private Object dataList;
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.modules.category;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.modules.category.service.CategoryAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 相关
+ * @Author songyunpeng
+ * @Date 2020/2/10 16:06
+ */
+@RestController
+@RequestMapping("category")
+public class CategoryAnalysisController {
+
+	@Autowired
+	private CategoryAnalysisService categoryAnalysisService;
+
+	/**
+	 * @Description  获取分类编码
+	 * @Author songyunpeng
+	 * @Date  2021/1/7
+	 * @Param []
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result
+	 **/
+    @GetMapping("getCategoryCode")
+    public Result<EpmetCategoryCodeOption> getCategoryCode(){
+        EpmetCategoryCodeOption deptCodeOption = categoryAnalysisService.getCategoryCode();
+        return new Result().ok(deptCodeOption);
+    }
+
+    /**
+     * @Description  分类编码上报
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("uploadCategoryCode")
+    public Result uploadCategoryCode(){
+        return categoryAnalysisService.uploadCategoryCode();
+    }
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.category.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.category.CategoryCodeUpload;
+import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * @Description 分类相关
+ * @Author yinzuomei
+ * @Date 2020/2/10 16:06
+ */
+@Mapper
+public interface CategoryAnalysisDao extends BaseDao<IssueResultDTO> {
+    /**
+     * @Description  查询分类编码
+     * @Author songyunpeng
+     * @Date  2021/3/23
+     * @Param []
+     * @return java.util.List<com.elink.esua.epdc.dto.category.CategoryCodeUpload>
+     **/
+    List<CategoryCodeUpload> selectCategoryCode();
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.modules.category.service;
+
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+
+/**
+ * @Description 相关
+ * @Author songyunpeng
+ * @Date 2020/2/10 16:06
+ */
+public interface CategoryAnalysisService {
+    /**
+     * @Description  获取分类编码
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return java.lang.String
+     **/
+    EpmetCategoryCodeOption getCategoryCode();
+    /**
+     * @Description  项目分类字典上报 
+     * @Author songyunpeng
+     * @Date  2021/3/23
+     * @Param [categoryCodeUpload]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result uploadCategoryCode();
+}

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

@@ -0,0 +1,62 @@
+package com.elink.esua.epdc.modules.category.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.datasources.DataSourceNames;
+import com.elink.esua.epdc.datasources.annotation.DataSource;
+import com.elink.esua.epdc.dto.category.CategoryCodeTree;
+import com.elink.esua.epdc.dto.category.CategoryCodeUpload;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
+import com.elink.esua.epdc.modules.category.dao.CategoryAnalysisDao;
+import com.elink.esua.epdc.modules.category.service.CategoryAnalysisService;
+import com.elink.esua.epdc.utils.EpmetUtils;
+import com.elink.esua.epdc.utils.ScreenDataUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description admin相关
+ * @Author songyunpeng
+ * @Date 2020/2/10 16:06
+ */
+@Service
+public class CategoryAnalysisServiceImpl extends BaseServiceImpl<CategoryAnalysisDao, IssueResultDTO> implements CategoryAnalysisService {
+
+    @Autowired
+    private EpmetUtils epmetUtils;
+
+
+    @Override
+    public EpmetCategoryCodeOption getCategoryCode() {
+        String dataResult = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CATEGORY_CODE,null);
+        JSONObject jsonObject = JSONObject.parseObject(dataResult);
+        Result categoryCodeTreeResult = JSON.toJavaObject(jsonObject, Result.class );
+        if(categoryCodeTreeResult!=null && categoryCodeTreeResult.getData()!=null){
+            List<CategoryCodeTree> categoryCodeTreeList = JSONArray.parseArray(JSONObject.toJSONString(categoryCodeTreeResult.getData()), CategoryCodeTree.class);
+            EpmetCategoryCodeOption epmetCategoryCodeOption = new EpmetCategoryCodeOption();
+            epmetCategoryCodeOption.setOptions(categoryCodeTreeList);
+            return epmetCategoryCodeOption;
+        }
+        return new EpmetCategoryCodeOption();
+    }
+
+    @Override
+    @DataSource(name = DataSourceNames.FOURTH)
+    public Result uploadCategoryCode() {
+        // 数据统计
+        List<CategoryCodeUpload> data = baseDao.selectCategoryCode();
+        // 数据格式化
+        String dataJson = ScreenDataUtils.getScreenDateJson(data,true);
+        // 数据上报
+        epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_CATEGORY_CODE_UPLOAD, dataJson);
+        return new Result();
+    }
+
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.dto.screen.result.ScreenDataDTO;
 import com.elink.esua.epdc.dto.screen.result.ScreenDataDateDTO;
 import com.elink.esua.epdc.dto.screen.result.ScreenDataMonthDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +39,24 @@ public class ScreenDataUtils {
 
         return JSONObject.toJSONString(dateDto);
     }
+    /**
+     * 只携带first
+     *
+     * @param data 数据
+     * @param isFirst 是否首次
+     * @return java.lang.String
+     * @author Liuchuang
+     * @since 2020/9/10 15:55
+     */
+    public static String getScreenDateJson(Object data, Boolean isFirst) {
+        // 获取当前时间 yyyy-MM-dd
+        String dateId = DateUtils.format(new Date());
+        ScreenDataDTO dateDto = new ScreenDataDTO();
+        dateDto.setIsFirst(isFirst);
+        dateDto.setDataList(data);
+
+        return JSONObject.toJSONString(dateDto);
+    }
 
     /**
      * @describe: 获取昨日日期：yyyy-MM-dd

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/category/CategoryAnalysisDao.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.category.dao.CategoryAnalysisDao">
+
+
+    <select id="selectCategoryCode" resultType="com.elink.esua.epdc.dto.category.CategoryCodeUpload">
+        select
+            t1.ID as categoryId,
+            t1.CATEGORY_NAME,
+            t1.CATEGORY_CODE,
+            ifnull((select t2.category_code from epdc_category t2 where t1.pid = t2.id and t2.del_flag = '0' and t2.enable_flag = '1'),0) as parentCategoryCode,
+            CASE t1.category_type
+            WHEN 0 THEN '1'
+            WHEN 1 THEN '2'
+            WHEN 2 THEN '3'
+            WHEN 3 THEN '4'
+            WHEN 4 THEN '5'
+            ELSE ''
+            END AS level,
+            t1.SORT,
+            t1.CREATE_DATE as originCreatedTime,
+            t1.UPDATE_DATE as orginUpdatedTime,
+            t1.EPMET_CATEGORY_CODE
+        from epdc_category t1
+        where t1.del_flag ='0' and t1.enable_flag = '1'
+    </select>
+</mapper>

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java

@@ -17,9 +17,6 @@
 
 package com.elink.esua.epdc.dto.category;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.elink.esua.epdc.commons.tools.utils.TreeNode;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
@@ -31,6 +28,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Null;
+import java.io.Serializable;
 
 
 /**
@@ -89,5 +87,11 @@ public class CategoryDTO extends TreeNode implements Serializable {
 
     private String label;
 
+    private String epmetCategoryCode;
+
+    private String epmetCategoryName;
+
+
+
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.excel.CategoryExcel;
@@ -144,4 +145,17 @@ public class CategoryController {
         List<CategoryInfoResultDTO> data = categoryService.listCategoryInfo(formDTO);
         return new Result<List<CategoryInfoResultDTO>>().ok(data);
     }
+
+    /**
+     * @Description  获取分类编码树
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.getdeptinfocommons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.DeptCodeOption>
+     **/
+    @GetMapping("getCategoryCode")
+    public Result<EpmetCategoryCodeOption> getCategoryCode(){
+        return categoryService.getCategoryCode();
+    }
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java

@@ -111,4 +111,8 @@ public class CategoryEntity extends BaseEntity {
 	 */
 	private String enableFlag;
 
+    private String epmetCategoryCode;
+
+    private String epmetCategoryName;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
@@ -131,4 +132,12 @@ public interface CategoryService extends BaseService<CategoryEntity> {
      * @Date 2019/12/4 9:43
      **/
     List<CategoryInfoResultDTO> listCategoryInfo(CategoryInfoFormDTO formDTO);
+    /**
+     * @Description  获取分类编码树 
+     * @Author songyunpeng
+     * @Date  2021/3/23
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EpmetCategoryCodeOption>
+     **/
+    Result<EpmetCategoryCodeOption> getCategoryCode();
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

@@ -35,12 +35,14 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
 import com.elink.esua.epdc.dto.category.CategoryTreeDTO;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.dao.CategoryDao;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
 import com.elink.esua.epdc.modules.category.redis.CategoryRedis;
 import com.elink.esua.epdc.modules.category.service.CategoryService;
+import com.elink.esua.epdc.modules.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer;
 import com.google.common.collect.Lists;
@@ -86,6 +88,8 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 	@Autowired
 	private CategoryModifyProducer categoryModifyProducer;
 
+	@Autowired
+    private AnalysisFeignClient analysisFeignClient;
 
 	private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -613,6 +617,11 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 		return categoryInfoResultDTOList;
 	}
 
+    @Override
+    public Result<EpmetCategoryCodeOption> getCategoryCode() {
+        return analysisFeignClient.getCategoryCode();
+    }
+
     /**
 	 * @param
 	 * @return void

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

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.modules.feign.fallback.AnalysisFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 数据分析模块调用
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/9 15:41
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+public interface AnalysisFeignClient {
+
+    /**
+     * @Description  组织机构编码获取
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping(value = "analysis/category/getCategoryCode", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpmetCategoryCodeOption> getCategoryCode();
+
+}

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

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.modules.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.modules.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author：songyunpeg
+ * @Date：2020/9/9 15:42
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+
+    @Override
+    public Result<EpmetCategoryCodeOption> getCategoryCode() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryCode");
+    }
+}

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

@@ -295,4 +295,14 @@ public interface AnalysisFeignClient {
      **/
     @PostMapping("analysis/data/stats/project/uploadprojectprocess")
     Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO);
+
+    /**
+     * @Description 分类编码上报
+     * @Author songyunpeng
+     * @Date  2021/2/23
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("analysis/category/uploadCategoryCode")
+    Result uploadCategoryCode();
 }

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

@@ -154,4 +154,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadProjectProcess",screenProjectFormDTO);
     }
+
+    @Override
+    public Result uploadCategoryCode() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadCategoryCode");
+    }
 }

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

@@ -41,7 +41,7 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP
 
     @Override
     public void run(String param) {
-        for (int i = 0; i < 11; i++) {
+        for (int i = 0; i < 12; i++) {
             createThread(i);
         }
     }
@@ -80,6 +80,9 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP
                 } else if (methodIndex == 10) {
                     // 010、中央区各类总数
                     customerUsertotaldata();
+                }else if (methodIndex == 11) {
+                    // 011、项目分类字典上报
+                    uploadcategorydict();
                 }
                 return 0;
             }
@@ -301,4 +304,19 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP
         logger.info("<" + methodName + "|基层党建-党员基本情况>定时任务执行结束");
     }
 
+    /**
+     * 项目分类字典上报
+     *
+     * @return void
+     * @author WK
+     * @since 2020/9/17 14:01
+     */
+    private void uploadcategorydict() {
+        // 方法名
+        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
+        logger.info("<" + methodName + "|项目分类字典上报>定时任务开始执行");
+        analysisFeignClient.uploadCategoryCode();
+        logger.info("<" + methodName + "|项目分类字典上报>定时任务执行结束");
+    }
+
 }