基础接口自测优化

src/main/resources/application.properties

@@ -9,7 +9,7 @@ sso.redis.password = cbkj123!@#
 # redis expire minute
 sso.redis.expire.minute=1440
 # redis name space
-sso.redis.namespace=SSO
+sso.redis.namespace=platform:api
 
 #rsa
 rsa.publicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDaKmCXLWqBIVOVSa/dTY08bgKhWcvi3j6vPksjrV7X3oFZ6dbF3XhaTXuV65x9qqmlQqlNepkqv03miY72QkjWMgbaEt0v5MFnQ+B2AWPIGunvSbaDIBwer/6V9f+ra7imLdgt9jwlkjDYvRjvw7mDHFkXkMvKWl1FFihV0EN8JwIDAQAB

src/main/resources/mappers/dic/DicDataMapper.xml

@@ -20,7 +20,7 @@
     <select id="getList" parameterType="com.cbkj.platform.api.beans.dic.DicNode" resultMap="BaseResultMap">
         SELECT dic_id,dic_code,dic_name,parent_id,dic_desc,sort,app_id,ins_code,dept_id,pha_id
         from t_dic_base
-        where is_enable = '1'
+        where status = '0'
         <if test=" appId != null and appId!='' ">
             and app_id = #{appId}
         </if>
@@ -46,8 +46,8 @@
         tds.stan_id, tds.stan_code, tds.stan_name, tds.stan_type
         from t_dic_base tdb
         left join t_dic_mapping tdm on tdm.stan_type = #{stanType} and tdm.dic_id = tdb.dic_id
-        left join t_dic_standard tds on tds.stan_id = tdm.stan_id
-        where tdb.is_enable = '1'
+        left join t_dic_standard tds on tds.stan_id = tdm.stan_id and tds.status = '0'
+        where tdb.status = '0'
         <if test=" appId != null and appId!='' ">
             and tdb.app_id = #{appId}
         </if>

src/main/resources/mappers/org/SysAppMapper.xml

@@ -7,14 +7,12 @@
         <result column="app_name" jdbcType="VARCHAR" property="appName"/>
         <result column="app_pwd" jdbcType="VARCHAR" property="appPwd"/>
         <result column="app_desc" jdbcType="VARCHAR" property="appDesc"/>
-        <result column="status" jdbcType="VARCHAR" property="status"/>
-        <result column="sort" jdbcType="INTEGER" property="sort"/>
     </resultMap>
 
     <select id="getList" parameterType="com.cbkj.platform.api.beans.org.SysApp" resultMap="BaseResultMap">
         SELECT app_id,app_name,app_desc
         from sys_app
