diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java index 2365ec57f0..da4781f803 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; /** * @description: @@ -67,6 +66,10 @@ public class ScreenProjectDataInfoFormDTO implements Serializable { /** * 事件级别 红色1级：已超期；黄色2级:即将超期；绿色3级：未超期 + * 2021-04-28平阴定义： + * 1：红色：为刚提交未做任何响应处理未结案的项目； + * 2：黄色: 至少做过一次响应处理答复但未结案的项目； + * 3：绿色：已经结案的项目。 */ private Integer projectLevel; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index d8712f7162..952d7b4ba5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -89,6 +89,10 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently e.printStackTrace(); } if (aBoolean.isDone()){ + // 指标库，实时数据只更新:【screen_project_data】 + // 【screen_project_process_attachment】 + // 【screen_project_img_data】 + // 【screen_project_process】这四个表 SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId,dateId); } logger.info("consumer projectChanged msg success,{}",aBoolean); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index ffa1936236..0697a46edd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -183,12 +183,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch (Exception e){ log.error("基层治理-难点赌点抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e); } - extractPartData(customerId, dateId); - log.info("===== extractDaily method end ======"); - } - @Override - public void extractPartData(String customerId, String dateId) { ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO(); param.setCustomerId(customerId); param.setDateId(dateId); @@ -211,25 +206,37 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch (Exception e){ log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); } - //项目分类打标签未上线，暂时屏蔽 - try{ - //大屏项目数据抽取_按天抽取 - screenProjectSettleService.extractScreenData(param); - }catch (Exception e){ - log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); - } + //按天统计：网格内各个分类下的项目总数 try{ projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId); }catch(Exception e){ log.error("按天统计：网格内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e); } + // 按天统计：组织内各个分类下的项目总数 try{ projectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId); }catch(Exception e){ log.error("按天统计：组织内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e); } + + extractPartData(customerId, dateId); + log.info("===== extractDaily method end ======"); + } + + @Override + public void extractPartData(String customerId, String dateId) { + ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO(); + param.setCustomerId(customerId); + param.setDateId(dateId); + + try{ + //大屏项目数据抽取_按天抽取 + screenProjectSettleService.extractScreenData(param); + }catch (Exception e){ + log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e); + } } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java index 85be2e5128..1f68336cd7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java @@ -8,11 +8,20 @@ package com.epmet; +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.scan.param.TextScanParamDTO; +import com.epmet.commons.tools.scan.param.TextTaskDTO; +import com.epmet.commons.tools.scan.result.SyncScanResult; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.ScanContentUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import java.util.ArrayList; +import java.util.List; + /** * 模块 * @@ -26,6 +35,37 @@ public class ResiGroupApplication { public static void main(String[] args) { SpringApplication.run(ResiGroupApplication.class, args); + System.out.println("===============started======================"); + testTextSyncScan(); + System.out.println("===============end======================"); + } + + public static void testTextSyncScan(){ + String url = "https://epmet-dev.elinkservice.cn/api/epmetscan/api/textSyncScan"; + TextTaskDTO p = new TextTaskDTO(); + p.setDataId("1"); + p.setContent("开着房车去旅行，已经成了不少人出游的新方式。临近“五一”，房车租赁市场持续火爆，尽管价格比平时贵了不少，可仍一车难求。\n" + + "\n" + + "“临近‘五一’，想开一辆房车拉着一家人去草原旅游，没想到一周前就已经租不到车了。”读者刘先生说，最近一段时间，他总是在一些短视频平台上看到有人开着房车出门旅行的视频。眼下春暖花开，正是出游的好时节，开上一辆房车，不仅节省了住宿费，还能体验一种不同的出行方式。不过，这周起刘先生搜索相关的房车租赁信息时，却发现不少房车租赁公司已经是一车难求了。\n" + + "在某房车租车软件上记者发现，位于房山和顺义的两个取车还车点，五一期间的全部车型已经被租赁一空。而在另一家房车租赁公司的价格目录里，明确标注了租赁价格分为平时价和节假日价，后者是前者的1.2倍。\n" + + "\n" + + "“‘五一’期间，北京的房车租赁情况很紧张，目前只剩一台东风了，你可以考虑一下。”一家房车租赁公司的工作人员介绍，他们公司规定“五一”期间租赁时间为五天起租，仅剩的东风车型每天的租金在1278元。“‘五一’期间的价格会比平时高一些，我建议您在5月6日之后租，一方面没有租赁时长的限制，另一方面租金会便宜不少，每天也就900多元。"); + List list = new ArrayList<>(); + list.add(p); + TextScanParamDTO param = new TextScanParamDTO(); + param.setTasks(list); + Result imgSyncScanResult = ScanContentUtils.textSyncScan(url, param); + System.out.println("==================="+JSON.toJSONString(imgSyncScanResult)); + SyncScanResult result = new SyncScanResult(); + if (imgSyncScanResult != null){ + SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData(); + if (imgSyncScanResult.success()&&imgSyncScanResultData.isAllPass()) { + result.setAllPass(imgSyncScanResultData.isAllPass()); + result.getSuccessDataIds().addAll(imgSyncScanResultData.getSuccessDataIds()); + result.getFailDataIds().addAll(imgSyncScanResultData.getFailDataIds()); + System.out.println("================"+JSON.toJSONString(result)); + } + } } }