WXF %!s(int64=3) %!d(string=hai) anos
pai
achega
f90bbd39d1

+ 14 - 0
api-common/src/main/java/api/common/pojo/param/system/RoleParam.java

@@ -0,0 +1,14 @@
+package api.common.pojo.param.system;
+
+import api.common.pojo.common.PageVO;
+
+public class RoleParam extends PageVO {
+
+    //角色名称
+    private String roleName;
+    //角色编码
+    private String roleCode;
+    //是否启用
+    private String visible;
+
+}

+ 1 - 1
api-common/src/main/java/api/common/pojo/po/system/DictPO.java

@@ -17,6 +17,6 @@ public class DictPO extends CommonPO {
     //编码
     private String dictCode;
     //序号
-    private String dictOrder;
+    private int dictOrder;
 
 }

+ 22 - 0
api-common/src/main/java/api/common/pojo/po/system/RolePO.java

@@ -0,0 +1,22 @@
+package api.common.pojo.po.system;
+
+import api.common.pojo.common.CommonPO;
+import lombok.Data;
+
+@Data
+public class RolePO extends CommonPO {
+
+    //主键
+    private String id;
+    //角色名称
+    private String roleName;
+    //角色编码
+    private String roleCode;
+    //角色描述
+    private String description;
+    //是否启用
+    private String visible;
+    //排序号
+    private int sort;
+
+}

+ 21 - 0
api-common/src/main/java/api/common/pojo/vo/system/RoleVO.java

@@ -0,0 +1,21 @@
+package api.common.pojo.vo.system;
+
+import lombok.Data;
+
+@Data
+public class RoleVO {
+
+    //主键
+    private String id;
+    //角色名称
+    private String roleName;
+    //角色编码
+    private String roleCode;
+    //角色描述
+    private String description;
+    //是否启用
+    private String visible;
+    //排序号
+    private int sort;
+
+}

+ 65 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/RoleCtrl.java

