Skip to content

C
chnmuseum-party
Commit 2c27db79 authored by wzp's avatar wzp
Browse files
Options

机构管理查询和导入，用户管理

parent 1ffb1bd9
Show whitespace changes
Inline Side-by-side
Showing with 671 additions and 301 deletions
pom.xml
View file @ 2c27db79
......@@ -115,6 +115,19 @@
<version>1.27.2</version>
</dependency>
<!-- POI导入导出 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<!-- Swagger2 Document -->
<dependency>
<groupId>io.springfox</groupId>
......
src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperModule.java
View file @ 2c27db79
package cn.wisenergy.chnmuseum.party.common.log;
public enum OperModule {
用户管理,
角色管理,
人员管理,
部门管理,
机构管理;
USER(1,"用户管理"),
ROLE(1,"角色管理"),
DEPT(1,"部门管理"),
ORG(1,"机构管理");
// 错误编码
private Integer code;
// 信息
private String msg;
// 相应编码有参构造函数
OperModule(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperType.java
View file @ 2c27db79
......@@ -4,13 +4,41 @@ public enum OperType {
/**
*
*/
查询,
添加,
修改,
删除,
禁用,
启用,
复制,
分享,
注销;
SELECT(1,"查询"),
ADD(2,"新增"),
UPDATE(3,"修改"),
DELETE(4,"删除"),
UNABLE(5,"启用"),
DISABLE(6,"禁用"),
IMPORT(7,"导入");
// 错误编码
private Integer code;
// 信息
private String msg;
// 相应编码有参构造函数
OperType(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java
View file @ 2c27db79
......@@ -132,9 +132,9 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
*/
public void getControllerMethodDescription(MethodLog log, SysLog sysLog) throws Exception {
// 设置action动作
sysLog.setOperationType(log.operType().name());
sysLog.setOperationType(log.operType().getMsg());
// 设置标题
sysLog.setOperationObject(log.operModule().name());
sysLog.setOperationObject(log.operModule().getMsg());
}
/**
......
src/main/java/cn/wisenergy/chnmuseum/party/common/util/ImportExcelUtil.java 0 → 100644
View file @ 2c27db79
package cn.wisenergy.chnmuseum.party.common.util;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ImportExcelUtil {
// abc.xls
public static boolean isXls(String fileName) {
// (?i)忽略大小写
if (fileName.matches("^.+\\.(?i)(xls)$")) {
return true;
} else if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
return false;
} else {
throw new RuntimeException("格式不对");
}
}
public static List<Map<String,String>> readExcel(String fileName,InputStream is) throws Exception {
boolean ret = isXls(fileName);
Workbook workbook = null;
// 根据文件后缀创建不同的对象
if (ret) {
workbook = new HSSFWorkbook(is);
} else {
workbook = new XSSFWorkbook(is);
}
Sheet sheet = workbook.getSheetAt(0);
// 得到标题行
Row titleRow = sheet.getRow(0);
//行数
int lastRowNum = sheet.getLastRowNum();
//列数
int lastCellNum = titleRow.getLastCellNum();
List<Map<String,String>> list = new ArrayList<>();
for (int i = 1; i <= lastRowNum; i++) {
ArrayList<String> list1 = new ArrayList<>();
HashMap<String,String> map = new HashMap<>();
//获取行数据
Row row = sheet.getRow(i);
for (int j = 0; j < lastCellNum; j++) {
//获取单元格
Cell cell = row.getCell(j);
if (cell!=null) {
cell.setCellType(Cell.CELL_TYPE_STRING);
//获取单元格数据
list1.add(cell.getStringCellValue());
//列名 ：数据
map.put(titleRow.getCell(j).getStringCellValue(), cell.getStringCellValue());
}else {
continue;
}
}
list.add(map);
}
is.close();
return list;
}
}
\ No newline at end of file
src/main/java/cn/wisenergy/chnmuseum/party/conf/SwaggerConfig.java
View file @ 2c27db79
......@@ -32,8 +32,8 @@ public class SwaggerConfig {
.apis(RequestHandlerSelectors.basePackage("cn.wisenergy.chnmuseum.party.web.controller"))
.paths(PathSelectors.any())
.build()
//.securitySchemes(newArrayList(apiKey()))
//.securityContexts(newArrayList(securityContext()))
.securitySchemes(newArrayList(apiKey()))
.securityContexts(newArrayList(securityContext()))
;
}
......
src/main/java/cn/wisenergy/chnmuseum/party/core/aop/WebLogAspect.java
View file @ 2c27db79
......@@ -76,7 +76,7 @@ public class WebLogAspect {
content = annotation.value();
}
//插入到系统日志表
this.sysLogController.insertSysLog(content,null);
this.sysLogController.insertSysLog(content,null,null);
}
return proceedingJoinPoint.proceed();
......
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TOrganMapper.java
View file @ 2c27db79
......@@ -3,6 +3,9 @@ package cn.wisenergy.chnmuseum.party.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.wisenergy.chnmuseum.party.model.TOrgan;
import java.util.List;
import java.util.Map;
/**
* <pre>
* 用户 Mapper 接口
......@@ -12,5 +15,5 @@ import cn.wisenergy.chnmuseum.party.model.TOrgan;
* @since 2021-03-22
*/
public interface TOrganMapper extends BaseMapper<TOrgan> {
List<Map<String,Object>> selectArea();
}
src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java
View file @ 2c27db79
......@@ -3,6 +3,8 @@ package cn.wisenergy.chnmuseum.party.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.wisenergy.chnmuseum.party.model.TUser;
import java.util.List;
/**
* <pre>
* 用户 Mapper 接口
......@@ -13,5 +15,7 @@ import cn.wisenergy.chnmuseum.party.model.TUser;
*/
public interface TUserMapper extends BaseMapper<TUser> {
TUser selectByUsername(String username);
TUser selectByUsername(String userName);
List<TUser> selectList(String userName);
}
src/main/java/cn/wisenergy/chnmuseum/party/model/Role.java
View file @ 2c27db79
......@@ -18,7 +18,7 @@ import java.util.List;
* @author 杨智平
* @since 2018-08-02
*/
@TableName("role")
@TableName("t_role")
public class Role extends Model<Role> {
private static final long serialVersionUID = 1L;
......
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @ 2c27db79
......@@ -90,7 +90,7 @@ public class TUser implements Serializable {
@TableField("exired_date")
private LocalDate exiredDate;
@ApiModelProperty("状态")
@ApiModelProperty("状态 1.启用 2.禁用")
@TableField("status")
private String status;
......@@ -122,7 +122,7 @@ public class TUser implements Serializable {
@TableField("type")
private String type;
@ApiModelProperty("审核状态 1.通过 2.待初审 3.待复审 4.已驳回")
@ApiModelProperty("审核状态 1.待初审 2.已驳回 3.待复审 4.通过 ")
@TableField("audit_status")
private String auditStatus;
......
src/main/java/cn/wisenergy/chnmuseum/party/service/TOrganService.java
View file @ 2c27db79
......@@ -16,4 +16,6 @@ import java.util.List;
public interface TOrganService extends IService<TOrgan> {
List<TOrgan> getTree();
boolean batchUpload(List excelList);
}
src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java
View file @ 2c27db79
package cn.wisenergy.chnmuseum.party.service;
import cn.wisenergy.chnmuseum.party.model.TUser;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
/**
......@@ -13,5 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface TUserService extends IService<TUser> {
TUser selectByUsername(String username);
TUser selectByUsername(String userName);
Page<TUser> selectList(Page<TUser> page, String userName);
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/RunLogServiceImpl.java
View file @ 2c27db79
......@@ -6,6 +6,8 @@ import cn.wisenergy.chnmuseum.party.service.RunLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* <p>
* 服务实现类
......@@ -17,4 +19,12 @@ import org.springframework.stereotype.Service;
@Service
public class RunLogServiceImpl extends ServiceImpl<RunLogMapper, RunLog> implements RunLogService {
@Resource
private RunLogMapper runLogMapper;
public boolean insertRunLog(RunLog runLog){
boolean save = save(runLog);
return save;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java
View file @ 2c27db79
package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.model.TOrgan;
import cn.wisenergy.chnmuseum.party.mapper.TOrganMapper;
import cn.wisenergy.chnmuseum.party.service.TOrganService;
......@@ -8,13 +10,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -50,4 +49,45 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
list = list.stream().filter(o -> o.getLevel() == 1).collect(Collectors.toList());
return list;
}
@Override
public boolean batchUpload(List excelList) {
boolean flag =false;
List<TOrgan> list = new ArrayList<>();
List<TOrgan> list1 = list();
HashMap<String, TOrgan> map1 = new HashMap<>();
list1.stream().forEach(o-> map1.put(o.getName(),o));
HashMap<String, Integer> area = new HashMap<>();
List<Map<String, Object>> mapList = organMapper.selectArea();
mapList.stream().forEach(m->area.put(m.get("name").toString(),Integer.valueOf(m.get("id").toString())));
for (int i = 0; i < excelList.size(); i++) {
Map<String, String> map = null;
map = (Map<String, String>) excelList.get(i);
TOrgan organ = new TOrgan();
organ.setName(map.get("名称"));
String parent = map.get("上级机构");
if (map1.get(parent)==null){
organ.setParentId("0");
organ.setLevel(1);
}else {
organ.setParentId(map1.get(parent).getId());
organ.setLevel(map1.get(parent).getLevel()+1);
}
organ.setProvince(area.get(map.get("省")+"P"));
organ.setCity(area.get(map.get("市")+"C"));
organ.setCountry(area.get(map.get("县")+"T"));
organ.setIcon(map.get("icon"));
organ.setRemarks(map.get("备注"));
organ.setIsDeleted(false);
organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
organ.setUpdateTime(LocalDateTime.now());
list.add(organ);
}
flag = saveBatch(list);
return flag;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java
View file @ 2c27db79
......@@ -3,6 +3,7 @@ package cn.wisenergy.chnmuseum.party.service.impl;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.mapper.TUserMapper;
import cn.wisenergy.chnmuseum.party.service.TUserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
......@@ -28,7 +29,12 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
private TUserMapper tUserMapper;
@Override
public TUser selectByUsername(String username) {
return tUserMapper.selectByUsername(username);
public TUser selectByUsername(String userName) {
return tUserMapper.selectByUsername(userName);
}
@Override
public Page<TUser> selectList(Page<TUser> page, String userName) {
return page.setRecords(tUserMapper.selectList(userName));
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java
View file @ 2c27db79
......@@ -32,10 +32,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
......@@ -165,14 +162,17 @@ public class LoginController {
}
//获取当前用户角色拥有菜单
List<Menu> userMenuPerms = this.menuService.getUserMenuPerms(roles);
List<Menu> userMenuPerms = new ArrayList<>();
if (roles.size() > 0) {
userMenuPerms = this.menuService.getUserMenuPerms(roles);
}
//登录时插入系统日志
String operationContent = username + "登录本系统";
if (user.getOrgName() != null) {
operationContent += "，机构" + user.getOrgName();
}
this.sysLogController.insertSysLog(operationContent, username);
this.sysLogController.insertSysLog(operationContent, username, user.getId());
String token = JwtTokenUtil.sign(username, user.getId());
// 将token信息存入Redis
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/SysLogController.java
View file @ 2c27db79
......@@ -2,7 +2,9 @@ package cn.wisenergy.chnmuseum.party.web.controller;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.common.util.NetWorkUtil;
import cn.wisenergy.chnmuseum.party.model.RunLog;
import cn.wisenergy.chnmuseum.party.model.SysLog;
import cn.wisenergy.chnmuseum.party.service.impl.RunLogServiceImpl;
import cn.wisenergy.chnmuseum.party.service.impl.SysLogServiceImpl;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -30,12 +32,15 @@ public class SysLogController extends BaseController {
@Resource
private SysLogServiceImpl sysLogService;
@Resource
private RunLogServiceImpl runLogService;
/**
* 插入系统日志表
*/
@ApiOperation(value = "插入系统日志", notes = "插入系统日志")
@PostMapping(value = "/insertSysLog")
public Boolean insertSysLog(String operationContent, String username) {
public Boolean insertSysLog(String operationContent, String username,String id) {
SysLog sysLog = new SysLog();
//日志时间
sysLog.setOperationTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
......@@ -50,6 +55,11 @@ public class SysLogController extends BaseController {
} else {
sysLog.setOperator(username);
}
if ("1".equals(id)) {
sysLog.setType(1);
}else {
sysLog.setType(2);
}
//日志内容
sysLog.setOperationContent(operationContent);
sysLog.setOperationObject("登录管理");
......@@ -80,5 +90,15 @@ public class SysLogController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
/**
* 插入机顶盒日志表
*/
@ApiOperation(value = "插入系统日志", notes = "插入系统日志")
@PostMapping(value = "/insertRunLog")
public Boolean insertRunLog(RunLog runLog) {
boolean b = runLogService.insertRunLog(runLog);
return b;
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java
View file @ 2c27db79
......@@ -4,6 +4,7 @@ import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
import cn.wisenergy.chnmuseum.party.common.log.OperModule;
import cn.wisenergy.chnmuseum.party.common.log.OperType;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.common.util.ImportExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -26,13 +27,20 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
......@@ -57,7 +65,7 @@ public class TOrganController extends BaseController {
@PostMapping("/add")
@RequiresPermissions("/organ/add")
@ApiOperation(value = "添加机构", notes = "添加机构")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.添加)
@MethodLog(operModule = OperModule.ORG,operType = OperType.ADD)
public Map<String, Object> add(TOrgan organ) {
organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
......@@ -75,7 +83,7 @@ public class TOrganController extends BaseController {
@PutMapping("/update")
@RequiresPermissions("/organ/update")
@ApiOperation(value = "update", notes = "修改机构信息")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.修改)
@MethodLog(operModule = OperModule.ORG,operType = OperType.UPDATE)
public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
tOrgan.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
boolean flag = tOrganService.updateById(tOrgan);
......@@ -85,28 +93,11 @@ public class TOrganController extends BaseController {
return getFailResult();
}
// @PutMapping("/updateAuditStatus")
// @RequiresPermissions("/organ/updateAuditStatus")
// @ApiOperation(value = "更新机构审核状态", notes = "更新机构审核状态")
// @ApiImplicitParams(value = {
// @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
// @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
// })
// public Map<String, Object> updateStatus(@NotNull(message = "机构ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
// UpdateWrapper<TOrgan> updateWrapper = new UpdateWrapper<>();
// updateWrapper.eq("id", id);
// updateWrapper.eq("audit_status", status.name());
// boolean flag = tOrganService.update(updateWrapper);
// if (flag) {
// return getSuccessResult();
// }
// return getFailResult();
// }
@DeleteMapping("/delete")
@RequiresPermissions("/organ/delete")
@ApiOperation(value = "根据ID删除机构", notes = "根据ID删除机构")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.删除)
@MethodLog(operModule = OperModule.ORG,operType = OperType.DELETE)
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
})
......@@ -125,12 +116,14 @@ public class TOrganController extends BaseController {
@GetMapping("/getList")
@RequiresPermissions("/organ/getList")
@ApiOperation(value = "获取机构全部列表(无分页)", notes = "获取机构全部列表(无分页)")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.查询)
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public Map<String, Object> getTOrganList() {
List<TOrgan> tOrganList = tOrganService.list(Wrappers.<TOrgan>lambdaQuery().eq(TOrgan::getIsDeleted, 0));
return getResult(tOrganList);
}
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
......@@ -141,7 +134,7 @@ public class TOrganController extends BaseController {
@PostMapping("/getPageList")
@RequiresPermissions("/organ/getPageList")
@ApiOperation(value = "获取机构分页列表", notes = "获取机构分页列表")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.查询)
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public Map<String, Object> getTOrganPageList(GenericPageParam genericPageParam) {
LambdaQueryWrapper<TOrgan> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询
......@@ -162,7 +155,7 @@ public class TOrganController extends BaseController {
@ApiOperation(value = "获取机构详情", notes = "获取机构详情")
@GetMapping("/getById")
@RequiresPermissions("/organ/getById")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.查询)
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public Map<String, Object> getById(String id) {
TOrgan tOrgan = tOrganService.getById(id);
return getResult(tOrgan);
......@@ -172,10 +165,43 @@ public class TOrganController extends BaseController {
@GetMapping("/getTree")
@RequiresPermissions("/organ/getTree")
@ApiOperation(value = "获取机构树", notes = "获取机构树")
@MethodLog(operModule = OperModule.机构管理,operType = OperType.查询)
public Map<String, Object> getTree() {
List<TOrgan> tOrganList = tOrganService.getTree();
return getResult(tOrganList);
@MethodLog(operModule = OperModule.ORG,operType = OperType.SELECT)
public Map<String, Object> getTree(String name) {
List<TOrgan> list = new ArrayList<>();
if (StringUtils.isBlank(name)) {
list = tOrganService.getTree();
}else {
list = tOrganService.list(new UpdateWrapper<TOrgan>().like("name",name));
}
return getResult(list);
}
// 导入EXCEL
@ApiOperation(value = "导入EXCEL", notes = "导入EXCEL", httpMethod = "POST")
@RequestMapping(value = "/import", method = RequestMethod.POST)
@RequiresPermissions("/organ/import")
@MethodLog(operModule = OperModule.ORG,operType = OperType.IMPORT)
public ResponseEntity<Map> upload(MultipartFile file) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try {
boolean flag = false;
//使用工具类从文件中读取数据
List excelList = ImportExcelUtil.readExcel(file.getOriginalFilename(), file.getInputStream());
flag = tOrganService.batchUpload(excelList);
if (!flag) {
resultMap.put("status",500);
resultMap.put("massage","导入失败!");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
resultMap.put("status",200);
resultMap.put("massage","导入成功!");
return ResponseEntity.ok(resultMap);
} catch (Exception e) {
resultMap.put("status",500);
resultMap.put("massage","导入失败!");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
}
}
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @ 2c27db79
......@@ -2,24 +2,26 @@ package cn.wisenergy.chnmuseum.party.web.controller;
import cn.wisenergy.chnmuseum.party.auth.SHA256PasswordEncryptionService;
import cn.wisenergy.chnmuseum.party.auth.SecureRandomSaltService;
import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
import cn.wisenergy.chnmuseum.party.common.log.OperModule;
import cn.wisenergy.chnmuseum.party.common.log.OperType;
import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
import cn.wisenergy.chnmuseum.party.common.util.RandomUtil;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import cn.wisenergy.chnmuseum.party.core.annotations.OperationLog;
import cn.wisenergy.chnmuseum.party.model.Role;
import cn.wisenergy.chnmuseum.party.model.TOrgan;
import cn.wisenergy.chnmuseum.party.model.TUserRole;
import cn.wisenergy.chnmuseum.party.service.RoleService;
import cn.wisenergy.chnmuseum.party.service.TUserRoleService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import cn.wisenergy.chnmuseum.party.model.TUser;
import cn.wisenergy.chnmuseum.party.service.TUserService;
import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -32,11 +34,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Repository;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
import sun.security.util.Password;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
......@@ -62,226 +61,281 @@ public class TUserController extends BaseController {
@Resource
private TUserRoleService tUserRoleService;
@Resource
private RoleService roleService;
@Resource
private StringRedisTemplate stringRedisTemplate;
private static final String SHIRO_JWT_TOKEN = "shiro:jwt:token";
//用户登录是否被锁定 一小时 redisKey 前缀
private String SHIRO_IS_LOCK = "shiro_is_lock_";
// /**
// * 查询成员列表
// *
// * @param employName (用户名称，账号，手机号，角色名称有一个满足即可返回值)
// * @return
// */
// @ApiOperation(value = "查询成员列表")
// @RequestMapping(value = "/getUserList", method = RequestMethod.GET)
// @RequiresPermissions("/user/getUserList")
// public ResponseEntity<Page<TUser>> queryUserList(String employName) {
// try {
// employName = StringUtils.trimToNull(employName);
// Page<TUser> page = getPage();
// Page<TUser> userPage = userService.selectRolenameList(page, employName);
// return ResponseEntity.ok(userPage);
// } catch (Exception e) {
// logger.error("查询成员列表出错!", e);
// }
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
// }
//
// //新增
// @OperationLog("新增成员")
// @ApiOperation(value = "新增成员")
// @RequestMapping(value = "/add", method = RequestMethod.POST)
// @RequiresPermissions("/user/add")
// public ResponseEntity<Map<String, Object>> add(@RequestBody TUser user) {
// Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
// try {
// if (StringUtils.isBlank(user.getUserName())) {
// resultMap.put("status", 400);
// resultMap.put("message", "账号不能为空！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// } else {
// user.setUserName(StringUtils.trimToNull(user.getUserName()));
// }
// if (StringUtils.isBlank(user.getPassword())) {
// resultMap.put("status", 400);
// resultMap.put("message", "密码不能为空！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// } else {
// user.setPassword(StringUtils.trimToNull(user.getPassword()));
// }
// if (StringUtils.isBlank(user.getRealName())) {
// resultMap.put("status", 400);
// resultMap.put("message", "姓名不能为空！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// } else {
// user.setRealName(StringUtils.trimToNull(user.getRealName()));
// }
//
// if (user.getRoleList()==null||user.getRoleList().size()<1) {
// resultMap.put("status", 400);
// resultMap.put("message", "请选择角色！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
// if (StringUtils.isBlank(user.getOrgId())) {
// resultMap.put("status", 400);
// resultMap.put("message", "请选择机构！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
//
// QueryWrapper<TUser> ew = new QueryWrapper<>();
// if (StringUtils.isNoneBlank(user.getUserName())) {
// user.setUserName(user.getUserName().trim());
// ew.eq("is_deleted", 0);
// ew.eq("username", user.getUserName());
// TUser one = this.userService.getOne(ew);
// if (one != null) {
// resultMap.put("status", 400);
// resultMap.put("message", "账号已存在！");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
// }
//
// byte[] passwordSalt = SecureRandomSaltService.generateSalt();
// byte[] passwordHash = SHA256PasswordEncryptionService
// .createPasswordHash(user.getPassword(), passwordSalt);
// user.setPasswordSalt(passwordSalt);
// user.setPasswordHash(passwordHash);
// user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
// user.setUpdateTime(user.getCreateTime());
//
// boolean ret = this.userService.save(user);
//
// List<Role> list = user.getRoleList();
// List<TUserRole> list1 = new ArrayList<>();
// for (Role role : list) {
// TUserRole entity = new TUserRole();
// entity.setUserId(user.getId());
// entity.setRoleId(role.getId());
// entity.setIsDeleted(false);
// list1.add(entity);
// }
//
// this.tUserRoleService.saveBatch(list1);
//
// if (!ret) {
// // 新增失败, 500
// resultMap.put("status", 500);
// resultMap.put("message", "服务器忙");
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
// .body(resultMap);
// }
// resultMap.put("status", 201);
// resultMap.put("message", "添加成功");
// // 201
// return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
// } catch (Exception e) {
// resultMap.put("status", 500);
// resultMap.put("message", "服务器忙");
// logger.error("新增成员错误!", e);
// }
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
// }
//
// // 编辑用户信息
// @OperationLog("修改成员信息")
// @ApiOperation(value = "编辑用户信息(必须传 1username 2name 3roleId)")
// @PutMapping(value = "/modify")
// @RequiresPermissions("/user/modify")
// public ResponseEntity<Map<String, Object>> edit(TUser user) {
// Map<String, Object> resultMap = new HashMap<>();
// try {
// boolean ret = false;
// if (user.getId() != null) {
// if ("1".equals(user.getId()) && user.getStatus() == "2") {
// resultMap.put("status", 400);
// resultMap.put("message", "该账号不能被禁用");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
//
// user.setUserName(StringUtils.trimToNull(user.getUserName()));
// user.setPassword(StringUtils.trimToNull(user.getPassword()));
// user.setRealName(StringUtils.trimToNull(user.getRealName()));
// user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
// ret = userService.updateById(user);
// //查询当前用户拥有的角色
// QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
// userRoleWrapper.eq("user_id", user.getId());
// TUserRole userRole = this.userRoleService.getOne(userRoleWrapper);
//
// if (userRole != null && user.getRoleId() != null
// && user.getRoleId() != userRole.getRoleId()) {
// // 角色有变化即修改角色
// userRole.setRoleId(user.getRoleId());
// userRole.setUpdateTime(user.getUpdateTime());
// ret = this.userRoleService.updateById(userRole);
// }
// } else {
// // 更新失败, 400
// resultMap.put("status", 400);
// resultMap.put("message", "请选择用户");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
//
// if (!ret) {
// // 更新失败, 500
// resultMap.put("status", 500);
// resultMap.put("message", "服务器忙");
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
// }
// // 204
// resultMap.put("status", 201);
// resultMap.put("message", "更新成功");
// return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
// } catch (Exception e) {
// logger.error("更新错误!", e);
// }
// // 500
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
// }
// /**
// * 删除
// *
// * @param userId
// * @return
// */
// @OperationLog("删除成员")
// @ApiOperation(value = "删除成员")
// @DeleteMapping(value = "/delete")
// @RequiresPermissions("/user/delete")
// public ResponseEntity<Map<String, Object>> delete(String userId) {
// Map<String, Object> resultMap = new HashMap<>();
// try {
// if ("1".equals(userId)) {
// resultMap.put("status", 400);
// resultMap.put("message", "该账号不能被删除");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
// TUser entity = new TUser();
// entity.setId(userId);
// entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
// entity.setIsDeleted(true);
// boolean ret1 = this.userService.updateById(entity);
//
// QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
// userRoleWrapper.eq("user_id", userId);
// boolean ret2 = this.userRoleService.remove(userRoleWrapper);
//
// if (!ret1 || !ret2) {
// resultMap.put("status", 400);
// resultMap.put("message", "删除失败");
// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
// }
// resultMap.put("status", 201);
// resultMap.put("message", "删除成功");
// return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
// } catch (Exception e) {
// logger.error("删除用户出错!", e);
// }
// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
// }
/**
* 查询成员列表
*
* @param userName (用户名称)
* @return
*/
@ApiOperation(value = "查询成员列表")
@RequestMapping(value = "/getUserList", method = RequestMethod.GET)
@RequiresPermissions("/user/getUserList")
@MethodLog(operModule = OperModule.USER,operType = OperType.SELECT)
public ResponseEntity<Page<TUser>> queryUserList(String userName) {
try {
userName = StringUtils.trimToNull(userName);
Page<TUser> page = getPage();
Page<TUser> userPage = userService.selectList(page, userName);
return ResponseEntity.ok(userPage);
} catch (Exception e) {
logger.error("查询成员列表出错!", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "nameOrCode", value = "名称或编码", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startDate", value = "创建时间-开始", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "创建时间-结束", paramType = "query", dataType = "String")
})
@PostMapping("/getPageList")
@RequiresPermissions("/user/getPageList")
@ApiOperation(value = "获取用户分页列表", notes = "获取用户分页列表")
@MethodLog(operModule = OperModule.USER,operType = OperType.SELECT)
public Map<String, Object> getPageList(GenericPageParam genericPageParam) {
LambdaQueryWrapper<TUser> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询
if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
queryWrapper.like(TUser::getUserName, genericPageParam.getNameOrCode());
}
// 根据创建时间区间检索
if (genericPageParam.getStartDate() != null && genericPageParam.getEndDate() != null) {
queryWrapper.ge(TUser::getCreateTime, genericPageParam.getStartDate().atTime(0, 0, 0))
.le(TUser::getCreateTime, genericPageParam.getEndDate().atTime(23, 59, 59));
}
// 设置排序规则
queryWrapper.orderByDesc(TUser::getCreateTime);
Page<TUser> page = userService.page(getPage(), queryWrapper);
return getResult(page);
}
@ApiOperation(value = "获取用户详情", notes = "获取用户详情")
@GetMapping("/getById")
@RequiresPermissions("/user/getById")
@MethodLog(operModule = OperModule.USER,operType = OperType.SELECT)
public Map<String, Object> getById(String id) {
TUser tUser = userService.getById(id);
List<Role> list = roleService.selectRoleByUserId(id);
tUser.setRoleList(list);
return getResult(tUser);
}
//新增
@OperationLog("新增成员")
@ApiOperation(value = "新增成员")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@RequiresPermissions("/user/add")
@MethodLog(operModule = OperModule.USER,operType = OperType.ADD)
public ResponseEntity<Map<String, Object>> add(@RequestBody TUser user) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try {
if (StringUtils.isBlank(user.getUserName())) {
resultMap.put("status", 400);
resultMap.put("message", "账号不能为空！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} else {
user.setUserName(StringUtils.trimToNull(user.getUserName()));
}
if (StringUtils.isBlank(user.getPassword())) {
resultMap.put("status", 400);
resultMap.put("message", "密码不能为空！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} else {
user.setPassword(StringUtils.trimToNull(user.getPassword()));
}
if (StringUtils.isBlank(user.getRealName())) {
resultMap.put("status", 400);
resultMap.put("message", "姓名不能为空！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} else {
user.setRealName(StringUtils.trimToNull(user.getRealName()));
}
if (user.getRoleList()==null||user.getRoleList().size()<1) {
resultMap.put("status", 400);
resultMap.put("message", "请选择角色！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
if (StringUtils.isBlank(user.getOrgId())) {
resultMap.put("status", 400);
resultMap.put("message", "请选择机构！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
QueryWrapper<TUser> ew = new QueryWrapper<>();
if (StringUtils.isNoneBlank(user.getUserName())) {
user.setUserName(user.getUserName().trim());
ew.eq("is_deleted", 0);
ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew);
if (one != null) {
resultMap.put("status", 400);
resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
}
byte[] passwordSalt = SecureRandomSaltService.generateSalt();
byte[] passwordHash = SHA256PasswordEncryptionService
.createPasswordHash(user.getPassword(), passwordSalt);
user.setPasswordSalt(passwordSalt);
user.setPasswordHash(passwordHash);
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
boolean ret = this.userService.save(user);
List<Role> list = user.getRoleList();
List<TUserRole> list1 = new ArrayList<>();
for (Role role : list) {
TUserRole entity = new TUserRole();
entity.setUserId(user.getId());
entity.setRoleId(role.getId());
entity.setIsDeleted(false);
list1.add(entity);
}
this.tUserRoleService.saveBatch(list1);
if (!ret) {
// 新增失败, 500
resultMap.put("status", 500);
resultMap.put("message", "服务器忙");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(resultMap);
}
resultMap.put("status", 200);
resultMap.put("message", "添加成功");
// 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
} catch (Exception e) {
resultMap.put("status", 500);
resultMap.put("message", "服务器忙");
logger.error("新增成员错误!", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 编辑用户信息
@OperationLog("修改成员信息")
@ApiOperation(value = "编辑用户信息(必须传 1username 2name 3roleId)")
@PutMapping(value = "/update")
@RequiresPermissions("/user/update")
@MethodLog(operModule = OperModule.USER,operType = OperType.UPDATE)
public ResponseEntity<Map<String, Object>> edit(@RequestBody TUser user) {
Map<String, Object> resultMap = new HashMap<>();
try {
boolean ret = false;
if (user.getId() != null) {
if ("1".equals(user.getId()) && user.getStatus() == "2") {
resultMap.put("status", 400);
resultMap.put("message", "该账号不能被禁用");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
user.setUserName(StringUtils.trimToNull(user.getUserName()));
user.setPassword(StringUtils.trimToNull(user.getPassword()));
user.setRealName(StringUtils.trimToNull(user.getRealName()));
user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
ret = userService.updateById(user);
//查询当前用户拥有的角色
QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
userRoleWrapper.eq("user_id", user.getId());
boolean remove = tUserRoleService.remove(userRoleWrapper);
List<Role> list = user.getRoleList();
if (list != null && list.size() >0) {
ArrayList<TUserRole> list1 = new ArrayList<>();
for (Role r : list) {
TUserRole userRole = new TUserRole();
userRole.setUserId(user.getId());
userRole.setRoleId(r.getId());
userRole.setIsDeleted(false);
list1.add(userRole);
}
ret = this.tUserRoleService.saveBatch(list1);
}
} else {
// 更新失败, 400
resultMap.put("status", 400);
resultMap.put("message", "请选择用户");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
if (!ret) {
// 更新失败, 500
resultMap.put("status", 500);
resultMap.put("message", "服务器忙");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("message", "更新成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
} catch (Exception e) {
logger.error("更新错误!", e);
}
// 500
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
/**
* 删除
*
* @param userId
* @return
*/
@OperationLog("删除成员")
@ApiOperation(value = "删除成员")
@DeleteMapping(value = "/delete")
@RequiresPermissions("/user/delete")
@MethodLog(operModule = OperModule.USER,operType = OperType.DELETE)
public ResponseEntity<Map<String, Object>> delete(String userId) {
Map<String, Object> resultMap = new HashMap<>();
try {
if ("1".equals(userId)) {
resultMap.put("status", 400);
resultMap.put("message", "该账号不能被删除");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
TUser entity = new TUser();
entity.setId(userId);
entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
entity.setIsDeleted(true);
boolean ret1 = this.userService.updateById(entity);
QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
userRoleWrapper.eq("user_id", userId);
boolean ret2 = this.tUserRoleService.remove(userRoleWrapper);
if (!ret1 || !ret2) {
resultMap.put("status", 400);
resultMap.put("message", "删除失败");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("message", "删除成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
} catch (Exception e) {
logger.error("删除用户出错!", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
/**
......@@ -294,12 +348,15 @@ public class TUserController extends BaseController {
@ApiOperation(value = "禁用")
@RequestMapping(value = "/disable", method = RequestMethod.PUT)
@RequiresPermissions("/user/disable")
@MethodLog(operModule = OperModule.USER,operType = OperType.DISABLE)
public ResponseEntity<Map<String, Object>> disableTUser(String userId) {
Map<String, Object> resultMap = new HashMap<>();
try {
TUser entity = new TUser();
entity.setId(userId);
entity.setStatus("2");
Integer code = AuditStatusEnum.TBC.getCode();
entity.setAuditStatus(code.toString());
entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
boolean ret = this.userService.updateById(entity);
......@@ -329,7 +386,8 @@ public class TUserController extends BaseController {
@ApiOperation(value = "启用")
@RequestMapping(value = "/enable", method = RequestMethod.PUT)
@RequiresPermissions("/user/enable")
public ResponseEntity<Map<String, Object>> enableUser(String userId, String currBankId) {
@MethodLog(operModule = OperModule.USER,operType = OperType.UNABLE)
public ResponseEntity<Map<String, Object>> enableUser(String userId) {
try {
Map<String, Object> map = new HashMap<>();
......@@ -358,6 +416,7 @@ public class TUserController extends BaseController {
@ApiOperation(value = "管理员更改自己的登录密码", notes = "管理员更改自己的登录密码")
@RequestMapping(value = "/editPwd", method = RequestMethod.PUT)
@RequiresPermissions("/user/editPwd")
@MethodLog(operModule = OperModule.USER,operType = OperType.UPDATE)
public ResponseEntity<Map<String, Object>> editPwd(@RequestParam(value = "oldPassWord", required = true) String oldPassWord,
@RequestParam(value = "password", required = true) String password) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
......@@ -396,13 +455,6 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
@ApiOperation(value = "获取用户详情", notes = "获取用户详情")
@GetMapping("/getById")
@RequiresPermissions("/user/getById")
public Map<String, Object> getById(String id) {
TUser tUser = userService.getById(id);
return getResult(tUser);
}
// 管理员重置密码
......@@ -410,12 +462,13 @@ public class TUserController extends BaseController {
@ApiOperation(value = "管理员重置密码", notes = "管理员重置密码")
@RequestMapping(value = "/resetPassword", method = RequestMethod.PUT)
@RequiresPermissions("/user/resetPassword")
@MethodLog(operModule = OperModule.USER,operType = OperType.UPDATE)
public ResponseEntity<Map<Object, String>> resetPassword(String userId) {
try {
Map<Object, String> map = new LinkedHashMap<>();
TUser user = new TUser();
user.setId(userId);
String newPassword = RandomUtil.createRandom(6);
String newPassword = "123456";
byte[] passwordSalt = SecureRandomSaltService.generateSalt();
byte[] passwordHash = SHA256PasswordEncryptionService.createPasswordHash(newPassword, passwordSalt);
user.setPasswordSalt(passwordSalt);
......@@ -436,5 +489,26 @@ public class TUserController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
}
@PutMapping("/updateAuditStatus")
@RequiresPermissions("/user/updateAuditStatus")
@ApiOperation(value = "更新用户审核状态", notes = "更新用户审核状态")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
@ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
})
@MethodLog(operModule = OperModule.USER,operType = OperType.UPDATE)
public Map<String, Object> updateStatus(@NotNull(message = "机构用户不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
UpdateWrapper<TUser> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
updateWrapper.eq("audit_status", status.name());
boolean flag = userService.update(updateWrapper);
if (flag) {
return getSuccessResult();
}
return getFailResult();
}
}
src/main/resources/mapper/TOrganMapper.xml
View file @ 2c27db79
......@@ -23,4 +23,9 @@
id, name, parent_id, is_deleted, create_time, update_time, province, city, country, icon, remarks, level
</sql>
<select id="selectArea" resultType="java.util.HashMap">
select concat(name,type) name,id from t_area
</select>
</mapper>
src/main/resources/mapper/TUserMapper.xml
View file @ 2c27db79
......@@ -24,6 +24,22 @@
<result column="type" property="type"/>
<result column="audit_status" property="auditStatus"/>
<result column="org_name" property="orgName"/>
<collection fetchType="eager" property="roleList" ofType="cn.wisenergy.chnmuseum.party.model.Role"
select="selectRoles" column="user_name"/>
</resultMap>
<resultMap id="roleMap" type="cn.wisenergy.chnmuseum.party.model.Role">
<result column="id" property="id" />
<result column="name" property="name" />
<result column="alias" property="alias" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="status" property="status" />
<result column="is_allow_login" property="allowLogin" />
<result column="instruction" property="instruction" />
<result column="is_deleted" property="isDeleted" />
<result column="sortorder" property="sortorder" />
</resultMap>
<!-- 通用查询结果列 -->
......@@ -35,7 +51,27 @@
select u.*,o.name org_name
from t_user u
left join t_organ o on o.id = u.org_id
where u.user_name =#{username}
where u.user_name =#{userName}
</select>
<select id="selectList" resultMap="BaseResultMap">
select u.*,o.name org_name
from t_user u
left join t_organ o on o.id = u.org_id
<if test=" username != null and username != '' ">
where u.user_name LIKE concat('%', #{userName}, '%')
</if>
</select>
<select id="selectRoles" resultMap="roleMap">
select r.*
from t_user u
left join t_organ o on o.id = u.org_id
left join t_user_role_link l on l.user_id = u.id
left join t_role r on l.role_id = r.id
<if test=" username != null and username != '' ">
where u.user_name =#{userName}
</if>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment