新增修改数据方法

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java

@@ -31,5 +31,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GridLatestDao extends BaseDao<GridLatestEntity> {
 
-    GridLatestEntity getGridLatestByIds(GridLatestDTO formDTO);
+    GridLatestDTO selectGridLatestByGridAndUserId(GridLatestDTO formDTO);
+    int updateByLatestId(GridLatestDTO dto);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridVisitedDao.java

@@ -34,4 +34,5 @@ import org.apache.ibatis.annotations.Mapper;
 public interface GridVisitedDao extends BaseDao<GridVisitedEntity> {
 
     GridVisitedDTO selectGridVisitedByGridIdAndUserId(GridVisitedDTO formDTO);
+    int updateByVisitedId(GridVisitedDTO dto);
 }

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

@@ -51,6 +51,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
 
     @Autowired
     private GridLatestRedis gridLatestRedis;
+    @Autowired
+    private GridLatestDao gridLatestDao;
 
     @Override
     public PageData<GridLatestDTO> page(Map<String, Object> params) {
@@ -117,17 +119,15 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         gridLatestDTO.setLatestTime(date);
         gridLatestDTO.setUpdatedTime(date);
         //查询是否存在历史数据（一个用户对一个网格的访问只记录一条数据）
-        GridLatestEntity gridLatestEntity = baseDao.getGridLatestByIds(gridLatestDTO);
+        GridLatestDTO dto = baseDao.selectGridLatestByGridAndUserId(gridLatestDTO);
         GridLatestEntity entity = null;
-        if (null == gridLatestEntity || null == gridLatestEntity.getId()) {
+        if (null == dto || null == dto.getId()) {
             entity = ConvertUtils.sourceToTarget(gridLatestDTO, GridLatestEntity.class);
             return insert(entity);
         } else {
-            entity = ConvertUtils.sourceToTarget(gridLatestEntity, GridLatestEntity.class);
-            entity.setLatestTime(date);
-            entity.setUpdatedBy(visitedFormDTO.getUserId());
-            entity.setUpdatedTime(date);
-            return updateById(entity);
+            dto.setUpdatedBy(visitedFormDTO.getUserId());
+            dto.setUpdatedTime(date);
+            return BaseServiceImpl.retBool(gridLatestDao.updateByLatestId(dto));
         }
 
     }

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

@@ -60,6 +60,8 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
     private GovOrgFeignClient govOrgFeignClient;
     @Autowired
     private GridLatestService gridLatestService;
+    @Autowired
+    private GridVisitedDao gridVisitedDao;
 
     @Override
     public PageData<GridVisitedDTO> page(Map<String, Object> params) {
@@ -169,10 +171,9 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
             entity = ConvertUtils.sourceToTarget(gridVisitedDTO, GridVisitedEntity.class);
             return insert(entity);
         } else {
-            entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class);
-            entity.setUpdatedBy(visitedFormDTO.getUserId());
-            entity.setUpdatedTime(date);
-            return updateById(entity);
+            dto.setUpdatedBy(visitedFormDTO.getUserId());
+            dto.setUpdatedTime(date);
+            return BaseServiceImpl.retBool(gridVisitedDao.updateByVisitedId(dto));
         }
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -19,8 +19,8 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="getGridLatestByIds" parameterType="com.epmet.dto.GridLatestDTO"
-            resultType="com.epmet.entity.GridLatestEntity">
+    <select id="selectGridLatestByGridAndUserId" parameterType="com.epmet.dto.GridLatestDTO"
+            resultType="com.epmet.dto.GridLatestDTO">
         SELECT
             la.id,
             la.customer_id,
@@ -49,4 +49,12 @@
         </if>
     </select>
 
+    <update id="updateByLatestId">
+        UPDATE grid_latest
+        SET latest_time = #{latestTime},
+            updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id}
+    </update>
+
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/GridVisitedDao.xml

@@ -50,4 +50,11 @@
         </if>
     </select>
 
+    <update id="updateByVisitedId">
+        UPDATE grid_visited
+        SET updated_by = #{updatedBy},
+            updated_time = #{updatedTime}
+        WHERE id = #{id}
+    </update>
+
 </mapper>