用户和角色增删改查修改

epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @Author yinzuomei
  * @Date 2020/3/16 14:48
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class, url="http://localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
 
 	/**

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java

@@ -115,4 +115,26 @@ public class OperRoleUserController {
         return new Result();
     }
 
+    /**
+     * 根据用户id，删除角色用户关系
+     * @param id 用户id
+     * @return Result
+     */
+    @PostMapping("deleteByUserId")
+    public Result deleteByUserId(String id) {
+        operRoleUserService.deleteByUserId(id);
+        return new Result();
+    }
+
+    /**
+     * 根据用户ids，删除角色用户关系
+     * @param ids 用户ids
+     * @return Result
+     */
+    @PostMapping("deleteByUserIds")
+    public Result deleteByUserIds(@RequestBody String[] ids) {
+        operRoleUserService.deleteByUserIds(ids);
+        return new Result();
+    }
+
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperRoleMenuDao.java

@@ -39,4 +39,11 @@ public interface OperRoleMenuDao extends BaseDao<OperRoleMenuEntity> {
      * @param menuId 菜单id
      */
     void deleteByMenuId(String menuId);
+
+
+    /**
+     * 根据角色ids，删除角色菜单关系
+     * @param roleIds 角色ids
+     */
+    void deleteByRoleIds(String[] roleIds);
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/dao/OperRoleUserDao.java

@@ -29,6 +29,18 @@ public interface OperRoleUserDao extends BaseDao<OperRoleUserEntity> {
      */
     void deleteByRoleIds(String[] roleIds);
 
+    /**
+     * 根据用户ids，删除角色用户关系
+     * @param userIds 用户ids
+     */
+    void deleteByUserIds(String[] userIds);
+
+    /**
+     * 根据角色id，删除角色用户关系
+     * @param roleId 角色id
+     */
+    void deleteByRoleId(String roleId);
+
     /**
      * 根据用户id，删除角色用户关系
      * @param userId 用户id

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
  * @dscription
  * @date 2020/3/19 9:32
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class, url="http://localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
 
 	/**

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java

@@ -110,4 +110,10 @@ public interface OperRoleMenuService extends BaseService<OperRoleMenuEntity> {
      * @param roleId 角色id
      */
     void deleteByRoleId(String roleId);
+
+    /**
+     * 根据角色ids，删除角色菜单关系
+     * @param roleIds
+     */
+    void deleteByRoleIds(String[] roleIds);
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperRoleUserService.java

@@ -100,6 +100,12 @@ public interface OperRoleUserService extends BaseService<OperRoleUserEntity> {
      */
     void saveOrUpdate(String userId, List<String> roleIdList);
 
+    /**
+     * 根据角色id，删除角色用户关系
+     * @param roleId 角色id
+     */
+    void deleteByRoleId(String roleId);
+
     /**
      * 根据用户id，删除角色用户关系
      * @param userId 用户id
@@ -112,4 +118,16 @@ public interface OperRoleUserService extends BaseService<OperRoleUserEntity> {
      * @return List<String>
      */
     List<String> getRoleIdList(String userId);
+
+    /**
+     * 根据角色ids，删除角色用户关系
+     * @param roleIds 角色ids
+     */
+    void deleteByRoleIds(String[] roleIds);
+
+    /**
+     * 根据用户ids，删除角色用户关系
+     * @param userIds 用户ids
+     */
+    void deleteByUserIds(String[] userIds);
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java

@@ -49,6 +49,8 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl<OperRoleMenuDao, Op
 
     @Autowired
     private OperRoleMenuRedis operRoleMenuRedis;
+    @Autowired
+    private OperRoleMenuDao operRoleMenuDao;
 
     @Override
     public PageData<OperRoleMenuDTO> page(Map<String, Object> params) {
@@ -134,4 +136,10 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl<OperRoleMenuDao, Op
     public void deleteByRoleId(String roleId) {
         baseDao.deleteByRoleId(roleId);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByRoleIds(String[] roleIds) {
+        operRoleMenuDao.deleteByRoleIds(roleIds);
+    }
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.entity.OperRoleEntity;
 import com.epmet.redis.OperRoleRedis;
 import com.epmet.service.OperRoleMenuService;
 import com.epmet.service.OperRoleService;
+import com.epmet.service.OperRoleUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,6 +52,8 @@ public class OperRoleServiceImpl extends BaseServiceImpl<OperRoleDao, OperRoleEn
     private OperRoleRedis operRoleRedis;
     @Autowired
     private OperRoleMenuService OperRoleMenuService;
+    @Autowired
+    private OperRoleUserService operRoleUserService;
 
     @Override
     public PageData<OperRoleDTO> page(Map<String, Object> params) {
@@ -106,6 +109,10 @@ public class OperRoleServiceImpl extends BaseServiceImpl<OperRoleDao, OperRoleEn
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+
+        OperRoleMenuService.deleteByRoleIds(ids);
+
+        operRoleUserService.deleteByRoleIds(ids);
     }
 
 }

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java

@@ -49,6 +49,8 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
 
     @Autowired
     private OperRoleUserRedis operRoleUserRedis;
+    @Autowired
+    private OperRoleUserDao operRoleUserDao;
 
     @Override
     public PageData<OperRoleUserDTO> page(Map<String, Object> params) {
@@ -124,9 +126,14 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
         }
     }
 
+    @Override
+    public void deleteByRoleId(String roleId) {
+        operRoleUserDao.deleteByRoleId(roleId);
+    }
+
     @Override
     public void deleteByUserId(String userId) {
-        baseDao.deleteByUserId(userId);
+        operRoleUserDao.deleteByUserId(userId);
     }
 
     @Override
@@ -135,4 +142,15 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
         return baseDao.getRoleIdList(userId);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByRoleIds(String[] roleIds) {
+        operRoleUserDao.deleteByRoleIds(roleIds);
+    }
+
+    @Override
+    public void deleteByUserIds(String[] userIds) {
+        operRoleUserDao.deleteByUserIds(userIds);
+    }
+
 }

epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleMenuDao.xml

@@ -7,12 +7,19 @@
         select menu_id from oper_role_menu where role_id = #{value}
     </select>
 
-    <delete id="deleteByRoleId">
+    <update id="deleteByRoleIds">
-        delete from oper_role_menu where role_id = #{value}
+        update oper_role_menu set del_flag = 1 where del_flag = 0 and role_id in
-    </delete>
+        <foreach item="roleId" collection="array" open="(" separator="," close=")">
+            #{roleId}
+        </foreach>
+    </update>
 
-    <delete id="deleteByMenuId">
+    <update id="deleteByRoleId">
-        delete from oper_role_menu where menu_id = #{value}
+        update oper_role_menu set del_flag = 1 where role_id = #{value} and del_flag = 0
-    </delete>
+    </update>
+
+    <update id="deleteByMenuId">
+        update oper_role_menu set del_flag = 1 where menu_id = #{value} and del_flag = 0
+    </update>
 
 </mapper>

epmet-module/oper-access/oper-access-server/src/main/resources/mapper/OperRoleUserDao.xml

@@ -3,16 +3,27 @@
 
 <mapper namespace="com.epmet.dao.OperRoleUserDao">
 
-    <delete id="deleteByRoleIds">
+    <update id="deleteByRoleIds">
-        delete from oper_role_user where role_id in
+        update oper_role_user set del_flag = 1 where del_flag = 0 and role_id in
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-    </delete>
+    </update>
 
-    <delete id="deleteByUserId">
+    <update id="deleteByUserIds">
-        delete from oper_role_user where user_id = #{value}
+        update oper_role_user set del_flag = 1 where del_flag = 0 and user_id in
-    </delete>
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </update>
+
+    <update id="deleteByRoleId">
+        update oper_role_user set del_flag = 1 where role_id = #{value} and del_flag = 0
+    </update>
+
+    <update id="deleteByUserId">
+        update oper_role_user set del_flag = 1 where user_id = #{value} and del_flag = 0
+    </update>
 
     <select id="getRoleIdList" resultType="java.lang.String">
         select role_id from oper_role_user where user_id = #{value}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/QueryOperUserResultDto.java

@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/3/21 9:53
+ */
+@Data
+public class QueryOperUserResultDto implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	private String id;
+
+	/**
+	 * 姓名
+	 */
+	private String realName;
+
+
+	/**
+	 * 头像
+	 */
+	private String headUrl;
+
+	/**
+	 * 性别   0：男   1：女    2：保密
+	 */
+	private Integer gender;
+
+	/**
+	 * 邮箱
+	 */
+	private String email;
+
+	/**
+	 * 手机号
+	 */
+	private String phone;
+
+	/**
+	 * 微信openId
+	 */
+	private String wxOpenId;
+
+	/**
+	 * 超级管理员   0：否   1：是
+	 */
+	private Integer superAdmin;
+
+	/**
+	 * 状态  0：停用    1：正常
+	 */
+	private Integer status;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java

@@ -20,6 +20,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -28,6 +29,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.OperUserDTO;
+import com.epmet.dto.result.QueryOperUserResultDto;
 import com.epmet.excel.OperUserExcel;
 import com.epmet.feign.OperRoleUserFeignClient;
 import com.epmet.service.OperUserService;
@@ -107,9 +109,10 @@ public class OperUserController {
 	 * @author zhaoqifeng
 	 */
 	@GetMapping("queryOperUserDto")
-	public Result<OperUserDTO> queryOperUserDto(@LoginUser TokenDto tokenDto) {
+	public Result<QueryOperUserResultDto> queryOperUserDto(@LoginUser TokenDto tokenDto) {
 		OperUserDTO data = operUserService.getOperUserInfoById(tokenDto.getUserId());
-		return new Result<OperUserDTO>().ok(data);
+		QueryOperUserResultDto dto = ConvertUtils.sourceToTarget(data, QueryOperUserResultDto.class);
+		return new Result<QueryOperUserResultDto>().ok(dto);
 	}
 
 	/**

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperRoleUserFeignClient.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @dscription
  * @date 2020/3/20 17:19
  */
-@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class, url = "http://localhost:8093")
+@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperRoleUserFeignClientFallBack.class)
 public interface OperRoleUserFeignClient {
 
 	/**
@@ -33,4 +33,12 @@ public interface OperRoleUserFeignClient {
 	 */
 	@PostMapping("/oper/access/operroleuser/saveOrUpdateRole")
 	Result saveOrUpdate(@RequestParam("userId") String userId, @RequestBody List<String> roleIdList);
+
+	/**
+	 * 根据用户ids，删除角色用户关系
+	 * @param ids 户ids
+	 * @return Result
+	 */
+	@PostMapping("/oper/access/operroleuser/deleteByUserIds")
+	Result deleteByUserIds(@RequestBody String[] ids);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java

@@ -25,4 +25,9 @@ public class OperRoleUserFeignClientFallBack implements OperRoleUserFeignClient
 	public Result saveOrUpdate(String userId, List<String> roleIdList) {
 		return  ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "saveOrUpdate",userId);
 	}
+
+	@Override
+	public Result deleteByUserIds(String[] ids) {
+		return  ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "deleteByUserId",ids);
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.password.PasswordUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.OperUserDao;
@@ -92,6 +93,10 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     public void save(OperUserDTO dto) {
         OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
 
+        //密码加密
+        String password = PasswordUtils.encode(entity.getPassword());
+        entity.setPassword(password);
+
         entity.setSuperAdmin(SuperAdminEnum.NO.value());
         insert(entity);
 
@@ -103,6 +108,15 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     @Transactional(rollbackFor = Exception.class)
     public void update(OperUserDTO dto) {
         OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
+
+        //密码加密
+        if(StringUtils.isBlank(dto.getPassword())){
+            entity.setPassword(null);
+        }else{
+            String password = PasswordUtils.encode(entity.getPassword());
+            entity.setPassword(password);
+        }
+
         updateById(entity);
 
         //更新角色用户关系
@@ -114,6 +128,8 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+
+        operRoleUserFeignClient.deleteByUserIds(ids);
     }
 
     @Override