Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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 {
                         // 项目(事件)分析按网格_按天统计

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