Merge remote-tracking branch 'remotes/origin/dev'

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/service/evaluationindex/extract/biz/impl/BizDataStatsServiceImpl.java

@@ -130,7 +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.info("reloadStaffPatrolStatsData 所有网格员数据{}",JSON.toJSONString(yesterdayStatsMap));
+        log.debug("reloadStaffPatrolStatsData 所有网格员数据{}",JSON.toJSONString(yesterdayStatsMap));
         //获取昨日的巡查记录
         List<StaffPatrolRecordResult> yesterdayPatrolList = userService.selectStaffPatrolListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
 
@@ -139,7 +139,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
 
         //获取昨日的例行工作数据
         List<PatrolRoutineWorkResult> yesterdayWorkList = userService.selectRoutineWorkListByDateId(formDTO.getCustomerId(), formDTO.getDateId());
-        log.info("reloadStaffPatrolStatsData 例行工作数据数据{}",JSON.toJSONString(yesterdayWorkList));
+        log.debug("reloadStaffPatrolStatsData 例行工作数据数据{}",JSON.toJSONString(yesterdayWorkList));
         //遍历网格员 设置其 巡查次数 巡查时常 上报项目数
         yesterdayPatrolList.forEach(patrolRecord -> {
             String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId());
@@ -189,13 +189,9 @@ public class BizDataStatsServiceImpl implements BizDataStatsService {
                 return;
             }
             patrolRecordDailyDTO.setRoutineWorkCount(patrolRecordDailyDTO.getRoutineWorkCount() + NumConstant.ONE);
-            if ("a47337f6b67dd3ce5d45e32603029ad0".equals(work.getUserId())){
-                log.info("reloadStaffPatrolStatsData 问题用户 例行工作数据{},累加次数:{}",JSON.toJSONString(work),patrolRecordDailyDTO.getRoutineWorkCount());
-            }
-
         });
 
-        Integer effectRow = statsStaffPatrolService.delAndInsertBatch(formDTO, insertList);
+        Integer effectRow = statsStaffPatrolService.insertBatchOrUpdate(formDTO, insertList);
         log.info("initStaffPatrolStats insert rows:{}", JSON.toJSONString(insertList));
     }
 
@@ -223,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,