Merge remote-tracking branch 'origin/develop' into release_temp

epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.11__del_social_org.sql

@@ -0,0 +1,7 @@
+UPDATE sys_dict_data
+SET DEL_FLAG = '1',
+UPDATED_BY = 'yinzuomei',
+UPDATED_TIME = NOW(),
+remark = '2022.02.21删除社会组织功能，改用联建单位两新组织'
+WHERE
+	dict_value = 'social_org';

epmet-admin/epmet-admin-server/src/main/resources/mapper/SysDictDataDao.xml

@@ -14,8 +14,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort ASC
     </select>
@@ -27,8 +27,8 @@
         FROM
             sys_dict_data a
         INNER JOIN sys_dict_type b ON a.dict_type_id = b.id
-        WHERE
-            b.dict_type = #{dictType}
+        WHERE a.del_flag='0'
+            and b.dict_type = #{dictType}
         ORDER BY
             a.sort asc
     </select>

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -641,6 +641,39 @@ public class RedisKeys {
 		return rootPrefix.concat("house:").concat(customerId).concat(":").concat(houseId);
 	}
 
+	/**
+	 * 居民导入-缓存目录key
+	 * @param importTag
+	 * @return
+	 */
+	public static String icResiImportBaseKey(String importTag) {
+		return rootPrefix.concat("resi:").concat("import:").concat(importTag);
+	}
+
+	/**
+	 * 居民导入-数据分类的key
+	 * 	add：新增居民
+	 * 	category：类别变更
+	 * 	transfer：调动
+	 * @param importTag
+	 * @param type
+	 * @return
+	 */
+	public static String icResiImportTypeKey(String importTag, String type) {
+		return icResiImportBaseKey(importTag).concat(":").concat(type);
+	}
+
+	/**
+	 * 居民导入-详细信息key
+	 * @param importTag
+	 * @param type
+	 * @param resiId
+	 * @return
+	 */
+	public static String icResiImportResiCategoryKey(String importTag, String type, String resiId) {
+		return icResiImportTypeKey(importTag, type).concat(":").concat(resiId);
+	}
+
 	/**
 	 * @Description  临时房屋缓存key
 	 * @param customerId
@@ -696,39 +729,6 @@ public class RedisKeys {
 		return rootPrefix.concat("temporary:").concat("temporaryBuildingUnit:").concat(customerId).concat(":").concat(userId);
 	}
 
-	/**
-	 * 居民导入-缓存目录key
-	 * @param importTag
-	 * @return
-	 */
-	public static String icResiImportBaseKey(String importTag) {
-		return rootPrefix.concat("resi:").concat("import:").concat(importTag);
-	}
-
-	/**
-	 * 居民导入-数据分类的key
-	 * 	add：新增居民
-	 * 	category：类别变更
-	 * 	transfer：调动
-	 * @param importTag
-	 * @param type
-	 * @return
-	 */
-	public static String icResiImportTypeKey(String importTag, String type) {
-		return icResiImportBaseKey(importTag).concat(":").concat(type);
-	}
-
-	/**
-	 * 居民导入-详细信息key
-	 * @param importTag
-	 * @param type
-	 * @param resiId
-	 * @return
-	 */
-	public static String icResiImportResiCategoryKey(String importTag, String type, String resiId) {
-		return icResiImportTypeKey(importTag, type).concat(":").concat(resiId);
-	}
-
 	public static String getTemporaryImportResultCacheKey(String customerId,String userId){
 		return rootPrefix.concat("temporary:").concat("temporaryResult:").concat(customerId).concat(":").concat(userId);
 	}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/CustomerDataManageExcel.java

