补充上次

server/src/main/java/com/pica/cloud/account/account/server/entity/SaaSMenu.java

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class SaaSMenu {
+    private Integer id;
+
+    private Long hospitalId;
+
+    private String permissionRoleId;
+
+    private String name;
+
+    private String url;
+
+    private Integer parentId;
+
+    private Integer systemType;
+
+    private Integer seq;
+
+    private Integer deleteFlag;
+
+    private Integer creatId;
+
+    private Date creatTime;
+
+    private Integer modifyId;
+
+    private Date modifyTime;
+
+    private String icon;
+
+    private Integer menuType;
+
+    private Integer secondMenuId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getPermissionRoleId() {
+        return permissionRoleId;
+    }
+
+    public void setPermissionRoleId(String permissionRoleId) {
+        this.permissionRoleId = permissionRoleId == null ? null : permissionRoleId.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Integer getSystemType() {
+        return systemType;
+    }
+
+    public void setSystemType(Integer systemType) {
+        this.systemType = systemType;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatId() {
+        return creatId;
+    }
+
+    public void setCreatId(Integer creatId) {
+        this.creatId = creatId;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Integer getModifyId() {
+        return modifyId;
+    }
+
+    public void setModifyId(Integer modifyId) {
+        this.modifyId = modifyId;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon == null ? null : icon.trim();
+    }
+
+    public Integer getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(Integer menuType) {
+        this.menuType = menuType;
+    }
+
+    public Integer getSecondMenuId() {
+        return secondMenuId;
+    }
+
+    public void setSecondMenuId(Integer secondMenuId) {
+        this.secondMenuId = secondMenuId;
+    }
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/mapper/SaaSMenuMapper.java

+package com.pica.cloud.account.account.server.mapper;
+
+import com.pica.cloud.account.account.server.entity.SaaSMenu;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SaaSMenuMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(SaaSMenu record);
+
+    int insertSelective(SaaSMenu record);
+
+    SaaSMenu selectByPrimaryKey(Integer id);
+
+    int batchInsert(List<SaaSMenu> list);
+
+    List<SaaSMenu> selectByRoleId(String id);
+
+    int updateByPrimaryKeySelective(SaaSMenu record);
+
+    int updateByPrimaryKey(SaaSMenu record);
+
+    int deleteByRoleId(Map<String, Object> map);
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasRoleServiceImpl.java

@@ -2,10 +2,12 @@
 package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.PermissionRole;
+import com.pica.cloud.account.account.server.entity.SaaSMenu;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.SaasRoleEnum;
 import com.pica.cloud.account.account.server.mapper.PermissionDoctorRoleMapper;
 import com.pica.cloud.account.account.server.mapper.PermissionRoleMapper;
+import com.pica.cloud.account.account.server.mapper.SaaSMenuMapper;
 import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
 import com.pica.cloud.account.account.server.req.HospitalRoleListReq;
 import com.pica.cloud.account.account.server.resp.*;
@@ -32,8 +34,11 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
     PermissionRoleMapper permissionRoleMapper;
     @Autowired
     PermissionDoctorRoleMapper permissionDoctorRoleMapper;
+    @Autowired
+    SaaSMenuMapper saaSMenuMapper;
 
     @Override
+    @Transactional
     public int insertAndModify(HospitalRoleDetailReq req, PicaUser user) {
         if (StringUtils.isEmpty(req.getName()) || req.getName().trim().length() > 16) {
             throw new PicaWarnException(PicaResultCode.DATA_EXCEPTION.code(), "姓名长度≤16字符");
@@ -69,6 +74,15 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             role.setModifiedId(Long.valueOf(user.getId()));
             role.setModifiedTime(new Date());
             num = permissionRoleMapper.insertSelective(role);
+            List<SaaSMenu> saaSMenus = saaSMenuMapper.selectByRoleId(String.valueOf(4));
+            saaSMenus.forEach(t -> {
+                t.setPermissionRoleId(String.valueOf(role.getId()));
+                t.setModifyId(user.getId());
+                t.setModifyTime(new Date());
+                t.setCreatTime(new Date());
+                t.setCreatId(user.getId());
+            });
+            saaSMenuMapper.batchInsert(saaSMenus);
         }
         return num;
     }
@@ -107,6 +121,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         map.put("modifiedTime", new Date());
         permissionRoleMapper.deleteById(map);
         permissionDoctorRoleMapper.deleteByRoleId(map);
+        saaSMenuMapper.deleteByRoleId(map);
         return 1;
     }
 

server/src/main/resources/mybatis/SaaSMenuMapper.xml

+<?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.pica.cloud.account.account.server.mapper.SaaSMenuMapper">
+    <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.SaaSMenu">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="hospital_id" property="hospitalId" jdbcType="BIGINT"/>
+        <result column="permission_role_id" property="permissionRoleId" jdbcType="VARCHAR"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="url" property="url" jdbcType="VARCHAR"/>
+        <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
+        <result column="system_type" property="systemType" jdbcType="INTEGER"/>
+        <result column="seq" property="seq" jdbcType="INTEGER"/>
+        <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
+        <result column="creat_id" property="creatId" jdbcType="INTEGER"/>
+        <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP"/>
+        <result column="modify_id" property="modifyId" jdbcType="INTEGER"/>
+        <result column="modify_time" property="modifyTime" jdbcType="TIMESTAMP"/>
+        <result column="icon" property="icon" jdbcType="VARCHAR"/>
+        <result column="menu_type" property="menuType" jdbcType="INTEGER"/>
+        <result column="second_menu_id" property="secondMenuId" jdbcType="INTEGER"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, hospital_id, permission_role_id, name, url, parent_id, system_type, seq, delete_flag,
+    creat_id, creat_time, modify_id, modify_time, icon, menu_type, second_menu_id
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from p_saas_menu
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <select id="selectByRoleId" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from p_saas_menu
+        where permission_role_id = #{id,jdbcType=VARCHAR} and delete_flag = 1
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete
+        from p_saas_menu
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <update id="deleteByRoleId" parameterType="java.util.Map">
+        update p_saas_menu
+        set delete_flag = 2,
+            modify_id   = #{modifiedId,jdbcType=BIGINT},
+            modify_time = #{modifiedTime,jdbcType=TIMESTAMP}
+        where permission_role_id = #{id,jdbcType=VARCHAR}
+          and delete_flag = 1
+    </update>
+    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
+        insert into p_saas_menu (id, hospital_id, permission_role_id,
+                                 name, url, parent_id,
+                                 system_type, seq, delete_flag,
+                                 creat_id, creat_time, modify_id,
+                                 modify_time, icon, menu_type,
+                                 second_menu_id)
+        values (#{id,jdbcType=INTEGER}, #{hospitalId,jdbcType=BIGINT}, #{permissionRoleId,jdbcType=VARCHAR},
+                #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
+                #{systemType,jdbcType=INTEGER}, #{seq,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
+                #{creatId,jdbcType=INTEGER}, #{creatTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER},
+                #{modifyTime,jdbcType=TIMESTAMP}, #{icon,jdbcType=VARCHAR}, #{menuType,jdbcType=INTEGER},
+                #{secondMenuId,jdbcType=INTEGER})
+    </insert>
+
+
+    <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+        insert into p_saas_menu (hospital_id, permission_role_id,
+        name, url, parent_id,
+        system_type, seq, delete_flag,
+        creat_id, creat_time, modify_id,
+        modify_time, icon, menu_type,
+        second_menu_id)
+        values
+        <foreach collection="list" item="item" separator=",">
+            ( #{item.hospitalId,jdbcType=BIGINT}, #{item.permissionRoleId,jdbcType=VARCHAR},
+            #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR}, #{item.parentId,jdbcType=INTEGER},
+            #{item.systemType,jdbcType=INTEGER}, #{item.seq,jdbcType=INTEGER}, #{item.deleteFlag,jdbcType=INTEGER},
+            #{item.creatId,jdbcType=INTEGER}, #{item.creatTime,jdbcType=TIMESTAMP}, #{item.modifyId,jdbcType=INTEGER},
+            #{item.modifyTime,jdbcType=TIMESTAMP}, #{item.icon,jdbcType=VARCHAR}, #{item.menuType,jdbcType=INTEGER},
+            #{item.secondMenuId,jdbcType=INTEGER} )
+        </foreach>
+    </insert>
+    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
+        insert into p_saas_menu
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="hospitalId != null">
+                hospital_id,
+            </if>
+            <if test="permissionRoleId != null">
+                permission_role_id,
+            </if>
+            <if test="name != null">
+                name,
+            </if>
+            <if test="url != null">
+                url,
+            </if>
+            <if test="parentId != null">
+                parent_id,
+            </if>
+            <if test="systemType != null">
+                system_type,
+            </if>
+            <if test="seq != null">
+                seq,
+            </if>
+            <if test="deleteFlag != null">
+                delete_flag,
+            </if>
+            <if test="creatId != null">
+                creat_id,
+            </if>
+            <if test="creatTime != null">
+                creat_time,
+            </if>
+            <if test="modifyId != null">
+                modify_id,
+            </if>
+            <if test="modifyTime != null">
+                modify_time,
+            </if>
+            <if test="icon != null">
+                icon,
+            </if>
+            <if test="menuType != null">
+                menu_type,
+            </if>
+            <if test="secondMenuId != null">
+                second_menu_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="hospitalId != null">
+                #{hospitalId,jdbcType=BIGINT},
+            </if>
+            <if test="permissionRoleId != null">
+                #{permissionRoleId,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="parentId != null">
+                #{parentId,jdbcType=INTEGER},
+            </if>
+            <if test="systemType != null">
+                #{systemType,jdbcType=INTEGER},
+            </if>
+            <if test="seq != null">
+                #{seq,jdbcType=INTEGER},
+            </if>
+            <if test="deleteFlag != null">
+                #{deleteFlag,jdbcType=INTEGER},
+            </if>
+            <if test="creatId != null">
+                #{creatId,jdbcType=INTEGER},
+            </if>
+            <if test="creatTime != null">
+                #{creatTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifyId != null">
+                #{modifyId,jdbcType=INTEGER},
+            </if>
+            <if test="modifyTime != null">
+                #{modifyTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="icon != null">
+                #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="menuType != null">
+                #{menuType,jdbcType=INTEGER},
+            </if>
+            <if test="secondMenuId != null">
+                #{secondMenuId,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
+        update p_saas_menu
+        <set>
+            <if test="hospitalId != null">
+                hospital_id = #{hospitalId,jdbcType=BIGINT},
+            </if>
+            <if test="permissionRoleId != null">
+                permission_role_id = #{permissionRoleId,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                name = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="url != null">
+                url = #{url,jdbcType=VARCHAR},
+            </if>
+            <if test="parentId != null">
+                parent_id = #{parentId,jdbcType=INTEGER},
+            </if>
+            <if test="systemType != null">
+                system_type = #{systemType,jdbcType=INTEGER},
+            </if>
+            <if test="seq != null">
+                seq = #{seq,jdbcType=INTEGER},
+            </if>
+            <if test="deleteFlag != null">
+                delete_flag = #{deleteFlag,jdbcType=INTEGER},
+            </if>
+            <if test="creatId != null">
+                creat_id = #{creatId,jdbcType=INTEGER},
+            </if>
+            <if test="creatTime != null">
+                creat_time = #{creatTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifyId != null">
+                modify_id = #{modifyId,jdbcType=INTEGER},
+            </if>
+            <if test="modifyTime != null">
+                modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="icon != null">
+                icon = #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="menuType != null">
+                menu_type = #{menuType,jdbcType=INTEGER},
+            </if>
+            <if test="secondMenuId != null">
+                second_menu_id = #{secondMenuId,jdbcType=INTEGER},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.SaaSMenu">
+        update p_saas_menu
+        set hospital_id        = #{hospitalId,jdbcType=BIGINT},
+            permission_role_id = #{permissionRoleId,jdbcType=VARCHAR},
+            name               = #{name,jdbcType=VARCHAR},
+            url                = #{url,jdbcType=VARCHAR},
+            parent_id          = #{parentId,jdbcType=INTEGER},
+            system_type        = #{systemType,jdbcType=INTEGER},
+            seq                = #{seq,jdbcType=INTEGER},
+            delete_flag        = #{deleteFlag,jdbcType=INTEGER},
+            creat_id           = #{creatId,jdbcType=INTEGER},
+            creat_time         = #{creatTime,jdbcType=TIMESTAMP},
+            modify_id          = #{modifyId,jdbcType=INTEGER},
+            modify_time        = #{modifyTime,jdbcType=TIMESTAMP},
+            icon               = #{icon,jdbcType=VARCHAR},
+            menu_type          = #{menuType,jdbcType=INTEGER},
+            second_menu_id     = #{secondMenuId,jdbcType=INTEGER}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+</mapper>
\ No newline at end of file