2024.1.10

src/main/java/com/spring/modules/base/controller/BaseController.java

@@ -236,6 +236,18 @@ public class BaseController extends AbstractController {
         return R.ok().put("selectBUList", baseService.selectBUList(data)).put("buList",baseService.getBUList(data));
     }
 
+    /**
+     * @Title searchAccessRoleList
+      * @param data
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchAccessRoleList")
+    @ResponseBody
+    public R searchAccessRoleList(@RequestBody RoleData data){
+        return R.ok().put("selectRoleList", baseService.selectRoleList(data)).put("roleList",baseService.getRoleList(data));
+    }
+
     /**
      * @Description TODO
      * @Title searchAccessBuList
@@ -267,6 +279,19 @@ public class BaseController extends AbstractController {
         return R.ok();
     }
 
+    /**
+     * @Title saveAccessRole
+      * @param data
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/saveAccessRole")
+    @ResponseBody
+    public R saveAccessRole(@RequestBody List<RoleData> data){
+        baseService.saveAccessRole(data);
+        return R.ok();
+    }
+
     /**
      * @Description TODO
      * @Title saveAccessBuListForBu
@@ -437,6 +462,20 @@ public class BaseController extends AbstractController {
         return R.ok().put("rows", rows);
     }
 
+    /**
+     * @Title getUserAccessRoleInfoList
+     * @auther jiayang_yue
+     * @Date 2024/1/10 11:35
+     * @param inData
+     * @return R
+     */
+    @PostMapping(value="/getUserAccessRoleInfoList")
+    @ResponseBody
+    public R getUserAccessRoleInfoList(@RequestBody RoleData inData){
+        List<Role> rows  = baseService.getUserAccessRoleInfoList(inData);
+        return R.ok().put("rows", rows);
+    }
+
     @PostMapping(value = "/getUserAccessBUInfoList")
     @ResponseBody
     public R getUserAccessBUInfoList(@RequestBody BuData inData){

src/main/java/com/spring/modules/base/dao/BaseMapper.java

@@ -395,4 +395,13 @@ public interface BaseMapper {
 
     List<DepartmentEntity> getDepartmentList(DepartmentEntity inData);
 
+    List<Role> getUserAccessRoleInfoList(RoleData inData);
+
+    void deleteAccessRoleWithUsername(RoleData roleData);
+
+    void saveAccessRole(RoleData roleData);
+
+    List<String> selectRoleList(RoleData data);
+
+    List<RoleData> getRoleList(RoleData data);
 }

src/main/java/com/spring/modules/base/data/RoleData.java

@@ -0,0 +1,27 @@
+package com.spring.modules.base.data;
+
+import com.spring.modules.base.entity.Role;
+import org.apache.ibatis.type.Alias;
+
+@Alias("RoleData")
+public class RoleData extends Role {
+    private String username;
+
+    private String siteID;
+
+    public String getSiteID() {
+        return siteID;
+    }
+
+    public void setSiteID(String siteID) {
+        this.siteID = siteID;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

src/main/java/com/spring/modules/base/data/RoleUserData.java

@@ -0,0 +1,42 @@
+package com.spring.modules.base.data;
+
+import java.util.List;
+
+public class RoleUserData {
+    private String username;
+    private String roleNo;
+    private String site;
+    private List<RoleData> accessRoleList;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getRoleNo() {
+        return roleNo;
+    }
+
+    public void setRoleNo(String roleNo) {
+        this.roleNo = roleNo;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public List<RoleData> getAccessRoleList() {
+        return accessRoleList;
+    }
+
+    public void setAccessRoleList(List<RoleData> accessRoleList) {
+        this.accessRoleList = accessRoleList;
+    }
+}

src/main/java/com/spring/modules/base/entity/Role.java

@@ -0,0 +1,82 @@
+package com.spring.modules.base.entity;
+
+public class Role {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 工厂编码
+     */
+    private String site;
+
+    /**
+     * BU编码
+     */
+    private String roleNo;
+
+    /**
+     * BU名称
+     */
+    private String roleDesc;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否在用
+     */
+    private String active;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getRoleNo() {
+        return roleNo;
+    }
+
+    public void setRoleNo(String roleNo) {
+        this.roleNo = roleNo;
+    }
+
+    public String getRoleDesc() {
+        return roleDesc;
+    }
+
+    public void setRoleDesc(String roleDesc) {
+        this.roleDesc = roleDesc;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+}
+

src/main/java/com/spring/modules/base/service/BaseService.java

@@ -301,4 +301,12 @@ public interface BaseService {
     List<PostEntity> getPostList(PostEntity inData);
 
     List<DepartmentEntity> getDepartmentList(DepartmentEntity inData);
+
+    List<Role> getUserAccessRoleInfoList(RoleData inData);
+
+    void saveAccessRole(List<RoleData> data);
+
+    List<String> selectRoleList(RoleData data);
+
+    List<RoleData> getRoleList(RoleData data);
 }

src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java

@@ -116,6 +116,29 @@ public class BaseServiceImpl implements BaseService {
         return result;
     }
 
+    @Override
+    public List<Role> getUserAccessRoleInfoList(RoleData inData) {
+        return baseMapper.getUserAccessRoleInfoList(inData);
+    }
+
+    @Override
+    public void saveAccessRole(List<RoleData> data) {
+        baseMapper.deleteAccessRoleWithUsername(data.get(0));
+        for (int i = 0; i < data.size(); i++) {
+            baseMapper.saveAccessRole(data.get(i));
+        }
+    }
+
+    @Override
+    public List<String> selectRoleList(RoleData data) {
+        return baseMapper.selectRoleList(data);
+    }
+
+    @Override
+    public List<RoleData> getRoleList(RoleData data) {
+        return baseMapper.getRoleList(data);
+    }
+
 
     //=============生产订单类型===================
     @Override

src/main/resources/mapper/base/BaseMapper.xml

@@ -237,6 +237,11 @@
         values (#{fieldId},#{username})
     </insert>
 
+    <insert id="saveAccessRole">
+        insert into AccessRole (site,role_no,username)
+        values (#{site},#{roleNo},#{username})
+    </insert>
+
     <select id="searchAccessFieldListByUser" resultType="String">
         select field_id from AccessField where username=#{username}
     </select>
@@ -321,8 +326,37 @@
         WHERE
             site = #{site}
     </select>
+    <select id="getUserAccessRoleInfoList" resultType="com.spring.modules.base.entity.Role">
+        SELECT
+            b.site,
+            b.role_no,
+            b.role_desc
+        FROM
+            AccessRole a
+                LEFT JOIN Role b ON a.site = b.site and a.role_no = b.role_no
+        WHERE
+            a.username = #{username} and b.role_no is not null
+    </select>
+
+    <select id="selectRoleList" resultType="java.lang.String">
+        select a.role_no from AccessRole a left join Role b on a.site=b.site and a.role_no=b.role_no
+        where a.site=#{site} and a.username=#{username} and b.active='Y'
+    </select>
+
+    <select id="getRoleList" resultType="com.spring.modules.base.data.RoleData">
+        select id,site,role_no,role_desc,remark,active from Role
+        <where>
+            and site=#{site}
+            <if test="active != null and active != ''">
+                AND Active = #{active}
+            </if>
+        </where>
+    </select>
 
     <delete id="deleteAccessFieldWithUser">
         delete from AccessField  where field_id in (select field_id from plm_field_list where function_id=#{functionId}) and username=#{username}
     </delete>
+    <delete id="deleteAccessRoleWithUsername">
+        delete from AccessRole where site=#{site} and username=#{username}
+    </delete>
 </mapper>