From 2e2834f19552ec51325933122e3bbe93185e4f0f Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Thu, 21 Nov 2019 20:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=B1=85=E6=B0=91=E5=B7=B2=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=88=97=E8=A1=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BD=91=E6=A0=BC=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserGridRelationController.java           | 19 +++++++++++--
 .../epdc/service/UserGridRelationService.java | 11 +++++++-
 .../impl/UserGridRelationServiceImpl.java     | 28 +++++++++++++++++--
 3 files changed, 52 insertions(+), 6 deletions(-)

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<List<UserGridRelationDTO>>().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<UserGridRelationEnt
      * @date 2019/10/30 17:55
      */
     int delete(String userId, Long gridId);
-}
\ No newline at end of file
+
+    /**
+     * @param id 主键
+     * @return void
+     * @Author yinzuomei
+     * @Description 解绑
+     * @Date 2019/11/21 18:06
+     **/
+    void unbindGridHandle(String id);
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
index bd62422cf..5c9b5deae 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java
@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -33,6 +35,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
 import com.elink.esua.epdc.service.UserGridRelationService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,7 +52,8 @@ import java.util.Map;
  */
 @Service
 public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelationDao, UserGridRelationEntity> implements UserGridRelationService {
-
+    @Autowired
+    private RedisUtils redisUtils;
     @Override
     public PageData<UserGridRelationDTO> page(Map<String, Object> params) {
         IPage<UserGridRelationEntity> page = baseDao.selectPage(
@@ -161,4 +165,24 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
                 .eq(FieldConstant.GRID_ID, gridId);
         return this.baseDao.delete(wrapper);
     }
-}
\ No newline at end of file
+
+    /**
+     * @param id 主键
+     * @return void
+     * @Author yinzuomei
+     * @Description 解绑
+     * @Date 2019/11/21 18:06
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void unbindGridHandle(String id) {
+        UserGridRelationEntity userGridRelationEntity = this.baseDao.selectById(id);
+        this.baseDao.deleteById(id);
+        String key = RedisKeys.getCpUserKey(userGridRelationEntity.getUserId());
+        Map<String, Object> map = redisUtils.hGetAll(key);
+        Long currentGridId = userGridRelationEntity.getGridId();
+        if (map.containsKey("gridId") && currentGridId.equals(map.get("gridId"))) {
+            redisUtils.delete(RedisKeys.getCpUserKey(userGridRelationEntity.getUserId()));
+        }
+    }
+}