Browse Source

Merge remote-tracking branch 'origin/feature/syp_emptCategory'

feature/syp_points
songyunpeng 5 years ago
parent
commit
577d4b94ac
  1. 19
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java
  2. 33
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeTree.java
  3. 57
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryCodeUpload.java
  4. 18
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/category/EpmetCategoryCodeOption.java
  5. 66
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java
  6. 71
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java
  7. 31
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java
  8. 24
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenDataDTO.java
  9. 49
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/CategoryAnalysisController.java
  10. 43
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/dao/CategoryAnalysisDao.java
  11. 29
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryAnalysisService.java
  12. 62
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryAnalysisServiceImpl.java
  13. 33
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/dao/EpdcTableNameDao.java
  14. 17
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/entity/EpdcTableName.java
  15. 36
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java
  16. 6
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java
  17. 22
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java
  18. 34
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
  19. 42
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java
  20. 28
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/category/CategoryAnalysisDao.xml
  21. 29
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/common/EpdcTableName.xml
  22. 83
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml
  23. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/CategoryDTO.java
  24. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java
  25. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java
  26. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java
  27. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java
  28. 30
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java
  29. 22
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java
  30. 33
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
  31. 14
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
  32. 54
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushDayTaskImpl.java

19
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";
/**
* 事件/项目分析网格内事件
@ -204,6 +212,17 @@ public interface EpmetConstant {
String EPMET_PROJECT_UPLOAD_PROJECT_PROCESS = "/data/stats/project/uploadprojectprocess";
/**
* 事件/项目分析按类别统计-网格03-22已确定
*/
String EPMET_PROJECT_CATEGORY_GRID_DAILY = "/data/stats/project/category-grid-daily";
/**
* 事件/项目分析按类别统计-组织03-22已确定
*/
String EPMET_PROJECT_CATEGORY_ORG_DAILY = "/data/stats/project/category-org-daily";
/**
* 行政地区编码查询 - 平阴县
*/

33
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;
}

57
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;
/**
* 分类等级12....对应关系领域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;
}

18
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;
}

66
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java

@ -0,0 +1,66 @@
/**
* 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.dto.item.result;
import lombok.Data;
import java.io.Serializable;
/**
* 事件/项目分析按类别统计-网格03-22已确定
*
* @author zhy
* @date 2021/3/22 16:55
*/
@Data
public class CategoryGridDailyResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 类别编码
*/
private String categoryCode;
/**
* 项目总数
*/
private Integer projectTotal;
/**
* 组织id
*/
private String gridId;
/**
* 组织所属上级id如果属于跟组织下直属网格pid=0
*/
private String pid;
/**
* 组织所有父级ids以英文逗号隔开; pid=0时pids=0
*/
private String pids;
/**
* 分类等级12....
*/
private Integer level;
}

71
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java

@ -0,0 +1,71 @@
/**
* 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.dto.item.result;
import lombok.Data;
import java.io.Serializable;
/**
* 事件/项目分析按类别统计-组织03-22已确定
*
* @author zhy
* @date 2021/3/22 16:56
*/
@Data
public class CategoryOrgDailyResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 类别编码
*/
private String categoryCode;
/**
* 项目总数
*/
private Integer projectTotal;
/**
* 组织id
*/
private String orgId;
/**
* 组织所属上级id如果属于跟组织下直属网格pid=0
*/
private String pid;
/**
* 组织所有父级ids以英文逗号隔开; pid=0时pids=0
*/
private String pids;
/**
* 社区级community街道:street
*/
private String orgType;
/**
* 分类等级12....
*/
private Integer level;
}

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

@ -0,0 +1,31 @@
package com.elink.esua.epdc.dto.screen.result;
import lombok.Data;
import java.io.Serializable;
/**
* 事件/项目分析按类别统计
*
* @author zhy
* @date 2021/3/23 10:37
*/
@Data
public class ScreenCategoryDateDTO implements Serializable {
private static final long serialVersionUID = 8161588041384645877L;
/**
* 当为true时后台将先删除当前维度的数据后新增
*/
private Boolean isFirst;
/**
* 日期Id, 数据更新至yyyyMMdd
*/
private String dateId;
/**
* 上报数据
*/
private Object dataList;
}

24
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;
/**
* @Authorliuchuang
* @Date2020/9/10 14:51
*/
@Data
public class ScreenDataDTO implements Serializable {
private static final long serialVersionUID = 8161588041384645877L;
/**
* 当为true时后台将先删除当前维度的数据后新增
*/
private Boolean isFirst;
/**
* 上报数据
*/
private Object dataList;
}

