添加获取用户接口,对象版本

yun-zuoyi
wynne1005 4 years ago
parent e014266277
commit 76a44d7f09

@ -340,4 +340,7 @@ public interface ISysUserService {
@ApiOperation(value = "查询有效的用户与角色关系")
List<SysRefUserRole> findValidUserRoleRef();
@ApiOperation(value = "查询所有用户")
List<SysUser> findAll();
}

@ -61,6 +61,19 @@ public class BackstageController extends CoreBaseController {
}
}
@GetMapping(value = "/redis-put-pojo-version-plan")
@ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据")
public ResultBean redisPutPojoVersionPlan(){
try {
systemInitService.reloadPojoVersionPlan();
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value = "/redis-put-system-language")
@ApiOperation(value = "重新加载语言数据",notes = "重新加载语言数据")
public ResultBean redisPutSystemLanguage(){

@ -14,6 +14,7 @@ import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -60,6 +61,7 @@ public class SysLogRoleChangeController extends CoreBaseController {
@GetMapping(value = "/export/user-role-change")
@ApiOperation(value = "导出用户角色变更记录")
public ResultBean exportUserRoleChangedLog(HttpServletResponse response, String startDate, String endDate) {
File file = null;
try {
final String ZERO_TIME = " 00:00:00";
// 获取当月第一天和最后一天
@ -85,9 +87,9 @@ public class SysLogRoleChangeController extends CoreBaseController {
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String fileName = "user-role-changed-" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
file = new File(fileName);
file.createNewFile();
File excel = excelTool.exportData(file, logRoleChanges, SysLogRoleChange.class
excelTool.exportData(file, logRoleChanges, SysLogRoleChange.class
, (LinkedHashMap<String, String>) ExcelTool.getColName(SysLogRoleChange.class));
response.setContentType("application/force-download"); // 设置强制下载不打开
@ -95,7 +97,7 @@ public class SysLogRoleChangeController extends CoreBaseController {
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName, true)));
// 设置文件名
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excel)))) {
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(file)))) {
OutputStream os = response.getOutputStream();
byte[] buffer = new byte[1024];
int i = bis.read(buffer);
@ -111,6 +113,10 @@ public class SysLogRoleChangeController extends CoreBaseController {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} finally {
if (file != null) {
FileUtils.deleteQuietly(file);
}
}
}

@ -66,20 +66,20 @@ public class SysLogUserLoginController extends CoreBaseController {
private ImppRedis redisRes;
@GetMapping("/query")
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
public ResultBean querySysLogUserLogin(SysLogUserLogin sysLogUserLogin, Pager pager){
@ApiOperation(value = "定时任务日志分页复杂查询", notes = "定时任务日志分页复杂查询")
public ResultBean querySysLogUserLogin(SysLogUserLogin sysLogUserLogin, Pager pager) {
try {
ListPager logUserLoginListPager = sysLogUserLoginService.querySysLogUserLoginByPager(sysLogUserLogin, pager);
return ResultBean.success("查询成功").setListPager(logUserLoginListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException e){
} catch (ImppBusiException e) {
return ResultBean.fail(e);
}catch(Exception e){
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping("/export")
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
@ApiOperation(value = "定时任务日志分页复杂查询", notes = "定时任务日志分页复杂查询")
public void exportSysLogUserLogin(SysLogUserLogin sysLogUserLogin, HttpServletResponse response) throws Exception {
File file = null;
try {
@ -93,7 +93,7 @@ public class SysLogUserLoginController extends CoreBaseController {
response.setContentType("application/force-download"); // 设置强制下载不打开
response.addHeader("Content-Disposition", "attachment;fileName=" + fileName); // 设置文件名
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName,true)));
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName, true)));
// 设置文件名
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excel)))) {
@ -115,6 +115,7 @@ public class SysLogUserLoginController extends CoreBaseController {
@GetMapping(value = "/export/month/user-fail-login")
@ApiOperation(value = "根据语言代码查询资源")
public ResultBean exportMonthlyUserFailLoginReport(HttpServletResponse response, String date) {
File file = null;
try {
final String ZERO_TIME = " 00:00:00";
// 获取当月第一天和最后一天
@ -140,9 +141,9 @@ public class SysLogUserLoginController extends CoreBaseController {
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String fileName = "user-login-log-" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
file = new File(fileName);
file.createNewFile();
File excel = excelTool.exportData(file, sysLogUserLogins, SysLogUserLogin.class
excelTool.exportData(file, sysLogUserLogins, SysLogUserLogin.class
, (LinkedHashMap<String, String>) ExcelTool.getColName(SysLogUserLogin.class));
response.setContentType("application/force-download"); // 设置强制下载不打开
@ -150,7 +151,7 @@ public class SysLogUserLoginController extends CoreBaseController {
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName, true)));
// 设置文件名
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excel)))) {
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(file)))) {
OutputStream os = response.getOutputStream();
byte[] buffer = new byte[1024];
int i = bis.read(buffer);
@ -166,6 +167,10 @@ public class SysLogUserLoginController extends CoreBaseController {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}finally {
if(file!=null){
FileUtils.deleteQuietly(file);
}
}
}

