8.14 修改密码

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitService.java

@@ -319,7 +319,6 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		int insert = tbOrderMapper.insert(tbOrder);
 		if(insert == 1){
 			//删除购物车
-//			boolean removeById = tbGoodsCartService.removeById(purchaseLevelOntGoodsTransitParam.getGoodsCartId());
 			tbGoodsCartMapper.deleteById(purchaseLevelOntGoodsTransitParam.getGoodsCartId());
 			//将商品信息改成已被下单
 			tbGoodsTransit.setIsOrders(1);

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -69,4 +69,16 @@ public class AppUserApiController {
         return AjaxJson.getError("验证码发送失败!");
     }
 
+    /**
+     * 修改密码
+     */
+    @RequestMapping("modifyPassword")
+    public AjaxJson modifyPassword(String olePassword,String newPassword) {
+        boolean result = appUserService.modifyPassword(olePassword, newPassword);
+        if (result) return AjaxJson.getSuccess("密码修改成功!");
+        return AjaxJson.getError("密码修改失败!");
+    }
+
+
+
 }

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
 import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.PeopleDto;
@@ -59,6 +60,10 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	private SmsRetryService smsRetryService;
 	@Autowired
 	private LevelOneServerInterface levelOneServerInterface;
+	@Autowired
+	private AdminInterface adminInterface;
+
+
 	/** 验证码前缀 */
 	String PREFIX = "app_user:phone:sms_code:";
 
@@ -307,6 +312,30 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		return "退出登录成功!";
 	}
 
+	/**
+	 * 修改密码
+	 * @param oldPassword 旧密码
+	 * @param newPassword 新密码
+	 * @return
+	 */
+	public boolean modifyPassword(String oldPassword,String newPassword){
+		//获取user
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		AppUser appUser = appUserMapper.selectById(appLoginInfo.getLoginId());
+		if(appUser == null)throw new SecurityException("当前账户信息异常!");
+		//旧密码比对
+		boolean result = passwordEncoder.matches(appUser.getPassword(), oldPassword);
+		if(!result)throw new SecurityException("旧密码输入错误!");
+		//新密码进行编码
+		String password = passwordEncoder.encode(newPassword);
+		//执行修改
+		appUser.setPassword(password);
+		//设置基本属性
+		appUser.setUpdateTime(new Date());
+		//保存
+		return 1 == appUserMapper.updateById(appUser);
+	}
+
 
 
 }

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/AppRoleMenuController.java

