1、优化

Former-commit-id: 00d521012d0fb374c69f810e31d0efa0f898b4d4

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java

@@ -1,18 +1,20 @@
 package ${basePackage}.module.system.mgr;
 
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.req.ResCreateRequest;
 import ${basePackage}.module.system.req.ResDeleteRequest;
 import ${basePackage}.module.system.req.ResFindRequest;
 import ${basePackage}.module.system.req.ResGetRequest;
+import ${basePackage}.module.system.req.ResLoadRequest;
 import ${basePackage}.module.system.req.ResTreeRequest;
 import ${basePackage}.module.system.req.ResUpdateRequest;
 import ${basePackage}.module.system.rsp.ResCreateResponse;
 import ${basePackage}.module.system.rsp.ResDeleteResponse;
 import ${basePackage}.module.system.rsp.ResFindResponse;
 import ${basePackage}.module.system.rsp.ResGetResponse;
+import ${basePackage}.module.system.rsp.ResLoadResponse;
 import ${basePackage}.module.system.rsp.ResTreeResponse;
 import ${basePackage}.module.system.rsp.ResUpdateResponse;
-import ${basePackage}.frame.auth.Token;
 
 /**
  * 资源
@@ -59,6 +61,15 @@ public interface ResManager {
      */
     ResFindResponse find(ResFindRequest request, Token token);
 