@ -17,6 +17,7 @@ import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -83,6 +84,7 @@ public class SysPojoVersionController extends CrudBaseController<SysPojoVersion>
@GetMapping("/export-user-operation")
@ApiOperation(value = "导出用户操作数据", notes = "导出用户操作数据")
BaseResultBean<SysPojoVersion> exportUserOperation(HttpServletResponse response, String userName, String startDate, String endDate) {
File file =null;
try {
final String ZERO_TIME = " 00:00:00";
startDate += ZERO_TIME;
@ -92,9 +94,9 @@ public class SysPojoVersionController extends CrudBaseController<SysPojoVersion>
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String fileName = "user-operation-" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
file = new File(fileName);
file.createNewFile();
File excel = excelTool.exportData(file, pojoVersions, SysPojoVersion.class
excelTool.exportData(file, pojoVersions, SysPojoVersion.class
, (LinkedHashMap<String, String>) ExcelTool.getColName(SysPojoVersion.class));
response.setContentType("application/force-download"); // 设置强制下载不打开
@ -102,7 +104,7 @@ public class SysPojoVersionController extends CrudBaseController<SysPojoVersion>
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName, true)));
// 设置文件名
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excel)))) {
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(file)))) {
OutputStream os = response.getOutputStream();
byte[] buffer = new byte[1024];
int i = bis.read(buffer);
@ -118,6 +120,10 @@ public class SysPojoVersionController extends CrudBaseController<SysPojoVersion>
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}finally {
if(file!=null){
FileUtils.deleteQuietly(file);
}
}
}
}

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserPasswordService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
@ -24,6 +25,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
@ -35,6 +37,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -92,6 +95,9 @@ public class SysUserController extends CoreBaseController {
private ISysUserPasswordService userPasswordService;
@Autowired
private ISysRoleService roleService;
@Autowired
private EntityManager entityManager;
@Resource(name = CommonConstWords.IMPP_REDIS_RES)
@ -331,13 +337,14 @@ public class SysUserController extends CoreBaseController {
@GetMapping(value = "/export/ref-user-role")
@ApiOperation(value = "导出用户角色关系", notes = "导出用户角色关系")
public ResultBean exportUserRoleRef(HttpServletResponse response) {
File file = null;
try {
List<SysRefUserRole> list = sysUserService.findValidUserRoleRef();
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String fileName = "user-role-ref-" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
file = new File(fileName);
file.createNewFile();
File excel = excelTool.exportData(file, list, SysRefUserRole.class
excelTool.exportData(file, list, SysRefUserRole.class
, (LinkedHashMap<String, String>) ExcelTool.getColName(SysRefUserRole.class));
response.setContentType("application/force-download"); // 设置强制下载不打开
@ -345,7 +352,7 @@ public class SysUserController extends CoreBaseController {
response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName, true)));
// 设置文件名
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(excel)))) {
try (BufferedInputStream bis = new BufferedInputStream(new DataInputStream(new FileInputStream(file)))) {
OutputStream os = response.getOutputStream();
byte[] buffer = new byte[1024];
int i = bis.read(buffer);
@ -363,6 +370,10 @@ public class SysUserController extends CoreBaseController {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} finally {
if (file != null) {
FileUtils.deleteQuietly(file);
}
}
}
@ -426,6 +437,20 @@ public class SysUserController extends CoreBaseController {
}
@GetMapping(value = "/role/list")
@ApiOperation(value = "查询所有角色", notes = "查询所有系统角色")
public ResultBean findRoleAll() {
try {
List<SysRole> list = roleService.findAll();
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
/**
*
*

@ -795,6 +795,11 @@ public class SysUserService implements ISysUserService {
return refUserRoleRDao.findByHqlWhere(packBean);
}
@Override
public List<SysUser> findAll() {
return userRDao.findAll();
}
/**
*
*

Loading…
Cancel
Save