From de3f71f2c59aa766177b4729bf855585a6604f9a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Dec 2021 09:37:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenExtractServiceImpl.java        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 1ec4738376..1b70d7b6dc 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
@@ -210,6 +210,17 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             threadPool.submit(() -> {
                 //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
                 try {
+
+                    ScreenCentralZoneDataFormDTO screenCentralZone = new ScreenCentralZoneDataFormDTO();
+                    screenCentralZone.setCustomerId(customerId);
+                    screenCentralZone.setDateId(dateId);
+                    //中央区 screen_user_total_data
+                    try {
+                        screenCentralZoneDataAbsorptionService.centralZoneDataHub(screenCentralZone);
+                    } catch (Exception e) {
+                        log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                    }
+
                     try {
                         publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
                     } catch (Exception e) {
@@ -246,15 +257,6 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             });
             threadPool.submit(() -> {
                 try {
-                    ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-                    param.setCustomerId(customerId);
-                    param.setDateId(dateId);
-                    //中央区 screen_user_total_data
-                    try {
-                        screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
-                    } catch (Exception e) {
-                        log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
-                    }
 
                     try {
                         // 项目(事件)分析按网格_按天统计

From f156a2294b99e1c1e0decec8f579f53fff659996 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 1 Dec 2021 12:59:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=86=85=E5=AE=B9=20?=
 =?UTF-8?q?=E6=88=AA=E5=8F=961000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BaseDisputeProcessServiceImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
index bc3d194bb6..609295a770 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java
@@ -32,6 +32,7 @@ import com.epmet.opendata.service.BaseDisputeProcessService;
 import com.epmet.opendata.service.ExDeptService;
 import com.epmet.opendata.service.ExUserService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -100,7 +101,12 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                 entity.setEventName(item.getEventName());
                 entity.setHappenDate(item.getHappenDate());
                 entity.setHappenPlace(item.getHappenPlace());
-                entity.setEventDescription(item.getEventDescription());
+                String eventDescription = item.getEventDescription();
+                //如果不为空 长度控制1000以内
+                if (StringUtils.isNotBlank(eventDescription) && eventDescription.length() > NumConstant.ONE_THOUSAND){
+                    eventDescription = eventDescription.substring(NumConstant.ZERO,NumConstant.ONE_THOUSAND);
+                }
+                entity.setEventDescription(eventDescription);
                 entity.setLng(null == item.getLng()?null:item.getLng().toPlainString());
                 entity.setLat(null == item.getLat()?null:item.getLat().toPlainString());
                 entity.setCreateBy(null == userMap.get(item.getReporterId())?null:String.valueOf(userMap.get(item.getReporterId())));
@@ -124,4 +130,4 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
             baseConflictsResolveService.saveOrUpdateBatch(resolveList, formDTO.getPageSize());
         }
     }
-}
\ No newline at end of file
+}