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(); } } 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); }
@@ -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; } 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> 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); 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()); } 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()); } 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)); } } user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -24,4 +24,6 @@ List<User> getUserMenu(); int upUserPassword(String oldPassword, String newPassWord); } 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); } }