@@ -0,0 +1,65 @@
+package com.css.simulation.resource.system.ctrl;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.system.RoleParam;
+import api.common.pojo.po.system.RolePO;
+import api.common.pojo.vo.system.RoleVO;
+import api.common.util.ObjectUtil;
+import com.css.simulation.resource.system.service.RoleService;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 角色管理
+ */
+@Controller
+@RequestMapping("/role")
+public class RoleCtrl {
+
+    @Autowired
+    RoleService roleService;
+
+    /**
+     * 获取角色列表
+     */
+    @RequestMapping("/getRolePageList")
+    @ResponseBody
+    public ResponseBodyVO<PageInfo<RoleVO>> getRolePageList(@RequestBody RoleParam pageParam){
+        ResponseBodyVO<PageInfo<RoleVO>> response = new ResponseBodyVO<PageInfo<RoleVO>>(ResponseBodyVO.Response.SUCCESS);
+        response.setInfo(roleService.getRolePageList(pageParam));
+        return response;
+    }
+
+    /**
+     * 新增、修改
+     */
+    @RequestMapping("/saveRole")
+    @ResponseBody
+    public ResponseBodyVO<RolePO> saveRole(@RequestBody RoleVO roleVO){
+        if(ObjectUtil.isNull(roleVO)){
+            return new ResponseBodyVO(false, 500, "参数必传!",null);
+        }
+        ResponseBodyVO<RolePO> response = new ResponseBodyVO<RolePO>(ResponseBodyVO.Response.SUCCESS);
+        response.setInfo(roleService.saveRole(roleVO));
+        return response;
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delRoleById")
+    @ResponseBody
+    public ResponseBodyVO delRoleById(@RequestBody RolePO rolePO){
+        int i = roleService.delRoleById(rolePO);
+        if(i>0){
+            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        }else{
+            return new ResponseBodyVO(false, 500, "删除失败!",null);
+        }
+    }
+
+}

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/UserCtrl.java

@@ -17,7 +17,7 @@ public class UserCtrl {
     UserService userService;
 
     /**
-     * 获取当前登录人的菜单列表
+     * 获取当前登录人详情
      */
     @RequestMapping("/getUserInfo")
     @ResponseBody

+ 22 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/RoleMapper.java

@@ -0,0 +1,22 @@
+package com.css.simulation.resource.system.mapper;
+
+import api.common.pojo.param.system.RoleParam;
+import api.common.pojo.po.system.RolePO;
+import api.common.pojo.vo.system.RoleVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface RoleMapper {
+
+    List<RoleVO> getRolePageList(RoleParam pageParam);
+
+    void insert(RolePO po);
+
+    void update(RolePO po);
+
+    int delRoleById(RolePO rolePO);
+}

+ 48 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/RoleService.java

@@ -0,0 +1,48 @@
+package com.css.simulation.resource.system.service;
+
+import api.common.pojo.param.system.RoleParam;
+import api.common.pojo.po.system.RolePO;
+import api.common.pojo.vo.system.RoleVO;
+import api.common.util.ObjectUtil;
+import api.common.util.StringUtil;
+import com.css.simulation.resource.common.utils.PageUtil;
+import com.css.simulation.resource.common.utils.PoUtil;
+import com.css.simulation.resource.system.mapper.RoleMapper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class RoleService {
+
+    @Autowired
+    RoleMapper roleMapper;
+
+    public PageInfo<RoleVO> getRolePageList(RoleParam pageParam) {
+        PageUtil.setPageInfo(pageParam);
+        List<RoleVO> list = roleMapper.getRolePageList(pageParam);
+        return new PageInfo<>(list);
+    }
+
+    public RolePO saveRole(RoleVO roleVO) {
+        RolePO po = new RolePO();
+        ObjectUtil.voToPo(roleVO,po);
+        //常规字段赋值
+        PoUtil.initAddPo(po);
+        String id = po.getId();
+        if(ObjectUtil.isNull(id)){//新增
+            po.setId(StringUtil.getRandomUUID());
+            roleMapper.insert(po);
+        }else{
+            roleMapper.update(po);
+        }
+        return po;
+    }
+
+    public int delRoleById(RolePO rolePO) {
+        PoUtil.initDelPo(rolePO);
+        return roleMapper.delRoleById(rolePO);
+    }
+}

+ 75 - 0
simulation-resource-server/src/main/resources/mapper/system/RoleMapper.xml

@@ -0,0 +1,75 @@
+<?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.css.simulation.resource.system.mapper.RoleMapper" >
+
+    <select id="getRolePageList" parameterType="api.common.pojo.param.system.RoleParam" resultType="api.common.pojo.vo.system.RoleVO">
+        SELECT
+            id,
+            role_name,
+            role_code,
+            description,
+            visible,
+            sort
+        FROM system_role
+        WHERE is_deleted = '0'
+        <if test="roleName != null and roleName != ''">
+            and c.role_name like CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="roleCode != null and roleCode != ''">
+            and c.role_code like CONCAT('%',#{roleCode,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="visible != null and visible != ''">
+            and c.visible = #{roleName,jdbcType=VARCHAR}
+        </if>
+        ORDER BY sort
+    </select>
+
+    <insert id="insert" parameterType="api.common.pojo.po.system.RolePO">
+        INSERT INTO system_role(
+            id,
+            role_name,
+            role_code,
+            description,
+            visible,
+            sort,
+            create_time,
+            modify_time,
+            create_user_id,
+            modify_user_id,
+            is_deleted
+        )
+        VALUES(
+            #{id,jdbcType=VARCHAR},
+            #{roleName,jdbcType=VARCHAR},
+            #{roleCode,jdbcType=VARCHAR},
+            #{description,jdbcType=VARCHAR},
+            #{visible,jdbcType=VARCHAR},
+            #{sort,jdbcType=INTEGER},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{modifyTime,jdbcType=TIMESTAMP},
+            #{createUserId,jdbcType=VARCHAR},
+            #{modifyUserId,jdbcType=VARCHAR},
+            #{isDeleted,jdbcType=VARCHAR}
+        )
+    </insert>
+
+    <update id="update" parameterType="api.common.pojo.po.system.RolePO">
+        update system_role set
+            role_name = #{roleName,jdbcType=VARCHAR},
+            role_code = #{roleCode,jdbcType=VARCHAR},
+            description = #{description,jdbcType=VARCHAR},
+            visible = #{visible,jdbcType=VARCHAR},
+            sort = #{sort,jdbcType=INTEGER},
+            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_user_id = #{modifyUserId,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=VARCHAR}
+    </update>
+
+    <update id="delRoleById" parameterType="api.common.pojo.po.system.RolePO">
+        update system_role set
+          modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+          modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+          is_deleted = #{isDeleted,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=VARCHAR}
+    </update>
+</mapper>