From e4c2789c8778fd0cc827692b9ebf554411d05673 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 07 三月 2024 11:30:04 +0800
Subject: [PATCH] 完成客户管理
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 25 ++++++++
user-server/src/main/java/com/yuanchu/mom/service/impl/CustomServiceImpl.java | 62 ++++++++++++++++++++
user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java | 4 +
user-server/src/main/java/com/yuanchu/mom/service/CustomService.java | 26 ++++++++
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 21 ++++---
user-server/src/main/resources/mapper/CustomMapper.xml | 19 ++++++
user-server/src/main/resources/mapper/UserMapper.xml | 2
7 files changed, 148 insertions(+), 11 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index f0792ec..78811e3 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -7,8 +7,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.CustomService;
import com.yuanchu.mom.service.PowerService;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -39,6 +41,8 @@
private PowerService powerService;
private Jwt jwt;
+
+ private CustomService customService;
@ApiOperation(value = "鐧诲綍")
@PostMapping("/enter")
@@ -124,4 +128,25 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
+
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
+ @PostMapping("/selectCustomPageList")
+ public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
+ return Result.success(customService.selectCustomPageList(page, custom));
+ }
+
+ @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
+ @PostMapping("/delCustomById")
+ public Result<?> delCustomById(Integer id) {
+ return Result.success(customService.delCustomById(id));
+ }
+
+ @ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
+ @PostMapping("/addCustom")
+ public Result<?> addCustom(@RequestBody Custom custom) {
+ return Result.success(customService.addCustom(custom));
+ }
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index 3533258..b916334 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -25,26 +25,26 @@
private Integer id;
@ValueTableShow(2)
- @ApiModelProperty(value = "璐﹀彿")
+ @ApiModelProperty(value = "瀹㈡埛璐﹀彿")
private String account;
@ValueTableShow(1)
- @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String name;
- @ValueTableShow(10)
- @ApiModelProperty(value = "鐘舵��")
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "璐﹀彿鐘舵��")
private Integer state;
@ValueTableShow(5)
- @ApiModelProperty(value = "閭")
+ @ApiModelProperty(value = "鐢靛瓙閭")
private String email;
@ValueTableShow(6)
@ApiModelProperty(value = "鐢佃瘽鍙风爜")
private String phone;
- @ApiModelProperty(value = "閮ㄩ棬")
+ @ApiModelProperty(value = "鎵�鍦ㄩ儴闂�")
private String department;
@ValueTableShow(7)
@@ -55,13 +55,12 @@
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
- @ValueTableShow(9)
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@@ -74,6 +73,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+ @ValueTableShow(10)
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ private String updateUserName;
+
private Integer isCustom;
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java
index 78685a5..3e9e083 100644
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java
@@ -11,6 +11,8 @@
@Repository
public interface CustomMapper extends BaseMapper<Custom> {
-// IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+ IPage<Custom> selectCustomPageList(IPage<Custom> page, QueryWrapper<Custom> ew);
+
+ int delCustomById(Integer id);
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/CustomService.java b/user-server/src/main/java/com/yuanchu/mom/service/CustomService.java
new file mode 100644
index 0000000..44ddeb5
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/service/CustomService.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.Custom;
+import com.yuanchu.mom.dto.UserPageDto;
+import com.yuanchu.mom.pojo.Power;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恥ser(鐢ㄦ埛id)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024骞�3鏈�7鏃�09:21:59
+*/
+public interface CustomService extends IService<Custom> {
+
+ Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom);
+
+ int delCustomById(Integer id);
+
+ int addCustom(Custom custom);
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/CustomServiceImpl.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/CustomServiceImpl.java
new file mode 100644
index 0000000..ed73a53
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/CustomServiceImpl.java
@@ -0,0 +1,62 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.Custom;
+import com.yuanchu.mom.dto.UserPageDto;
+import com.yuanchu.mom.mapper.CustomMapper;
+import com.yuanchu.mom.mapper.PowerMapper;
+import com.yuanchu.mom.mapper.UserMapper;
+import com.yuanchu.mom.pojo.Power;
+import com.yuanchu.mom.service.CustomService;
+import com.yuanchu.mom.service.PowerService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恜ower(鐢ㄦ埛id)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2023-12-27 02:37:38
+*/
+@Service
+@AllArgsConstructor
+public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom>
+ implements CustomService {
+
+ private CustomMapper customMapper;
+
+ private GetLook getLook;
+
+ @Override
+ public Map<String, Object> selectCustomPageList(IPage<Custom> page, Custom custom) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(Custom.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectCustomPageList");
+ if(map1.get("look")==1) custom.setCreateUser(map1.get("userId"));
+ map.put("body", customMapper.selectCustomPageList(page, QueryWrappers.queryWrappers(custom)));
+ return map;
+ }
+
+ @Override
+ public int delCustomById(Integer id) {
+ return customMapper.delCustomById(id);
+ }
+
+ @Override
+ public int addCustom(Custom custom) {
+ custom.setIsCustom(1);
+ return customMapper.updateById(custom);
+ }
+}
+
+
+
+
diff --git a/user-server/src/main/resources/mapper/CustomMapper.xml b/user-server/src/main/resources/mapper/CustomMapper.xml
new file mode 100644
index 0000000..5d1ff67
--- /dev/null
+++ b/user-server/src/main/resources/mapper/CustomMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.CustomMapper">
+ <update id="delCustomById">
+ update user set is_custom = 0
+ where id = #{id}
+ </update>
+ <select id="selectCustomPageList" resultType="com.yuanchu.mom.dto.Custom">
+ select * from (
+ select u1.id, u1.account, u1.name, u1.state, u1.update_time, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u2.name update_user_name
+ from user u1
+ left join user u2 on u2.id = u1.update_user
+ where u1.is_custom = 1
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b51610f..229b3c4 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.yuanchu.mom.mapper.UserMapper">
<select id="selectUserDtoPageList" resultType="com.yuanchu.mom.dto.UserPageDto">
select * from (
- select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.role_id, u2.name create_user_name, u3.name update_user_name, r.name role_name
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name create_user_name, u3.name update_user_name, r.name role_name
from user u1
left join user u2 on u2.id = u1.create_user
left join user u3 on u3.id = u1.update_user
--
Gitblit v1.9.3