添加管理员

cdssman-service/src/main/java/com/diagbot/dto/UserRoleInfoFindDTO.java

@@ -0,0 +1,39 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 18:43
+ */
+@Setter
+@Getter
+public class UserRoleInfoFindDTO {
+
+    private Long id;
+    /**
+     * 用户名
+     */
+    private Long usernId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    private Integer status ;
+
+    private Long hospitalId;
+
+}

cdssman-service/src/main/java/com/diagbot/facade/TokenPermissionFacade.java

@@ -44,6 +44,14 @@ public class TokenPermissionFacade extends TokenPermissionServiceImpl {
     public Boolean boundPermissionTokens(PermissionTokenAllVO permissionTokenAllVO) {
         Date now = DateUtil.now();
         Long tokenId = tokenHospitalFacade.getHospitalTokenId(permissionTokenAllVO.getHospitalId());
+        QueryWrapper<TokenPermission> tokenPermissionQuery = new QueryWrapper<>();
+        tokenPermissionQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("token_id", tokenId)
+                .eq("permission_id", permissionTokenAllVO.getPermissionId());
+        int count = count(tokenPermissionQuery);
+        if(count>0){
+            throw new CommonException(CommonErrorCode.IS_EXISTS, "该数据已存在");
+        }
         TokenPermission tokenPermission = new TokenPermission();
         BeanUtil.copyProperties(permissionTokenAllVO, tokenPermission);
         tokenPermission.setCreator(UserUtils.getCurrentPrincipleID());

cdssman-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -1,7 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.User;
+import com.diagbot.entity.UserHospital;
 import com.diagbot.entity.UserRole;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.UserRoleService;
 import com.diagbot.service.impl.UserRoleServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -9,11 +13,14 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.UserHospitalInfoVO;
 import com.diagbot.vo.UserInfoVO;
+import com.diagbot.vo.UserRoleInfoCancelVO;
+import com.diagbot.vo.UserRoleInfoFindVO;
 import com.diagbot.vo.UserRoleInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author wangfeng
@@ -55,4 +62,32 @@ public class UserRoleFacade extends UserRoleServiceImpl {
         }
         return res;
     }
+
+    public List<UserRoleInfoFindDTO> getUserRoles(UserRoleInfoFindVO userRoleInfoFindVO) {
+        List<UserRoleInfoFindDTO> data = userRoleService.getUserRoleAlls(userRoleInfoFindVO);
+        return data;
+    }
+
+    /**
+     * @param userRoleInfoCancelVO
+     * @return
+     */
+    public boolean cancelUserRole(UserRoleInfoCancelVO userRoleInfoCancelVO) {
+        UpdateWrapper<UserRole> userRoleUpdate = new UpdateWrapper<>();
+        userRoleUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", userRoleInfoCancelVO.getUserId())
+                .eq("id", userRoleInfoCancelVO.getId())
+                .eq("role_id", -1);
+        boolean res = userRoleService.remove(userRoleUpdate);
+        UpdateWrapper<User> userUpdate = new UpdateWrapper<>();
+        userUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", userRoleInfoCancelVO.getUserId());
+        res = userFacade.remove(userUpdate);
+        UpdateWrapper<UserHospital> userHospitalUpdate = new UpdateWrapper<>();
+        userHospitalUpdate.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", userRoleInfoCancelVO.getUserId())
+                .eq("hospital_id", userRoleInfoCancelVO.getHospitalId());
+        res = userHospitalFacade.remove(userHospitalUpdate);
+        return res;
+    }
 }

cdssman-service/src/main/java/com/diagbot/mapper/UserRoleMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.UserRoleInfoFindVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UserRoleMapper extends BaseMapper<UserRole> {
 
+    List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
 }

cdssman-service/src/main/java/com/diagbot/service/UserRoleService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
+import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.UserRoleInfoFindVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface UserRoleService extends IService<UserRole> {
 
+    List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO);
 }

cdssman-service/src/main/java/com/diagbot/service/impl/UserRoleServiceImpl.java

@@ -1,11 +1,15 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.entity.UserRole;
 import com.diagbot.mapper.UserRoleMapper;
 import com.diagbot.service.UserRoleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.UserRoleInfoFindVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 系统用户角色关联表 服务实现类
@@ -17,4 +21,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
 
+    @Override
+    public List<UserRoleInfoFindDTO> getUserRoleAlls(UserRoleInfoFindVO userRoleInfoFindVO) {
+        return baseMapper.getUserRoleAlls(userRoleInfoFindVO);
+    }
 }

cdssman-service/src/main/java/com/diagbot/vo/UserRoleInfoCancelVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 19:36
+ */
+@Setter
+@Getter
+public class UserRoleInfoCancelVO {
+    @NotNull(message = "请输入id")
+    private Long id;
+    @NotNull(message = "请输入用户id")
+    private Long userId;
+    @NotNull(message = "请输入医院")
+    private Long hospitalId;
+}

