From 5be07b1a021f596b003eac001f4cb77416ae6c7b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 十二月 2024 17:08:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WebController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WebController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WebController.java
index f7d14a3..2a8a2cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WebController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WebController.java
@@ -2,18 +2,14 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.domain.TIndexMenu;
-import com.ruoyi.system.domain.TUserChange;
-import com.ruoyi.system.domain.TUserChangeDetail;
+import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.AllertTitleDto;
import com.ruoyi.system.dto.RegionDto;
-import com.ruoyi.system.service.TIndexMenuService;
-import com.ruoyi.system.service.TRegionService;
-import com.ruoyi.system.service.TUserChangeDetailService;
-import com.ruoyi.system.service.TUserChangeService;
+import com.ruoyi.system.service.*;
import com.ruoyi.web.controller.query.CityQueryDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +17,9 @@
import javax.annotation.Resource;
import java.nio.file.LinkOption;
+import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
@RestController
@RequestMapping("/web")
@@ -39,6 +37,8 @@
private TUserChangeService changeService;
@Resource
private TUserChangeDetailService changeDetailService;
+ @Resource
+ private TAppUserService appUserService;
@ApiOperation(value = "获取地区树状图",tags = "web端偏好设置")
@PostMapping(value = "/region/tree")
@@ -54,10 +54,10 @@
@ApiOperation(value = "通过cityCodes查职称分类",tags = "web端偏好设置")
@PostMapping(value = "/title/tree")
- public R<List<AllertTitleDto>> list(@RequestBody CityQueryDto cityQueryDto) {
-
+ public R<List<AllertTitleDto>> list(@Validated @RequestBody CityQueryDto cityQueryDto) {
+ String[] split = cityQueryDto.getStrings().split(",");
+ cityQueryDto.getCityCode().addAll(Arrays.asList(split));
List<AllertTitleDto> allertTitleDtos = indexMenuService.allert(cityQueryDto.getCityCode());
-
return R.ok(allertTitleDtos);
}
@@ -65,6 +65,11 @@
@PostMapping(value = "/title/set")
public R<List<AllertTitleDto>> set(@RequestBody List<TUserChangeDetail> userChangeDetails) {
Long userId = tokenService.getLoginUser().getUserId();
+ TAppUser byId = appUserService.getById(userId);
+ if(Objects.nonNull(byId)){
+ byId.setIsSetPreference(1);
+ appUserService.updateById(byId);
+ }
//保存一次变更记录
--
Gitblit v1.7.1