公共板块的代码和请求方式整理

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

@@ -1,62 +0,0 @@
-package com.kxs.system.biz.controller.admin;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.poi.excel.ExcelReader;
-import cn.hutool.poi.excel.ExcelUtil;
-import com.kxs.common.core.constant.SecurityConstants;
-import com.kxs.common.core.util.R;
-import com.kxs.common.security.annotation.Inner;
-import com.pig4cloud.plugin.excel.annotation.RequestExcel;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 登录控制器
- *
- * @author 没秃顶的码农
- * @date 2023/11/03
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/login")
-@Tag(description = "login", name = "登录管理")
-public class LoginController {
-
-	private final RedisTemplate<String, Object> redisTemplate;
-
-	private static final Integer DEFAULT_IMAGE_WIDTH = 100;
-
-	private static final Integer DEFAULT_IMAGE_HEIGHT = 40;
-
-	@GetMapping("/test")
-	@Inner(value = false)
-	 public R getCode(@RequestParam Map randomStr){
-		return R.ok(randomStr);
-	 }
-
-	@PostMapping("/testPost")
-	@Inner(value = false)
-	 public R testPost(){
-
-		return R.ok();
-	 }
-
-	 //批量预设职级
-//	public static void main(String[] args) {
-//		ExcelReader reader = ExcelUtil.getReader("/Users/mac/Desktop/刘耀辉申请保级名单.xlsx");
-//		List<Map<String, Object>> readAll = reader.readAll();
-//		for (Map<String, Object> map : readAll) {
-//			String level = map.get("预设职级").toString();
-//			String sql = "INSERT INTO `UserRankWhite` (Id, CreateDate, UpdateDate, `Rank`, UserId) VALUES ("+map.get("创客Id")+", NOW(), '2024/6/1 00:00:00', "+level.charAt(1)+", "+map.get("创客Id")+") ON DUPLICATE KEY UPDATE UpdateDate = '2024/6/1 00:00:00', `Rank` = "+level.charAt(1)+";";
-//			System.out.println(sql);
-//		}
-//	}
-
-}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
+import com.kxs.common.log.annotation.SysLog;
 import com.kxs.system.api.model.KxsCamp;
 import com.kxs.system.api.model.KxsCampBonusLog;
 import com.kxs.system.api.model.KxsCampUser;
