Browse Source

2024-02-05 设备正式提交1

master
fengyuan_yang 3 years ago
parent
commit
396ce2fe34
  1. 114
      src/main/java/com/jianteng/config/CustomerMvcConfig.java
  2. 10
      src/main/java/com/jianteng/modules/sys/controller/SysRoleController.java
  3. 18
      src/main/java/com/jianteng/modules/sys/controller/SysUserController.java

114
src/main/java/com/jianteng/config/CustomerMvcConfig.java

@ -37,62 +37,62 @@ public class CustomerMvcConfig implements WebMvcConfigurer {
WebMvcConfigurer.super.addResourceHandlers(registry); WebMvcConfigurer.super.addResourceHandlers(registry);
} }
/**
*
* @Title: fastConverter
* @Description: fastjson转换器
* @return
* @return: HttpMessageConverter<?>
* @author LR
* @date: 2021-5-11 11:56:58
* @throws
*/
public HttpMessageConverter<?> fastConverter() {
//1、定义一个convert转换消息的对象
FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
//2、添加fastjson的配置信息
FastJsonConfig fastJsonConfig = new FastJsonConfig();
fastJsonConfig.setSerializerFeatures(
//字符串null返回空字符串
SerializerFeature.WriteNullStringAsEmpty,
//数值类型为0
SerializerFeature.WriteNullNumberAsZero,
//格式化时间信息
SerializerFeature.WriteDateUseDateFormat,
//空字段保留
SerializerFeature.WriteNullListAsEmpty);
fastJsonConfig.setCharset(Charset.forName("UTF-8"));
//2-1 处理中文乱码问题
List<MediaType> fastMediaTypes = new ArrayList<>();
fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
fastConverter.setSupportedMediaTypes(fastMediaTypes);
//3、在convert中添加配置信息
fastConverter.setFastJsonConfig(fastJsonConfig);
return fastConverter;
}
@Override
public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
converters.clear();
converters.add(fastConverter());
converters.add(stringConverter());
}
/**
*
* @Title: stringConverter
* @Description: 字符串转换器
* @return
* @return: HttpMessageConverter<String>
* @author LR
* @date: 2021-5-11 11:59:22
* @throws
*/
public HttpMessageConverter<String> stringConverter() {
StringHttpMessageConverter converter = new StringHttpMessageConverter(
Charset.forName("UTF-8"));
return converter;
}
// /**
// *
// * @Title: fastConverter
// * @Description: fastjson转换器
// * @return
// * @return: HttpMessageConverter<?>
// * @author LR
// * @date: 2021-5-11 11:56:58
// * @throws
// */
// public HttpMessageConverter<?> fastConverter() {
// //1、定义一个convert转换消息的对象
// FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
// //2、添加fastjson的配置信息
// FastJsonConfig fastJsonConfig = new FastJsonConfig();
// fastJsonConfig.setSerializerFeatures(
// //字符串null返回空字符串
// SerializerFeature.WriteNullStringAsEmpty,
// //数值类型为0
// SerializerFeature.WriteNullNumberAsZero,
// //格式化时间信息
// SerializerFeature.WriteDateUseDateFormat,
// //空字段保留
// SerializerFeature.WriteNullListAsEmpty);
//
// fastJsonConfig.setCharset(Charset.forName("UTF-8"));
// //2-1 处理中文乱码问题
// List<MediaType> fastMediaTypes = new ArrayList<>();
// fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
// fastConverter.setSupportedMediaTypes(fastMediaTypes);
// //3、在convert中添加配置信息
// fastConverter.setFastJsonConfig(fastJsonConfig);
// return fastConverter;
// }
//
// @Override
// public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
// converters.clear();
// converters.add(fastConverter());
// converters.add(stringConverter());
// }
//
// /**
// *
// * @Title: stringConverter
// * @Description: 字符串转换器
// * @return
// * @return: HttpMessageConverter<String>
// * @author LR
// * @date: 2021-5-11 11:59:22
// * @throws
// */
// public HttpMessageConverter<String> stringConverter() {
// StringHttpMessageConverter converter = new StringHttpMessageConverter(
// Charset.forName("UTF-8"));
// return converter;
// }
} }

