From edc0b4ee1fb8b292635667379387cc0e76e5af01 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 10 九月 2024 16:21:03 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 6 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 17 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 +-
zhang-content/pom.xml | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java | 90 ++++++++++++++++++++++++++++-----------------
6 files changed, 82 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 1ba96ad..9a29aca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -456,8 +456,8 @@
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
{
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
+ // userService.checkUserAllowed(user);
+// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
index 6f9ac20..8f408d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
@@ -26,7 +26,7 @@
@Autowired
TravelDetailService travelDetailService;
- @GetMapping()
+ @GetMapping("/{cid}")
public AjaxResult getDataByCid(@PathParam("cid") Long cid,TravelDetail travelDetail){
List<TravelDetail> travelDetailList = travelDetailService.getDataByCid(cid,travelDetail);
return AjaxResult.success(travelDetailList);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 8015c54..344dd46 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -23,6 +23,7 @@
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +52,7 @@
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -118,12 +120,25 @@
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+
+
+
+ ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
+ if(zInfoUser!=null)
+ {
+ return AjaxResult.success(zInfoUser);
+ }
+ else
+ return AjaxResult.success(user);
}
@GetMapping("/{id}")
public AjaxResult getInfoById(@PathVariable("id") Long id) {
// SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = id;
+
+
+ //鏌ヨsys_user琛�
+ // SysUser sysUser = sysUserService.selectUserById(userId);
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
//
diff --git a/zhang-content/pom.xml b/zhang-content/pom.xml
index 1e4d07c..64a15f0 100644
--- a/zhang-content/pom.xml
+++ b/zhang-content/pom.xml
@@ -59,6 +59,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
+
</dependencies>
<build>
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 0b330bf..dca8db9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -48,6 +48,7 @@
@Resource
private ZfFamilyService zfFamilyService;
+
@Resource
private ZfRoleService zfRoleService;
@@ -694,6 +695,11 @@
// user.setFamilyName(familyName);
// }
}
+ else{
+ //鏌ヨsys_user琛�
+
+
+ }
return user;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
index b34ee23..8cc19a4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import java.io.IOException;
+import java.sql.SQLIntegrityConstraintViolationException;
import java.time.LocalDateTime;
import java.util.*;
@@ -158,43 +159,64 @@
zfLog.setModule("瀹舵棌");
// zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
+
+ LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(ZfClan::getClanId);
+ lqw.eq(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
+ List<ZfClan> lis = this.list(lqw);
// System.out.println("===================================="+meeting);
- if(updateById(zfClan)){
- //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
- ZfClan dataById = getById(zfClan.getClanId());
+ if(lis.size()>0)
+ {
+ return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
- //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
- EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
-// System.out.println("===================================="+meeting);
- if (esResult == null){
- return AjaxResult.success();
- }
-
- //鎿嶄綔es淇敼鏁版嵁
- EsModel newModel = new EsModel();
- if(zfClan.getClanName()!=null){
- newModel.setBy1(zfClan.getClanName());
- }else {
- newModel.setBy1(dataById.getClanName());
- }
-//
-
- UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
- updateRequest.doc(
- "by1",newModel.getBy1()
-
- );
-
- try {
- restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- return AjaxResult.success();
- }else {
- return AjaxResult.error();
}
+ else
+ {
+ boolean res = updateById(zfClan);
+ return AjaxResult.success();
+ }
+
+ // if(res){
+
+ // }else {
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+ // }
+
+
+
+ // return AjaxResult.success("瀹舵棌鍚嶇О涓嶈兘閲嶅锛�");
+// //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+// ZfClan dataById = getById(zfClan.getClanId());
+//
+// //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+// EsModel esResult = esSer.findByCtId(dataById.getClanId(), "瀹舵棌");
+//// System.out.println("===================================="+meeting);
+// if (esResult == null){
+// return AjaxResult.success();
+// }
+//
+// //鎿嶄綔es淇敼鏁版嵁
+// EsModel newModel = new EsModel();
+// if(zfClan.getClanName()!=null){
+// newModel.setBy1(zfClan.getClanName());
+// }else {
+// newModel.setBy1(dataById.getClanName());
+// }
+////
+//
+// UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+// updateRequest.doc(
+// "by1",newModel.getBy1()
+//
+// );
+
+// try {
+// restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+
+
}
@Override
--
Gitblit v1.9.1