Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master

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

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -138,7 +137,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             entity.setLng(item.getLng());
             entity.setLat(item.getLat());
             entity.setIsDel("N");
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(null);
 
             //业务不包含 一级分类里 如果是03 矛盾纠纷 则涉及人数写2（目前业务不支持 所以应产品需求 填2）
             if ("03".equals(item.getParentEventCategory())) {

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

@@ -34,7 +34,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 
@@ -190,7 +189,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             entity.setGridName(ag.getGridName());
             entity.setGridLevel("07");
             entity.setIsDel("N");
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(null);
             if (ag.getLatitude().length() > 10) {
                 entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10)));
             } else {
@@ -259,7 +258,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
         if (StringUtils.isNotBlank(formDTO.getOldCode()) && !formDTO.getOldCode().equals(entity.getGridCode())){
             GridInfoPingyinEntity gridInfoEntity = new GridInfoPingyinEntity();
             gridInfoEntity.setGridCode(entity.getGridCode());
-            gridInfoEntity.setUpdateTime(new Date());
+            gridInfoEntity.setUpdateTime(null);
             LambdaUpdateWrapper<GridInfoPingyinEntity> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(GridInfoPingyinEntity::getGridCode,formDTO.getOldCode());
             int update = baseDao.update(gridInfoEntity, updateWrapper);
@@ -268,7 +267,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             GridstaffInfoPingyinEntity staffInfo = new GridstaffInfoPingyinEntity();
             staffInfo.setGridCode(entity.getGridCode());
-            staffInfo.setUpdateTime(new Date());
+            staffInfo.setUpdateTime(null);
 
             LambdaUpdateWrapper<GridstaffInfoPingyinEntity> staffInfoWrapper = new LambdaUpdateWrapper<>();
             staffInfoWrapper.eq(GridstaffInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@@ -277,7 +276,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             GridstaffWorkInfoPingyinEntity workInfo = new GridstaffWorkInfoPingyinEntity();
             workInfo.setGridCode(entity.getGridCode());
-            workInfo.setUpdateTime(new Date());
+            workInfo.setUpdateTime(null);
 
             LambdaUpdateWrapper<GridstaffWorkInfoPingyinEntity> workInfoWrapper = new LambdaUpdateWrapper<>();
             workInfoWrapper.eq(GridstaffWorkInfoPingyinEntity::getGridCode,formDTO.getOldCode());
@@ -286,7 +285,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
 
             EventreportPingyinEntity eventEntity = new EventreportPingyinEntity();
             eventEntity.setGridCode(entity.getGridCode());
-            eventEntity.setUpdateTime(new Date());
+            eventEntity.setUpdateTime(null);
 
             LambdaUpdateWrapper<EventreportPingyinEntity> eventWrapper = new LambdaUpdateWrapper<>();
             eventWrapper.eq(EventreportPingyinEntity::getGridCode,formDTO.getOldCode());

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

@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -141,7 +140,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId());
             log.info(String.format("网格工作人员信息同步，当前操作人员信息，姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId()));
             if (null != gs) {
-                entity.setUpdateTime(new Date());
+                entity.setUpdateTime(null);
                 baseDao.edit(entity);
             } else {
                 insert(entity);

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

@@ -138,7 +138,7 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<Gridsta
         entity.setWorkResult(NumConstant.ONE == record.getIsNormal() ? "Y" : "N");
         entity.setWorkType(record.getWorkTypeSecondCode());
         entity.setRecoredInsertTime(record.getCreatedTime());
-        entity.setUpdateTime(record.getUpdatedTime());
+        entity.setUpdateTime(null);
         entity.setId(null);
         entity.setIsDel("N");
         return entity;

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/EventreportPingyinDao.xml

@@ -40,7 +40,7 @@
         <result property="recoredInsertTime" column="recored_insert_time"/>
     </resultMap>
     <delete id="deleteAllData">
-        DELETE FROM eventreport_pingyin
+        update eventreport_pingyin SET is_del = 'Y'
     </delete>
 
 

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml

@@ -4,12 +4,12 @@
 <mapper namespace="com.epmet.opendata.dao.GridInfoPingyinDao">
 
     <delete id="deleteAllAgencyData">
-        delete from grid_info_pingyin where grid_level !='07'
+        update grid_info_pingyin set is_del = 'Y' where grid_level !='07'
     </delete>
 
 
     <delete id="deleteAllGridData">
-        delete from grid_info_pingyin where grid_level ='07'
+        update grid_info_pingyin set is_del = 'Y' where grid_level ='07'
     </delete>
 
     <select id="selectByGridCode" parameterType="java.lang.String" resultType="com.epmet.opendata.entity.GridInfoPingyinEntity">
@@ -22,13 +22,12 @@
        set grid_name = #{gridName},
            grid_level = #{gridLevel},
            lng = #{lng},
-           lat = #{lat},
-           update_time = now()
+           lat = #{lat}
         where grid_code = #{gridCode} and is_del = 'N'
     </update>
 
     <update id="deleteByCode">
-        update grid_info_pingyin set is_del = 'Y',update_time = now()
+        update grid_info_pingyin set is_del = 'Y'
         where grid_code = #{gridCode}
     </update>
 </mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffInfoPingyinDao.xml

@@ -16,7 +16,7 @@
     </update>
 
     <delete id="del">
-        delete from gridstaff_info_pingyin
+        UPDATE gridstaff_info_pingyin set IS_LEAVE = 'Y'
     </delete>
 
     <select id="selectByCodeAndStaffId" resultType="com.epmet.opendata.entity.GridstaffInfoPingyinEntity">

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridstaffWorkInfoPingyinDao.xml

@@ -19,7 +19,7 @@
         <result property="recoredInsertTime" column="recored_insert_time"/>
     </resultMap>
     <delete id="delAllGridStaffWorkInfoPY">
-        delete from gridstaff_work_info_pingyin LIMIT 1000
+        update gridstaff_work_info_pingyin SET is_del = 'Y' LIMIT 1000
     </delete>