From e0559aa7b1bd3f3583b37ccf1029ebec5f7c0a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Fri, 18 Jun 2021 10:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B5=84=E6=BA=90=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E8=A1=A8=20=E7=BB=88=E6=9E=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserResourceController.java    |  6 +++--
 .../dispatch/mapper/UserResourceMapper.java   |  5 +++-
 .../dispatch/service/UserResourceService.java |  6 ++---
 .../service/impl/UserResourceServiceImpl.java | 27 ++++++++-----------
 .../resources/mapper/UserResourceMapper.xml   | 14 ++++++++++
 .../meapi/controller/NwaUserController.java   | 10 +++++++
 .../meapi/controller/ResrceController.java    | 10 +++++++
 .../mesnac/meapi/mapper/NwaUserMapper.java    |  6 ++++-
 .../mesnac/meapi/mapper/ResrceMapper.java     |  2 ++
 .../mesnac/meapi/service/NwaUserService.java  |  2 ++
 .../mesnac/meapi/service/ResrceService.java   |  2 ++
 .../service/impl/NwaUserServiceImpl.java      |  6 +++++
 .../meapi/service/impl/ResrceServiceImpl.java |  6 +++++
 .../main/resources/mapper/NwaUserMapper.xml   |  8 ++++++
 .../main/resources/mapper/ResrceMapper.xml    |  8 ++++++
 15 files changed, 95 insertions(+), 23 deletions(-)

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 262b02d8..596ec4a2 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
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.dispatch.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.dispatch.service.UserResourceService;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -129,8 +130,9 @@ public class UserResourceController {
     }
 
     @PostMapping("saveAll")
-    public R saveAll(@RequestBody HashMap<String,Object> map){
-        userResourceService.saveAll(map);
+    public R saveAll(@RequestBody List<UserResourceDto> userResourceList){
+        HashMap<String,Object> hashMap = new HashMap<String,Object>();
+        userResourceService.saveAll(userResourceList);
         return R.ok();
     }
 }
\ No newline at end of file
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 a52e01f6..c98b10b8 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
@@ -1,7 +1,8 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
-import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
+import com.foreverwin.mesnac.dispatch.model.UserResource;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -20,4 +21,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("user") String user);
+
 }
\ 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 b25be4ba..b69fa437 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
@@ -1,9 +1,9 @@
 package com.foreverwin.mesnac.dispatch.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@ public interface UserResourceService extends IService<UserResource> {
 
     List<UserResource> findEnableList(String site, String resource, String user);
 
-    List<UserResource> findAll(String resource,String user);
+    List<UserResourceDto> findAll(String resource, String user);
 
-    void saveAll(HashMap<String,Object> map);
+    void saveAll(List<UserResourceDto> userResourceDtoList);
 }
\ 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 14680a30..b1f1e0ef 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
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.dispatch.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.dispatch.service.UserResourceService;
@@ -12,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -39,34 +39,29 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
     }
 
     @Override
