diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java index d4f114c9ac..0534f38363 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java @@ -35,6 +35,8 @@ public class ShiBeiICJobController { private StatsProjectService statsProjectService; @Autowired private RedisUtils redisUtils; + @Autowired + private com.epmet.service.stats.FactIcuserCategoryAnalysisDailyService userCategoryAnalysisDailyService; @PostMapping("userPointAndProjectStatus/{bizType}") public Result userPointAndProjectStatus(@PathVariable("bizType") String bizType, @RequestBody ExtractOriginFormDTO formDTO) { @@ -66,6 +68,7 @@ public class ShiBeiICJobController { private void executeMethod(String bizType, String customerId, String d) { if (bizType.equals(BizTypeEnum.USER.getType())){ this.extractUserPointData(customerId, d); + this.statUserCategoryGridDaily(customerId, d); } if (bizType.equals(BizTypeEnum.PROJECT.getType())) { this.agencyProjectStats(customerId, d); @@ -103,4 +106,18 @@ public class ShiBeiICJobController { log.error("市北-热心市民/党员得分数据写入失败,参数为:{}" + customerId + StrConstant.HYPHEN + dateId, e); } } + + /** + * desc:抽取 用户类别分析数据 + * @param customerId + * @param dateId + */ + private void statUserCategoryGridDaily(String customerId, String dateId) { + try { + //用户 类别分析 + userCategoryAnalysisDailyService.statUserCategoryGridDaily(customerId, dateId); + } catch (Exception e) { + log.error("市北-居民分类分析数据写入失败,参数为:{}" + customerId + StrConstant.HYPHEN + dateId, e); + } + } } diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 9eae5a851f..bc63091248 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./epmet-user.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 600M + memory: 1100M