后台以及病组查询修改

hs-admin/src/main/java/com/hs/admin/controller/OrgController.java

@@ -57,13 +57,13 @@ public class OrgController {
     @PostMapping("add")
     @Token
     @ApiOperation("添加机构")
-    public Object addOrg(@ApiIgnore @CurrentUser Integer userId,@Valid @RequestBody OrgReq.AddOrgReq org) throws Exception {
+    public Object addOrg(@ApiIgnore @CurrentUser Integer userId, @Valid @RequestBody OrgReq.AddOrgReq org) throws Exception {
         DicOrg sysRole = dicOrgService.getByName(org.getOrgName());
-        if(sysRole != null){
+        if (sysRole != null) {
             return Result.error("该机构已存在！");
         }
-        boolean result = dicOrgService.addOrg(userId,org);
-        if(result)
+        boolean result = dicOrgService.addOrg(userId, org);
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -74,7 +74,7 @@ public class OrgController {
     @ApiOperation("删除机构")
     public Object deleteOrg(@RequestBody OrgReq.DeleteOrgReq org) throws Exception {
         boolean result = dicOrgService.deleteOrg(org);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -86,13 +86,13 @@ public class OrgController {
     public Object updateOrg(@Valid @RequestBody OrgReq.UpdateOrgReq org) throws Exception {
         DicOrg reqDic = dicOrgService.info(org.getOrgId());
         DicOrg nameRole = dicOrgService.getByName(org.getOrgName());
-        if(reqDic != null){
-            if(nameRole != null && !nameRole.getOrgName().equals(reqDic.getOrgName())){
+        if (reqDic != null) {
+            if (nameRole != null && !nameRole.getOrgName().equals(reqDic.getOrgName())) {
                 return Result.error("该机构已存在");
             }
         }
         boolean result = dicOrgService.updateOrg(org);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -109,9 +109,9 @@ public class OrgController {
     @PostMapping("saveuserorg")
     @Token
     @ApiOperation("保存用户机构")
-    public Object saveUserOrg(@ApiIgnore @CurrentUser Integer loginUserId,@RequestBody OrgReq.SaveUserOrgReq org) throws Exception {
-        boolean result = dicOrgService.saveUserOrg(Long.valueOf(loginUserId),org);
-        if(result)
+    public Object saveUserOrg(@ApiIgnore @CurrentUser Integer loginUserId, @RequestBody OrgReq.SaveUserOrgReq org) throws Exception {
+        boolean result = dicOrgService.saveUserOrg(Long.valueOf(loginUserId), org.getUserId(), org.getOrg());
+        if (result)
             return Result.success(null);
         else
             return Result.error();

hs-admin/src/main/java/com/hs/admin/controller/RoleController.java

@@ -44,13 +44,13 @@ public class RoleController {
     @PostMapping("add")
     @Token
     @ApiOperation("添加角色")
-    public Object addUser(@ApiIgnore @CurrentUser Integer userId,@Valid @RequestBody RoleReq.AddRoleReq role) throws Exception {
+    public Object addUser(@ApiIgnore @CurrentUser Integer userId, @Valid @RequestBody RoleReq.AddRoleReq role) throws Exception {
         SysRole sysRole = sysRoleService.findByCode(role.getRoleCode());
-        if(sysRole != null){
+        if (sysRole != null) {
             return Result.error("该角色已存在！");
         }
-        boolean result = sysRoleService.addRole(Long.valueOf(userId),role);
-        if(result)
+        boolean result = sysRoleService.addRole(Long.valueOf(userId), role);
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -61,7 +61,7 @@ public class RoleController {
     @ApiOperation("删除角色")
     public Object addUser(@RequestBody RoleReq.DeleteRoleReq role) throws Exception {
         boolean result = sysRoleService.deleteRole(role);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -73,13 +73,13 @@ public class RoleController {
     public Object addUser(@Valid @RequestBody RoleReq.UpdateRoleReq role) throws Exception {
         SysRole reqRole = sysRoleService.info(role.getRoleId());
         SysRole codeRole = sysRoleService.findByCode(role.getRoleCode());
-        if(reqRole != null){
-            if(codeRole != null && !codeRole.getRoleCode().equals(reqRole.getRoleCode())){
+        if (reqRole != null) {
+            if (codeRole != null && !codeRole.getRoleCode().equals(reqRole.getRoleCode())) {
                 return Result.error("该角色已存在");
             }
         }
         boolean result = sysRoleService.updateRole(role);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -88,9 +88,9 @@ public class RoleController {
     @PostMapping("saveuserole")
     @Token
     @ApiOperation("保存用户角色")
-    public Object saveUserOrg(@ApiIgnore @CurrentUser Integer userId,@RequestBody RoleReq.SavaUserRoleReq role) throws Exception {
-        boolean result = sysRoleService.saveUserRole(Long.valueOf(userId),role);
-        if(result)
+    public Object saveUserOrg(@ApiIgnore @CurrentUser Integer userId, @RequestBody RoleReq.SavaUserRoleReq role) throws Exception {
+        boolean result = sysRoleService.saveUserRole(Long.valueOf(userId), role.getUserId(), role.getRoleId());
+        if (result)
             return Result.success(null);
         else
             return Result.error();

hs-admin/src/main/java/com/hs/admin/controller/UserController.java

@@ -5,8 +5,11 @@ import com.hs.admin.common.annotations.CurrentUser;
 import com.hs.admin.common.annotations.Token;
 import com.hs.admin.model.SysRole;
 import com.hs.admin.model.SysUser;
+import com.hs.admin.model.reqmodel.AddUserReq;
+import com.hs.admin.model.reqmodel.UpdateUserReq;
 import com.hs.admin.model.reqmodel.UserReq;
 import com.hs.admin.model.respmodel.SysMenuList;
+import com.hs.admin.model.respmodel.SysUserList;
 import com.hs.admin.service.SysMenuService;
 import com.hs.admin.service.SysUserRoleRsService;
 import com.hs.admin.service.UserService;
@@ -37,7 +40,7 @@ public class UserController {
     @Token
     @ApiOperation("查询用户列表")
     public Object getAll(@RequestBody UserReq.GetUserReq user) throws Exception {
-        List<SysUser> list = userService.getAll(user);
+        List<SysUserList> list = userService.getAll(user);
         return Result.success(list);
     }
 
@@ -52,13 +55,13 @@ public class UserController {
     @PostMapping("add")
     @Token
     @ApiOperation("添加用户")
-    public Object addUser(@ApiIgnore @CurrentUser Integer userId,@Valid @RequestBody UserReq.AddUserReq user) throws Exception {
+    public Object addUser(@ApiIgnore @CurrentUser Integer userId, @Valid @RequestBody AddUserReq user) throws Exception {
         SysUser sysUser = userService.findByLoginName(user.getUserCode());
-        if(sysUser != null){
+        if (sysUser != null) {
             return Result.error("该账号已存在！");
         }
-        boolean result = userService.addUser(Long.valueOf(userId),user);
-        if(result)
+        boolean result = userService.addUser(Long.valueOf(userId), user);
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -69,7 +72,7 @@ public class UserController {
     @ApiOperation("删除用户")
     public Object deleteUser(@RequestBody UserReq.DeleteUserReq user) throws Exception {
         boolean result = userService.deleteUser(user);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();
@@ -78,16 +81,16 @@ public class UserController {
     @PostMapping("update")
     @Token
     @ApiOperation("修改用户")
-    public Object updateUser(@Valid @RequestBody UserReq.UpdateUserReq user) throws Exception {
+    public Object updateUser(@Valid @RequestBody UpdateUserReq user) throws Exception {
         SysUser reqUser = userService.info(user.getUserId());
         SysUser codeUser = userService.findByLoginName(user.getUserCode());
-        if(reqUser != null){
-            if(codeUser != null && !codeUser.getUserCode().equals(reqUser.getUserCode())){
+        if (reqUser != null) {
+            if (codeUser != null && !codeUser.getUserCode().equals(reqUser.getUserCode())) {
                 return Result.error("该用户已存在");
             }
         }
         boolean result = userService.updateUser(user);
-        if(result)
+        if (result)
             return Result.success(null);
         else
             return Result.error();

hs-admin/src/main/java/com/hs/admin/mapper/SysUserMapper.java

 package com.hs.admin.mapper;
 
 import com.hs.admin.model.SysUser;
+import com.hs.admin.model.respmodel.SysUserList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface SysUserMapper {
     int updateByPrimaryKey(SysUser record);
 
     SysUser selectByCode(@Param("userCode") String loginName);
+
+    List<SysUserList> selectUserList();
 }
\ No newline at end of file

hs-admin/src/main/java/com/hs/admin/model/reqmodel/AddUserReq.java

+package com.hs.admin.model.reqmodel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class AddUserReq {
+    @ApiModelProperty(value = "账号", required = true)
+    @NotBlank(message = "账号 参数必传")
+    private String userCode;
+
+    @ApiModelProperty(value = "名称", required = true)
+    @NotBlank(message = "名称 参数必传")
+    private String userName;
+
+    @ApiModelProperty(value = "密码", required = true)
+    @NotBlank(message = "密码 参数必传")
+    private String password;
+
+    @ApiModelProperty(value = "身份证", required = true)
+    private String idcard;
+
+    @ApiModelProperty(value = "性别", required = true)
+    private String sex;
+
+    @ApiModelProperty(value = "手机号码", required = true)
+    private String mobile;
+
+    @NotNull(message = "角色ID 参数必传")
+    @ApiModelProperty(value = "角色ID", required = true)
+    private Long roleId;
+
+    @ApiModelProperty(value = "机构ID", required = true)
+    @NotNull(message = "机构ID 参数必传")
+    private List<Long> org;
+}

hs-admin/src/main/java/com/hs/admin/model/reqmodel/UpdateUserReq.java

+package com.hs.admin.model.reqmodel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class UpdateUserReq {
+    @ApiModelProperty(value = "用户ID", required = true)
+    @NotNull(message = "用户ID 参数必传")
+    private Integer userId;
+
+    @ApiModelProperty(value = "账号", required = true)
+    @NotBlank(message = "账号 参数必传")
+    private String userCode;
+
+    @ApiModelProperty(value = "名称", required = true)
+    @NotBlank(message = "名称 参数必传")
+    private String userName;
+
+    @ApiModelProperty(value = "密码", required = true)
+    @NotBlank(message = "密码 参数必传")
+    private String password;
+
+    @ApiModelProperty(value = "身份证", required = true)
+    private String idcard;
+
+    @ApiModelProperty(value = "性别", required = true)
+    private String sex;
+
+    @ApiModelProperty(value = "手机号码", required = true)
+    private String mobile;
+
+    @NotNull(message = "角色ID 参数必传")
+    @ApiModelProperty(value = "角色ID", required = true)
+    private Long roleId;
+
+    @ApiModelProperty(value = "机构ID", required = true)
+    @NotNull(message = "机构ID 参数必传")
+    private List<Long> org;
+}

hs-admin/src/main/java/com/hs/admin/model/respmodel/SysUserList.java

+package com.hs.admin.model.respmodel;
+
+import com.hs.admin.model.SysUser;
+import lombok.Data;
+
+@Data
+public class SysUserList extends SysUser {
+    private Integer roleId;
+    private String roleName;
+    private Integer orgId;
+    private String orgName;
+}

hs-admin/src/main/java/com/hs/admin/service/DicOrgService.java

@@ -27,5 +27,5 @@ public interface DicOrgService {
 
     List<SysUserOrgRsList> getUserOrg(Integer userId);
 
-    boolean saveUserOrg(Long userId,OrgReq.SaveUserOrgReq org);
+    boolean saveUserOrg(Long userId, Long saveUserId, List<Long> org);
 }

hs-admin/src/main/java/com/hs/admin/service/SysRoleService.java

@@ -8,7 +8,7 @@ import java.util.List;
 public interface SysRoleService {
     SysRole findByCode(Long roleCode);
 
-    boolean addRole(Long userId,RoleReq.AddRoleReq role);
+    boolean addRole(Long userId, RoleReq.AddRoleReq role);
 
     boolean deleteRole(RoleReq.DeleteRoleReq role);
 
@@ -18,5 +18,5 @@ public interface SysRoleService {
 
     SysRole info(Integer roleId);
 
-    boolean saveUserRole(Long userId,RoleReq.SavaUserRoleReq role);
+    boolean saveUserRole(Long userId, Long saveUserId, Long roleId);
 }

hs-admin/src/main/java/com/hs/admin/service/UserService.java

 package com.hs.admin.service;
 
 import com.hs.admin.model.SysUser;
+import com.hs.admin.model.reqmodel.AddUserReq;
+import com.hs.admin.model.reqmodel.UpdateUserReq;
 import com.hs.admin.model.reqmodel.UserReq;
+import com.hs.admin.model.respmodel.SysUserList;
 
 import java.util.List;
 
 public interface UserService {
     SysUser findByLoginName(String loginName);
 
-    boolean addUser(Long userId,UserReq.AddUserReq user);
+    boolean addUser(Long userId, AddUserReq user);
 
     boolean deleteUser(UserReq.DeleteUserReq user);
 
-    boolean updateUser(UserReq.UpdateUserReq user);
+    boolean updateUser(UpdateUserReq user);
 
-    List<SysUser> getAll(UserReq.GetUserReq user);
+    List<SysUserList> getAll(UserReq.GetUserReq user);
 
     SysUser info(Integer userId);
 }

hs-admin/src/main/java/com/hs/admin/service/impl/DicOrgServiceImpl.java

@@ -25,11 +25,11 @@ public class DicOrgServiceImpl implements DicOrgService {
     @Resource
     private SysUserOrgRsMapper sysUserOrgRsMapper;
 
-    private List<DicOrgList> getLevelData(List<DicOrgList> list,Integer parentcode) {
+    private List<DicOrgList> getLevelData(List<DicOrgList> list, Integer parentcode) {
         List<DicOrgList> resultList = new ArrayList<>();
-        for(DicOrgList data : list){
-            if(data.getParentId() == parentcode){
-                List<DicOrgList> childList = getLevelData(list,data.getId());
+        for (DicOrgList data : list) {
+            if (data.getParentId() == parentcode) {
+                List<DicOrgList> childList = getLevelData(list, data.getId());
                 data.setDicOrgList(childList);
                 resultList.add(data);
             }
@@ -40,12 +40,12 @@ public class DicOrgServiceImpl implements DicOrgService {
 
     public List<DicOrgList> getParentAll(OrgReq.GetOrgReq org) {
         List<DicOrgList> list = dicOrgMapper.selectParentAll();
-        if(org.getOrgName() != null){
+        if (org.getOrgName() != null) {
             list = list.stream().filter(
                     o -> (o.getOrgName() != null && o.getOrgName().toLowerCase().contains(org.getOrgName().toLowerCase())))
                     .collect(Collectors.toList());
         }
-        List<DicOrgList> resultList = getLevelData(list,ORG_TOP_PARENT_ID);
+        List<DicOrgList> resultList = getLevelData(list, ORG_TOP_PARENT_ID);
         return resultList;
     }
 
@@ -59,12 +59,12 @@ public class DicOrgServiceImpl implements DicOrgService {
         return dicOrg;
     }
 
-    public boolean addOrg(Integer userId,OrgReq.AddOrgReq org) {
-        if(org != null){
+    public boolean addOrg(Integer userId, OrgReq.AddOrgReq org) {
+        if (org != null) {
             DicOrg dicOrg = new DicOrg();
             dicOrg.setCreateDate(new Date());
             dicOrg.setCreateUserid(Long.valueOf(userId));
-            dicOrg.setState((short)StateType.ON.getValue());
+            dicOrg.setState((short) StateType.ON.getValue());
             dicOrg.setOrgCode(org.getOrgCode());
             dicOrg.setOrgName(org.getOrgName());
             dicOrg.setOrgShortName(org.getOrgShortName());
@@ -80,10 +80,10 @@ public class DicOrgServiceImpl implements DicOrgService {
     }
 
     public boolean deleteOrg(OrgReq.DeleteOrgReq org) {
-        if(org != null){
+        if (org != null) {
             DicOrg dicOrg = dicOrgMapper.selectByPrimaryKey(org.getOrgId());
-            if(dicOrg != null){
-                dicOrg.setState((short)StateType.OFF.getValue());
+            if (dicOrg != null) {
+                dicOrg.setState((short) StateType.OFF.getValue());
                 dicOrgMapper.updateByPrimaryKey(dicOrg);
                 return true;
             }
@@ -92,9 +92,9 @@ public class DicOrgServiceImpl implements DicOrgService {
     }
 
     public boolean updateOrg(OrgReq.UpdateOrgReq org) {
-        if(org != null){
+        if (org != null) {
             DicOrg dicOrg = dicOrgMapper.selectByPrimaryKey(org.getOrgId());
-            if(dicOrg != null){
+            if (dicOrg != null) {
                 dicOrg.setOrgCode(org.getOrgCode());
                 dicOrg.setOrgName(org.getOrgName());
                 dicOrg.setOrgShortName(org.getOrgShortName());
@@ -128,26 +128,26 @@ public class DicOrgServiceImpl implements DicOrgService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveUserOrg(Long userId,OrgReq.SaveUserOrgReq org) {
+    public boolean saveUserOrg(Long userId, Long saveUserId, List<Long> org) {
         int result = 0;
-        if(org != null && org.getOrg() != null && org.getOrg().size() > 0 && org.getUserId() != null){
-            sysUserOrgRsMapper.deleteByUser(org.getUserId());
-            for(Long orgId : org.getOrg()){
+        if (org != null && org.size() > 0 && saveUserId != null) {
+            sysUserOrgRsMapper.deleteByUser(saveUserId);
+            for (Long orgId : org) {
                 //判断是否存在关系数据
-                SysUserOrgRs sysUserOrgRs = sysUserOrgRsMapper.selectByUserWithOrg(org.getUserId(),orgId);
-                if(sysUserOrgRs != null){
+                SysUserOrgRs sysUserOrgRs = sysUserOrgRsMapper.selectByUserWithOrg(saveUserId, orgId);
+                if (sysUserOrgRs != null) {
                     //开启状态
-                    sysUserOrgRs.setState((short)StateType.ON.getValue());
+                    sysUserOrgRs.setState((short) StateType.ON.getValue());
                     result += sysUserOrgRsMapper.updateByPrimaryKey(sysUserOrgRs);
 
-                }else{
+                } else {
                     //添加
                     sysUserOrgRs = new SysUserOrgRs();
                     sysUserOrgRs.setOrgId(orgId);
-                    sysUserOrgRs.setUserId(org.getUserId());
+                    sysUserOrgRs.setUserId(saveUserId);
                     sysUserOrgRs.setCreateDate(new Date());
                     sysUserOrgRs.setCreateUserid(userId);
-                    sysUserOrgRs.setState((short)StateType.ON.getValue());
+                    sysUserOrgRs.setState((short) StateType.ON.getValue());
                     result += sysUserOrgRsMapper.insert(sysUserOrgRs);
                 }
             }

hs-admin/src/main/java/com/hs/admin/service/impl/SysRoleServiceImpl.java

@@ -28,12 +28,12 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public boolean addRole(Long userId,RoleReq.AddRoleReq role) {
-        if(role != null){
+    public boolean addRole(Long userId, RoleReq.AddRoleReq role) {
+        if (role != null) {
             SysRole sysRole = new SysRole();
             sysRole.setCreateDate(new Date());
             sysRole.setCreateUserid(userId);
-            sysRole.setState((short)StateType.ON.getValue());
+            sysRole.setState((short) StateType.ON.getValue());
             sysRole.setRoleCode(role.getRoleCode());
             sysRole.setRoleName(role.getRoleName());
             sysRoleMapper.insert(sysRole);
@@ -44,10 +44,10 @@ public class SysRoleServiceImpl implements SysRoleService {
 
     @Override
     public boolean deleteRole(RoleReq.DeleteRoleReq role) {
-        if(role != null){
+        if (role != null) {
             SysRole sysRole = sysRoleMapper.selectByPrimaryKey(role.getRoleId());
-            if(sysRole != null){
-                sysRole.setState((short)StateType.OFF.getValue());
+            if (sysRole != null) {
+                sysRole.setState((short) StateType.OFF.getValue());
                 sysRoleMapper.updateByPrimaryKey(sysRole);
                 return true;
             }
@@ -57,9 +57,9 @@ public class SysRoleServiceImpl implements SysRoleService {
 
     @Override
     public boolean updateRole(RoleReq.UpdateRoleReq role) {
-        if(role != null){
+        if (role != null) {
             SysRole sysRole = sysRoleMapper.selectByPrimaryKey(role.getRoleId());
-            if(sysRole != null){
+            if (sysRole != null) {
                 sysRole.setRoleCode(role.getRoleCode());
                 sysRole.setRoleName(role.getRoleName());
                 sysRoleMapper.updateByPrimaryKey(sysRole);
@@ -72,7 +72,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     public List<SysRole> getAll(RoleReq.GetRoleReq role) {
         List<SysRole> list = sysRoleMapper.selectAll();
-        if(role.getRoleName() != null){
+        if (role.getRoleName() != null) {
             list = list.stream().filter(
                     o -> (o.getRoleName() != null && o.getRoleName().toLowerCase().contains(role.getRoleName().toLowerCase())))
                     .collect(Collectors.toList());
@@ -88,22 +88,22 @@ public class SysRoleServiceImpl implements SysRoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveUserRole(Long userId,RoleReq.SavaUserRoleReq role) {
+    public boolean saveUserRole(Long userId, Long saveUserId, Long roleId) {
         int result = 0;
-        if(role != null && role.getRoleId() != null && role.getUserId() != null){
+        if (saveUserId != null && roleId != null) {
             //先删除用户关联数据
-            sysUserRoleRsMapper.deleteByUser(role.getUserId());
-            SysUserRoleRs info = sysUserRoleRsMapper.selectByUser(role.getUserId(),role.getRoleId());
-            if(info != null){
-                info.setState((short)StateType.ON.getValue());
+            sysUserRoleRsMapper.deleteByUser(saveUserId);
+            SysUserRoleRs info = sysUserRoleRsMapper.selectByUser(saveUserId, roleId);
+            if (info != null) {
+                info.setState((short) StateType.ON.getValue());
                 result = sysUserRoleRsMapper.updateByPrimaryKey(info);
-            }else{
+            } else {
                 info = new SysUserRoleRs();
                 info.setCreateDate(new Date());
                 info.setCreateUserid(userId);
-                info.setState((short)StateType.ON.getValue());
-                info.setUserId(role.getUserId());
-                info.setRoleId(role.getRoleId());
+                info.setState((short) StateType.ON.getValue());
+                info.setUserId(saveUserId);
+                info.setRoleId(roleId);
                 result = sysUserRoleRsMapper.insert(info);
             }
         }

hs-admin/src/main/java/com/hs/admin/service/impl/UserServiceImpl.java

@@ -3,9 +3,15 @@ package com.hs.admin.service.impl;
 import com.hs.admin.common.enums.StateType;
 import com.hs.admin.mapper.SysUserMapper;
 import com.hs.admin.model.SysUser;
+import com.hs.admin.model.reqmodel.AddUserReq;
+import com.hs.admin.model.reqmodel.UpdateUserReq;
 import com.hs.admin.model.reqmodel.UserReq;
+import com.hs.admin.model.respmodel.SysUserList;
+import com.hs.admin.service.DicOrgService;
+import com.hs.admin.service.SysRoleService;
 import com.hs.admin.service.UserService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -17,6 +23,10 @@ public class UserServiceImpl implements UserService {
 
     @Resource
     private SysUserMapper sysUserMapper;
+    @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private DicOrgService dicOrgService;
 
     @Override
     public SysUser findByLoginName(String loginName) {
@@ -24,8 +34,10 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public boolean addUser(Long userId,UserReq.AddUserReq user) {
-        if(user != null){
+    @Transactional(rollbackFor = Exception.class)
+    public boolean addUser(Long userId, AddUserReq user) {
+        if (user != null) {
+            //添加用户信息
             SysUser sysUser = new SysUser();
             sysUser.setUserCode(user.getUserCode());
             sysUser.setUserName(user.getUserName());
@@ -35,8 +47,15 @@ public class UserServiceImpl implements UserService {
             sysUser.setSex(user.getSex());
             sysUser.setCreateDate(new Date());
             sysUser.setCreateUserid(userId);
-            sysUser.setState((short)StateType.ON.getValue());
+            sysUser.setState((short) StateType.ON.getValue());
             sysUserMapper.insert(sysUser);
+
+            //添加角色信息
+            sysRoleService.saveUserRole(userId, (long) sysUser.getId(), user.getRoleId());
+
+            //添加科室信息
+            dicOrgService.saveUserOrg(userId, (long) sysUser.getId(), user.getOrg());
+
             return true;
         }
         return false;
@@ -44,10 +63,10 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public boolean deleteUser(UserReq.DeleteUserReq user) {
-        if(user != null){
+        if (user != null) {
             SysUser sysUser = sysUserMapper.selectByPrimaryKey(user.getUserId());
-            if(sysUser != null){
-                sysUser.setState((short)StateType.OFF.getValue());
+            if (sysUser != null) {
+                sysUser.setState(sysUser.getState().equals((short) StateType.OFF.getValue()) ? (short) StateType.OFF.getValue() : (short) StateType.ON.getValue());
                 sysUserMapper.updateByPrimaryKey(sysUser);
                 return true;
             }
@@ -56,10 +75,12 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public boolean updateUser(UserReq.UpdateUserReq user) {
-        if(user != null){
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateUser(UpdateUserReq user) {
+        if (user != null) {
             SysUser sysUser = sysUserMapper.selectByPrimaryKey(user.getUserId());
-            if(sysUser != null){
+            if (sysUser != null) {
+                //修改用户
                 sysUser.setUserCode(user.getUserCode());
                 sysUser.setUserName(user.getUserName());
                 sysUser.setPassword(user.getPassword());
@@ -67,6 +88,13 @@ public class UserServiceImpl implements UserService {
                 sysUser.setMobile(user.getMobile());
                 sysUser.setSex(user.getSex());
                 sysUserMapper.updateByPrimaryKey(sysUser);
+
+                //修改角色信息
+                sysRoleService.saveUserRole(null, (long) sysUser.getId(), user.getRoleId());
+
+                //修改科室信息
+                dicOrgService.saveUserOrg(null, (long) sysUser.getId(), user.getOrg());
+
                 return true;
             }
         }
@@ -74,9 +102,9 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<SysUser> getAll(UserReq.GetUserReq user) {
-        List<SysUser> list = sysUserMapper.selectAll();
-        if(user.getUserName() != null){
+    public List<SysUserList> getAll(UserReq.GetUserReq user) {
+        List<SysUserList> list = sysUserMapper.selectUserList();
+        if (user.getUserName() != null) {
             list = list.stream().filter(
                     o -> (o.getUserName() != null && o.getUserName().toLowerCase().contains(user.getUserName().toLowerCase())))
                     .collect(Collectors.toList());

hs-admin/src/main/resources/mapper/SysUserMapper.xml

@@ -18,6 +18,12 @@
         <result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
         <result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
     </resultMap>
+    <resultMap id="SysUserList" extends="BaseResultMap" type="com.hs.admin.model.respmodel.SysUserList">
+        <result column="ROLE_ID" jdbcType="INTEGER" property="roleId"/>
+        <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName"/>
+        <result column="ROLE_ID" jdbcType="INTEGER" property="orgId"/>
+        <result column="USER_CODE" jdbcType="VARCHAR" property="orgName"/>
+    </resultMap>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete
         from sys_user
@@ -113,4 +119,13 @@
         where USER_CODE = #{userCode,jdbcType=VARCHAR}
           and `STATE` != 0
     </select>
+    <select id="selectUserList" resultMap="SysUserList">
+        select r.ID as ROLE_ID, r.ROLE_NAME, s.ID as ORG_ID, s.ORG_NAME, u.*
+        from sys_user u
+                 join sys_user_role_rs ur on ur.USER_ID = u.ID and ur.STATE = 1
+                 join sys_role r on r.ID = ur.ROLE_ID and r.STATE = 1
+                 join sys_user_sbj_rs us on us.USER_ID = u.ID and us.STATE = 1
+                 join sys_subject s on s.ID = us.ORG_ID and s.STATE = 1 and ((s.PARENT_ID != 0 and r.ROLE_CODE != 1) or
+                                                                             (s.PARENT_ID = 0 and r.ROLE_CODE = 1))
+    </select>
 </mapper>
\ No newline at end of file

hs-api/src/main/java/com/hs/api/controller/LoginController.java

@@ -2,6 +2,7 @@ package com.hs.api.controller;
 
 import com.hs.api.common.Result;
 import com.hs.api.model.reqmodel.CodeAndPwd;
+import com.hs.api.model.reqmodel.UpdatePass;
 import com.hs.api.model.respmodel.LoginInfo;
 import com.hs.api.service.LoginService;
 import com.hs.common.utils.HttpUtil;
@@ -24,11 +25,6 @@ public class LoginController {
     @Autowired
     private LoginService loginServiceImpl;
 
-    /**
-     * @param codeAndPwd
-     * @param request
-     * @return
-     */
     @PostMapping("login")
     @ApiOperation(value = "Result«LoginService.LoginInfo»登录")
     public Result login(@RequestBody CodeAndPwd codeAndPwd, HttpServletRequest request) {
@@ -41,6 +37,18 @@ public class LoginController {
         return Result.success(loginInfo);
     }
 
+    @PostMapping("pass")
+    @ApiOperation(value = "修改密码")
+    public Result updatePass(@RequestBody UpdatePass request) {
+        boolean result = loginServiceImpl.updatePass(request.getLoginName(), request.getOldPassword()
+                , request.getNewPassword());
+        if (result)
+            return Result.success(null);
+        else
+            return Result.error();
+    }
+
+
     @PostMapping("token")
     @ApiOperation("刷新TOKEN")
     public Result<String> refresh(@ApiIgnore HttpServletRequest request) {

hs-api/src/main/java/com/hs/api/controller/SerDiseaseController.java

@@ -3,9 +3,9 @@ package com.hs.api.controller;
 import com.hs.api.common.Result;
 import com.hs.api.common.annotations.CurrentUser;
 import com.hs.api.common.annotations.Token;
-import com.hs.api.model.SerDisease;
 import com.hs.api.model.reqmodel.Disease;
 import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.respmodel.DiseaseName;
 import com.hs.api.service.SerDiseaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,17 +34,17 @@ public class SerDiseaseController {
     @PostMapping("disease/list")
     @Token
     @ApiOperation("根据疾病编码或者疾病等级查询疾病列表")
-    public Object getDiseaseByLevel(@ApiIgnore @CurrentUser Long userId,@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
-        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),
-                disease.getLevel(),disease.getDoctor(),disease.getDept(),userId);
+    public Object getDiseaseByLevel(@ApiIgnore @CurrentUser Long userId, @RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
+        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(), disease.getDisease(),
+                disease.getLevel(), disease.getDoctor(), disease.getDept(), userId);
         return Result.success(diseaseLevel);
     }
 
     @PostMapping("disease/name")
     @Token
     @ApiOperation("根据疾病名称查询疾病信息")
-    public Object getDiseaseByMdcName(@RequestBody Disease.DiseaseName disease) throws InterruptedException {
-        List<SerDisease> list = serDiseaseService.selectByMdcName(disease.getDate(),disease.getMdcName(),disease.getDoctor(),disease.getDept());
+    public Object getDiseaseByMdcName(@ApiIgnore @CurrentUser Long userId, @RequestBody Disease.DiseaseName disease) throws InterruptedException {
+        List<DiseaseName> list = serDiseaseService.selectByMdcName(userId, disease.getDate(), disease.getMdcName(), disease.getDoctor(), disease.getDept());
         return Result.success(list);
     }
 

hs-api/src/main/java/com/hs/api/mapper/SerDiseaseMapper.java

@@ -2,6 +2,7 @@ package com.hs.api.mapper;
 
 import com.hs.api.model.SerDisease;
 import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.respmodel.DiseaseName;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,8 +15,8 @@ public interface SerDiseaseMapper {
     SerDisease selectByCode(@Param("code") String code, @Param("date") String date, @Param("docCode") String docCode,
                             @Param("deptCode") String deptCode);
 
-    List<SerDisease> selectByMdcName(@Param("date") String date, @Param("mdcName") String mdcName,
-                                     @Param("docCode") String docCode, @Param("deptCode") String deptCode);
+    List<DiseaseName> selectByMdcName(@Param("date") String date, @Param("mdcNameList") String[] mdcNameList,
+                                      @Param("hosCode") String hosCode, @Param("deptCode") String deptCode);
 
     List<DiseaseLevel> selectByLevel(@Param("date") String date, @Param("level") Integer level,
                                      @Param("docCode") String docCode, @Param("deptCode") String deptCode,

hs-api/src/main/java/com/hs/api/model/reqmodel/UpdatePass.java

+package com.hs.api.model.reqmodel;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel
+public class UpdatePass {
+    @ApiModelProperty(value = "账号", required = true)
+    @NotNull(message = "账号 参数必传")
+    String loginName;
+
+    @NotBlank(message = "旧密码 参数必传")
+    @ApiModelProperty(value = "旧密码", required = true)
+    String oldPassword;
+
+    @NotBlank(message = "新密码 参数必传")
+    @ApiModelProperty(value = "新密码", required = true)
+    String newPassword;
+}

hs-api/src/main/java/com/hs/api/model/respmodel/DiseaseName.java

+package com.hs.api.model.respmodel;
+
+import com.hs.api.model.SerDisease;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class DiseaseName extends SerDisease {
+    private String parentMdcCode;
+    private String parentMdcName;
+    private BigDecimal parentMdcLevel;
+}

hs-api/src/main/java/com/hs/api/service/Impl/LoginServiceImpl.java

@@ -39,7 +39,7 @@ public class LoginServiceImpl implements LoginService {
         LoginInfo loginInfo = new LoginInfo();
 
         SysUser user = userServiceImpl.findByLoginName(logName);
-        if (user != null && user.getPassword().equals(password) && (user.getMacAddress().equals(macAddrss) || user.getMacAddress() == null)) {
+        if (user != null && user.getPassword().equals(password) && (user.getMacAddress() == null || user.getMacAddress().equals(macAddrss))) {
             String token = TokenUtil.getToken(password, user);
             //修改ip以及最后登录时间、MAC地址
             user.setLastIp(ip);
@@ -70,6 +70,19 @@ public class LoginServiceImpl implements LoginService {
         return loginInfo;
     }
 
+    public boolean updatePass(String logName, String oldPassword, String newPassword) {
+        int result = 0;
+        SysUser user = userServiceImpl.findByLoginName(logName);
+        if (user != null && user.getPassword().equals(oldPassword)) {
+            user.setPassword(newPassword);
+            result = sysUserMapper.updateByPrimaryKey(user);
+        } else {
+            throw new DBConfigurationError("旧密码错误！");
+        }
+        return result > 0;
+    }
+
+
     public String refreshToken(String oldToken) {
         return TokenUtil.refresh(oldToken);
     }

hs-api/src/main/java/com/hs/api/service/Impl/SerDiseaseServiceImpl.java

@@ -4,10 +4,12 @@ import com.hs.api.common.exceptions.DBConfigurationError;
 import com.hs.api.mapper.DicOrgMapper;
 import com.hs.api.mapper.SerDiseaseMapper;
 import com.hs.api.mapper.SysRoleMapper;
+import com.hs.api.model.DicOrg;
 import com.hs.api.model.SerDepartment;
 import com.hs.api.model.SerDisease;
 import com.hs.api.model.SysRole;
 import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.respmodel.DiseaseName;
 import com.hs.api.service.SerDiseaseService;
 import com.hs.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
@@ -52,11 +54,18 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     }
 
     @Override
-    public List<SerDisease> selectByMdcName(String date, String mdcName, String docCode, String deptCode) {
+    public List<DiseaseName> selectByMdcName(Long userId, String date, String mdcName, String docCode, String deptCode) {
+        List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
+        String orgCode = orgList != null && orgList.size() > 0 ? orgList.get(0).getOrgCode() : null;
+
         mdcName = StringUtil.isNullOrEmpty(mdcName) ? null : mdcName;
         docCode = StringUtil.isNullOrEmpty(docCode) ? null : docCode;
         deptCode = StringUtil.isNullOrEmpty(deptCode) ? null : deptCode;
-        return serDiseaseMapper.selectByMdcName(date, mdcName, docCode, deptCode);
+        String[] mdcNameList = null;
+        if (mdcName != null) {
+            mdcNameList = mdcName.split("\\s+");
+        }
+        return serDiseaseMapper.selectByMdcName(date, mdcNameList, orgCode, deptCode);
     }
 
     /**

hs-api/src/main/java/com/hs/api/service/LoginService.java

 package com.hs.api.service;
 
+import com.hs.api.model.reqmodel.UpdatePass;
 import com.hs.api.model.respmodel.LoginInfo;
 
 public interface LoginService {
     LoginInfo login(String logName, String password, String macAddrss, String ip);
 
+    boolean updatePass(String logName, String oldPassword, String newPassword);
+
     String refreshToken(String oldToken);
 }

hs-api/src/main/java/com/hs/api/service/SerDiseaseService.java

 package com.hs.api.service;
 
-import com.hs.api.model.SerDisease;
 import com.hs.api.model.respmodel.DiseaseLevel;
+import com.hs.api.model.respmodel.DiseaseName;
 
 import java.util.List;
 
 public interface SerDiseaseService {
 
-    List<SerDisease> selectByMdcName(String date,String mdcName,String docCode,String deptCode);
+    List<DiseaseName> selectByMdcName(Long userId, String date, String mdcName, String docCode, String deptCode);
 
-    List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode,Long userId);
+    List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode, Integer level, String docCode, String deptCode, Long userId);
 }

hs-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -17,6 +17,11 @@
         <result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
         <result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
     </resultMap>
+    <resultMap id="DiseaseName" extends="BaseResultMap" type="com.hs.api.model.respmodel.DiseaseName">
+        <result column="PARENT_MDC_CODE" jdbcType="VARCHAR" property="parentMdcCode"/>
+        <result column="PARENT_MDC_NAME" jdbcType="VARCHAR" property="parentMdcName"/>
+        <result column="PARENT_MDC_LEVEL" jdbcType="DECIMAL" property="parentMdcLevel"/>
+    </resultMap>
     <resultMap id="DiseaseLevel" type="com.hs.api.model.respmodel.DiseaseLevel">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
         <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode"/>
@@ -69,15 +74,44 @@
         where d.STATE = 1
           and d.MDC_CODE = #{code,jdbcType=VARCHAR}
     </select>
-    <select id="selectByMdcName" resultMap="BaseResultMap">
-        select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
-        from dic_disease d
-        where 1 = 1 and STATE=1
-        <if test="mdcName!=null">
-            and INSTR(d.MDC_NAME,#{mdcName,jdbcType=VARCHAR})>0
+    <select id="selectByMdcName" resultMap="DiseaseName">
+        select d.*,d2.MDC_NAME as PARENT_MDC_NAME,d2.`LEVEL` as PARENT_MDC_LEVEL
+        from (
+        SELECT null as PARENT_MDC_CODE,ZBZBM as MDC_CODE,ZBZ as MDC_NAME
+        FROM `from_table_dept_dis`
+        where 1=1
+        <if test="date!=null">
+            and TIME = #{date}
+        </if>
+        <if test="deptCode!=null">
+            and KSBM = #{deptCode}
+        </if>
+        <if test="hosCode!=null">
+            and HOS_CODE = #{deptCode}
+        </if>
+        UNION
+
+        SELECT ZBZBM as PARENT_MDC_CODE,YJBZBM as MDC_CODE,YJBZ as MDC_NAME
+        FROM `from_table_dept_dis_st`
+        where 1=1
+        <if test="date!=null">
+            and TIME = #{date}
+        </if>
+        <if test="deptCode!=null">
+            and KSBM = #{deptCode}
+        </if>
+        <if test="hosCode!=null">
+            and HOS_CODE = #{deptCode}
+        </if>
+        ) du
+        join dic_disease d on d.MDC_CODE = d.MDC_CODE and d.STATE = 1
+        left join dic_disease d2 on d2.MDC_CODE = du.PARENT_MDC_CODE and d2.STATE = 1
+        where 1=1
+        <if test="mdcNameList!=null">
+            <foreach item="item" index="index" collection="mdcNameList">
+                and INSTR(d.MDC_NAME,#{item,jdbcType=VARCHAR})>0
+            </foreach>
         </if>
-        order by d.MDC_NUM
     </select>
     <select id="selectByLevel" resultMap="DiseaseLevel">
         select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
@@ -93,7 +127,6 @@
         <if test="deptCode==null">
             join (select ZBZBM,ZLS as ZLS
             from val_block_values_1_1_2
-            where `TIME`=#{date} and ZLS>0
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1

hs-api/src/main/resources/更新日志.txt

-时间：2020.08.011		版本号：2.02.0811001
+时间：2020.08.18		版本号：2.02.0818001
+时间：2020.08.18		版本号：2.02.0818001
+
+后端更新说明
+       病组模糊查询根据输入词分割字符查询
+       病组模糊查询代入父级病组信息
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+时间：2020.08.017		版本号：2.02.0817001
+
+前端更新说明
+       科室账号下钻  返回页面加载不出来   浮框不出来
+      全院账号  下钻返回  医院名显示underfined
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+时间：2020.08.016		版本号：2.02.0816001
+
+前端更新说明
+       科室账号下钻  返回页面加载不出来   浮框不出来
+      全院账号  下钻返回  医院名显示underfined
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+时间：2020.08.013		版本号：2.02.0813001
+
+前端更新说明
+       593 绩效趋势图0%偏离线与50%得分线合并成一根
+       600 登录界面修改密码功能
+       608    科室账号登录预算编制界面空白
+       603    加载的进度条百分数提示
+       605 绩效趋势图得分线加一个相同颜色的虚线
+       606 科室账号登录，在住院预算编制得界面，住院---》门诊----》汇总，，点上一页，门诊界面显示全院数据
+       601 能效科室内所有一级病组的趋势图，点一个浮框，左下主病组的下的一级病组目录排序发生改变，应该不变
+       607 科室账号登录，趋势图得界面先显示全院，再显示科室，错误，应该直接显示科室
+       604 成本的饼加成本占比数据
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 时间：2020.08.011		版本号：2.02.0811001
 
 前端更新说明