+    /**
+     * 加载
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    ResLoadResponse load(ResLoadRequest request, Token token);
+
     /**
      * 获得对象
      *

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java

@@ -1,11 +1,17 @@
 package ${basePackage}.module.system.mgr;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ${basePackage}.frame.auth.Token;
+import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.base.SortType;
 import ${basePackage}.frame.utils.IDgenerator;
-import ${basePackage}.frame.utils.Message;
-import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.auth.Token;
 import ${basePackage}.frame.utils.MapperUtil;
+import ${basePackage}.frame.utils.Message;
 import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.module.system.ent.Res;
 import ${basePackage}.module.system.ent.ResTree;
@@ -14,20 +20,16 @@ import ${basePackage}.module.system.req.ResCreateRequest;
 import ${basePackage}.module.system.req.ResDeleteRequest;
 import ${basePackage}.module.system.req.ResFindRequest;
 import ${basePackage}.module.system.req.ResGetRequest;
+import ${basePackage}.module.system.req.ResLoadRequest;
 import ${basePackage}.module.system.req.ResTreeRequest;
 import ${basePackage}.module.system.req.ResUpdateRequest;
 import ${basePackage}.module.system.rsp.ResCreateResponse;
 import ${basePackage}.module.system.rsp.ResDeleteResponse;
 import ${basePackage}.module.system.rsp.ResFindResponse;
 import ${basePackage}.module.system.rsp.ResGetResponse;
+import ${basePackage}.module.system.rsp.ResLoadResponse;
 import ${basePackage}.module.system.rsp.ResTreeResponse;
 import ${basePackage}.module.system.rsp.ResUpdateResponse;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.github.pagehelper.util.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -169,6 +171,29 @@ public class ResManagerImpl implements ResManager {
         return response;
     }
 
+    @Override
+    public ResLoadResponse load(ResLoadRequest request, Token token) {
+        ResLoadResponse response = new ResLoadResponse();
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        if (request.getPageSize() != 0) {
+            PageHelper.startPage(request.getPageNumber(), request.getPageSize());
+        }
+        if (StringUtil.isNotEmpty(request.getSortKey())) {
+            PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
+        }
+        PageInfo<Res> pageInfo = new PageInfo<>(resMapper.load(request, token));
+
+        response.setResult(pageInfo.getList());
+        response.setTotalCount(pageInfo.getTotal());
+
+        return response;
+    }
+
     /**
      * 获得对象
      *

src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java

@@ -10,8 +10,8 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${basePackage}.config.CacheConfig;
-import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.auth.Token;
+import ${basePackage}.frame.base.ErrorType;
 import ${basePackage}.frame.base.SortType;
 import ${basePackage}.frame.utils.IDgenerator;
 import ${basePackage}.frame.utils.MapperUtil;
@@ -20,6 +20,7 @@ import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.module.system.ent.Tokens;
 import ${basePackage}.module.system.mpr.TokensMapper;
 import ${basePackage}.module.system.req.ResFindRequest;
+import ${basePackage}.module.system.req.ResLoadRequest;
 import ${basePackage}.module.system.req.TokensBuildRequest;
 import ${basePackage}.module.system.req.TokensCreateRequest;
 import ${basePackage}.module.system.req.TokensDeleteRequest;
@@ -28,6 +29,7 @@ import ${basePackage}.module.system.req.TokensGetRequest;
 import ${basePackage}.module.system.req.TokensLogoutRequest;
 import ${basePackage}.module.system.req.TokensUpdateRequest;
 import ${basePackage}.module.system.rsp.ResFindResponse;
+import ${basePackage}.module.system.rsp.ResLoadResponse;
 import ${basePackage}.module.system.rsp.TokensBuildResponse;
 import ${basePackage}.module.system.rsp.TokensCreateResponse;
 import ${basePackage}.module.system.rsp.TokensDeleteResponse;
@@ -277,10 +279,10 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token
                 newToken.setUserName(tokens.getUserName());
 
                 // 获取用户的资源
-                ResFindRequest resFindRequest = new ResFindRequest();
-                resFindRequest.setPageSize(0);
-                resFindRequest.setUserId(tokens.getUserId());
-                ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
+                ResLoadRequest resLoadRequest = new ResLoadRequest();
+                resLoadRequest.setPageSize(0);
+                resLoadRequest.setUserId(tokens.getUserId());
+                ResLoadResponse resFindResponse = resManager.load(resLoadRequest, token);
                 if (resFindResponse.hasError()) {
                     response.addErrors(resFindResponse.getErrors());
                     return response;

src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml

@@ -82,6 +82,66 @@
         </if>
     </select>
 
+    <select id="find" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        `IS_DELETED` = 0
+        <if test="request.resCode != null and request.resCode != ''">
+            AND `RES_CODE` = ${r'#'}{request.resCode}
+        </if>
+        <if test="request.resName != null and request.resName != ''">
+            AND `RES_NAME` = ${r'#'}{request.resName}
+        </if>
+        <if test="request.resType != null and request.resType != ''">
+            AND `RES_TYPE` = ${r'#'}{request.resType}
+        </if>
+        <if test="request.resValue != null and request.resValue != ''">
+            AND `RES_VALUE` = ${r'#'}{request.resValue}
+        </if>
+        <if test="request.supCode != null and request.supCode != ''">
+            AND `SUP_CODE` = ${r'#'}{request.supCode}
+        </if>
+        <if test="request.supName != null and request.supName != ''">
+            AND `SUP_NAME` = ${r'#'}{request.supName}
+        </if>
+        <if test="request.free != null">
+            AND `FREE` = ${r'#'}{request.free}
+        </if>
+        <if test="request.valid != null">
+            AND `VALID` = ${r'#'}{request.valid}
+        </if>
+    </select>
+
+    <select id="load" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        `IS_DELETED` = 0
+        <if test="request.userId != null">
+            AND `ID` IN (
+            SELECT
+            t2.RES_ID
+            FROM
+            `sys_user_role` t1,
+            `sys_role_res` t2
+            WHERE t1.ROLE_ID = t2.ROLE_ID
+            AND t1.IS_DELETED = '0'
+            AND t2.IS_DELETED = '0'
+            AND t1.USER_ID = ${r'#'}{request.userId}
+            )
+        </if>
+        <if test="request.roleId != null">
+            AND `ID` IN (
+            SELECT RES_ID FROM `sys_role_res` WHERE ROLE_ID = ${r'#'}{request.roleId}
+            )
+        </if>
+    </select>
+
     <select id="search" resultMap="res">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java

@@ -1,17 +1,16 @@
 package ${basePackage}.module.system.mpr;
 
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
+import org.apache.ibatis.annotations.Param;
+import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.system.ent.Res;
-import ${basePackage}.module.system.req.ResCreateRequest;
 import ${basePackage}.module.system.req.ResDeleteRequest;
 import ${basePackage}.module.system.req.ResFindRequest;
 import ${basePackage}.module.system.req.ResGetRequest;
+import ${basePackage}.module.system.req.ResLoadRequest;
 import ${basePackage}.module.system.req.ResUpdateRequest;
-import ${basePackage}.frame.auth.Token;
+
+import java.util.List;
 
 /**
  * RES - 资源
@@ -32,12 +31,12 @@ public interface ResMapper {
     long insert(@Param("request") Res request, @Param("token") Token token);
 
     /**
-    * 批量插入
-    *
-    * @param request 请求对象
-    * @param token   令牌
-    * @return 返回数量
-    */
+     * 批量插入
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回数量
+     */
     long insertBatch(@Param("list") List<Res> request, @Param("token") Token token);
 
     /**
@@ -67,6 +66,15 @@ public interface ResMapper {
      */
     List<Res> find(@Param("request") ResFindRequest request, @Param("token") Token token);
 
