From c115237aeb36c61bb61b617d54ba4d7025381527 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 四月 2024 11:11:57 +0800
Subject: [PATCH] 系统调整
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 7 +++
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 1
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 2 +
user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java | 13 ++++++
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2 +
user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java | 3 +
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 9 ++++
data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java | 4 ++
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 13 ++++++
data-server/src/main/resources/mapper/DataReportingMapper.xml | 7 +++
10 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
index edb24e5..e916fa2 100644
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -77,7 +77,7 @@
return Result.success(dataReportingService.selectProductCountDtoPageList(page, productCountDto));
}
- @ApiOperation(value = "鑾峰彇鐧昏浜烘眹鎬诲垪琛�")
+ @ApiOperation(value = "鑾峰彇鍛樺伐鏁版嵁缁熻鍒楄〃")
@PostMapping("/selectRegistrantCountDtoPageList")
public Result selectRegistrantCountDtoPageList(@RequestBody Map<String, Object> data) {
Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
@@ -423,4 +423,11 @@
financeSubmitService.deleteAllFinance(date);
return Result.success();
}
+
+ @ApiOperation(value = "鏁版嵁涓婃姤涓荤鏉冮檺")
+ @GetMapping("/dataReportingPower")
+ public Result dataReportingPower() {
+ return Result.success();
+ }
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
index b3ccf9a..b4a461a 100644
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
+++ b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
@@ -46,6 +46,10 @@
List<String> selectDataReportingForCreateUserNames(String time);
List<String> selectDataReportingForProduct(String time);
+
+ String getUserNameById(Integer id);
+
+ String getUserDepartmentById(Integer id);
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index 07c2a5a..ffe8732 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -23,6 +23,7 @@
import com.yuanchu.mom.dto.DataReportingPageDto;
import com.yuanchu.mom.dto.ProductCountDto;
import com.yuanchu.mom.dto.RegistrantCountDto;
+import com.yuanchu.mom.mapper.AuthMapper;
import com.yuanchu.mom.mapper.FansSubmitMapper;
import com.yuanchu.mom.mapper.FinanceSubmitMapper;
import com.yuanchu.mom.pojo.DataReporting;
@@ -84,11 +85,18 @@
@Resource
private FinanceSubmitMapper financeSubmitMapper;
+ @Resource
+ private AuthMapper authMapper;
+
@Override
public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
Map<String, Object> map = new HashMap<>();
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
+ Integer power = authMapper.isPower(map1.get("userId"), "dataReportingPower");
+ if(power == 1){
+ dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
+ }
map.put("head", PrintChina.printChina(DataReportingPageDto.class));
map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto)));
return map;
@@ -152,7 +160,10 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(RegistrantCountDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList");
- if (map1.get("look") == 1) registrantCountDto.setCreateUser(map1.get("userId"));
+ if (map1.get("look") == 1) {
+ String name = dataReportingMapper.getUserNameById(map1.get("userId"));
+ registrantCountDto.setName2(name);
+ };
map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
return map;
}
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index a1ed534..ff38784 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -167,4 +167,11 @@
select distinct product from data_reporting
where create_time like concat('%', #{time}, '%')
</select>
+
+ <select id="getUserNameById" resultType="java.lang.String">
+ select account from user where id = #{id}
+ </select>
+ <select id="getUserDepartmentById" resultType="java.lang.String">
+ select department from user where id = #{id}
+ </select>
</mapper>
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index 2097319..df1045d 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -42,6 +42,8 @@
type = "瀵煎叆";
} else if(remark.contains("瀵煎嚭")){
type = "瀵煎嚭";
+ } else if(remark.contains("鏉冮檺")){
+ type = "鐗规畩鏉冮檺";
}
try {
authMapper.insertPower(value.getMethod().getName(), remark, type);
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index c6e21c4..8014908 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.pojo.CustomEnum;
import com.yuanchu.mom.pojo.ProductEnum;
import com.yuanchu.mom.pojo.Role;
@@ -38,6 +39,7 @@
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃鏋氫妇")
@GetMapping("/selectCustomEnumList")
+ @ValueAuth
public Result selectCustomEnumList(){
return Result.success(customEnumService.selectList());
}
@@ -70,6 +72,7 @@
@ApiOperation(value = "鑾峰彇椤圭洰鍒楄〃鏋氫妇")
@GetMapping("/selectProductEnumList")
+ @ValueAuth
public Result selectProductEnumList(){
return Result.success(productEnumService.selectList());
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index b6233db..a8d2f31 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -42,6 +42,7 @@
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇")
@GetMapping("/selectRoleList")
+ @ValueAuth
public Result selectRoleList(){
return Result.success(roleService.selectList());
}
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..eb52f07 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
@@ -124,4 +124,11 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
+
+ @PostMapping("/upUserPassword")
+ @ApiOperation(value = "淇敼鐢ㄦ埛瀵嗙爜")
+ @ValueAuth
+ public Result<?> upUserPassword(String oldPassword, String newPassWord){
+ return Result.success(userService.upUserPassword(oldPassword, newPassWord));
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 3b8fc96..cf8f54d 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -24,4 +24,6 @@
List<User> getUserMenu();
+ int upUserPassword(String oldPassword, String newPassWord);
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
index 7d8d7ae..5fcb027 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.imp;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,6 +12,7 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.UserPageDto;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
@@ -76,4 +78,15 @@
public List<User> getUserMenu() {
return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
}
+
+ @Override
+ public int upUserPassword(String oldPassword, String newPassWord) {
+ Map<String, Integer> map = getLook.selectPowerByMethodAndUserId(null);
+ User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map.get("userId")).eq(User::getPassword, DigestUtils.md5DigestAsHex(oldPassword.getBytes())).select(User::getId));
+ if(BeanUtil.isEmpty(user)){
+ throw new ErrorException("瀵嗙爜涓嶆纭�");
+ }
+ user.setPassword(DigestUtils.md5DigestAsHex(newPassWord.getBytes()));
+ return userMapper.updateById(user);
+ }
}
--
Gitblit v1.9.3