优化公共模块的请求

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/dto/admin/UserDTO.java

@@ -37,6 +37,6 @@ public class UserDTO extends SysUser {
 	 * 新密码
 	 */
 	@Schema(description = "新密码")
-	private String newpassword1;
+	private String newPwd;
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysClientController.java

@@ -83,14 +83,14 @@ public class SysClientController {
 
 	/**
 	 * 删除
-	 * @param ids ID 列表
+	 * @param id ID
 	 * @return success/false
 	 */
 	@SysLog("删除终端")
-	@PostMapping("remove")
+	@PostMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_client_del')")
-	public R removeById(@RequestBody Long[] ids) {
-		clientDetailsService.removeBatchByIds(CollUtil.toList(ids));
+	public R removeById(@PathVariable Long id) {
+		clientDetailsService.removeBatchByIds(CollUtil.toList(id));
 		return R.ok();
 	}
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysDictController.java

@@ -103,15 +103,16 @@ public class SysDictController {
 
 	/**
 	 * 删除字典，并且清除字典缓存
-	 * @param ids ID
+	 * @param id ID
 	 * @return R
 	 */
 	@SysLog("删除字典")
-	@PostMapping("remove")
+	@PostMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_dict_del')")
 	@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
-	public R removeById(@RequestBody Long[] ids) {
-		return R.ok(sysDictService.removeDictByIds(ids));
+	public R removeById(@PathVariable Long id) {
+
+		return R.ok(sysDictService.removeDictByIds(new Long[]{id}));
 	}
 
 	/**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysPostController.java

@@ -112,15 +112,15 @@ public class SysPostController {
 
 	/**
 	 * 通过id删除岗位信息表
-	 * @param ids id 列表
+	 * @param id id
 	 * @return R
 	 */
 	@Operation(description = "通过id删除岗位信息表", summary = "通过id删除岗位信息表")
 	@SysLog("通过id删除岗位信息表")
-	@PostMapping("remove")
+	@PostMapping("removeById")
 	@PreAuthorize("@pms.hasPermission('sys_post_del')")
-	public R removeById(@RequestBody Long[] ids) {
-		return R.ok(sysPostService.removeBatchByIds(CollUtil.toList(ids)));
+	public R removeById(@PathVariable Long id) {
+		return R.ok(sysPostService.removeBatchByIds(CollUtil.toList(id)));
 	}
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysPublicParamController.java

@@ -110,17 +110,18 @@ public class SysPublicParamController {
 		return sysPublicParamService.updateParam(sysPublicParam);
 	}
 
+
 	/**
 	 * 通过id删除公共参数
-	 * @param ids ids
+	 * @param id id
 	 * @return R
 	 */
 	@Operation(description = "删除公共参数", summary = "删除公共参数")
 	@SysLog("删除公共参数")
-	@PostMapping("remove")
+	@PostMapping("removeById")
 	@PreAuthorize("@pms.hasPermission('sys_syspublicparam_del')")
-	public R removeById(@RequestBody Long[] ids) {
-		return R.ok(sysPublicParamService.removeParamByIds(ids));
+	public R removeById(@PathVariable Long id) {
+		return R.ok(sysPublicParamService.removeParamByIds(new Long[]{id}));
 	}
 
 	/**

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysRoleController.java

@@ -85,7 +85,7 @@ public class SysRoleController {
 	}
 
 	/**
-	 * 删除角色
+	 * 批量删除角色
 	 *
 	 * @param ids id
 	 * @return {@link R}
@@ -94,10 +94,25 @@ public class SysRoleController {
 	@PostMapping("remove")
 	@PreAuthorize("@pms.hasPermission('sys_role_del')")
 	@CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true)
-	public R removeById(@RequestBody Long[] ids) {
+	public R remove(@RequestBody Long[] ids) {
 		return R.ok(sysRoleService.removeRoleByIds(ids));
 	}
 
+	/**
+	 * 删除角色
+	 *
+	 * @param id id
+	 * @return {@link R}
+	 */
+	@SysLog("删除角色")
+	@PostMapping("removeById/{id}")
+	@PreAuthorize("@pms.hasPermission('sys_role_del')")
+	@CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true)
+	public R removeById(@PathVariable Long id) {
+
+		return R.ok(sysRoleService.removeRoleByIds(new Long[]{id}));
+	}
+
 	/**
 	 * 获取角色列表
 	 * @return 角色列表

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysUserController.java

@@ -90,18 +90,31 @@ public class SysUserController {
 	}
 
 	/**
-	 * 删除用户信息
+	 * 批量删除用户信息
 	 * @param ids ID
 	 * @return R
 	 */
-	@SysLog("删除用户信息")
+	@SysLog("批量删除用户信息")
 	@PostMapping("remove")
 	@PreAuthorize("@pms.hasPermission('sys_user_del')")
-	@Operation(summary = "删除用户", description = "根据ID删除用户")
+	@Operation(summary = "删除用户", description = "批量删除用户信息")
 	public R userDel(@RequestBody Long[] ids) {
 		return R.ok(userService.deleteUserByIds(ids));
 	}
 
+	/**
+	 * 删除用户信息
+	 * @param id ID
+	 * @return R
+	 */
+	@SysLog("删除用户信息")
+	@PostMapping("removeById")
+	@PreAuthorize("@pms.hasPermission('sys_user_del')")
+	@Operation(summary = "删除用户", description = "根据ID删除用户")
+	public R removeById(@PathVariable Long id) {
+		return R.ok(userService.deleteUserByIds(new Long[]{id}));
+	}
+
 	/**
 	 * 添加用户
 	 * @param userDto 用户信息
@@ -150,13 +163,13 @@ public class SysUserController {
 
 	/**
 	 * 锁定指定用户
-	 * @param username 用户名
+	 * @param user 用户
 	 * @return R
 	 */
 	@Inner
 	@PutMapping("/lock")
-	public R lockUser(@RequestParam("username") String username) {
-		return userService.lockUser(username);
+	public R lockUser(@RequestBody SysUser user) {
+		return userService.lockUser(user);
 	}
 
 	@PutMapping("/password")

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/SysUserService.java

@@ -75,10 +75,10 @@ public interface SysUserService extends IService<SysUser> {
 
 	/**
 	 * 锁定用户
-	 * @param username
+	 * @param user
 	 * @return
 	 */
-	R<Boolean> lockUser(String username);
+	R<Boolean> lockUser(SysUser user);
 
 	/**
 	 * 修改密码
@@ -94,4 +94,5 @@ public interface SysUserService extends IService<SysUser> {
 	 */
 	R checkPassword(String password);
 
+
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysRoleServiceImpl.java

@@ -94,6 +94,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 		}).collect(Collectors.toList());
 	}
 
+
 	/**
 	 * 插入excel Role
 	 */

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/SysUserServiceImpl.java

@@ -179,6 +179,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return Boolean.TRUE;
 	}
 
+
 	@Override
 	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#userDto.username")
 	public R<Boolean> updateUserInfo(UserDTO userDto) {
@@ -221,13 +222,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 	/**
 	 * 锁定用户
-	 * @param username 用户名
+	 * @param user 用户
 	 * @return
 	 */
 	@Override
-	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#username")
-	public R<Boolean> lockUser(String username) {
-		SysUser sysUser = baseMapper.selectOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, username));
+	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#user.username")
+	public R<Boolean> lockUser(SysUser user) {
+		SysUser sysUser = baseMapper.selectOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUserId, user.getUserId()));
 
 		if (Objects.nonNull(sysUser)) {
 			sysUser.setLockFlag(CommonConstants.STATUS_LOCK);
@@ -253,10 +254,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			return R.failed(ErrorTypeEnum.SYS_USER_UPDATE_PASSWORD_ERROR);
 		}
 
-		if (StrUtil.isEmpty(userDto.getNewpassword1())) {
+		if (StrUtil.isEmpty(userDto.getNewPwd())) {
 			return R.failed("新密码不能为空");
 		}
-		String password = ENCODER.encode(userDto.getNewpassword1());
+		String password = ENCODER.encode(userDto.getNewPwd());
 
 		this.update(Wrappers.<SysUser>lambdaUpdate()
 			.set(SysUser::getPassword, password)

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsShopOrderService.java

@@ -97,7 +97,7 @@ public class KxsShopOrderService extends ServiceImpl<KxsShopOrderMapper, KxsShop
                     order.setSendTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "Remark":
-                    order.setRemark(validFieldDataMap.get(field).toString());
+                    order.setRemark(validFieldDataMap.get(field) != null ? validFieldDataMap.get(field).toString(): null);
                     break;
                 case "RealName":
                     order.setConsignee(validFieldDataMap.get(field).toString());
@@ -106,7 +106,7 @@ public class KxsShopOrderService extends ServiceImpl<KxsShopOrderMapper, KxsShop
                     order.setPhone(validFieldDataMap.get(field).toString());
                     break;
                 case "Address":
-                    order.setAddress(validFieldDataMap.get(field).toString());
+                    order.setAddress(validFieldDataMap.get(field) != null ? validFieldDataMap.get(field).toString(): null);
                     break;
                 case "ErpCode":
                     order.setErpSn(validFieldDataMap.get(field).toString());