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)); 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); 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)); } // zhang-content/pom.xml
@@ -59,6 +59,7 @@ <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> </dependencies> <build> 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; }
@@ -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中查询到对应那条数据在es的id 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中查询到对应那条数据在es的id // 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