-        where status = '1'
+        where status = '0'
         <if test="appName != null and appName!='' ">
             and app_name like CONCAT('%',trim(#{appName}),'%')
         </if>

src/main/resources/mappers/org/SysDepartmentMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cbkj.platform.api.mapper.org.SysDepartmentMapper">
 
     <resultMap id="BaseResultMap" type="com.cbkj.platform.api.beans.org.SysDepartment">
-        <id column="DEP_ID" jdbcType="VARCHAR"  property="deptId" />
+        <id column="DEPT_ID" jdbcType="VARCHAR"  property="deptId" />
         <result column="dept_name" jdbcType="VARCHAR" property="deptName" />
         <result column="APP_ID" jdbcType="VARCHAR" property="appId" />
         <result column="INS_CODE" jdbcType="VARCHAR" property="insCode" />
@@ -23,9 +23,9 @@
         ins.ins_name,
         ins.ins_parent_code
         from sys_department dep
-        left join sys_app app on dep.app_id = app.app_id AND app.status = '1' AND app.status = '1'
-        left join sys_institution ins on dep.ins_code = ins.ins_code AND ins.status = '1'
-        where dep.status = '1'
+        left join sys_app app on dep.app_id = app.app_id AND app.status = '0'
+        left join sys_institution ins on dep.ins_code = ins.ins_code AND ins.status = '0'
+        where dep.status = '0'
         <if test="appName != null and appName!='' ">
            and app.APP_NAME like CONCAT('%',trim(#{appName}),'%')
         </if>

src/main/resources/mappers/org/SysInstitutionMapper.xml

@@ -19,8 +19,6 @@
         <result column="street_code" jdbcType="VARCHAR" property="streetCode"/>
         <result column="street_name" jdbcType="VARCHAR" property="streetName"/>
         <result column="INS_ADDRESS" jdbcType="VARCHAR" property="insAddress"/>
-        <result column="sort" jdbcType="VARCHAR" property="sort"/>
-        <result column="status" jdbcType="VARCHAR" property="status"/>
         <result column="ins_level" jdbcType="VARCHAR" property="insLevel"/>
     </resultMap>
 
@@ -29,21 +27,17 @@
         ins.ins_id,
         ins.ins_code,
         ins.ins_name,
-        ins.app_id,,
-        (SELECT app_name FROM sys_app WHERE app_id = ins.APP_ID LIMIT 1) AS APP_NAME
+        ins.app_id,
+        (SELECT app_name FROM sys_app WHERE app_id = ins.APP_ID LIMIT 1) AS APP_NAME,
         ins.ins_parent_code,
         (SELECT INS_NAME FROM sys_institution WHERE INS_CODE = ins.ins_parent_code limit 1) as INS_PARENT_NAME
         from sys_institution ins
-        where status='1'
+        where status = '0'
         <if test="appId != null and appId!='' ">
             and APP_ID = #{appId}
         </if>
         <if test="insCode != null and insCode!='' ">
-            and ( INS_CODE = #{insCode}
-            <if test="lower != null and lower ">
-                or ins_parent_code = #{insCode}
-            </if>
-            )
+            and ( INS_CODE = #{insCode} or ins_parent_code = #{insCode} )
         </if>
         order by ins.SORT, ins.INS_CODE
     </select>
@@ -53,7 +47,7 @@
         (SELECT INS_NAME FROM sys_institution WHERE INS_CODE = ins.ins_parent_code limit 1) as INS_PARENT_NAME,
         (SELECT app_name FROM sys_app WHERE app_id = ins.APP_ID LIMIT 1) AS APP_NAME
         from sys_institution ins
-        where status='1'
+        where status = '0'
         <if test="insId != null and insId!='' ">
             and INS_ID = #{insId}
         </if>

src/main/resources/mappers/param/SysParamMapper.xml

@@ -15,7 +15,7 @@
     <select id="getList" resultMap="BaseResultMap" parameterType="com.cbkj.platform.api.beans.param.SysParam">
         select APP_ID, INS_CODE, DEPT_ID, PAR_CODE, PAR_NAME, PAR_VALUES
         from t_sys_param
-        where status = '1'
+        where status = '0'
         <if test="appId != null and appId != ''">
             and APP_ID = #{ appId }
         </if>
@@ -37,7 +37,7 @@
     <select id="getDetail" resultMap="BaseResultMap" parameterType="com.cbkj.platform.api.beans.param.SysParam">
         select PAR_CODE, PAR_NAME, PAR_VALUES
         from t_sys_param
-        where status = '1'
+        where status = '0'
         <if test="appId != null and appId != ''">
             and APP_ID = #{ appId }
         </if>

src/main/resources/mappers/user/AdminInfoMapper.xml

@@ -13,13 +13,13 @@
         <result column="name_zh" jdbcType="VARCHAR" property="nameZh"/>
         <result column="user_heand" jdbcType="VARCHAR" property="userHeand"/>
         <result column="email" jdbcType="VARCHAR" property="email"/>
-        <result column="APP_ID" jdbcType="VARCHAR" property="appId"/>
-        <result column="APP_NAME" jdbcType="VARCHAR" property="appName"/>
-        <result column="INS_CODE" jdbcType="VARCHAR" property="insCode"/>
-        <result column="INS_NAME" jdbcType="VARCHAR" property="insName"/>
+        <result column="app_id" jdbcType="VARCHAR" property="appId"/>
+        <result column="app_name" jdbcType="VARCHAR" property="appName"/>
+        <result column="ins_code" jdbcType="VARCHAR" property="insCode"/>
+        <result column="ins_name" jdbcType="VARCHAR" property="insName"/>
         <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
-        <result column="EXPIRE_DATE" jdbcType="TIMESTAMP" property="expireDate"/>
+        <result column="expire_date" jdbcType="TIMESTAMP" property="expireDate"/>
         <result column="is_qualifier" jdbcType="INTEGER" property="isQualifier"/>
         <result column="dept_id_his" jdbcType="VARCHAR" property="deptIdHis"/>
         <result column="dept_name_his" jdbcType="VARCHAR" property="deptNameHis"/>
@@ -28,18 +28,21 @@
 
 
     <select id="getList" parameterType="com.cbkj.platform.api.beans.user.AdminInfo" resultMap="BaseResultMap">
-        select ai.user_id, ai.user_name, ai.name_zh, ai.app_id, ai.ins_code, ai.dept_id, ai.dept_name
+        select ai.user_id, ai.user_name, ai.name_zh, sdm.app_id, sdm.ins_code, sdm.dept_id, sdm.dept_name
+        , (select app.app_name from sys_app app where app.app_id = sdm.app_id and app.status = '0') app_name
+        , (select ins.ins_name from sys_institution ins where ins.ins_code = sdm.ins_code and ins.status = '0') ins_name
         from sys_admin_info ai
+        join sys_doctor_multipoint sdm on sdm.user_id = ai.user_id
         <where>
-            ai.status = '1'
+            ai.status = '0'
             <if test="appId != null and appId != ''">
-                and ai.app_id = #{appId}
+                and sdm.app_id = #{appId}
             </if>
             <if test="insCode != null and insCode != ''">
-                and ai.ins_code = #{insCode}
+                and sdm.ins_code = #{insCode}
             </if>
             <if test="deptId != null and deptId != ''">
-                and ai.dept_id = #{deptId}
+                and sdm.dept_id = #{deptId}
             </if>
             <if test="userName != null and userName != ''">
                 and ai.user_name like concat('%', #{userName}, '%')
@@ -48,25 +51,53 @@
                 and ai.name_zh like concat('%', #{nameZh}, '%')
             </if>
         </where>
+        group by ai.user_id
     </select>
 
 
     <select id="getDetail" parameterType="com.cbkj.platform.api.beans.user.AdminInfo" resultMap="BaseResultMap">
-        select ai.*
+        select ai.user_id
+        , ai.user_name
+        , ai.name_zh
+        , ai.sex
+        , ai.phone
+        , ai.address
+        , ai.user_heand
+        , ai.email
+        , ai.certificate
+        , ai.last_ip
+        , ai.EXPIRE_DATE
+        , ai.is_qualifier
+        , ai.is_py_wb
+        , ai.qualifier_pic_path
+        , ai.personal_share
+        , ai.professional
+        , ai.professional_pic_path
+        , sdm.app_id
+        , sdm.ins_code
+        , sdm.dept_id
+        , sdm.dept_name
+        , sdm.dept_id_his
+        , sdm.dept_name_his
+        , sdm.employee_id
+        , (select app.app_name from sys_app app where app.app_id = sdm.app_id and app.status = '0') app_name
+        , (select ins.ins_name from sys_institution ins where ins.ins_code = sdm.ins_code and ins.status = '0') ins_name
+
         from sys_admin_info ai
+        join sys_doctor_multipoint sdm on sdm.user_id = ai.user_id
         <where>
-            ai.status = '1'
+            ai.status = '0'
             <if test="appId != null and appId != ''">
-                and ai.app_id = #{appId}
+                and sdm.app_id = #{appId}
             </if>
             <if test="insCode != null and insCode != ''">
-                and ai.ins_code = #{insCode}
+                and sdm.ins_code = #{insCode}
             </if>
             <if test="deptId != null and deptId != ''">
-                and ai.dept_id = #{deptId}
+                and sdm.dept_id = #{deptId}
             </if>
-            <if test="employee_id != null and employee_id != ''">
-                and ai.employee_id = #{employee_id}
+            <if test="employeeId != null and employeeId != ''">
+                and sdm.employee_id = #{employeeId}
             </if>
             <if test="userId != null and userId != ''">
                 and ai.user_id = #{userId}
@@ -76,31 +107,31 @@
 
     <select id="getListByMultipoint" parameterType="com.cbkj.platform.api.beans.user.AdminInfo" resultMap="BaseResultMap">
         select e.*
-        ,(select app.app_name from sys_app app where app.app_id = e.APP_ID) APP_NAME
-        ,(select ins.INS_NAME from sys_institution ins where ins.ins_code = e.INS_CODE and ins.app_id = e.APP_ID) INS_NAME
+        ,(select app.app_name from sys_app app where app.app_id = e.APP_ID and app.status = '0') APP_NAME
+        ,(select ins.INS_NAME from sys_institution ins where ins.ins_code = e.INS_CODE and ins.app_id = e.APP_ID and ins.status = '0') INS_NAME
         from
         (
-            select ai.user_id, ai.user_name, ai.name_zh
-            , IFNULL(dm.app_id, IFNULL(ai.app_id, '000000')) app_id
-            , IFNULL(dm.ins_code, IFNULL(ai.ins_code, '000000')) ins_code
-            , IFNULL(dm.dept_id, IFNULL(ai.dept_id, '000000')) dept_id
-            , IFNULL(dm.dept_name, IFNULL(ai.dept_name, '000000')) dept_name
-            from sys_admin_info ai
-            left join sys_doctor_multipoint dm on dm.user_id = ai.user_id
-            where ai.status = '1'
-            <if test="appId != null and appId != ''">
-                and dm.app_id = #{appId}
-            </if>
-            <if test="insCode != null and insCode != ''">
-                and dm.ins_code = #{insCode}
-            </if>
-            <if test="deptId != null and deptId != ''">
-                and dm.dept_id = #{deptId}
-            </if>
-            <if test="deptIdHis != null and deptIdHis != ''">
-                and dm.dept_id_his = #{deptIdHis}
-            </if>
-            order by app_id, ins_code, dept_id
+        select ai.user_id, ai.user_name, ai.name_zh
+        , IFNULL(dm.app_id, IFNULL(ai.app_id, '000000')) app_id
+        , IFNULL(dm.ins_code, IFNULL(ai.ins_code, '000000')) ins_code
+        , IFNULL(dm.dept_id, IFNULL(ai.dept_id, '000000')) dept_id
+        , IFNULL(dm.dept_name, IFNULL(ai.dept_name, '000000')) dept_name
+        from sys_admin_info ai
+        left join sys_doctor_multipoint dm on dm.user_id = ai.user_id
+        where ai.status = '0'
+        <if test="appId != null and appId != ''">
+            and dm.app_id = #{appId}
+        </if>
+        <if test="insCode != null and insCode != ''">
+            and dm.ins_code = #{insCode}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and dm.dept_id = #{deptId}
+        </if>
+        <if test="deptIdHis != null and deptIdHis != ''">
+            and dm.dept_id_his = #{deptIdHis}
+        </if>
+        order by app_id, ins_code, dept_id
         ) e
     </select>
 </mapper>

src/main/resources/mappers/user/AdminMenuMapper.xml

@@ -23,7 +23,7 @@
         join sys_admin_rule_menu rm on m.menu_id = rm.menu_id
         join sys_admin_info_rule ur on rm.role_id = ur.role_id
         where ur.user_id = #{userId}
-        and m.status = '1'
+        and m.status = '0'
         and m.modual_code = #{modualCode}
         <if test="menuType != null and menuType != ''">
             and menu_type in
@@ -37,9 +37,9 @@
 
 
     <select id="getAllMenu" parameterType="com.cbkj.platform.api.beans.user.AdminMenu" resultMap="BaseResultMap">
-        select menu_id, menu_name, menu_path, menu_class, parent_menu_id
+        select menu_id, menu_name, menu_path, menu_type, menu_class, parent_menu_id
         from sys_admin_menu
-        where status = '1'
+        where status = '0'
         and modual_code = #{modualCode}
         <if test="menuType != null and menuType != ''">
             and menu_type in

src/main/resources/mappers/user/AdminRoleMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cbkj.platform.api.mapper.user.AdminRuleMapper">
+
+    <resultMap id="AdminRoleMap" type="com.cbkj.platform.api.beans.user.AdminRole">
+        <id column="role_id" jdbcType="VARCHAR" property="roleId"/>
+        <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
+        <result column="role_desc" jdbcType="VARCHAR" property="roleDesc"/>
+        <result column="rname_zh" jdbcType="VARCHAR" property="rnameZh"/>
+        <result column="index_url" jdbcType="VARCHAR" property="indexUrl"/>
+        <result column="obj_id" jdbcType="VARCHAR" property="objId"/>
+    </resultMap>
+
+    <resultMap id="AdminRoleDataMap" type="com.cbkj.platform.api.beans.user.AdminRoleData">
+        <id column="role_id" jdbcType="VARCHAR" property="roleId"/>
+        <result column="app_id" jdbcType="VARCHAR" property="appId"/>
+        <result column="ins_code" jdbcType="VARCHAR" property="insCode"/>
+        <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
+        <result column="pha_id" jdbcType="VARCHAR" property="phaId"/>
+        <result column="modual_code" jdbcType="VARCHAR" property="modualCode"/>
+    </resultMap>
+
+    <select id="getRuleDataByUser" parameterType="com.cbkj.platform.api.beans.user.AdminRoleData" resultMap="AdminRoleDataMap">
+        select sard.*
+        from sys_admin_role_data sard
+        join sys_admin_info_rule sair on sair.role_id = sard.role_id
+        where sair.user_id = #{userId}
+        and sard.modual_code = #{modual_code}
+    </select>
+</mapper>

src/main/resources/mappers/user/AdminRuleMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cbkj.platform.api.mapper.user.AdminRuleMapper">
-    <resultMap id="BaseResultMap" type="com.cbkj.platform.api.beans.user.AdminRule">
-        <id column="role_id" jdbcType="VARCHAR" property="roleId"/>
-        <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
-        <result column="role_desc" jdbcType="VARCHAR" property="roleDesc"/>
-        <result column="rname_zh" jdbcType="VARCHAR" property="rnameZh"/>
-        <result column="index_url" jdbcType="VARCHAR" property="indexUrl"/>
-        <result column="obj_id" jdbcType="VARCHAR" property="objId"/>
-    </resultMap>
-
-    <select id="getRuleRelesCount" parameterType="String" resultType="Long">
-        select count(1) cun
-        from sys_admin_info_rule
-        where role_id = #{ids}
-    </select>
-
-</mapper>