From f34203dacf5485b06d9d80618e5e14cf4463c2d7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:06 +0800
Subject: [PATCH] 修改了增加，修改用户代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 13 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 36 ++++++--
zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java | 58 ++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 59 +++++++++++++-
ruoyi-admin/src/main/resources/application.yml | 2
zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java | 3
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 3
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 5 +
9 files changed, 164 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index a8b5321..1fbaeeb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -50,8 +50,10 @@
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
loginBody.getUuid());
+
HashMap<String, String> tokenMap = new HashMap<>();
tokenMap.put("token",token);
+ // tokenMap.put("roid",roid)
return AjaxResult.success(tokenMap);
}
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 2d590f8..3697614 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.sysUserAndUserInfo;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import org.apache.commons.lang3.ArrayUtils;
@@ -132,6 +133,42 @@
}
/**
+ * 淇敼鐢ㄦ埛
+ *
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateUserInfo")
+ public AjaxResult editUser(@Validated @RequestBody sysUserAndUserInfo user)
+ {
+ SysUser us = new SysUser();
+ us.setUserId(user.getSysId());
+ us.setNickName(user.getNickName());
+ us.setRoleId(user.getRoleId());
+ us.setSex(user.getSex());
+ us.setStatus(user.getStatus());
+ userService.updateUser(us);
+
+ System.out.println(user.getFamilyId());
+ // System.out.println("[[[[]]]]]]");
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setUserId(user.getUserId());
+ infoUser.setIsMyFamily(user.getIsMyFamily());
+ infoUser.setFamilyId(user.getFamilyId());
+ infoUser.setSysId(user.getSysId());
+ if(user.getSpouseId()!=null)
+ infoUser.setSpouseId(user.getSpouseId());
+ ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
+ if(zfFamily!=null&&zfFamily.getFid()!=null)
+ infoUser.setFatherId(zfFamily.getFid());
+ if(zfFamily!=null&&zfFamily.getMid()!=null)
+ infoUser.setMomId(zfFamily.getMid());
+ zInfoUserService.saveOrUpdate(infoUser);
+ // zInfoUserService.update(infoUser);
+ // .saveOrUpdate(infoUser);
+ return AjaxResult.success();
+ }
+ /**
* 鏂板鐢ㄦ埛
*/
@PreAuthorize("@ss.hasPermi('system:user:add')")
@@ -168,21 +205,28 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ userService.insertUser(user);
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
ZInfoUser infoUser = new ZInfoUser();
- infoUser.setUserId(user.getUserId());
+ infoUser.setSysId(user.getUserId());
+ // infoUser.setUserId(user.getUserId());
infoUser.setNickName(user.getNickName());
infoUser.setPhoneNumber(user.getPhonenumber());
infoUser.setSex(user.getSex()=="鐢�"?1:0);
infoUser.setFamilyId(userAll.getFamilyId());
- if(zfFamily!=null) {
+ if(zfFamily!=null&&zfFamily.getFid()!=null) {
infoUser.setFatherId(zfFamily.getFid());
- // infoUser.setMomId(zfFamily.getMid());
+ // infoUser.setMomId(zfFamily.getMid());
+ }
+ if(zfFamily!=null&&zfFamily.getMid()!=null) {
+ infoUser.setFatherId(zfFamily.getMid());
+ // infoUser.setMomId(zfFamily.getMid());
}
System.out.println("-----");
System.out.println(userAll.getIsMyFamily());
+ System.out.println(userAll.getFamilyId());
infoUser.setIsMyFamily(userAll.getIsMyFamily());
if(userAll.getSpouseId()==0)
infoUser.setSpouseId(null);
@@ -194,8 +238,10 @@
if(user.getRoleIds()[0]==102)
infoUser.setRoleId(3L);
// infoUser.setRoleName(user.g);
+
if(userAll.getFamilyId()!=-1) {
- zInfoUserService.saveOrUpdate(infoUser);
+ zInfoUserService.save(infoUser);
+ // zInfoUserService.saveOrUpdate(infoUser);
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
List<ZInfoUser> lis = zInfoUserService.list(lqw);
@@ -211,7 +257,7 @@
.update();
}
}
- return toAjax(userService.insertUser(user));
+ return AjaxResult.success();
}
/**
@@ -252,6 +298,9 @@
{
return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
+// for(Long uid: userIds) {
+// zInfoUserService.getInfoBysysId();
+// }
zInfoUserService.removeByUserName( userService.findUserNames(userIds));
return toAjax(userService.deleteUserByIds(userIds));
}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f2fd417..3e0957d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -18,7 +18,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8080
+ port: 8089
ssl: #ssl閰嶇疆
# resources鏍圭洰褰曠殑鈥濊瘉涔︽簮鏂囦欢.pfx鈥�
key-store: classpath:www.bendudu.com.pfx
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b42a4d4..20050dd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -214,16 +214,32 @@
<update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
-
+
+ <delete id="deleteUserByUserName" parameterType="String">
+ update sys_user set status = '1' where user_name= #{userName}
+ </delete>
+ <delete id="deleteUserByName" parameterType="String">
+ delete from sys_user where user_name= #{userName}
+ </delete>
+
<delete id="deleteUserById" parameterType="Long">
- update sys_user set del_flag = '2' where user_id = #{userId}
- </delete>
-
- <delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
+ update sys_user set status = '1' where user_id = #{userId}
+ </delete>
+
+
+
+ <delete id="deleteById" parameterType="Long">
+ delete from sys_user where user_id in
+ <foreach collection="array" item="userId" open="(" separator="," close=")">
+ #{userId}
+ </foreach>
+ </delete>
+
+ <delete id="deleteUserByIds" parameterType="Long">
+ update sys_user set status = '1' where user_id in
+ <foreach collection="array" item="userId" open="(" separator="," close=")">
+ #{userId}
+ </foreach>
+ </delete>
</mapper>
\ No newline at end of file
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 699d7c5..6b109e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -218,6 +218,9 @@
*/
private String secondFamilyId;
+
+
+ private Long sysId;
/**
* 浠ｆ暟
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
index 0f0cdc2..ff54f44 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -39,6 +39,9 @@
private Long fid;
+ @Excel(name="姣嶄翰id")
+ private Long mid;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
new file mode 100644
index 0000000..a143ca1
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -0,0 +1,58 @@
+package com.ruoyi.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class sysUserAndUserInfo {
+ private static final long serialVersionUID = 1L;
+
+
+ private Long userId;
+
+
+
+ /** 鐢ㄦ埛鏄电О */
+ @Excel(name = "鐢ㄦ埛鍚嶇О")
+ private String nickName;
+
+
+
+ /** 鐢ㄦ埛鎬у埆 */
+ @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
+ private String sex;
+
+
+
+ /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ private String status;
+
+
+
+ /** 瑙掕壊瀵硅薄 */
+ private List<SysRole> roles;
+
+ /** 瑙掕壊缁� */
+ private Long[] roleIds;
+
+
+ /** 瑙掕壊ID */
+ private Long roleId;
+
+
+ private Integer isMyFamily;
+
+
+ private Long spouseId;
+
+ private Long familyId;
+
+ private Long sysId;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index bf377fd..d12a5fc 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,7 +22,12 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+
+
+ public ZInfoUser getInfoBysysId(Long sysid);
AjaxResult getInfoByfid(Long fid);
+
+ // AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
AjaxResult removeByUserName(List userName);
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 1997d0c..e7f008e 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
@@ -71,6 +71,14 @@
}
@Override
+ public ZInfoUser getInfoBysysId(Long sysid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSysId, sysid);
+ List<ZInfoUser> list = list(lqw);
+ return list.get(0);
+ }
+
+ @Override
public AjaxResult getInfoByfid(Long fid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getFamilyId, fid);
@@ -615,7 +623,7 @@
@Override
public ZInfoUser getInfoById(Long userId) {
- ZInfoUser user = getById(userId);
+ ZInfoUser user = getInfoBysysId(userId);
if(user!=null)
@@ -793,6 +801,9 @@
Long spouseId = one.getSpouseId();
if (spouseId != null) {
ZInfoUser spouse = zInfoUserService.getById(spouseId);
+ // System.out.println(spouseId);
+ // System.out.println(spouse);
+ // System.out.println("0000))))))))))))))))");
spouse.setIdentity(people.getIdentity() + 1);
one.setSpouse(spouse);
}
--
Gitblit v1.9.1