-    public List<UserResource> findAll(String resource, String user) {
+    public List<UserResourceDto> findAll(String resource, String user) {
         String site = CommonMethods.getSite();
-        return userResourceMapper.findEnableList(site,resource,user);
+        return userResourceMapper.findAll(site, resource, user);
     }
 
     @Override
-    public void saveAll(HashMap<String, Object> map) {
-        List<UserResource> userResourceList = new ArrayList<UserResource>();
-
-        List<HashMap<String,Object>> list = (List<HashMap<String,Object>>)map.get("userResourceList");
-//                (List<Object>)map.get("userResourceList");
-
+    public void saveAll(List<UserResourceDto> userResourceDtoList) {
+        List<UserResource> userResourceList = new ArrayList<>();
         String site = CommonMethods.getSite();
-        for (int i=0; i < list.size(); i++) {
+        for (UserResourceDto userResourceDto: userResourceDtoList) {
             UserResource userResource = new UserResource();
             userResource.setSite(site);
-            userResource.setResourceBo(HandleEnum.RESOURCE.getHandle(site, list.get(i).get("resrce").toString()));
-            userResource.setResrce(list.get(i).get("resrce").toString());
-            userResource.setUserId(list.get(i).get("userId").toString());
-            userResource.setTemporaryUser(list.get(i).get("temporaryUser").toString());
-            userResource.setStatus(list.get(i).get("status").toString());
+            userResource.setResourceBo(HandleEnum.RESOURCE.getHandle(site, userResourceDto.getResrce()));
+            userResource.setResrce(userResourceDto.getResrce());
+            userResource.setUserId(userResourceDto.getUserId());
+            userResource.setTemporaryUser(userResourceDto.getTemporaryUser());
+            userResource.setStatus(userResourceDto.getStatus());
             userResource.setCreateUser(CommonMethods.getUser());
             userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+
                     userResource.getResrce()+","+userResource.getUserId());
             if(userResourceMapper.selectById(userResource.getHandle()) == null){
                 userResource.setCreatedDateTime(LocalDateTime.now());
             }
-
             userResource.setModifyUser(CommonMethods.getUser());
             userResource.setModifiedDateTime(LocalDateTime.now());
 
diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index 63228337..71599f59 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -428,4 +428,18 @@
         </if>
     </select>
 
+    <resultMap id="UserResourceDto" type="com.foreverwin.mesnac.dispatch.dto.UserResourceDto" extends="BaseResultMap">
+        <result column="SEQ" property="seq"/>
+    </resultMap>
+    <select id="findAll" resultMap="UserResourceDto">
+        SELECT ROW_NUMBER() OVER(ORDER BY RESRCE ASC) SEQ,<include refid="Base_Column_List"></include>
+        FROM Z_USER_RESOURCE
+        WHERE SITE = #{site}
+        <if test="resource != null and resource != ''">
+            AND RESRCE = #{resource}
+        </if>
+        <if test="user != null and user != ''">
+            AND USER_ID = #{user}
+        </if>
+    </select>
 </mapper>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
index 4e7286ea..71f99434 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
@@ -143,4 +143,14 @@ public class NwaUserController {
     public R findUserById(String user){
         return R.ok(nwaUserService.findUserByUserName(user));
     }
+
+    /**
+     * 不分页查询
+     * @param user
+     * @return
+     */
+    @GetMapping("findAllUser")
+    public R findAllUser(String user){
+        return R.ok(nwaUserService.findAllUser(user));
+    }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
index 08afa467..aa566ebf 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
@@ -138,4 +138,14 @@ public class ResrceController {
     public R findByResrce(String resrce){
         return R.ok(resrceService.findByResrce(resrce));
     }
+
+    /**
+     * 不分页查询
+     * @param resrce
+     * @return
+     */
+    @GetMapping("findAllResrce")
+    public R findAllResrce(String resrce){
+        return R.ok(resrceService.findAllResrce(resrce));
+    }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
index 9ae771bd..b7ed83d8 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
@@ -1,10 +1,12 @@
 package com.foreverwin.mesnac.meapi.mapper;
 
-import com.foreverwin.mesnac.meapi.model.NwaUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.meapi.model.NwaUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +18,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface NwaUserMapper extends BaseMapper<NwaUser> {
     NwaUser findUserByUserName(@Param("site")String site, @Param("user")String user);
+
+    List<NwaUser> findAllUser(@Param("site")String site, @Param("user")String user);;
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
index e6b9b8a8..4faccb95 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
@@ -30,4 +30,6 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
     List<Map<String, Object>> selectResourceTypeResourceList(@Param("site") String site);
 
     Resrce findByResrce(@Param("site")String site,@Param("resrce")String resrce);
+
+    List<Resrce> findAllResrce(@Param("site")String site,@Param("resrce")String resrce);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
index 86722cba..d3833a08 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
@@ -27,4 +27,6 @@ public interface NwaUserService extends IService<NwaUser> {
     List<NwaUser> selectList(NwaUser nwaUser);
 
     NwaUser findUserByUserName(String id);
+
+    List<NwaUser> findAllUser(String user);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
index 8e12d7e5..8757672b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
@@ -45,4 +45,6 @@ public interface ResrceService extends IService<Resrce> {
     List<Map<String, Object>> getResourceTypeResourceList(String site);
 
     Resrce findByResrce(String resrce);
+
+    List<Resrce> findAllResrce(String resrce);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
index 8698b6a7..74e26379 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
@@ -49,5 +49,11 @@ public class NwaUserServiceImpl extends ServiceImpl<NwaUserMapper, NwaUser> impl
         return nwaUserMapper.findUserByUserName(site, user);
     }
 
+    @Override
+    public List<NwaUser> findAllUser(String user) {
+        String site = CommonMethods.getSite();
+        return nwaUserMapper.findAllUser(site,user);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
index 0d8f23b1..3836a5e2 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
@@ -62,5 +62,11 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> impleme
         return byResrce;
     }
 
+    @Override
+    public List<Resrce> findAllResrce(String resrce) {
+        String site = CommonMethods.getSite();
+        return resrceMapper.findAllResrce(site,resrce);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/NwaUserMapper.xml b/meapi/src/main/resources/mapper/NwaUserMapper.xml
index 9ebe8892..0d4d1e05 100644
--- a/meapi/src/main/resources/mapper/NwaUserMapper.xml
+++ b/meapi/src/main/resources/mapper/NwaUserMapper.xml
@@ -320,6 +320,14 @@
             AND USER_NAME = #{user}
         </if>
     </select>
+    <select id="findAllUser" resultMap="BaseResultMap">
+        SELECT USER_NAME,FULL_NAME
+        FROM Z_NWA_USER
+        WHERE SITE = #{site}
+        <if test="user != null and user != ''">
+            AND USER_NAME like '%${user}%'
+        </if>
+    </select>
 
     <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.NwaUser">
         INSERT INTO Z_NWA_USER
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index b6383fa2..63e74785 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -564,4 +564,12 @@
             AND RESRCE = #{resrce}
         </if>
     </select>
+    <select id="findAllResrce" resultMap="BaseResultMap">
+        SELECT  RESRCE,DESCRIPTION
+        FROM RESRCE
+        WHERE SITE = #{site}
+        <if test="resrce != null and resrce != ''">
+            AND RESRCE like '%${resrce}%'
+        </if>
+    </select>
 </mapper>