49
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();
}
}

43
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();
}

29
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();
}

62
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();
}
}

33
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/dao/EpdcTableNameDao.java

@ -0,0 +1,33 @@
/**
* 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.common.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.modules.common.entity.EpdcTableName;
import org.apache.ibatis.annotations.Mapper;
/**
* 声明表名
*
* @author work@yujt.net.cn
* @date 2020/7/20 16:04
*/
@Mapper
public interface EpdcTableNameDao extends BaseDao<EpdcTableName> {
}

17
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/entity/EpdcTableName.java

@ -0,0 +1,17 @@
package com.elink.esua.epdc.modules.common.entity;
import lombok.Data;
import java.io.Serializable;
/**
* 声明表名
*
* @author work@yujt.net.cn
* @date 2020/7/20 16:00
*/
@Data
public class EpdcTableName implements Serializable {
private static final long serialVersionUID = 2548002813384497114L;
}

36
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java

@ -20,14 +20,12 @@ package com.elink.esua.epdc.modules.item.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO;
import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO;
import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@ -109,4 +107,30 @@ public class ItemAnalysisController {
PageData<ReportSolvedItemResultDTO> page = itemAnalysisService.listReportSolvedItemResultDTO(params);
return new Result<PageData<ReportSolvedItemResultDTO>>().ok(page);
}
/**
* 事件/项目分析按类别统计-网格03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryGridResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/
@GetMapping("categoryGridDaily")
public Result getCategoryGridDaily(String date) {
return itemAnalysisService.getCategoryGridDaily(date);
}
/**
* 事件/项目分析按类别统计-组织03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryOrgResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/
@GetMapping("categoryOrgDaily")
public Result getCategoryOrgDaily(String date) {
return itemAnalysisService.getCategoryOrgDaily(date);
}
}

6
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java

@ -105,4 +105,10 @@ public interface ItemAnalysisDao extends BaseDao<ItemResultDTO> {
* @Date: 2020-02-12
*/
List<HotItemListResultDTO> selectListHotItemList(HotItemListFormDTO formDto);
List<CategoryGridDailyResultDTO> getCategoryGridDaily();
List<CategoryOrgDailyResultDTO> getCategoryCommDaily();
List<CategoryOrgDailyResultDTO> getCategoryStreetDaily();
}

22
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java

@ -1,8 +1,8 @@
package com.elink.esua.epdc.modules.item.service;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.item.result.*;
@ -89,4 +89,24 @@ public interface ItemAnalysisService {
* @Date: 2020-02-12
*/
List<HotItemListResultDTO> listHotItemList(HotItemListFormDTO formDto);
/**
* 事件/项目分析按类别统计-网格03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author zhy
* @date 2021/3/23 9:13
*/
Result getCategoryGridDaily(String date);
/**
* 事件/项目分析按类别统计-组织03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @author zhy
* @date 2021/3/23 9:13
*/
Result getCategoryOrgDaily(String date);
}

34
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java

@ -2,23 +2,31 @@ package com.elink.esua.epdc.modules.item.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
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.item.form.HotItemListFormDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao;
import com.elink.esua.epdc.modules.item.service.ItemAnalysisService;
import com.elink.esua.epdc.utils.EpmetUtils;
import com.elink.esua.epdc.utils.ScreenDataUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -31,6 +39,8 @@ import java.util.Map;
public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, ItemResultDTO> implements ItemAnalysisService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private EpmetUtils epmetUtils;
/**
* @param params
* @return com.elink.esua.epdc.dto.item.result.ItemResultDTO
@ -149,4 +159,26 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
formDto.setPageIndex(pageIndex);
return baseDao.selectListHotItemList(formDto);
}
@Override
public Result getCategoryGridDaily(String date) {
date = StringUtils.isEmpty(date) ? DateUtils.format(DateUtils.addDateDays(new Date(),-1)) : date;
List<CategoryGridDailyResultDTO> gridDataList = baseDao.getCategoryGridDaily();
String dataJson = ScreenDataUtils.getScreenCategoryDataJson(gridDataList, date, true);
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_CATEGORY_GRID_DAILY, dataJson);
return new Result();
}
@Override
public Result getCategoryOrgDaily(String date) {
date = StringUtils.isEmpty(date) ? DateUtils.format(DateUtils.addDateDays(new Date(),-1)) : date;
List<CategoryOrgDailyResultDTO> commDataList = baseDao.getCategoryCommDaily();
List<CategoryOrgDailyResultDTO> streetDataList = baseDao.getCategoryStreetDaily();
List<CategoryOrgDailyResultDTO> orgDataList = new ArrayList<>();
orgDataList.addAll(streetDataList);
orgDataList.addAll(commDataList);
String dataJson = ScreenDataUtils.getScreenCategoryDataJson(orgDataList, date, true);
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_CATEGORY_ORG_DAILY, dataJson);
return new Result();
}
}

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

@ -2,6 +2,8 @@ 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.ScreenCategoryDateDTO;
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 +40,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
@ -123,6 +143,28 @@ public class ScreenDataUtils {
dateDto.setMonthId(dateId.replace("-", ""));
dateDto.setDataList(data);
return JSONObject.toJSONString(dateDto);
}
/**
* 数据更新至事件为年月日类型
*
* @param data 数据
* @param dateId 日期字符串
* @param isFirst 是否首次
* @return java.lang.String
* @author zhy
* @date 2021/3/23 9:52
*/
public static String getScreenCategoryDataJson(Object data, String dateId, Boolean isFirst) {
if (StringUtils.isEmpty(dateId)) {
// 获取当前时间 yyyy-MM
dateId = DateUtils.formatYearMonth(new Date());
}
ScreenCategoryDateDTO dateDto = new ScreenCategoryDateDTO();
dateDto.setIsFirst(isFirst);
dateDto.setDateId(dateId.replace("-", ""));
dateDto.setDataList(data);
return JSONObject.toJSONString(dateDto);
}
}

