From 1443a18705c876708d22a005dfe7f2e72f124f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 27 Jul 2021 10:00:02 +0800
Subject: [PATCH] =?UTF-8?q?UserResource=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java        |  1 -
 .../dispatch/controller/UserResourceController.java  | 11 +++++++++--
 .../mesnac/dispatch/mapper/UserResourceMapper.java   |  2 ++
 .../mesnac/dispatch/service/UserResourceService.java |  2 +-
 .../service/impl/UserResourceServiceImpl.java        |  4 ++--
 .../src/main/resources/mapper/UserResourceMapper.xml | 12 +++++++++++-
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index c6ac68db..68a6bbd7 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -880,7 +880,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(Constants.NEW.equals(abnormalBill.getStatus()) || Constants.CORRECTION_CONFIRM.equals(abnormalBill.getStatus())){
             abnormalMessage.setUpUserGroup(abnormalMessage.getSendUserGroup()+"_UP");
             //得到升级的时间和等级
-
             UserGroup customFieldByGroup = userGroupMapper.getCustomFieldByGroup(site, abnormalMessage.getSendUserGroup());
             if(customFieldByGroup != null && !StringUtil.isBlank(customFieldByGroup.getMessageNoticeTime())){
                 abnormalMessage.setUpDateTime(abnormalMessage.getResponseDateTime().plusMinutes(Integer.parseInt(customFieldByGroup.getMessageNoticeTime())));
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
index 0509fa59..a92e48d2 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
@@ -1,5 +1,7 @@
 package com.foreverwin.mesnac.dispatch.controller;
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
@@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -137,8 +140,12 @@ public class UserResourceController {
     }
 
     @PostMapping("saveAll")
-    public R saveAll(@RequestBody List<UserResourceDto> userResourceList){
-        userResourceService.saveAll(userResourceList);
+    public R saveAll(@RequestBody Map<String,Object> param){
+        String resource = (String) param.get("resource");
+        String user = (String) param.get("user");
+        String str = JSONUtil.toJsonStr(param.get("userResourceList"));
+        List<UserResourceDto> userResourceList = JSONArray.parseArray(str, UserResourceDto.class);
+        userResourceService.saveAll(userResourceList,resource,user);
         return R.ok();
     }
 
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
index c87ff219..ab1dd271 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
@@ -25,4 +25,6 @@ public interface UserResourceMapper extends BaseMapper<UserResource> {
     List<UserResource> findEnableList(@Param("site") String site, @Param("resource") String resource, @Param("user") String user);
 
     List<UserResourceDto> findAll(@Param("site") String site, @Param("resource") String resource, @Param("userId") String userId);
+
+    void deleteByUserAndResource(@Param("user")String user,@Param("resource")String resource);
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
index 6bf9ed8a..dc14e96d 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
@@ -34,7 +34,7 @@ public interface UserResourceService extends IService<UserResource> {
 
     List<UserResourceDto> findAll(UserResourceDto userResourceDto);
 
-    void saveAll(List<UserResourceDto> userResourceDtoList);
+    void saveAll(List<UserResourceDto> userResourceDtoList,String resource,String user);
 
 
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
index 8c3ead93..f75e1261 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
@@ -77,7 +77,7 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
     }
 
     @Override
-    public void saveAll(List<UserResourceDto> userResourceDtoList) {
+    public void saveAll(List<UserResourceDto> userResourceDtoList,String resource,String user) {
         List<UserResource> userResourceList = new ArrayList<>();
         String site = CommonMethods.getSite();
         for (int i = 0; i < userResourceDtoList.size(); i++) {
@@ -113,7 +113,7 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
 
             userResourceList.add(userResource);
         }
-
+        userResourceMapper.deleteByUserAndResource(user,resource);
         this.saveOrUpdateBatch(userResourceList);
     }
 
diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index 94433b0c..f15ae3d2 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -485,6 +485,16 @@
             OR ZUR.USER_DESCRIPTION LIKE '%${userId}%')
         </if>
     </select>
-
+    <select id="deleteByUserAndResource">
+        DELETE FROM Z_USER_RESOURCE
+        <where>
+            <if test="user != null and user != ''">
+                USER_ID = #{user}
+            </if>
+             <if test="resource != null and resource != ''">
+                AND RESRCE = #{resource}
+             </if>
+        </where>
+    </select>
 
 </mapper>