saas平台修改

server/src/main/java/com/pica/cloud/account/account/server/controller/HospitalSaasRoleController.java

@@ -3,7 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 
 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.HospitalRoleDto;
+import com.pica.cloud.account.account.server.resp.HospitalRoleDetailDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.service.HospitalSaasRoleService;
 import com.pica.cloud.foundation.entity.PicaResponse;
@@ -12,6 +12,7 @@ import com.pica.cloud.foundation.utils.entity.PicaUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -27,7 +28,7 @@ public class HospitalSaasRoleController extends AccountBaseController {
     @ApiOperation("机构saas角色-新增或更新")
     @PostMapping(value = "/hospital/role/insertAndModify")
     @EnabledLoginValidate
-    public PicaResponse<Integer> insertAndModify(@RequestBody HospitalRoleDetailReq req) {
+    public PicaResponse<Integer> insertAndModify(@Validated @RequestBody HospitalRoleDetailReq req) {
         PicaUser user = fetchPicaUser();
         return PicaResponse.toResponse(hospitalSaasRoleService.insertAndModify(req, user));
     }
@@ -36,7 +37,8 @@ public class HospitalSaasRoleController extends AccountBaseController {
     @DeleteMapping(value = "/hospital/role/delete/{id}")
     @EnabledLoginValidate
     public PicaResponse<Integer> delete(@PathVariable("id") Long id) {
-        return PicaResponse.toResponse(hospitalSaasRoleService.delete(id));
+        PicaUser user = fetchPicaUser();
+        return PicaResponse.toResponse(hospitalSaasRoleService.delete(id, user));
     }
 
     @ApiOperation("机构saas平台角色列表")
@@ -48,10 +50,10 @@ public class HospitalSaasRoleController extends AccountBaseController {
     }
 
 
-    @ApiOperation("机构saas角色-角色")
+    @ApiOperation("机构saas角色-角色详情")
     @GetMapping(value = "/hospital/role/getRoleDetail/{id}")
     @EnabledLoginValidate
-    public PicaResponse<HospitalRoleDto> getRoleDetail(@PathVariable("id") Long id) {
+    public PicaResponse<HospitalRoleDetailDto> getRoleDetail(@PathVariable("id") Long id) {
         return PicaResponse.toResponse(hospitalSaasRoleService.getRoleDetail(id));
     }
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/controller/HospitalSaasUserController.java

@@ -5,6 +5,7 @@ import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDetailResp;
+import com.pica.cloud.account.account.server.resp.HospitalSaasUserEditResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserResp;
 import com.pica.cloud.account.account.server.service.HospitalSaasRoleService;
 import com.pica.cloud.account.account.server.service.HospitalSaasUserService;
@@ -31,15 +32,17 @@ public class HospitalSaasUserController extends AccountBaseController {
     @ApiOperation("机构saas平台人员注册 0失败 1成功")
     @PostMapping(value = "/hospital/register")
     @EnabledLoginValidate
-    public PicaResponse<Integer> register(@RequestBody HospitalSaasUserReq req) {
-        return PicaResponse.toResponse(hospitalSaasUserService.register(req, super.getProductType(), super.getSourceType(), getPicaUser()));
+    public PicaResponse<Integer> register(@RequestBody HospitalSaasUserReq req, @RequestHeader("token") String token) {
+        Long doctorId = super.getDoctorIdByToken();
+        return PicaResponse.toResponse(hospitalSaasUserService.register(req, doctorId));
     }
 
     @ApiOperation("机构saas平台人员更新 0失败 1成功")
     @PostMapping(value = "/hospital/upsert")
     @EnabledLoginValidate
     public PicaResponse<Integer> upsert(@RequestBody HospitalSaasUserReq req) {
-        return PicaResponse.toResponse(hospitalSaasUserService.upsert(req, getPicaUser()));
+        Long doctorId = super.getDoctorIdByToken();
+        return PicaResponse.toResponse(hospitalSaasUserService.upsert(req,doctorId));
     }
 
     @ApiOperation("机构saas平台人员列表查询")
@@ -49,14 +52,21 @@ public class HospitalSaasUserController extends AccountBaseController {
         return PicaResponse.toResponse(hospitalSaasUserService.listByPage(req));
     }
 
+    @ApiOperation("机构saas平台人员详情查询")
+    @GetMapping(value = "/hospital/edit/{id}")
+    @EnabledLoginValidate
+    public PicaResponse<HospitalSaasUserEditResp> edit(@PathVariable("id") Long id) {
+        return PicaResponse.toResponse(hospitalSaasUserService.edit(id));
+    }
+
     @ApiOperation("机构saas平台人员删除 0失败 1成功")
-    @DeleteMapping(value = "/hospital/delete")
+    @GetMapping(value = "/hospital/delete")
     @EnabledLoginValidate
     public PicaResponse<Integer> delete(@RequestParam("id") Long id) {
         return PicaResponse.toResponse(hospitalSaasUserService.delete(id));
     }
 
-    @ApiOperation("机构saas平台人员账户")
+    @ApiOperation("机构saas平台人员详情")
     @GetMapping(value = "/hospital/userDetail")
     @EnabledLoginValidate
     public PicaResponse<HospitalSaasUserDetailResp> userDetail(@RequestHeader("token") String token) {

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

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDto;
+import com.pica.cloud.account.account.server.resp.HospitalSaasUserEditResp;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,6 +24,8 @@ public interface AccountMapper {
     //新增账号
     void insertSelective(Account account);
 
+    Long insertSelectiveV2(Account account);
+
     //更新账号
     int updateByIdSelective(Account account);
 
@@ -36,7 +39,10 @@ public interface AccountMapper {
 
     List<Map<String, Object>> getHospitalInfoByPage(@Param("id") Long id, @Param("offset") int offset, @Param("size") int size);
 
-    Integer listCountByPage( Map<String, Object> map);
+    Integer listCountByPage(Map<String, Object> map);
 
     List<HospitalSaasUserDto> listByPage(Map<String, Object> map);
+
+    HospitalSaasUserEditResp  selectUserRoleById (Long id);
+
 }

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

@@ -4,6 +4,7 @@ package com.pica.cloud.account.account.server.mapper;
 import com.pica.cloud.account.account.server.entity.PermissionDoctorRole;
 
 import java.util.List;
+import java.util.Map;
 
 
 public interface PermissionDoctorRoleMapper {
@@ -31,5 +32,5 @@ public interface PermissionDoctorRoleMapper {
 
     List<PermissionDoctorRole> selectByRoleId(Long id);
 
-    int upsertDefaultRole( Long id);
+    int upsertDefaultRole(Map<String, Object> map);
 }
\ No newline at end of file

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

@@ -26,7 +26,7 @@ public interface PermissionRoleMapper {
 
     int listCountByPage(Map<String, Object> map);
 
-    int deleteById(Long id);
+    int deleteById(Map<String, Object> map);
 
     List<RoleDto> querySaasRoles();
 

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalRoleDetailReq.java

@@ -4,6 +4,7 @@ package com.pica.cloud.account.account.server.req;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.NotBlank;
 
 /**
  * @Author qinwh
@@ -15,6 +16,7 @@ public class HospitalRoleDetailReq {
     @ApiModelProperty("角色id")
     private Long id;
     @ApiModelProperty("角色name")
+    @NotBlank(message = "角色名称不能为空")
     private String name;
     @ApiModelProperty("角色描述")
     private String remark;

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java

@@ -44,6 +44,11 @@ public class HospitalSaasUserReq {
     @ApiModelProperty("角色id")
     private Long roleId;
 
+    @ApiModelProperty("产品类型")
+    private Integer productType;
+
+    @ApiModelProperty("资源类型")
+    private Integer sourceType;
 
     public void checkInsertParams() {
         if (StringUtils.isBlank(this.mobile)) {
@@ -55,15 +60,20 @@ public class HospitalSaasUserReq {
         if (StringUtils.isBlank(this.password)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "密码不能为空");
         }
-        if (null == this.roleId) {
-            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "角色id不能为空");
-        }
+//        if (null == this.roleId) {
+//            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "角色id不能为空");
+//        }
         if (this.name.length() > 16) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名长度必须≤16字符！");
         }
         if (!ValidateUtils.isMobile(this.mobile)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号格式不正确！");
         }
+        if (null == this.productType) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "产品类型不能为空！");
+        }
+        if (null == this.sourceType) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "资源类型不能为空！");
+        }
     }
-
 }

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalRoleDetailDto.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.resp;
+
+import lombok.Data;
+
+/**
+ * @Author Pica
+ * @Date 2022/3/3 14:36
+ */
+@Data
+public class HospitalRoleDetailDto {
+    private String roleName;
+
+    private Long roleId;
+
+    private String remark;
+}

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalRoleDto.java

@@ -16,9 +16,9 @@ public class HospitalRoleDto {
 
     private String remark;
 
+    private String createName;
+
     private String createId;
 
     private Long createTime;
-
-
 }

server/src/main/java/com/pica/cloud/account/account/server/resp/HospitalSaasUserEditResp.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.resp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author Pica
+ * @Date 2022/3/3 17:58
+ */
+@Data
+public class HospitalSaasUserEditResp {
+
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("备注")
+    private String comment;
+    @ApiModelProperty("角色id")
+    private Integer roleId;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+    @ApiModelProperty("密码")
+    private String password;
+    @ApiModelProperty("密码是否可修改  1 不可修改  2 可修改")
+    private Integer pwdFlag;
+}

server/src/main/java/com/pica/cloud/account/account/server/service/HospitalSaasRoleService.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.service;
 
 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.HospitalRoleDetailDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleDto;
 import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasRoleResp;
@@ -20,10 +21,10 @@ public interface HospitalSaasRoleService {
 
     HospitalRoleResp listByPage(HospitalRoleListReq req);
 
-    int delete(Long id);
+    int delete(Long id, PicaUser user);
 
     HospitalSaasRoleResp querySaasRoles();
 
-    HospitalRoleDto getRoleDetail(Long id);
+    HospitalRoleDetailDto getRoleDetail(Long id);
 
 }

server/src/main/java/com/pica/cloud/account/account/server/service/HospitalSaasUserService.java

@@ -6,6 +6,7 @@ import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserDetailResp;
+import com.pica.cloud.account.account.server.resp.HospitalSaasUserEditResp;
 import com.pica.cloud.account.account.server.resp.HospitalSaasUserResp;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
@@ -18,13 +19,16 @@ import java.util.List;
  */
 public interface HospitalSaasUserService {
 
-    int register(HospitalSaasUserReq baseRequest, Integer productType, Integer sourceType, PicaUser user);
+    int register(HospitalSaasUserReq baseRequest,  Long doctorId);
 
     HospitalSaasUserResp listByPage(HospitalSaasUserListReq req);
 
-    int upsert(HospitalSaasUserReq req, PicaUser user);
+    int upsert(HospitalSaasUserReq req, Long doctorId);
 
     int delete(Long id);
 
     HospitalSaasUserDetailResp userDetail(PicaUser user);
+
+    HospitalSaasUserEditResp edit(Long id);
+
 }

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

@@ -7,10 +7,7 @@ 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.req.HospitalRoleDetailReq;
 import com.pica.cloud.account.account.server.req.HospitalRoleListReq;
-import com.pica.cloud.account.account.server.resp.HospitalRoleDto;
-import com.pica.cloud.account.account.server.resp.HospitalRoleResp;
-import com.pica.cloud.account.account.server.resp.HospitalSaasRoleResp;
-import com.pica.cloud.account.account.server.resp.RoleDto;
+import com.pica.cloud.account.account.server.resp.*;
 import com.pica.cloud.account.account.server.service.HospitalSaasRoleService;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
@@ -61,31 +58,13 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             role.setModifiedTime(new Date());
             num = permissionRoleMapper.insertSelective(role);
         }
-//        PermissionRole role = permissionRoleMapper.selectByPrimaryKey(req.getId());
-//        //新增
-//        if (Objects.isNull(role)) {
-//            //新增
-//            role = new PermissionRole();
-//            BeanUtils.copyProperties(req, role);
-//            CommonUtils.setCommonParam(role, user.getId(), Calendar.getInstance().getTime());
-//            permissionRoleMapper.insert(role);
-//        } else {
-//            //更新
-//            // todo   roleCode 字段格式定义
-//            role.setRoleName(req.getName());
-//            // todo  描述信息 需新增字段
-//            permissionRoleMapper.updateByPrimaryKeySelective(role);
-//        }
         return num;
     }
 
     @Override
     public HospitalRoleResp listByPage(HospitalRoleListReq req) {
         ArrayList<Object> list = new ArrayList<>(3);
-        list.add(1);
-        list.add(2);
-        //todo  过滤当前人员的角色信息
-        //list.add();
+        Arrays.asList(1, 2, 3);
         Map<String, Object> map = new HashMap(4);
         map.put("list", list);
         map.put("name", req.getName());
@@ -101,10 +80,13 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
 
     @Override
     @Transactional
-    public int delete(Long id) {
-        permissionRoleMapper.deleteById(id);
-        //把这个角色下的人员信息 调整为默认角色   todo  需写死一个默认角色的id
-        permissionDoctorRoleMapper.upsertDefaultRole(id);
+    public int delete(Long id, PicaUser user) {
+        Map<String, Object> map = new HashMap<>(3);
+        map.put("id", id);
+        map.put("modifiedId", user.getId());
+        map.put("modifiedTime", new Date());
+        permissionRoleMapper.deleteById(map);
+        permissionDoctorRoleMapper.upsertDefaultRole(map);
         return 1;
     }
 
@@ -115,11 +97,10 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
     }
 
     @Override
-    public HospitalRoleDto getRoleDetail(Long id) {
-        HospitalRoleDto roleDto = new HospitalRoleDto();
+    public HospitalRoleDetailDto getRoleDetail(Long id) {
         PermissionRole permissionRole = permissionRoleMapper.selectByPrimaryKey(id);
-        BeanUtils.copyProperties(permissionRole, roleDto);
-        roleDto.setRoleId(permissionRole.getId());
-        return roleDto;
+        HospitalRoleDetailDto dto = new HospitalRoleDetailDto();
+        BeanUtils.copyProperties(permissionRole, dto);
+        return dto;
     }
 }

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

@@ -48,7 +48,7 @@
           and modified_time < DATE_FORMAT(NOW(), '%Y-%m-%d %H:00:00')
     </insert>
 
-    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole"  useGeneratedKeys="true" keyProperty="id" >
         insert into permission_doctor_role (id, doctor_id, hospital_id,
                                             role_id, delete_flag, created_id,
                                             created_time, modified_id, modified_time)
@@ -170,7 +170,10 @@
 
     <update id="upsertDefaultRole" parameterType="java.lang.Integer">
         update permission_doctor_role
-        set role_id = 2
+        set delete_flag   = 2,
+            # role_id       = 4,
+            modified_id   = #{modifiedId,jdbcType=BIGINT},
+            modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
         where role_id = #{id,jdbcType=BIGINT}
           and delete_flag = 1
     </update>

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

@@ -167,24 +167,28 @@
         pr.created_time as createTime,
         pr.role_name as roleName,
         pr.id as roleId,
-        pr.remark as remark
-        from permission_role as pr
+        pr.remark as remark,
+        pr.created_id as createId,
+        pd.name as name
+        from permission_role as pr join p_doctor as pd on pr.created_id=pd.id
         where pr.delete_flag = 1
         <include refid="list_by_page"></include>
         ORDER BY pr.created_time ASC
         Limit #{pageNo},#{pageSize}
     </select>
+
     <select id="querySaasRoles" resultType="com.pica.cloud.account.account.server.resp.RoleDto">
         select p.id as id, p.role_name as name
         from permission_role as p
-             #  todo  id暂不确定
-        where p.id not in (1, 2, 3)
+        where p.id not in (1, 2)
     </select>
 
 
     <update id="deleteById">
         update permission_role
-        set delete_flag = 2
+        set delete_flag   = 2,
+            modified_id   = #{modifiedId,jdbcType=BIGINT},
+            modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
         where id = #{id,jdbcType=BIGINT}
     </update>