Merge remote-tracking branch 'origin/dev_grid_platform' into dev_grid_platform

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java

@@ -132,6 +132,8 @@ public class ScreenProjectDataDTO implements Serializable {
      */
 	private BigDecimal latitude;
 
+	private String projectCreator;
+
     /**
      * 删除标识 0未删除；1已删除
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java

@@ -160,4 +160,6 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
 	 */
 	private BigDecimal satisfactionScore;
 
+	private String projectCreator;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -85,6 +85,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 					meta.setProjectCreateTime(projectInfo.getCreatedTime());
 					meta.setProjectTitle(projectInfo.getTitle());
 					meta.setOrigin(projectInfo.getOrigin());
+					meta.setProjectCreator(projectInfo.getCreatedBy());
 					if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(projectInfo.getOrigin())) {
 
 						//来源于议题的，上面的initNewScreenProjectData，已经赋值orgType=grid, orgId:gridId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -194,6 +194,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setId(project.getProjectId());
 		dto.setCustomerId(project.getCustomerId());
 		dto.setEventName(project.getProjectTitle());
+		dto.setReporterId(project.getProjectCreator());
 		String categoryCode = project.getCategoryCode().split(StrConstant.COMMA)[0];
 		//如果是孔村、榆山、锦水的项目需要关联分类字典表
 		if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId()) ||
@@ -209,6 +210,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		dto.setEventCategory(categoryCode);
 		dto.setReportTime(project.getProjectCreateTime());
 		dto.setHappenDate(DateUtils.parseDate(DateUtils.format(project.getProjectCreateTime()), DateUtils.DATE_PATTERN));
+		dto.setHappenPlace(project.getProjectAddress());
 		dto.setEventDescription(project.getProjectContent());
 		dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
 		if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -212,6 +212,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 case TopicConstants.PATROL:
                 case TopicConstants.POINT:
                 case TopicConstants.STAFF:
+                case TopicConstants.PROJECT:
 
                     // 耗时较短。一个小时最多发送一次告警
                     if (l1LastAlertTime == null || (

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java

@@ -104,6 +104,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
     @Override
     public Map<String, Integer> getDeptMap() {
         LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ne(ExDeptEntity::getGridCode, null);
         List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(entityList)) {
             return Collections.emptyMap();