@@ -0,0 +1,91 @@
+package com.pj.project.re_role_menu;
+
+import java.util.List;
+
+import com.pj.project.re_role_menu.dto.AssignPermissionsDto;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+
+/**
+ * Controller: re_role_menu -- app用户菜单中间表
+ * @author qzy 
+ */
+@RestController
+@RequestMapping("/app/ReRoleMenu/")
+public class AppRoleMenuController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	ReRoleMenuService reRoleMenuService;
+
+	/** 增 */  
+	@RequestMapping("add")
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
+	public AjaxJson add(ReRoleMenu r){
+		reRoleMenuService.add(r);
+		r = reRoleMenuService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(r);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 reRoleMenuService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(ReRoleMenu.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
+	public AjaxJson update(ReRoleMenu r){
+		reRoleMenuService.update(r);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		ReRoleMenu r = reRoleMenuService.getById(id);
+		return AjaxJson.getSuccessData(r);
+	}
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param appRoleId 职务ID,非必填
+	 * @return
+	 */
+	@RequestMapping("getList")
+//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+	public AjaxJson getList(@RequestParam(value = "appRoleId",required = false) Integer appRoleId) {
+		SoMap so = SoMap.getRequestSoMap();
+		List<ReRoleMenu> list = reRoleMenuService.getList(so.startPage(),appRoleId);
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+
+	
+	
+
+	
+	
+	
+
+}

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/MethodRoleMenuService.java

@@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Author Mechrevo
@@ -25,12 +26,14 @@ public class MethodRoleMenuService {
         //查询该职务下属权限
         List<ReRoleMenu> reRoleMenus = reRoleMenuMapper.selectList
                 (new LambdaQueryWrapper<ReRoleMenu>().eq(ReRoleMenu::getAppRoleId, roleId));
+        //使用stream过滤出权限
+        List<Long> perList = reRoleMenus.stream().map(ReRoleMenu::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
         //创建返回值集合
-        List<Long> perList = new ArrayList<>();
-        //遍历集合封装数据
-        reRoleMenus.forEach(item -> {
-            perList.add(item.getId());
-        });
+//        List<Long> perList = new ArrayList<>();
+//        //遍历集合封装数据
+//        reRoleMenus.forEach(item -> {
+//            perList.add(item.getId());
+//        });
         return perList;
     }
 

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenuController.java → sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/PcRoleMenuController.java

@@ -1,19 +1,18 @@
 package com.pj.project.re_role_menu;
 
-import java.util.List;
-
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.pj.project.re_role_menu.dto.AssignPermissionsDto;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import com.pj.utils.sg.*;
-import com.pj.project4sp.SP;
-
-import com.pj.current.satoken.StpUserUtil;
-import cn.dev33.satoken.annotation.SaCheckPermission;
+import java.util.List;
 
 
 /**
@@ -22,7 +21,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
  */
 @RestController
 @RequestMapping("/ReRoleMenu/")
-public class ReRoleMenuController {
+public class PcRoleMenuController {
 
 	/** 底层 Service 对象 */
 	@Autowired
@@ -30,7 +29,7 @@ public class ReRoleMenuController {
 
 	/** 增 */  
 	@RequestMapping("add")
-//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
+	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_ADD)
 	public AjaxJson add(ReRoleMenu r){
 		reRoleMenuService.add(r);
 		r = reRoleMenuService.getById(SP.publicMapper.getPrimarykey());
@@ -39,7 +38,7 @@ public class ReRoleMenuController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 reRoleMenuService.delete(id);
 		return AjaxJson.getSuccess();
@@ -47,7 +46,7 @@ public class ReRoleMenuController {
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
-//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
+	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(ReRoleMenu.TABLE_NAME, ids);
@@ -56,7 +55,7 @@ public class ReRoleMenuController {
 	
 	/** 改 */  
 	@RequestMapping("update")
-//	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
+	@SaCheckPermission(ReRoleMenu.PERMISSION_CODE_EDIT)
 	public AjaxJson update(ReRoleMenu r){
 		reRoleMenuService.update(r);
 		return AjaxJson.getSuccess();
@@ -64,7 +63,7 @@ public class ReRoleMenuController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
 		ReRoleMenu r = reRoleMenuService.getById(id);
 		return AjaxJson.getSuccessData(r);
@@ -76,7 +75,7 @@ public class ReRoleMenuController {
 	 * @return
 	 */
 	@RequestMapping("getList")
-//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson getList(@RequestParam(value = "appRoleId",required = false) Integer appRoleId) {
 		SoMap so = SoMap.getRequestSoMap();
 		List<ReRoleMenu> list = reRoleMenuService.getList(so.startPage(),appRoleId);
@@ -89,7 +88,7 @@ public class ReRoleMenuController {
 	 * @return
 	 */
 	@RequestMapping("assignPermissions")
-//		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
+		@SaCheckPermission(ReRoleMenu.PERMISSION_CODE)
 	public AjaxJson assignPermissions(@Validated @RequestBody AssignPermissionsDto assignPermissionsDto) {
 		boolean permissions = reRoleMenuService.assignPermissions(assignPermissionsDto);
 		if(permissions)return AjaxJson.getSuccess("权限分配成功!");

sp-service/sp-admin/src/main/java/com/pj/project/re_role_menu/ReRoleMenuService.java

@@ -63,6 +63,7 @@ public class ReRoleMenuService extends ServiceImpl<ReRoleMenuMapper, ReRoleMenu>
 	boolean assignPermissions(AssignPermissionsDto assignPermissionsDto){
 		//取出数据
 		Long roleId = assignPermissionsDto.getRoleId();
+		//app_menu的主键进行去重
 		List<Long> permissionsDtoList = assignPermissionsDto.getList().stream().distinct().collect(Collectors.toList());
 		//情况1:传进来的集合为空,默认删除该职务下属的所有权限
 		if(permissionsDtoList.size() == 0){