+    /**
+     * 加载
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Res> load(@Param("request") ResLoadRequest request, @Param("token") Token token);
+
     /**
      * 获得对象
      *

src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml

@@ -72,13 +72,40 @@
             AND t1.USER_ID = ${r'#'}{request.userId}
             )
         </if>
-        <if test="request.roleCode != null">
+        <if test="request.roleId != null">
             AND "ID" IN (
             SELECT RES_ID FROM "SYS_ROLE_RES" WHERE ROLE_CODE = ${r'#'}{request.roleCode}
             )
         </if>
     </select>
 
+    <select id="load" resultMap="res">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        "IS_DELETED" = 0
+        <if test="request.userId != null">
+            AND "ID" IN (
+            SELECT
+            t2.RES_ID
+            FROM
+            "SYS_USER_ROLE" t1,
+            "SYS_ROLE_RES" t2
+            WHERE t1.ROLE_ID = t2.ROLE_ID
+            AND t1.IS_DELETED = '0'
+            AND t2.IS_DELETED = '0'
+            AND t1.USER_ID = ${r'#'}{request.userId}
+            )
+        </if>
+        <if test="request.roleId != null">
+            AND "ID" IN (
+            SELECT RES_ID FROM "SYS_ROLE_RES" WHERE ROLE_ID = ${r'#'}{request.roleId}
+            )
+        </if>
+    </select>
+
     <select id="search" resultMap="res">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/system/req/ResFindRequest.java

@@ -53,16 +53,6 @@ public class ResFindRequest extends BaseFindRequest {
      */
     private Boolean valid;
 
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
-    /**
-     * 角色代码
-     */
-    private Long roleCode;
-
     public String getResCode() {
         return this.resCode;
     }
@@ -126,20 +116,4 @@ public class ResFindRequest extends BaseFindRequest {
     public void setValid(Boolean valid) {
         this.valid = valid;
     }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getRoleCode() {
-        return roleCode;
-    }
-
-    public void setRoleCode(Long roleCode) {
-        this.roleCode = roleCode;
-    }
-}
+}

src/main/resources/modules/SpringBoot/java/module/system/req/ResLoadRequest.java

@@ -0,0 +1,39 @@
+package ${basePackage}.module.system.req;
+
+import ${basePackage}.frame.base.BaseFindRequest;
+
+/**
+ * ResLoadRequest -  资源加载，可根据用户或角色加载资源
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class ResLoadRequest extends BaseFindRequest {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色代码
+     */
+    private Long roleId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/system/rsp/ResLoadResponse.java

@@ -0,0 +1,14 @@
+package xyz.wbsite.module.system.rsp;
+
+import xyz.wbsite.frame.base.BaseFindResponse;
+import xyz.wbsite.module.system.ent.Res;
+
+/**
+ * ResLoadResponse - 资源
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class ResLoadResponse extends BaseFindResponse<Res> {
+}

src/main/resources/modules/SpringBoot/resources/dbtool/system/SQLite_RES.sql

@@ -12,6 +12,7 @@ CREATE TABLE IF NOT EXISTS SYS_RES (
     "RES_VALUE" VARCHAR(250),
     "SUP_CODE" VARCHAR(50),
     "SUP_NAME" VARCHAR(50),
+    "FREE" BOOLEAN NOT NULL,
     "VALID" BOOLEAN NOT NULL,
     "ROW_VERSION" BIGINT NOT NULL,
     "IS_DELETED" BOOLEAN NOT NULL,