Merge branch 'dev_oss_fix' into dev_group_code

# Conflicts:
#	epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java

@@ -19,6 +19,12 @@ import org.apache.commons.lang3.StringUtils;
  * @since 1.0.0
  */
 public class RenException extends RuntimeException {
+
+    public enum MessageMode {
+        //code_内部信息_外部信息
+        CODE_INTERNAL_EXTERNAL
+    }
+
     private static final long serialVersionUID = 1L;
     private int code;
     /**
@@ -47,7 +53,7 @@ public class RenException extends RuntimeException {
         }
     }
 
-    public RenException(int code, String internalMsg, String msg) {
+    public RenException(int code, String internalMsg, String msg, MessageMode mode) {
         this(code, internalMsg);
         this.msg = msg;
     }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/result/ProjectLatestOperationResultDTO.java

@@ -17,4 +17,8 @@ public class ProjectLatestOperationResultDTO implements Serializable {
     private String projectId;
 
     private String operationName;
+
+    private Integer costTime;
+
+    private String title;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenExtractDailyController.java

@@ -1,23 +1,33 @@
 package com.epmet.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.concurrent.*;
+
 /**
  * @Author zxc
  * @DateTime 2020/9/24 9:42 上午
  */
+@Slf4j
 @RestController
 @RequestMapping("screenextract")
 public class ScreenExtractDailyController {
-
+    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("ScreenExtractDailyController-pool-%d").build();
+    ExecutorService threadPool = new ThreadPoolExecutor(1, 1,
+            10L, TimeUnit.MINUTES,
+            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
     @Autowired
     private ScreenExtractService screenExtractService;
 
@@ -29,7 +39,15 @@ public class ScreenExtractDailyController {
      */
     @PostMapping("extractdailyall")
     public Result screenExtractDaily(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) {
-        screenExtractService.extractDailyAll(extractOriginFormDTO);
+        threadPool.submit(() -> {
+            log.info("screenExtractDaily start,param:{}", JSON.toJSONString(extractOriginFormDTO));
+            try {
+                screenExtractService.extractDailyAll(extractOriginFormDTO);
+                log.info("screenExtractDaily end");
+            } catch (Exception e) {
+                log.error("screenExtractDaily exception", e);
+            }
+        });
         return new Result();
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginGroupMainDailyDao.java

@@ -79,6 +79,16 @@ public interface FactOriginGroupMainDailyDao extends BaseDao<FactOriginGroupMain
      **/
     void deleteBatchMemberByCustomerId(@Param("customerId") String customerId, @Param("dimId") String dimId, @Param("dateType") String dateType);
 
+    /**
+     * @Description 删除指定组Id的成员
+     * @param customerId
+     * @param groups
+     * @return void
+     * @author wangc
+     * @date 2020.11.16 11:15
+    */
+    void deleteMemberByGroupList(@Param("customerId") String customerId,@Param("groups") List<String> groups);
+
     /**
      * @param customerId
      * @return

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java

@@ -153,15 +153,4 @@ public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
      * @date 2020.09.28 14:45
     */
     List<ProjectLatestOperationResultDTO> selectLatestOperation(@Param("list") List<String> list,@Param("customerId") String customerId);
-
-    /**
-     * @Description 查找项目标题
-     * @param list
-     * @return java.util.List<com.epmet.dto.project.result.ProjectLatestOperationResultDTO>
-     * @author wangc
-     * @date 2020.09.28 14:45
-     */
-    List<ProjectLatestOperationResultDTO> selectProjectTitle(@Param("list") List<String> list,@Param("customerId") String customerId);
-
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginGroupMainDailyService.java

@@ -64,7 +64,7 @@ public interface FactOriginGroupMainDailyService extends BaseService<FactOriginG
      * @author wangc
      * @date 2020.09.23 16:30
     **/
-    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList);
+    boolean insertExtractedData(boolean isFirst, String customerId, String dateId, List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList, List<String> missing);
 
     /**
      * @param customerId

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

@@ -84,7 +84,7 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList) {
+    public boolean insertExtractedData(boolean isFirst, String customerId, String dateId,List<FactOriginGroupMainDailyDTO> originGroupData, List<ExtractGroupMemberActionRecordResultDTO> memberList,List<String> missing) {
         if (isFirst) {
             //isFirst
             baseDao.deleteBatchMemberByCustomerId(customerId,null,null);
@@ -95,8 +95,13 @@ public class FactOriginGroupMainDailyServiceImpl extends BaseServiceImpl<FactOri
         }
         //删除要插入的组主表数据
         baseDao.deleteBatchByGroupId(customerId,originGroupData.stream().map(FactOriginGroupMainDailyDTO :: getId).distinct().collect(Collectors.toList()));
+
         baseDao.insertBatchMain(originGroupData);
         baseDao.insertBatchMembers(memberList);
+        if(!CollectionUtils.isEmpty(missing)){
+            baseDao.deleteBatchByGroupId(customerId,missing);
+            baseDao.deleteMemberByGroupList(customerId,missing);
+        }
         return true;
     }
 

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

@@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -91,11 +88,21 @@ public class GroupExtractServiceImpl implements GroupExtractService {
         List<ExtractGroupMemberActionRecordResultDTO> memberList = new LinkedList<>();
         if (!CollectionUtils.isEmpty(originGroupData)) {
         List<GridAttributesResultDTO> gridList = dimGridService.getGridAttributes(param.getCustomerId(),originGroupData.stream().map(FactOriginGroupMainDailyDTO::getGridId).distinct().collect(Collectors.toList()));
-
+        List<String> missingGroups = new LinkedList<>();
         if (!CollectionUtils.isEmpty(gridList)) {
             Map<String, GridAttributesResultDTO> gridMap =
                     gridList.stream().collect(Collectors.toMap(GridAttributesResultDTO::getGridId, Function.identity(), (key1, key2) -> key2));
-            if (!CollectionUtils.isEmpty(originGroupData)) {
+
+
+                for(Iterator<FactOriginGroupMainDailyDTO> iter = originGroupData.iterator();
+                    iter.hasNext();){
+                    FactOriginGroupMainDailyDTO pointer = iter.next();
+                    if(null == gridMap.get(pointer.getGridId())){
+                        missingGroups.add(pointer.getId());
+                        iter.remove();
+                    }
+                }
+
                 originGroupData.forEach(group -> {
                     GridAttributesResultDTO attr = gridMap.get(group.getGridId());
                     if (null != attr) {
@@ -141,14 +148,15 @@ public class GroupExtractServiceImpl implements GroupExtractService {
                     }
 
                 });
-            }
+
 
             factOriginGroupMainDailyService.insertExtractedData(
                     count <= NumConstant.ZERO ? true : false,
                     param.getCustomerId(),
                     param.getDateId(),
                     originGroupData,
-                    memberList
+                    memberList,
+                    missingGroups
             );
 
 

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

@@ -16,7 +16,6 @@ import com.epmet.dto.issue.IssueDTO;
 import com.epmet.dto.party.PartyMemberDTO;
 import com.epmet.dto.project.FinishOrgDTO;
 import com.epmet.dto.project.ProcessInfoDTO;
-import com.epmet.dto.project.ProjectOrgRelationDTO;
 import com.epmet.dto.project.result.ProjectOrgPeriodResultDTO;
 import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.topic.ResiTopicDTO;
@@ -42,8 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collector;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -123,6 +124,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 		}
 		//获取项目信息
 		List<ProjectDTO> projectList = projectService.getProjectInfo(customerId, dateString);
+		factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 		if (!CollectionUtils.isEmpty(projectList)) {
 			//提取议题ID
 			List<String> issueIds = projectList.stream().map(ProjectDTO::getOriginId).collect(Collectors.toList());
@@ -193,7 +195,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			}));
 			//插入数据
 			if (!list.isEmpty()) {
-				factOriginProjectMainDailyService.deleteByDate(customerId, dateString);
 				factOriginProjectMainDailyService.insertBatch(list);
 			}
 		}
@@ -368,8 +369,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 							path =path.substring(NumConstant.ZERO,path.length() - NumConstant.ONE);
 						}
 						entity.setPids(path);
-					}else{
-						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}",process.getAgencyId(),process.getPids());
+					} else {
+						log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids());
 						entity.setPid(NumConstant.ZERO_STR);
 						entity.setPids("");
 					}
@@ -378,8 +379,8 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
 			return entity;
 		}).collect(Collectors.toList()));
 
+		factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 		if (!logList.isEmpty()) {
-			factOriginProjectLogDailyService.deleteByDate(customerId, dateString);
 			factOriginProjectLogDailyService.insertBatch(logList);
 		}
 

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

@@ -112,14 +112,18 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             return;
         }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
-        issueTotal.forEach(issue -> {
+        for (FactIssueGridMonthlyEntity issue : issueTotal) {
             String gridId = issue.getGridId();
             ScreenUserJoinEntity entity = insertMap.get(gridId);
+            if (entity == null) {
+                log.warn("gridId:{} is not exist in dimGrid,monthId:{},gridId:{}", formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+                continue;
+            }
             entity.setJoinTotal(issue.getIssueIncr());
             GridUserCountResultDTO user = userCountMap.get(gridId);
             if (user == null) {
                 log.warn("gridId:{} is not exist in issue,customerId:{},monthId:{},gridId:{}", JSON.toJSONString(issue), formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
-                return;
+                continue;
             }
             //百人人均议题：统计周期内总的议题数/（注册用户数/100）
             log.debug("issue:{}", JSON.toJSONString(issue));
@@ -129,7 +133,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                         .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP);
                 entity.setAvgIssue(avgIssueCount);
             }
-        });
+        }
 
 
         //获取该月 表决的人数
@@ -153,6 +157,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) {
             String gridId = entry.getKey();
             ScreenUserJoinEntity entity = insertMap.get(gridId);
+            if (entity == null) {
+                log.warn("gridId:{} is not exist in dimGrid,monthId:{},gridId:{}", formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+                continue;
+            }
             List<IssueVoteUserCountResultDTO> issueList = entry.getValue();
             BigDecimal bigDecimal = new BigDecimal(0);
             BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());

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

@@ -243,7 +243,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             param.setDateId(monthId);
             screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
         }catch(Exception e){
-            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}",JSON.toJSONString(formDTO));
+            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
         }
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();

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

@@ -1,9 +1,11 @@
 package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.org.GridInfoDTO;
+import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@@ -21,16 +23,13 @@ import com.epmet.service.project.ProjectService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -79,8 +78,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
 
         //2.查询出客户下网格的相关信息
         List<GridInfoDTO> gridList = customerGridService.queryGridInfoList(param.getCustomerId());
-        Map<String,GridInfoDTO> gridMap = new HashMap<>();
-        gridList.forEach(grid -> {gridMap.put(grid.getGridId(),grid);});
+        Map<String,GridInfoDTO> gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
 
         //3.查询出客户下用户的累计积分(累计值，没有时间概念，否则需要查询积分明细计算出评价周期末的得分)
         Map<String,Integer> pointMap = userPointService.getUserPointMap(param.getCustomerId());
@@ -91,16 +89,22 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
         }else{
             String dateType = DateUtils.identifyTimeDimension(dateId);
-            if(StringUtils.isEmpty(dateType) || !org.apache.commons.lang3.StringUtils.equalsAny(dateType,"date","month")){
+            if (StringUtils.isEmpty(dateType) || !StringUtils.equalsAny(dateType, "date", "month")) {
                 dateId = DateUtils.getBeforeNMonth(NumConstant.ONE);
-            }else if(org.apache.commons.lang3.StringUtils.equals(dateType,"date")){
-                dateId = dateId.substring(NumConstant.ZERO,dateId.length() - NumConstant.TWO);
+            } else if (StringUtils.equals(dateType, "date")) {
+                dateId = dateId.substring(NumConstant.ZERO, dateId.length() - NumConstant.TWO);
             }
         }
         final String finalDateId = dateId;
 
         Map<String, BigDecimal> scoreMap = cpcIndexCalculateService.getCpcScore(param.getCustomerId(),dateId);
 
+        //剔除垃圾数据
+        for(Iterator<ScreenPartyUserRankDataEntity> iter = registeredUsers.iterator();
+            iter.hasNext();){
+            if(null == gridMap.get(iter.next().getGridId())) iter.remove();
+        }
+
         //5.整合数据
         if(!CollectionUtils.isEmpty(registeredUsers)){
             registeredUsers.forEach(user -> {
@@ -125,7 +129,19 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
 
         //6.存入数据库
         //不按照时间删除，每次插入之前将该客户下的所有历史数据清空
-        screenPartyUserRankDataService.dataClean(registeredUsers,param.getCustomerId());
+        //过滤 统计维度中没有的数据
+        Set<String> gridIdSet = new HashSet<>();
+        List<ScreenPartyUserRankDataEntity> newInsertList = registeredUsers.stream()
+                .filter(o -> {
+                    if (StringUtils.isBlank(o.getGridName())) {
+                        gridIdSet.add(o.getGridId());
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }).collect(Collectors.toList());
+        log.warn("userScoreDataHub grids:{} not in DimGrid", JSON.toJSONString(gridIdSet));
+        screenPartyUserRankDataService.dataClean(newInsertList, param.getCustomerId());
     }
 
     /**
@@ -144,13 +160,26 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         //查询数据
         List<ScreenDifficultyDataEntity> difficulties = factOriginProjectMainDailyService.getDifficultyBaseInfo(param.getCustomerId(),projectService.getOvertimeProjectByParameter(param.getCustomerId(),existed));
         if(CollectionUtils.isEmpty(difficulties)) return;
+        //剔除垃圾数据
+        //2.查询出客户下网格的相关信息
+        List<GridInfoDTO> gridList = customerGridService.queryGridInfoList(param.getCustomerId());
+        Map<String,GridInfoDTO> gridMap = gridList.stream().collect(Collectors.toMap(GridInfoDTO :: getGridId,a -> a,(o, n) -> o));
+        List<String> missing = new LinkedList<>();
+        for(Iterator<ScreenDifficultyDataEntity> iter = difficulties.iterator(); iter.hasNext();){
+            ScreenDifficultyDataEntity pointer = iter.next();
+            if(null == gridMap.get(pointer.getOrgId())){
+                missing.add(pointer.getEventId());
+                iter.remove();
+            }
+        }
+
+
         List<String> projectIds = difficulties.stream().map(ScreenDifficultyDataEntity :: getEventId).distinct().collect(Collectors.toList());
         //最近一次操作
-        Map<String,String> latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
-        //标题
-        Map<String,String> titleMap = projectProcessService.getProjectTitle(projectIds,param.getCustomerId());
+        Map<String, ProjectLatestOperationResultDTO> latestOperationMap = projectProcessService.getLatestOperation(projectIds,param.getCustomerId());
+
         boolean isOperationNull = CollectionUtils.isEmpty(latestOperationMap) ? true : false;
-        boolean isTitleNull = CollectionUtils.isEmpty(titleMap) ? true : false;
+
         //图片
         List<ProjectSourceMapFormDTO> projectSourceMap = factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
 
@@ -168,16 +197,20 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 diff.setEventContent(contentMap.get(diff.getEventId()));
             }
             if(!isOperationNull){
-                diff.setLatestOperateDesc(latestOperationMap.get(diff.getEventId()));
-            }
-            if(!isTitleNull){
-                diff.setEventTitle(titleMap.get(diff.getEventId()));
+                ProjectLatestOperationResultDTO oper = latestOperationMap.get(diff.getEventId());
+                if(null != oper){
+                    diff.setLatestOperateDesc(oper.getOperationName());
+                    diff.setEventTitle(oper.getTitle());
+                    diff.setEventCostTime(oper.getCostTime());
+                }
+
             }
+
             diff.setDataEndTime(DateUtils.getBeforeNDay(NumConstant.ONE));
         });
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();
         imgMap.values().forEach(list -> {imgList.addAll(list);});
 
-        screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);
+        screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList,missing);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenDifficultyDataService.java

@@ -49,6 +49,6 @@ public interface ScreenDifficultyDataService extends BaseService<ScreenDifficult
      * @author wangc
      * @date 2020.09.28 11:04
     */
-    void dataClean(String customerId,List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs);
+    void dataClean(String customerId,List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs,List<String> missing);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java

@@ -53,7 +53,11 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void dataClean(String customerId, List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs) {
+    public void dataClean(String customerId, List<ScreenDifficultyDataEntity> difficulties, List<ScreenDifficultyImgDataEntity> imgs,List<String> missing) {
+        if(!CollectionUtils.isEmpty(missing)){
+            baseDao.deleteBatchDifficulty(customerId, missing);
+            baseDao.deleteBatchDifficultyImg(missing);
+        }
         if (!CollectionUtils.isEmpty(difficulties)) {
             baseDao.deleteBatchDifficulty(customerId, difficulties.stream().map(ScreenDifficultyDataEntity::getEventId).distinct().collect(Collectors.toList()));
             baseDao.insertBatch(difficulties);
@@ -62,7 +66,6 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
             baseDao.deleteBatchDifficultyImg(imgs.stream().map(ScreenDifficultyImgDataEntity::getEventId).distinct().collect(Collectors.toList()));
             baseDao.insertBatchImg(imgs);
         }
-
         baseDao.updateTime(customerId, DateUtils.getBeforeNDay(NumConstant.ONE));
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -120,20 +120,9 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 获得项目最新操作
      * @param list
      * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
+     * @return
      * @author wangc
      * @date 2020.09.28 14:44
     */
-    Map<String,String> getLatestOperation(List<String> list, String customerId);
-
-    /**
-     * @Description 获取项目标题
-     * @param list
-     * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
-     * @author wangc
-     * @date 2020.10.27 14:34
-    */
-    Map<String,String> getProjectTitle(List<String>list ,String customerId);
-
+    Map<String,ProjectLatestOperationResultDTO> getLatestOperation(List<String> list, String customerId);
 }

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

@@ -117,36 +117,17 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      * @Description 获得项目最新操作
      * @param list
      * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
+     * @return
      * @author wangc
      * @date 2020.09.28 14:44
      */
     @Override
-    public Map<String, String> getLatestOperation(List<String> list, String customerId) {
+    public Map<String, ProjectLatestOperationResultDTO> getLatestOperation(List<String> list, String customerId) {
         List<ProjectLatestOperationResultDTO> operations = baseDao.selectLatestOperation(list,customerId);
         if(CollectionUtils.isEmpty(operations)){
             return Collections.EMPTY_MAP;
         }else{
-            return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
+            return operations.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,o->o,(a,n)-> a));
         }
     }
-
-    /**
-     * @Description 获取项目标题
-     * @param list
-     * @param customerId
-     * @return java.util.Map<java.lang.String,java.lang.String>
-     * @author wangc
-     * @date 2020.10.27 14:34
-     */
-    @Override
-    public Map<String, String> getProjectTitle(List<String> list, String customerId) {
-        List<ProjectLatestOperationResultDTO> titles = baseDao.selectProjectTitle(list,customerId);
-        if(CollectionUtils.isEmpty(titles)){
-            return Collections.EMPTY_MAP;
-        }else{
-            return titles.stream().collect(Collectors.toMap(ProjectLatestOperationResultDTO :: getProjectId,ProjectLatestOperationResultDTO :: getOperationName));
-        }
-    }
-
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml

@@ -64,6 +64,17 @@
         </if>
     </delete>
 
+    <!-- 删除指定组Id的成员 -->
+    <delete id="deleteMemberByGroupList">
+        DELETE FROM
+        fact_origin_group_member_daily
+        WHERE
+        CUSTOMER_ID = #{customerId}
+        <foreach collection="groups" item="groupId" open="AND (" separator=" OR "  close=" )" >
+            GROUP_ID = #{groupId}
+        </foreach>
+    </delete>
+
     <delete id="deleteBatchByGroupId" parameterType="java.util.List">
         DELETE FROM
         fact_origin_group_main_daily
@@ -75,6 +86,16 @@
         </where>
     </delete>
     
+    <delete id="deleteSpecifiedDateData">
+        DELETE FROM
+        fact_origin_group_main_daily
+        <where>
+        CUSTOMER_ID = #{customerId}
+        AND
+        DATE_ID =
+        </where>
+    </delete>
+
     <update id="updatePartyFlag" parameterType="java.util.List">
         UPDATE fact_origin_group_main_daily
         SET IS_OWNER_PARTY = 1

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -331,7 +331,7 @@
         ( project.PROJECT_STATUS = 'pending', '处理中', '已结案' ) AS eventStatusDesc,
         IFNULL(relation.reOrg,0) AS eventReOrg,
         IFNULL(handleCount.HandledCount,0) AS eventHandledCount,
-        IFNULL(costTime.costTime,0) AS eventCostTime ,
+
         gridInfo.allParentIds
         FROM
         fact_origin_project_main_daily project
@@ -382,26 +382,6 @@
         GROUP BY
         PROJECT_ID
         ) handleCount ON project.ID = handleCount.PROJECT_ID
-        LEFT JOIN (
-        SELECT
-        main.ID AS PROJECT_ID,
-        TIMESTAMPDIFF(
-        MINUTE,
-        str_to_date( main.DATE_ID, '%Y%m%d' ),
-        IF
-        ( main.IS_RESOLVED = 'resolved', time.HANDLED_DATE, NOW( ) )
-        ) AS costTime
-        FROM
-        fact_origin_project_main_daily main
-        LEFT JOIN fact_origin_project_org_period_daily time ON main.ID = time.PROJECT_ID
-        AND time.DEL_FLAG = '0'
-        AND time.OPERATION = 'close'
-        WHERE
-        main.DEL_FLAG = '0'
-        AND main.CUSTOMER_ID = #{customerId}
-        GROUP BY
-        main.ID
-        ) costTime ON project.ID = costTime.PROJECT_ID
         WHERE
         project.DEL_FLAG = '0'
         AND project.CUSTOMER_ID = #{customerId}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -268,9 +268,11 @@
     <select id="selectLatestOperation" resultType="com.epmet.dto.project.result.ProjectLatestOperationResultDTO">
         SELECT
             process.PROJECT_ID,
-            process.OPERATION_NAME
+            process.OPERATION_NAME,
+            project.TITLE,
+        CASE WHEN project.status = 'pending'	THEN TIMESTAMPDIFF(MINUTE,project.created_time,NOW())  ELSE TIMESTAMPDIFF(MINUTE,project.created_time,project.UPDATED_TIME)   END AS costTime
             FROM
-            project_process process
+            project_process process LEFT JOIN project ON process.PROJECT_ID = project.ID AND project.DEL_FLAG = '0'
             WHERE
             process.DEL_FLAG = '0'
             AND process.CUSTOMER_ID = #{customerId}
@@ -307,20 +309,4 @@
         </if>
     </select>
 
-    <!-- 查找项目标题 -->
-    <select id="selectProjectTitle" resultType="com.epmet.dto.project.result.ProjectLatestOperationResultDTO">
-        SELECT
-        ID AS projectId,
-        TITLE AS operationName
-        FROM
-        project
-        WHERE
-        DEL_FLAG = '0'
-        AND CUSTOMER_ID = #{customerId}
-        <if test="null != list and list.size() > 0">
-            <foreach collection="list" item="projectId" open="AND (" separator=" OR " close=" )">
-                ID = #{projectId}
-            </foreach>
-        </if>
-    </select>
 </mapper>

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

@@ -30,6 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallback =
         OssFeignClientFallback.class)
+//@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallback =
+//        OssFeignClientFallback.class)
 public interface OssFeignClient {
     /**
      * 文件上传
@@ -43,7 +45,8 @@ public interface OssFeignClient {
     @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result<UploadImgResultDTO> uploadQrCode(@RequestPart(value = "file") MultipartFile file);
 
-    @Configuration
+
+    //@Configuration
     class MultipartSupportConfig {
         @Bean
         public Encoder feignFormEncoder() {

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -73,6 +74,7 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     /**
      * 议题创建时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
 
     /**

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 //@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
-@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class,url="localhost:8089")
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
 public interface OperCustomizeFeignClient {
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -594,14 +594,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         //查找工作人员信息
         //最近一次登陆的而网格、人员信息、权限
         ExtStaffInfoResultDTO result = baseDao.selectStaffInfoExt(staffParam.getStaffId());
-        result.setUserId(staffParam.getStaffId());
         if(null != result) {
+			result.setUserId(staffParam.getStaffId());
             Result<ExtStaffInfoResultDTO> govOrgResult =
                 govOrgOpenFeignClient.staffInfoExt(result);
             if(govOrgResult.success() && null != govOrgResult.getData()){
                 return govOrgResult.getData();
             }
         }
+		log.warn("com.epmet.service.impl.CustomerStaffServiceImpl.extStaffInfo，根据传入的用户Id未找到对应的工作人员，传参：{}",JSON.toJSONString(staffParam));
         return null;
     }