diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java index 9b11331ae..a4ca83a59 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java @@ -36,13 +36,13 @@ import java.util.Map; /** * 网格长与网格关系表 * - * @author work@yujt.net.cn + * @author work@yujt.net.cn * @since v1.0.0 2019-10-23 */ @RestController @RequestMapping("usergrid") public class UserGridRelationController { - + @Autowired private UserGridRelationService userGridRelationService; @@ -89,4 +89,17 @@ public class UserGridRelationController { return new Result>().ok(data); } -} \ No newline at end of file + /** + * @param id epdc_user_grid_relation表主键 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 解绑 + * @Date 2019/11/21 19:00 + **/ + @GetMapping("unbindGridHandle/{id}") + public Result unbindGridHandle(@PathVariable("id") String id) { + userGridRelationService.unbindGridHandle(id); + return new Result(); + } + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java index 63dde19eb..9d91a4a63 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java @@ -146,4 +146,13 @@ public interface UserGridRelationService extends BaseService implements UserGridRelationService { - + @Autowired + private RedisUtils redisUtils; @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -161,4 +165,24 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl map = redisUtils.hGetAll(key); + Long currentGridId = userGridRelationEntity.getGridId(); + if (map.containsKey("gridId") && currentGridId.equals(map.get("gridId"))) { + redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId())); + } + } +}