cdssman-service/src/main/java/com/diagbot/vo/UserRoleInfoFindVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-08-11 17:11
+ */
+@Setter
+@Getter
+public class UserRoleInfoFindVO {
+    private Long hospitalId;
+}

cdssman-service/src/main/java/com/diagbot/web/UserRoleController.java

@@ -5,12 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TokenHospitaDTO;
+import com.diagbot.dto.UserRoleInfoFindDTO;
 import com.diagbot.facade.UserRoleFacade;
 import com.diagbot.vo.TokenHospitalVO;
+import com.diagbot.vo.UserRoleInfoCancelVO;
+import com.diagbot.vo.UserRoleInfoFindVO;
 import com.diagbot.vo.UserRoleInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +23,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -39,8 +44,27 @@ public class UserRoleController {
     @ApiOperation(value = "添加医院管理员[by:wangfeng]",notes = "添加医院管理员")
     @PostMapping("/addUserRole")
     @SysLogger("addUserRole")
+    @Transactional
     public RespDTO<Boolean> addUserRole(@RequestBody @Valid UserRoleInfoVO userRoleInfoVO) {
         boolean res = userRoleFacade.addUserRoles(userRoleInfoVO);
         return RespDTO.onSuc(res);
     }
+
+    @ApiOperation(value = "获取医院管理员[by:wangfeng]",notes = "获取医院管理员")
+    @PostMapping("/getUserRole")
+    @SysLogger("getUserRole")
+    @Transactional
+    public RespDTO<List<UserRoleInfoFindDTO>> getUserRole(@RequestBody @Valid UserRoleInfoFindVO userRoleInfoFindVO) {
+        List<UserRoleInfoFindDTO> data = userRoleFacade.getUserRoles(userRoleInfoFindVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "删除医院管理员[by:wangfeng]",notes = "获取医院管理员")
+    @PostMapping("/cancelUserRole")
+    @SysLogger("cancelUserRole")
+    @Transactional
+    public RespDTO<Boolean> cancelUserRole(@RequestBody @Valid UserRoleInfoCancelVO userRoleInfoCancelVO) {
+        boolean res = userRoleFacade.cancelUserRole(userRoleInfoCancelVO);
+        return RespDTO.onSuc(res);
+    }
 }

cdssman-service/src/main/resources/mapper/TokenPermissionMapper.xml

@@ -19,24 +19,29 @@
     <select id="getPermissionAll" resultType="com.diagbot.dto.PermissionAllDTO">
         SELECT
         a.id ,
-        a.`param_key` AS param_Key,
-        a.`param_value` AS paramValue,
-        a.`permission_id` AS permissionId,
-        a.`token_id`AS tokenId,
-        c.`name` AS permissionName,
-        c.`permissionUrl` AS permissionUrl,
-        d.`id` AS hospitalId,
-        d.`name` AS hospitalName
+        a.param_key AS paramKey,
+        a.param_value AS paramValue,
+        a.permission_id AS permissionId,
+        a.token_id AS tokenId,
+        c.name AS permissionName,
+        c.permissionUrl AS permissionUrl,
+        d.id AS hospitalId,
+        d.name AS hospitalName
         FROM
         sys_token_permission a ,
         sys_token_hospital b ,
         sys_permission c,
         tran_hospital_info d
-        WHERE a.token_id = b.id
+        WHERE
+        a.is_deleted = 'N'
+        AND b.is_deleted = 'N'
+        AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
+        and a.token_id = b.id
         AND a.permission_id = c.id
         AND d.id = b.hospital_id
-        <if test="hospitalId!=nulll">
-            b.hospital_id = #{hospitalId}
+        <if test="hospitalId!=null">
+            and b.hospital_id = #{hospitalId}
         </if>
     </select>
 

cdssman-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -4,15 +4,40 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.UserRole">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="user_id" property="userId" />
-        <result column="role_id" property="roleId" />
-        <result column="remark" property="remark" />
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="user_id" property="userId"/>
+        <result column="role_id" property="roleId"/>
+        <result column="remark" property="remark"/>
     </resultMap>
-
+    <select id="getUserRoleAlls" resultType="com.diagbot.dto.UserRoleInfoFindDTO">
+        SELECT
+        c.id AS id,
+        a.username AS username,
+        a.linkman AS linkman,
+        c.user_id AS userId,
+        d.id AS hospitalId,
+        d.name AS hospitalName,
+        a.status AS STATUS
+        FROM
+        sys_user a,
+        sys_user_hospital b,
+        sys_user_role c ,
+        tran_hospital_info d
+        WHERE
+        a.is_deleted = 'N'
+        AND b.is_deleted = 'N'
+        AND c.is_deleted = 'N'
+        AND d.is_deleted = 'N'
+        AND a.id =b.user_id
+        AND a.id =c.user_id
+        AND b.hospital_id = d.id
+        <if test="hospitalId !=null">
+            and hospital_id = #{hospitalId}
+        </if>
+    </select>
 </mapper>