28
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>

29
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/common/EpdcTableName.xml

@ -0,0 +1,29 @@
<?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.common.dao.EpdcTableNameDao">
<!--测试库名-->
<sql id="tb_admin">js_esua_epdc_admin</sql>
<sql id="tb_analysis">js_esua_epdc_analysis</sql>
<sql id="tb_api">js_esua_epdc_api</sql>
<sql id="tb_custom">js_esua_epdc_custom</sql>
<sql id="tb_events">js_esua_epdc_events</sql>
<sql id="tb_group">js_esua_epdc_group</sql>
<sql id="tb_mutuality">js_esua_epdc_mutuality</sql>
<sql id="tb_news">js_esua_epdc_news</sql>
<sql id="tb_user">js_esua_epdc_user</sql>
<!--生产库名-->
<!--<sql id="tb_admin">esua_epdc_admin</sql>
<sql id="tb_analysis">esua_epdc_analysis</sql>
<sql id="tb_api">esua_epdc_api</sql>
<sql id="tb_custom">esua_epdc_custom</sql>
<sql id="tb_events">esua_epdc_events</sql>
<sql id="tb_group">esua_epdc_group</sql>
<sql id="tb_mutuality">esua_epdc_mutuality</sql>
<sql id="tb_news">esua_epdc_news</sql>
<sql id="tb_user">esua_epdc_user</sql>-->
</mapper>

83
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml

@ -479,4 +479,87 @@
statementNum DESC
LIMIT #{pageIndex}, #{pageSize};
</select>
<select id="getCategoryGridDaily" resultType="com.elink.esua.epdc.dto.item.result.CategoryGridDailyResultDTO">
SELECT
ei.category_code AS categoryCode,
count(0) AS projectTotal,
ei.GRID_ID AS gridId,
REVERSE(
LEFT (
REVERSE(ei.PARENT_DEPT_IDS),
LOCATE(
',',
REVERSE(ei.PARENT_DEPT_IDS)
) - 1
)
) AS pid,
ei.PARENT_DEPT_IDS AS pids,
ec.category_type AS LEVEL
FROM
<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_category ec ON ei.CATEGORY_CODE = ec.category_code
WHERE
ei.DEL_FLAG = '0'
AND ec.DEL_FLAG = '0'
and ei.GRID_ID not in (
SELECT t.`dept_id`
FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t
WHERE t.`del_flag`= 0)
GROUP BY
ei.CATEGORY_CODE,
ei.GRID_ID
</select>
<select id="getCategoryCommDaily" resultType="com.elink.esua.epdc.dto.item.result.CategoryOrgDailyResultDTO">
SELECT
ei.category_code AS categoryCode,
count(0) AS projectTotal,
comm.id AS orgId,
comm.pid AS pid,
comm.pids AS pids,
'community' AS orgType,
ec.category_type AS LEVEL
FROM
<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_category ec ON ei.CATEGORY_CODE = ec.category_code
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept sd ON ei.GRID_ID = sd.id
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept comm ON sd.pid = comm.id
WHERE
ei.DEL_FLAG = '0'
AND ec.DEL_FLAG = '0' and comm.id not in (
SELECT t.`dept_id`
FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t
WHERE t.`del_flag`= 0)
GROUP BY
ei.CATEGORY_CODE,
comm.id
</select>
<select id="getCategoryStreetDaily" resultType="com.elink.esua.epdc.dto.item.result.CategoryOrgDailyResultDTO">
SELECT
ei.category_code AS categoryCode,
count(0) AS projectTotal,
street.id AS orgId,
'0' AS pid,
'0' AS pids,
'street' AS orgType,
ec.category_type AS LEVEL
FROM
<include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_item ei
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_events"/>.epdc_category ec ON ei.CATEGORY_CODE = ec.category_code
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept sd ON ei.GRID_ID = sd.id
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept comm ON sd.pid = comm.id
LEFT JOIN <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.sys_dept street ON comm.pid = street.id
WHERE
ei.DEL_FLAG = '0'
AND ec.DEL_FLAG = '0'
and street.id not in (
SELECT t.`dept_id`
FROM <include refid="com.elink.esua.epdc.modules.common.dao.EpdcTableNameDao.tb_admin"/>.`sys_dept_config` t
WHERE t.`del_flag`= 0)
GROUP BY
ei.CATEGORY_CODE,
street.id
</select>
</mapper>