@@ -48,7 +48,7 @@ public class CustomerDataManageExcel {
     private String patrolDuration;
 
     @Excel(name = "例行工作次数")
-    private String patrolRoutineWorkTimes;
+    private Integer patrolRoutineWorkTimes;
 
     /**
      * 未转换前的巡查时长

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2005,10 +2005,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
 
         //获取例行工作次数
         List<CustomerDataManageResultDTO.CustomerDataManage>  workCountList = statsStaffPatrolRecordDailyService.getPatrolRecordCount(patrolForm);
-        Map<String, List<CustomerDataManageResultDTO.CustomerDataManage>> workCountMap = null;
-        if(workCountList != null && workCountList.size() > NumConstant.ZERO && workCountList.get(NumConstant.ZERO) != null){
-            workCountMap = workCountList.stream().collect(Collectors.groupingBy(CustomerDataManageResultDTO.CustomerDataManage::getOrgId));
-        }
         //NumConstant.FOUR.判断是否需要查询起始日期用户、群组、话题、议题、项目、巡查数据
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> uStartMap = new HashMap<>();
         HashMap<String, CustomerDataManageResultDTO.CustomerDataManage> gStartMap = new HashMap<>();
@@ -2083,7 +2079,6 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             String patrolDuration = "";
             int patrolDurationInteger = NumConstant.ZERO;
             HashSet set = new HashSet();
-            List<CustomerDataManageResultDTO.CustomerDataManage> workCountListTemp;
             for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
                 if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
@@ -2099,21 +2094,14 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             }
             //例行工作次数累加
             int patrolRoutineWorkTimes = NumConstant.ZERO;
-            if (workCountMap != null){
-                workCountListTemp = workCountMap.get(org.getOrgId());
-                if (CollectionUtils.isNotEmpty(workCountListTemp)) {
-                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                        for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
-                            patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
-                            set.add(work.getStaffId());
-                        }
-                    } else {
-                        if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                            for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
-                                patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
-                                set.add(work.getStaffId());
-                            }
-                        }
+            if (CollectionUtils.isNotEmpty(workCountList) && workCountList.get(NumConstant.ZERO) != null) {
+                for (CustomerDataManageResultDTO.CustomerDataManage work : workCountList) {
+                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && org.getOrgId().equals(work.getOrgId())) {
+                        patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
+                        set.add(work.getStaffId());
+                    } else if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) && work.getOrgId().contains(org.getOrgId())) {
+                        patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
+                        set.add(work.getStaffId());
                     }
                 }
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/StatsStaffPatrolRecordDailyDao.java

@@ -43,7 +43,7 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
      * @author LiuJanJun
      * @date 2021/7/9 1:57 下午
      */
-    Integer insertBatch(@Param("list") List<StatsStaffPatrolRecordDailyDTO> insertList);
+    Integer insertBatchOrUpdate(@Param("list") List<StatsStaffPatrolRecordDailyDTO> insertList);
 
     /**
      * desc: 删除内部数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.constant.PingYinConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
@@ -66,7 +67,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         } catch (Exception e) {
             //失败不重发
             logger.error("consumeMessage fail,msg:{}",e.getMessage());
-            return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;
         }
         log.info("consumeMessage success, cost:{} ms",System.currentTimeMillis() - start);
         return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
@@ -94,7 +95,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         }
         log.info("消费了项目变动消息,customer id:{}", msgObj.getCustomerId());
 
-        if (org.apache.commons.lang.StringUtils.isNotBlank(pendingMsgLabel)) {
+        if (StringUtils.isNotBlank(pendingMsgLabel)) {
             try {
                 removePendingMqMsgCache(pendingMsgLabel);
             } catch (Exception e) {
@@ -109,19 +110,14 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         try {
             String customerId = msgObj.getCustomerId();
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
-            lock = distributedLock.getLock(String.format("lock:project_changed:%s", customerId)
+            lock = distributedLock.getLock(String.format("lock:project_changed:%s:%s", customerId, msgObj.getProjectId())
                     ,30L, 30L, TimeUnit.SECONDS);
 
             if (StringUtils.isBlank(customerId)){
                 logger.error("consumer project_changed fail,msg:{}",customerId);
                 return;
             }
-            //消息被消费太快 业务数据还没有完成 歇一会先
-            try {
-                Thread.sleep(60L);
-            } catch (InterruptedException e) {
-                logger.error("consumeMessage sleep exception",e);
-            }
+
             ExtractOriginFormDTO extractOriginFormDTO = new ExtractOriginFormDTO();
             extractOriginFormDTO.setCustomerId(customerId);
 
@@ -146,21 +142,8 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
             }
             logger.info("consumer projectChanged msg success,{}",aBoolean);
 
-            //发送项目数据上报的mq消息
-            if ("6f203e30de1a65aab7e69c058826cd80".equals(customerId)) {
-                if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation()) || "close".equals(msgObj.getOperation())) {
-                    String type;
-                    if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation())) {
-                        type = SystemMessageType.PROJECT_ADD;
-                    } else {
-                        type = SystemMessageType.PROJECT_EDIT;
-                    }
-                    List<String> projectList = new ArrayList<>();
-                    projectList.add(msgObj.getProjectId());
-                    DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, projectList, type);
-                    SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
-                }
-            }
+            sendProject2OpenData(msgObj, customerId);
+
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【RocketMQ】消费项目变动消息失败:",e);
@@ -175,6 +158,29 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
         }
     }
 
+    /**
+     * desc:发型项目数据到 opendata
+     * @param msgObj
+     * @param customerId
+     */
+    private void sendProject2OpenData(ProjectChangedMQMsg msgObj, String customerId) {
+        //发送项目数据上报的mq消息
+        if (PingYinConstant.PROD_PING_YIN_CUSTOMER_ID.equals(customerId)) {
+            if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation()) || "close".equals(msgObj.getOperation())) {
+                String type;
+                if ("issue_shift_project".equals(msgObj.getOperation()) || "created".equals(msgObj.getOperation())) {
+                    type = SystemMessageType.PROJECT_ADD;
+                } else {
+                    type = SystemMessageType.PROJECT_EDIT;
+                }
+                List<String> projectList = new ArrayList<>();
+                projectList.add(msgObj.getProjectId());
+                DisputeProcessMQMsg msg = new DisputeProcessMQMsg(customerId, projectList, type);
+                SpringContextUtils.getBean(ScreenProjectDataService.class).sendProjectChangeMq(msg);
+            }
+        }
+    }
+
     @PreDestroy
     public void saveCalStatus() {
         //todo

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

@@ -130,6 +130,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
         List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
 
         Map<String, StatsStaffPatrolRecordDailyDTO> yesterdayStatsMap = insertList.stream().collect(Collectors.toMap(o -> o.getGridId() + o.getStaffId(), o -> o, (o1, o2) -> o1));
+        log.debug("reloadStaffPatrolStatsData 所有网格员数据{}",JSON.toJSONString(yesterdayStatsMap));
         //获取昨日的巡查记录
         List<StaffPatrolRecordResult> yesterdayPatrolList = userService.selectStaffPatrolListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
 
@@ -138,7 +139,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
 
         //获取昨日的例行工作数据
         List<PatrolRoutineWorkResult> yesterdayWorkList = userService.selectRoutineWorkListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
-
+        log.debug("reloadStaffPatrolStatsData 例行工作数据数据{}",JSON.toJSONString(yesterdayWorkList));
         //遍历网格员 设置其 巡查次数 巡查时常 上报项目数
         yesterdayPatrolList.forEach(patrolRecord -> {
             String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId());
@@ -172,7 +173,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                     String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId());
                     StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey);
                     if (recordDailyDTO == null) {
-                        log.error("have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
+                        log.error("reloadStaffPatrolStatsData have project data but have any patrolRecordDaily,gridId:{},staffId:{}", patrol.getGrid(), patrol.getStaffId());
                         return;
                     }
 
@@ -181,17 +182,17 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
             });
         });
         yesterdayWorkList.forEach(work->{
-            String key = work.getGridId().concat(work.getUserId());
+            String key = getUnqPatrolKey(work.getGridId(),work.getUserId());
             StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key);
             if (patrolRecordDailyDTO == null){
+                log.warn("reloadStaffPatrolStatsData getRoutineWorkCount key{} not exist in gridMembers",key);
                 return;
             }
             patrolRecordDailyDTO.setRoutineWorkCount(patrolRecordDailyDTO.getRoutineWorkCount() + NumConstant.ONE);
-
         });
 