@@ -64,6 +65,7 @@ public class SysCampController {
      * @return 训练营-列表
      */
     @GetMapping("/campUserPage")
+//    @PreAuthorize("@pms.hasPermission('sys_camp_user_page')")
     public R campUserPage(Page<KxsCampUser> page, @ParameterObject KxsCampUser param) {
 
         return R.ok(kxsCampUserService.page(page, Wrappers.<KxsCampUser>lambdaQuery()
@@ -106,6 +108,7 @@ public class SysCampController {
      * @param id 主键ID
      * @return 训练营-删除
      */
+    @SysLog("删除训练营")
     @DeleteMapping("removeById/{id}")
 //    @PreAuthorize("@pms.hasPermission('sys_camp_remove')")
     public R removeById(@PathVariable("id") Integer id) {
@@ -120,6 +123,7 @@ public class SysCampController {
      * @param campUserExcelVOList 导入对象
      * @return 训练营-添加创客
      */
+    @SysLog("导入创客信息")
     @PostMapping("/importUser")
 //    @PreAuthorize("@pms.hasPermission('sys_camp_add_user')")
     public R importUser(@RequestExcel List<CampUserExcelVO> campUserExcelVOList, BindingResult bindingResult) {
@@ -134,6 +138,7 @@ public class SysCampController {
      * @param param 实体对象
      * @return 训练营-增减奖金池
      */
+    @SysLog("增减奖金池")
     @PostMapping("/changeBonus")
 //    @PreAuthorize("@pms.hasPermission('sys_camp_change_bonus')")
     public R changeBonus(@RequestBody @Valid KxsCampBonusLog param) {

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

@@ -87,7 +87,7 @@ public class SysClientController {
 	 * @return success/false
 	 */
 	@SysLog("删除终端")
-	@PostMapping("removeById/{id}")
+	@DeleteMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_client_del')")
 	public R removeById(@PathVariable Long id) {
 		clientDetailsService.removeBatchByIds(CollUtil.toList(id));

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

@@ -107,7 +107,7 @@ public class SysDictController {
 	 * @return R
 	 */
 	@SysLog("删除字典")
-	@PostMapping("removeById/{id}")
+	@DeleteMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_dict_del')")
 	@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
 	public R removeById(@PathVariable Long id) {
@@ -146,7 +146,7 @@ public class SysDictController {
 	 * @param sysDictItem 字典项
 	 * @return
 	 */
-	@GetMapping("/item/page")
+	@GetMapping("/pageItem")
 	public R getSysDictItemPage(Page page, SysDictItem sysDictItem) {
 		return R.ok(sysDictItemService.page(page, Wrappers.query(sysDictItem)));
 	}
@@ -156,7 +156,7 @@ public class SysDictController {
 	 * @param id id
 	 * @return R
 	 */
-	@GetMapping("/item/getItemById")
+	@GetMapping("/getItemById")
 	public R getDictItemById(@RequestParam("id") Long id) {
 		return R.ok(sysDictItemService.getById(id));
 	}
@@ -166,7 +166,7 @@ public class SysDictController {
 	 * @param query 查询条件
 	 * @return R
 	 */
-	@GetMapping("/item/details")
+	@GetMapping("/detailsItem")
 	public R getDictItemDetails(SysDictItem query) {
 		return R.ok(sysDictItemService.getOne(Wrappers.query(query), false));
 	}
@@ -177,7 +177,7 @@ public class SysDictController {
 	 * @return R
 	 */
 	@SysLog("新增字典项")
-	@PostMapping("/item/add")
+	@PostMapping("/addItem")
 	@CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
 	public R save(@RequestBody SysDictItem sysDictItem) {
 		return R.ok(sysDictItemService.save(sysDictItem));
@@ -189,7 +189,7 @@ public class SysDictController {
 	 * @return R
 	 */
 	@SysLog("修改字典项")
-	@PutMapping("/item/update")
+	@PutMapping("/updateItem")
 	public R updateById(@RequestBody SysDictItem sysDictItem) {
 		return sysDictItemService.updateDictItem(sysDictItem);
 	}
@@ -200,7 +200,7 @@ public class SysDictController {
 	 * @return R
 	 */
 	@SysLog("删除字典项")
-	@DeleteMapping("/item/{id}")
+	@DeleteMapping("/removeItemById/{id}")
 	public R removeDictItemById(@PathVariable Long id) {
 		return sysDictItemService.removeDictItem(id);
 	}

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

@@ -63,7 +63,7 @@ public class SysMenuController {
 	 * @return 属性集合
 	 */
 	@GetMapping("/getRoleTree")
-	public R getRoleTree(@RequestParam Long roleId) {
+	public R getRoleTree(@RequestParam("roleId") Long roleId) {
 		return R
 			.ok(sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList()));
 	}
@@ -74,7 +74,7 @@ public class SysMenuController {
 	 * @return 菜单详细信息
 	 */
 	@GetMapping("getById")
-	public R getById(@RequestParam Long id) {
+	public R getById(@RequestParam("id") Long id) {
 		return R.ok(sysMenuService.getById(id));
 	}
 

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

@@ -117,7 +117,7 @@ public class SysPostController {
 	 */
 	@Operation(description = "通过id删除岗位信息表", summary = "通过id删除岗位信息表")
 	@SysLog("通过id删除岗位信息表")
-	@PostMapping("removeById")
+	@DeleteMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_post_del')")
 	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/SysRoleController.java

@@ -44,7 +44,7 @@ public class SysRoleController {
 	 * @return 角色信息
 	 */
 	@GetMapping("/getById")
-	public R getById(@RequestParam Long id) {
+	public R getById(@RequestParam("id") Long id) {
 		return R.ok(sysRoleService.getById(id));
 	}
 
@@ -105,7 +105,7 @@ public class SysRoleController {
 	 * @return {@link R}
 	 */
 	@SysLog("删除角色")
-	@PostMapping("removeById/{id}")
+	@DeleteMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_role_del')")
 	@CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true)
 	public R removeById(@PathVariable Long id) {

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

@@ -108,7 +108,7 @@ public class SysUserController {
 	 * @return R
 	 */
 	@SysLog("删除用户信息")
-	@PostMapping("removeById")
+	@DeleteMapping("removeById/{id}")
 	@PreAuthorize("@pms.hasPermission('sys_user_del')")
 	@Operation(summary = "删除用户", description = "根据ID删除用户")
 	public R removeById(@PathVariable Long id) {

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

@@ -199,12 +199,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(value = CacheConstants.USER_DETAILS, key = "#userDto.username")
 	public Boolean updateUser(UserDTO userDto) {
+
+		SysUser user = baseMapper.selectById(userDto.getUserId());
 		// 更新用户表信息
 		SysUser sysUser = new SysUser();
 		BeanUtils.copyProperties(userDto, sysUser);
 		sysUser.setUpdateTime(LocalDateTime.now());
-		if (StrUtil.isNotBlank(userDto.getPassword())) {
-			sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
+		if (StrUtil.isNotBlank(userDto.getNewPwd()) && !user.getPassword().equals(userDto.getNewPwd())) {
+			sysUser.setPassword(ENCODER.encode(userDto.getNewPwd()));
 		}
 		this.updateById(sysUser);
 

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/controller/admin/SysTotalDebtController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
+import com.kxs.common.log.annotation.SysLog;
 import com.kxs.system.api.model.SysPublicParam;
 import com.kxs.user.api.model.KxsTotalDebt;
 import com.kxs.user.api.model.KxsTotalDebtLog;
@@ -58,6 +59,7 @@ public class SysTotalDebtController {
      * @param param 实体对象
      * @return 账户管理-总欠款管理-新增
      */
+    @SysLog("总欠款管理-新增")
     @PostMapping("/add")
 //    @PreAuthorize("@pms.hasPermission('sys_debt_add')")
     public R add(@RequestBody @Valid KxsTotalDebt param) {
@@ -72,6 +74,7 @@ public class SysTotalDebtController {
      * @param param 实体对象
      * @return 账户管理-总欠款管理-修改
      */
+    @SysLog("总欠款管理-修改")
     @PostMapping("/update")
 //    @PreAuthorize("@pms.hasPermission('sys_debt_edit')")
     public R update(@RequestBody @Valid KxsTotalDebt param) {
@@ -90,6 +93,7 @@ public class SysTotalDebtController {
      * @param idsList id集合
      * @return 账户管理-总欠款管理-删除
      */
+    @SysLog("总欠款管理-删除")
     @PostMapping("/remove")
 //    @PreAuthorize("@pms.hasPermission('sys_debt_del')")
     public R remove(@RequestBody List<Integer> idsList) {
@@ -102,16 +106,12 @@ public class SysTotalDebtController {
      *
      * @return 账户管理-总欠款管理-欠款明细列表
      */
-    @GetMapping("/{pagelog}")
-//    @PreAuthorize("@pms.hasPermission('sys_debtlog_del')")
-    public R pagelog(Page<KxsTotalDebtLog> page, KxsTotalDebtLog param) {
+    @GetMapping("/pageLog")
+    public R pageLog(Page<KxsTotalDebtLog> page, KxsTotalDebtLog param) {
 
-        return R.ok(kxsTotalDebtLogService.page(page, new QueryWrapper<>(param)));
+        return R.ok(kxsTotalDebtLogService.page(page, Wrappers.<KxsTotalDebtLog>lambdaQuery().eq(KxsTotalDebtLog::getUserId, param.getUserId())));
     }
 
 
-
-
-
 }