10
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;
}

14
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();
}
}

4
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;
}

9
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();
}

11
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,7 +617,12 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
return categoryInfoResultDTOList;
}
/**
@Override
public Result<EpmetCategoryCodeOption> getCategoryCode() {
return analysisFeignClient.getCategoryCode();
}
/**
* @param
* @return void
* @Author yinzuomei

30
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;
/**
* 数据分析模块调用
*
* @Authorliuchuang
* @Date2020/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();
}

22
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;
/**
* @Authorsongyunpeg
* @Date2020/9/9 15:42
*/
@Component
public class AnalysisFeignClientFallback implements AnalysisFeignClient {
@Override
public Result<EpmetCategoryCodeOption> getCategoryCode() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryCode");
}
}

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

@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -295,4 +296,36 @@ public interface AnalysisFeignClient {
**/
@PostMapping("analysis/data/stats/project/uploadprojectprocess")
Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO);
/**
* 事件/项目分析按类别统计-网格03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryGridResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/
@GetMapping("analysis/item/categoryGridDaily")
Result getCategoryGridDaily(String date);
/**
* 事件/项目分析按类别统计-组织03-22已确定
*
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.category.CategoryOrgResultDailyDTO>>
* @author zhy
* @date 2021/3/22 17:06
*/
@GetMapping("analysis/item/categoryOrgDaily")
Result getCategoryOrgDaily(String date);
/**
* @Description 分类编码上报
* @Author songyunpeng
* @Date 2021/2/23
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("analysis/category/uploadCategoryCode")
Result uploadCategoryCode();
}

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

@ -154,4 +154,18 @@ 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");
}
@Override
public Result getCategoryGridDaily(String date) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryGridDaily",date);
}
@Override
public Result getCategoryOrgDaily(String date) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getCategoryOrgDaily", date);
}
}

54
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 < 14; i++) {
createThread(i);
}
}
@ -80,6 +80,15 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP
} else if (methodIndex == 10) {
// 010、中央区各类总数
customerUsertotaldata();
}else if (methodIndex == 11) {
// 011、项目分类字典上报
uploadcategorydict();
}else if (methodIndex == 12) {
// 012、【事件/项目分析】按类别统计-网格
categoryGridDaily();
}else if (methodIndex == 13) {
// 013、【事件/项目分析】按类别统计-组织
categoryOrgDaily();
}
return 0;
}
@ -301,4 +310,47 @@ 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 + "|项目分类字典上报>定时任务执行结束");
}
/**
* 项目分类字典上报
*
* @return void
* @author WK
* @since 2020/9/17 14:01
*/
private void categoryGridDaily() {
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|【事件/项目分析】按类别统计-网格>定时任务开始执行");
analysisFeignClient.getCategoryGridDaily("");
logger.info("<" + methodName + "|【事件/项目分析】按类别统计-网格>定时任务执行结束");
}
/**
* 项目分类字典上报
*
* @return void
* @author WK
* @since 2020/9/17 14:01
*/
private void categoryOrgDaily() {
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|【事件/项目分析】按类别统计-组织>定时任务开始执行");
analysisFeignClient.getCategoryOrgDaily("");
logger.info("<" + methodName + "|【事件/项目分析】按类别统计-组织>定时任务执行结束");
}
}
Loading…
Cancel
Save