-        Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
-        log.debug("initStaffPatrolStats insert rows:{}", effectRow);
+        Integer effectRow = statsStaffPatrolService.insertBatchOrUpdate(formDTO, insertList);
+        log.info("initStaffPatrolStats insert rows:{}", effectRow);
     }
 
     /**
@@ -218,7 +219,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
     private void initStaffPatrolTodayData(StaffPatrolStatsFormDTO formDTO, List<CustomerGridStaffDTO> allGridMembers) {
         log.info("initStaffPatrolTodayData param:{}", JSON.toJSONString(formDTO));
         List<StatsStaffPatrolRecordDailyDTO> insertList = buildInitPatrolStatsData(formDTO, allGridMembers);
-        Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
+        Integer effectRow = statsStaffPatrolService.insertBatchOrUpdate(formDTO, insertList);
         log.debug("initStaffPatrolStats insert rows:{}", effectRow);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/StatsStaffPatrolService.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface StatsStaffPatrolService {
 
-    Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList);
+    Integer insertBatchOrUpdate(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList);
 
     List<StatsStaffPatrolRecordDailyDTO> selectData(String customerId, String yesterdayStr);
 }

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

@@ -1,6 +1,5 @@
 package com.epmet.service.user.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -33,10 +32,8 @@ public class StatsStaffPatrolServiceImpl implements StatsStaffPatrolService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Integer delAndInsertBatch(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
-        int delete = statsStaffPatrolRecordDailyDao.deleteInternal(formDTO);
-        log.debug("delAndInsertBatch delete:{},param:{}", delete, JSON.toJSONString(formDTO));
-        return statsStaffPatrolRecordDailyDao.insertBatch(insertList);
+    public Integer insertBatchOrUpdate(StaffPatrolStatsFormDTO formDTO, List<StatsStaffPatrolRecordDailyDTO> insertList) {
+        return statsStaffPatrolRecordDailyDao.insertBatchOrUpdate(insertList);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/StatsStaffPatrolRecordDailyDao.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.epmet.dao.user.StatsStaffPatrolRecordDailyDao">
-    <insert id="insertBatch">
+    <insert id="insertBatchOrUpdate">
          insert into stats_staff_patrol_record_daily
         (
             ID,
@@ -63,6 +63,11 @@
         ON DUPLICATE KEY UPDATE
             PATROL_TOTAL = values(PATROL_TOTAL),
             TOTAL_TIME = values(TOTAL_TIME),
+            LATEST_PATROL_STATUS = values(LATEST_PATROL_STATUS),
+            LATEST_PATROL_TIME = values(LATEST_PATROL_TIME),
+            REPORT_PROJECT_COUNT = values(REPORT_PROJECT_COUNT),
+            ROUTINE_WORK_COUNT = values(ROUTINE_WORK_COUNT),
+            UPDATED_TIME = now(),
             UPDATED_BY = VALUES(UPDATED_BY)
     </insert>
     <delete id="deleteInternal">

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java

@@ -317,7 +317,10 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		List<TickStaffFormDTO> staffList = formDTO.getStaffList();
 		//1.文字内容安全校验
 		List<String> list = new ArrayList<>();
-		list.add(formDTO.getTitle());list.add(formDTO.getBackGround());list.add(formDTO.getPublicReply());list.add(formDTO.getInternalRemark());
+		list.add(formDTO.getTitle());
+		list.add(formDTO.getBackGround());
+		list.add(formDTO.getPublicReply());
+		list.add(formDTO.getInternalRemark());
 		safetyCheck(list);
 
 		//2.数据准备，查询需要用到的数据

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

@@ -1209,7 +1209,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         String userCateRedisKey = RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", icResiId);
         Map < String, Object > addUserMap = redisUtils.hGetAll(userCateRedisKey);
-        if (addUserMap != null) {
+        if (addUserMap != null && addUserMap.size() > 0) {
             //说明是新增居民
             ResiImportCategoryData newResiCateData = ConvertUtils.mapToEntity(addUserMap, ResiImportCategoryData.class);
             newResiCateData.getCategories().put(columnName, "1");

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

@@ -159,13 +159,13 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         } finally {
             if (entity != null){
                 sendPatrolMsg(entity.getCustomerId(),entity.getId(),SystemMessageType.PATROL_ROUTINE_WORK_ADD);
+                //网格员添加例行工作，如果是榆山街道的工作人员，需要调用【更新用户积分(双实信息更新 网格巡查)】/api/points/behavior/updateUserPoints
+                UpdateUserPointsFormDTO updateUserPointsFormDTO=new UpdateUserPointsFormDTO();
+                updateUserPointsFormDTO.setCustomerId(entity.getCustomerId());
+                updateUserPointsFormDTO.setStaffId(entity.getUserId());
+                updateUserPointsFormDTO.setBehaviorType(BehaviorTypeYuShanEnum.GRID_WORK_UPLOAD.getCode());
+                yuShanSysApiService.updateUserPoints(entity.getCustomerId(), Arrays.asList(updateUserPointsFormDTO));
             }
-            //网格员添加例行工作，如果是榆山街道的工作人员，需要调用【更新用户积分(双实信息更新 网格巡查)】/api/points/behavior/updateUserPoints
-            UpdateUserPointsFormDTO updateUserPointsFormDTO=new UpdateUserPointsFormDTO();
-            updateUserPointsFormDTO.setCustomerId(entity.getCustomerId());
-            updateUserPointsFormDTO.setStaffId(entity.getUserId());
-            updateUserPointsFormDTO.setBehaviorType(BehaviorTypeYuShanEnum.GRID_WORK_UPLOAD.getCode());
-            yuShanSysApiService.updateUserPoints(entity.getCustomerId(), Arrays.asList(updateUserPointsFormDTO));
         }
 
     }