10
src/main/java/com/jianteng/modules/sys/controller/SysRoleController.java

@ -46,6 +46,16 @@ public class SysRoleController extends AbstractController {
return R.ok().put("page", page); return R.ok().put("page", page);
} }
/**
* 角色列表
*/
@GetMapping("/list2")
@ResponseBody
public R list2(@RequestParam Map<String, Object> params){
PageUtils page = sysRoleService.queryPage(params);
return R.ok().put("page", page);
}
/** /**
* 角色列表 * 角色列表

18
src/main/java/com/jianteng/modules/sys/controller/SysUserController.java

@ -43,12 +43,12 @@ public class SysUserController extends AbstractController {
* 所有用户列表 * 所有用户列表
*/ */
@GetMapping("/list") @GetMapping("/list")
@RequiresPermissions("sys:user:list")
// @RequiresPermissions("sys:user:list")
public R list(@RequestParam Map<String, Object> params){ public R list(@RequestParam Map<String, Object> params){
//只有超级管理员,才能查看所有管理员列表 //只有超级管理员,才能查看所有管理员列表
if(getUserId() != Constant.SUPER_ADMIN){
params.put("createUserId", getUserId());
}
// if(getUserId() != Constant.SUPER_ADMIN){
// params.put("createUserId", getUserId());
// }
PageUtils page = sysUserService.queryPage(params); PageUtils page = sysUserService.queryPage(params);
return R.ok().put("page", page); return R.ok().put("page", page);
@ -57,7 +57,7 @@ public class SysUserController extends AbstractController {
/** /**
* @author: sxm * @author: sxm
* @description: 获取用户列表非分页 * @description: 获取用户列表非分页
* @param [params]
* @param
* @return: com.alteams.common.utils.R * @return: com.alteams.common.utils.R
* @date: 2022/8/12 13:29 * @date: 2022/8/12 13:29
*/ */
@ -139,7 +139,7 @@ public class SysUserController extends AbstractController {
* 用户信息 * 用户信息
*/ */
@GetMapping("/info/{userId}") @GetMapping("/info/{userId}")
@RequiresPermissions("sys:user:info")
// @RequiresPermissions("sys:user:info")
public R info(@PathVariable("userId") Long userId){ public R info(@PathVariable("userId") Long userId){
SysUserEntity user = sysUserService.getById(userId); SysUserEntity user = sysUserService.getById(userId);
@ -155,7 +155,7 @@ public class SysUserController extends AbstractController {
*/ */
@SysLog("保存用户") @SysLog("保存用户")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("sys:user:save")
// @RequiresPermissions("sys:user:save")
public R save(@RequestBody SysUserEntity user){ public R save(@RequestBody SysUserEntity user){
ValidatorUtils.validateEntity(user, AddGroup.class); ValidatorUtils.validateEntity(user, AddGroup.class);
@ -170,7 +170,7 @@ public class SysUserController extends AbstractController {
*/ */
@SysLog("修改用户") @SysLog("修改用户")
@PostMapping("/update") @PostMapping("/update")
@RequiresPermissions("sys:user:update")
// @RequiresPermissions("sys:user:update")
public R update(@RequestBody SysUserEntity user){ public R update(@RequestBody SysUserEntity user){
ValidatorUtils.validateEntity(user, UpdateGroup.class); ValidatorUtils.validateEntity(user, UpdateGroup.class);
@ -185,7 +185,7 @@ public class SysUserController extends AbstractController {
*/ */
@SysLog("删除用户") @SysLog("删除用户")
@PostMapping("/delete") @PostMapping("/delete")
@RequiresPermissions("sys:user:delete")
// @RequiresPermissions("sys:user:delete")
public R delete(@RequestBody Long[] userIds){ public R delete(@RequestBody Long[] userIds){
if(ArrayUtils.contains(userIds, 1L)){ if(ArrayUtils.contains(userIds, 1L)){
return R.error("系统管理员不能删除"); return R.error("系统管理员不能删除");

Loading…
Cancel
Save