删除网格访问记录-废弃网格时

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -157,11 +157,20 @@ public interface EpmetUserFeignClient {
 	Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList);
 
 	/**
-	 * desc:删除审核中的徽章认证记录
+	 * desc:删除审核中的徽章认证记录-弃用网格是调用
 	 * @param customerId
 	 * @param gridId
 	 * @return
 	 */
 	@PostMapping("/epmetuser/badge/deleteBadgeCertificateAuditing")
     Result<Integer> deleteBadgeCertificateAuditing(@RequestParam("customerId") String customerId, @RequestParam("gridId") String gridId);
+
+	/**
+	 * desc:删除弃用网格的访问记录-弃用网格是调用
+	 * @param customerId
+	 * @param gridId
+	 * @return
+	 */
+	@PostMapping("/epmetuser/gridlatest/deleteGridLatestData")
+    Result<Integer> deleteGridLatestData(@RequestParam("customerId") String customerId, @RequestParam("gridId") String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -96,4 +96,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result<Integer> deleteBadgeCertificateAuditing(String customerId, String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deleteBadgeCertificateAuditing", customerId, gridId);
     }
+
+    @Override
+    public Result<Integer> deleteGridLatestData(String customerId, String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deleteGridLatestData", customerId, gridId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -1046,7 +1046,11 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         if (badgeResult == null || !badgeResult.success()){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"删除未审核徽章失败,请稍后重试");
         }
-
+        //删除废弃网格的访问记录
+        Result<Integer> gridLatestResult = epmetUserFeignClient.deleteGridLatestData(customerId,gridId);
+        if (gridLatestResult == null || !gridLatestResult.success()){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"删除网格访问记录失败,请稍后重试");
+        }
         //处理成功，隐藏网格
         LambdaUpdateWrapper<CustomerGridEntity> updateGrid=new LambdaUpdateWrapper<>();
         updateGrid.set(CustomerGridEntity::getAbandonFlag,NumConstant.ONE);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -1,7 +1,9 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -218,11 +220,12 @@ public class BadgeController {
 	}
 
 	/**
-	 * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否
+	 * desc:删除审核中的徽章认证记录-弃用网格是调用
+	 * @param customerId
 	 * @param gridId
-	 * @author zxc
+	 * @return
-	 * @date 2022/3/16 9:42 上午
 	 */
+	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE)
 	@PostMapping("deleteBadgeCertificateAuditing")
 	public Result<Integer> deleteBadgeCertificateAuditing(@RequestParam("customerId") String customerId,@RequestParam("gridId")String gridId){
 		return new Result<Integer>().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId));

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -143,4 +143,15 @@ public class GridLatestController {
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }
 
+    /**
+     * desc:删除弃用网格的访问记录-弃用网格是调用
+     * @param customerId
+     * @param gridId
+     * @return
+     */
+    @PostMapping("deleteGridLatestData")
+    public Result<Integer> deleteGridLatestData(@RequestParam("customerId") String customerId,@RequestParam("gridId")String gridId){
+        return new Result<Integer>().ok(gridLatestService.deleteGridLatestData(customerId,gridId));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java

@@ -140,4 +140,12 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @Date 2020/8/3
      **/
     LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO);
+
+    /**
+     * desc:删除弃用网格的访问记录-弃用网格是调用
+     * @param customerId
+     * @param gridId
+     * @return
+     */
+    Integer deleteGridLatestData(String customerId, String gridId);
 }

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

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -36,7 +37,6 @@ import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
-import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.service.GridLatestService;
 import com.epmet.util.ModuleConstant;
@@ -210,4 +210,13 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         return baseDao.selectLatestGridInfo(formDTO);
     }
 
+    @Override
+    public Integer deleteGridLatestData(String customerId, String gridId) {
+        LambdaUpdateWrapper<GridLatestEntity> wrapper = new LambdaUpdateWrapper();
+        wrapper.eq(GridLatestEntity::getCustomerId,customerId)
+                .eq(GridLatestEntity::getGridId,gridId)
+                .set(GridLatestEntity::getUpdatedTime,System.currentTimeMillis());
+        return baseDao.delete(wrapper);
+    }
+
 }