KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将put delete 请求改为 post

Browse Source
This commit is contained in:
tianwenbo
2023-03-13 11:25:59 +08:00
parent ef23c4633e
commit 6da7a26939
21 changed files with 182 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java
+11 -21
View File
@@ -1,32 +1,22 @@
package com.jero.modules.message.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.message.entity.SysMessage;
import com.jero.modules.message.service.ISysMessageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 消息
@@ -77,7 +67,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @param sysMessage
* @return
*/
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysMessage sysMessage) {
sysMessageService.updateById(sysMessage);
return Result.OK("操作成功!");
@@ -90,7 +80,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @param id
* @return
*/
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysMessageService.removeById(id);
return Result.OK("删除成功!");
@@ -102,7 +92,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
* @param ids
* @return
*/
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java
+13 -23
View File
@@ -1,11 +1,9 @@
package com.jero.modules.message.controller;
import java.util.Arrays;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
@@ -13,24 +11,16 @@ import com.jero.modules.message.entity.MsgParams;
import com.jero.modules.message.entity.SysMessageTemplate;
import com.jero.modules.message.service.ISysMessageTemplateService;
import com.jero.modules.message.util.PushMsgUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;
/**
* @Description: 消息模板
@@ -83,7 +73,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @param sysMessageTemplate
* @return
*/
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
sysMessageTemplateService.updateById(sysMessageTemplate);
return Result.OK("更新成功！");
@@ -95,7 +85,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @param id
* @return
*/
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysMessageTemplateService.removeById(id);
return Result.OK("删除成功!");
@@ -107,7 +97,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
* @param ids
* @return
*/
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java
+6 -12
View File
@@ -1,27 +1,21 @@
package com.jero.modules.oss.controller;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@Controller
@RequestMapping("/sys/oss/file")
@@ -59,7 +53,7 @@ public class OSSFileController {
}
@ResponseBody
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name = "id") String id) {
OSSFile file = ossFileService.getById(id);
if (file == null) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java
+18 -25
View File
@@ -1,30 +1,24 @@
package com.jero.modules.quartz.controller;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.system.base.controller.JeroController;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.ImportExcelUtil;
import com.jero.modules.quartz.entity.QuartzJob;
import com.jero.modules.quartz.service.IQuartzJobService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,14 +27,13 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Description: 定时任务在线管理
@@ -99,7 +92,7 @@ public class QuartzJobController {
*/
//@RequiresRoles("admin")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<T> eidt(@RequestBody QuartzJob quartzJob) {
try {
quartzJobService.editAndScheduleJob(quartzJob);
@@ -117,7 +110,7 @@ public class QuartzJobController {
* @return
*/
//@RequiresRoles("admin")
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
QuartzJob quartzJob = quartzJobService.getById(id);
if (quartzJob == null) {
@@ -136,7 +129,7 @@ public class QuartzJobController {
*/
//@RequiresRoles("admin")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
if (ids == null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
+3 -3
View File
@@ -138,7 +138,7 @@ public class SysAnnouncementController {
* @return
*/
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
if(sysAnnouncementEntity==null) {
@@ -163,7 +163,7 @@ public class SysAnnouncementController {
* @return
*/
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) {
@@ -185,7 +185,7 @@ public class SysAnnouncementController {
* @return
*/
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+5 -5
View File
@@ -89,7 +89,7 @@ public class SysAnnouncementSendController {
* @param sysAnnouncementSend
* @return
*/
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
if(sysAnnouncementSendEntity==null) {
@@ -109,7 +109,7 @@ public class SysAnnouncementSendController {
* @param id
* @return
*/
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) {
@@ -129,7 +129,7 @@ public class SysAnnouncementSendController {
* @param ids
* @return
*/
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids == null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
@@ -159,7 +159,7 @@ public class SysAnnouncementSendController {
* @param json
* @return
*/
@PutMapping(value = "/editByAnntIdAndUserId")
@PostMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
Result<SysAnnouncementSend> result = new Result<>();
String anntId = json.getString("anntId");
@@ -200,7 +200,7 @@ public class SysAnnouncementSendController {
* @功能：一键已读
* @return
*/
@PutMapping(value = "/readAll")
@PostMapping(value = "/readAll")
public Result<SysAnnouncementSend> readAll() {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+8 -8
View File
@@ -5,12 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.system.base.controller.JeroController;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser;
@@ -18,6 +14,10 @@ import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.model.TreeSelectModel;
import com.jero.modules.system.service.ISysCategoryService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -114,7 +114,7 @@ public class SysCategoryController {
* @return
*/
@RequiresPermissions("sys:category:edit")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysCategory sysCategory) {
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
if(sysCategoryEntity==null) {
@@ -131,7 +131,7 @@ public class SysCategoryController {
* @return
*/
@RequiresPermissions("sys:category:del")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysCategory sysCategory = sysCategoryService.getById(id);
if(sysCategory==null) {
@@ -148,7 +148,7 @@ public class SysCategoryController {
* @return
*/
@RequiresPermissions("sys:category:del")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java
+6 -6
View File
@@ -4,15 +4,15 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.system.entity.SysCheckRule;
import com.jero.modules.system.service.ISysCheckRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -113,7 +113,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
*/
@AutoLog(value = "编码校验规则-编辑")
@ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysCheckRule sysCheckRule) {
sysCheckRuleService.updateById(sysCheckRule);
return Result.OK("操作成功!");
@@ -127,7 +127,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
*/
@AutoLog(value = "编码校验规则-通过id删除")
@ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysCheckRuleService.removeById(id);
return Result.OK("删除成功!");
@@ -141,7 +141,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
*/
@AutoLog(value = "编码校验规则-批量删除")
@ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java
+7 -7
View File
@@ -5,10 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
@@ -17,6 +13,10 @@ import com.jero.common.util.dynamic.db.DataSourceCachePool;
import com.jero.modules.system.entity.SysDataSource;
import com.jero.modules.system.service.ISysDataSourceService;
import com.jero.modules.system.util.SecurityUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -125,7 +125,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
*/
@AutoLog(value = "多数据源管理-编辑")
@ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysDataSource sysDataSource) {
try {
SysDataSource d = sysDataSourceService.getById(sysDataSource.getId());
@@ -150,7 +150,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
*/
@AutoLog(value = "多数据源管理-通过id删除")
@ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name = "id") String id) {
SysDataSource sysDataSource = sysDataSourceService.getById(id);
DataSourceCachePool.removeCache(sysDataSource.getCode());
@@ -166,7 +166,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
*/
@AutoLog(value = "多数据源管理-批量删除")
@ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids") String ids) {
List<String> idList = Arrays.asList(ids.split(","));
idList.forEach(item->{
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+14 -17
View File
@@ -1,24 +1,16 @@
package com.jero.modules.system.controller;
import java.io.IOException;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.SysDepartTreeModel;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysDepartTreeModel;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.YouBianCodeUtil;
import com.jero.common.util.oConvertUtils;
@@ -28,6 +20,10 @@ import com.jero.modules.system.model.DepartIdModel;
import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysUserDepartService;
import com.jero.modules.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -42,9 +38,10 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
/**
* <p>
@@ -199,7 +196,7 @@ public class SysDepartController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
String username = JwtUtil.getUserNameByToken(request);
@@ -224,7 +221,7 @@ public class SysDepartController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:del")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysDepart sysDepart = sysDepartService.getById(id);
@@ -249,7 +246,7 @@ public class SysDepartController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:depart:del")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
if (ids == null || "".equals(ids.trim())) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java
+3 -3
View File
@@ -92,7 +92,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
* @return
*/
@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysDepartPermission sysDepartPermission) {
sysDepartPermissionService.updateById(sysDepartPermission);
return Result.OK("操作成功!");
@@ -105,7 +105,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
* @return
*/
@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
sysDepartPermissionService.removeById(id);
return Result.OK("删除成功!");
@@ -118,7 +118,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
* @return
*/
@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+5 -5
View File
@@ -366,7 +366,7 @@ public class SysDictController {
*/
@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<Object> edit(@RequestBody SysDict sysDict) {
SysDict sysdict = sysDictService.getById(sysDict.getId());
if(sysdict==null) {
@@ -389,7 +389,7 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
boolean ok = sysDictService.removeById(id);
@@ -406,7 +406,7 @@ public class SysDictController {
* @return
*/
@ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(oConvertUtils.isEmpty(ids)) {
@@ -540,7 +540,7 @@ public class SysDictController {
* @param id
* @return
*/
@DeleteMapping(value = "/deletePhysic/{id}")
@PostMapping(value = "/deletePhysic/{id}")
public Result<T> deletePhysic(@PathVariable String id) {
try {
sysDictService.deleteOneDictPhysically(id);
@@ -556,7 +556,7 @@ public class SysDictController {
* @param id
* @return
*/
@PutMapping(value = "/back/{id}")
@PostMapping(value = "/back/{id}")
public Result<T> back(@PathVariable String id) {
try {
sysDictService.updateDictDelFlag(0,id);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+3 -3
View File
@@ -94,7 +94,7 @@ public class SysDictItemController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> edit(@RequestBody SysDictItem sysDictItem) {
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
@@ -118,7 +118,7 @@ public class SysDictItemController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysDictItem joinSystem = sysDictItemService.getById(id);
@@ -141,7 +141,7 @@ public class SysDictItemController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:dict:list")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java
+8 -8
View File
@@ -5,9 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
@@ -15,6 +12,9 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.FillRuleUtil;
import com.jero.modules.system.entity.SysFillRule;
import com.jero.modules.system.service.ISysFillRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -94,7 +94,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
*/
@AutoLog(value = "填值规则-编辑")
@ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<T> edit(@RequestBody SysFillRule sysFillRule) {
sysFillRuleService.updateById(sysFillRule);
return Result.OK("操作成功!");
@@ -108,7 +108,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
*/
@AutoLog(value = "填值规则-通过id删除")
@ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除")
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysFillRuleService.removeById(id);
return Result.OK("删除成功!");
@@ -122,7 +122,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
*/
@AutoLog(value = "填值规则-批量删除")
@ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除")
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
@@ -173,7 +173,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
* @param formData 表单数据，可根据表单数据的不同生成不同的填值结果
* @return 运行后的结果
*/
@PutMapping("/executeRuleByCode/{ruleCode}")
@PostMapping("/executeRuleByCode/{ruleCode}")
public Result<Object> executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
Object result = FillRuleUtil.executeRule(ruleCode, formData);
return Result.OK(result);
@@ -188,7 +188,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
* @return 运行后的结果，返回示例： [{"ruleCode": "order_num_rule", "result": "CN2019111117212984"}]
*
*/
@PutMapping("/executeRuleByCodeBatch")
@PostMapping("/executeRuleByCodeBatch")
public Result<JSONArray> executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
JSONArray rules = ruleData.getJSONArray("rules");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java
+4 -4
View File
@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.common.system.base.controller.JeroController;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysGatewayRoute;
import com.jero.modules.system.service.ISysGatewayRouteService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -70,7 +70,7 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
*/
//@RequiresRoles({"admin"})
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
sysGatewayRouteService.deleteById(id);
return Result.OK("删除路由成功");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java
+12 -16
View File
@@ -1,24 +1,20 @@
package com.jero.modules.system.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysLog;
import com.jero.modules.system.entity.SysRole;
import com.jero.modules.system.service.ISysLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysLog;
import com.jero.modules.system.service.ISysLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
/**
* <p>
@@ -73,7 +69,7 @@ public class SysLogController {
* @return
*/
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysLog sysLog = sysLogService.getById(id);
if(sysLog==null) {
@@ -93,7 +89,7 @@ public class SysLogController {
* @return
*/
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java
+13 -11
View File
@@ -4,13 +4,8 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.MD5Util;
import com.jero.common.util.oConvertUtils;
@@ -20,8 +15,13 @@ import com.jero.modules.system.entity.SysPermissionDataRule;
import com.jero.modules.system.entity.SysRolePermission;
import com.jero.modules.system.model.SysPermissionTree;
import com.jero.modules.system.model.TreeModel;
import com.jero.modules.system.service.*;
import com.jero.modules.system.service.ISysDepartPermissionService;
import com.jero.modules.system.service.ISysPermissionDataRuleService;
import com.jero.modules.system.service.ISysPermissionService;
import com.jero.modules.system.service.ISysRolePermissionService;
import com.jero.modules.system.util.PermissionDataUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -249,7 +249,8 @@ public class SysPermissionController {
* @return
*/
//@RequiresRoles({ "admin" })
@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
// @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/edit")
public Result<Object> edit(@RequestBody SysPermission permission) {
try {
permission = PermissionDataUtil.intelligentProcessData(permission);
@@ -268,7 +269,7 @@ public class SysPermissionController {
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
try {
sysPermissionService.deletePermission(id);
@@ -286,7 +287,7 @@ public class SysPermissionController {
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
try {
String[] arr = ids.split(",");
@@ -685,7 +686,8 @@ public class SysPermissionController {
}
//@RequiresRoles({ "admin" })
@RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
// @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
@PostMapping("/editPermissionRule")
public Result<Object> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
try {
sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule);
@@ -704,7 +706,7 @@ public class SysPermissionController {
*/
//@RequiresRoles({ "admin" })
// @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
@DeleteMapping("/deletePermissionRule")
@PostMapping("/deletePermissionRule")
public Result<Object> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
try {
sysPermissionDataRuleService.deletePermissionDataRule(id);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+3 -3
View File
@@ -131,7 +131,7 @@ public class SysRoleController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<Object> edit(@RequestBody SysRole role) {
SysRole sysrole = sysRoleService.getById(role.getId());
if(sysrole==null) {
@@ -155,7 +155,7 @@ public class SysRoleController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
sysRoleService.deleteRole(id);
return Result.OK("删除角色成功");
@@ -169,7 +169,7 @@ public class SysRoleController {
//@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del")
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(oConvertUtils.isEmpty(ids)) {
return Result.error("未选中角色！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java
+5 -6
View File
@@ -5,20 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysTenant;
import com.jero.modules.system.service.ISysTenantService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
@@ -81,7 +80,7 @@ public class SysTenantController {
* @return
*/
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<Object> edit(@RequestBody SysTenant tenant) {
SysTenant sysTenant = sysTenantService.getById(tenant.getId());
if(sysTenant==null) {
@@ -101,7 +100,7 @@ public class SysTenantController {
* @return
*/
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
sysTenantService.removeTenantById(id);
return Result.OK("删除成功");
@@ -113,7 +112,7 @@ public class SysTenantController {
* @return
*/
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(oConvertUtils.isEmpty(ids)) {
return Result.error("未选中租户！");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java
+20 -35
View File
@@ -1,24 +1,18 @@
package com.jero.modules.system.controller;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.system.base.controller.JeroController;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysUserAgent;
import com.jero.modules.system.service.ISysUserAgentService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -26,26 +20,17 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Title: Controller
@@ -108,7 +93,7 @@ public class SysUserAgentController {
* @param sysUserAgent
* @return
*/
@PutMapping(value = "/edit")
@PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody SysUserAgent sysUserAgent) {
SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId());
if(sysUserAgentEntity==null) {
@@ -128,7 +113,7 @@ public class SysUserAgentController {
* @param id
* @return
*/
@DeleteMapping(value = "/delete")
@PostMapping(value = "/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
if(sysUserAgent==null) {
@@ -147,7 +132,7 @@ public class SysUserAgentController {
* @param ids
* @return
*/
@DeleteMapping(value = "/deleteBatch")
@PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
@@ -162,7 +147,7 @@ public class SysUserAgentController {
* @param id
* @return
*/
@GetMapping(value = "/queryById")
@PostMapping(value = "/queryById")
public Result<SysUserAgent> queryById(@RequestParam(name="id",required=true) String id) {
SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
if(sysUserAgent==null) {
@@ -177,7 +162,7 @@ public class SysUserAgentController {
* @param userName
* @return
*/
@GetMapping(value = "/queryByUserName")
@PostMapping(value = "/queryByUserName")
public Result<SysUserAgent> queryByUserName(@RequestParam(name="userName",required=true) String userName) {
LambdaQueryWrapper<SysUserAgent> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserAgent::getUserName, userName);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+15 -15
View File
@@ -211,7 +211,7 @@ public class SysUserController {
@RequiresPermissions("user:edit")
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
@PostMapping("/edit")
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
String rsaPublicKey = jsonObject.getString(RSA_PUBLIC_KEY);
String roles = jsonObject.getString(SELECTED_ROLES);
@@ -260,7 +260,7 @@ public class SysUserController {
}
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
@PostMapping("/delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteUser(id);
@@ -268,7 +268,7 @@ public class SysUserController {
}
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
@PostMapping("/deleteBatch")
public Result<T> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
this.sysUserService.deleteBatchUsers(ids);
@@ -278,7 +278,7 @@ public class SysUserController {
//@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
@PutMapping("/frozenBatch")
@PostMapping("/frozenBatch")
public Result<Object> frozenBatch(@RequestBody JSONObject jsonObject) {
try {
String ids = jsonObject.getString("ids");
@@ -363,7 +363,7 @@ public class SysUserController {
* 修改密码
*/
// @RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
@PutMapping("/changePassword")
@PostMapping("/changePassword")
public Result<T> changePassword(@RequestBody SysUser sysUser) {
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
if (u == null) {
@@ -622,7 +622,7 @@ public class SysUserController {
* 首页用户重置密码
*/
// @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
@PutMapping("/updatePassword")
@PostMapping("/updatePassword")
public Result<T> updatePassword(@RequestBody JSONObject json) {
String username = json.getString(USER_NAME);
String oldpassword = json.getString("oldpassword");
@@ -705,7 +705,7 @@ public class SysUserController {
* @return
*/
// @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
@DeleteMapping("/deleteUserRole")
@PostMapping("/deleteUserRole")
public Result<Object> deleteUserRole(@RequestParam(name="roleId") String roleId,
@RequestParam(name="userId",required=true) String userId) {
try {
@@ -726,7 +726,7 @@ public class SysUserController {
* @return
*/
// @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteUserRoleBatch")
@PostMapping("/deleteUserRoleBatch")
public Result<SysUserRole> deleteUserRoleBatch(
@RequestParam(name="roleId") String roleId,
@RequestParam(name="userIds",required=true) String userIds) {
@@ -838,7 +838,7 @@ public class SysUserController {
* 删除指定机构的用户关系
*/
// @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
@DeleteMapping("/deleteUserInDepart")
@PostMapping("/deleteUserInDepart")
public Result<Object> deleteUserInDepart(@RequestParam(name="depId") String depId,
@RequestParam(name="userId",required=true) String userId) {
try {
@@ -857,7 +857,7 @@ public class SysUserController {
* 批量删除指定机构的用户关系
*/
// @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteUserInDepartBatch")
@PostMapping("/deleteUserInDepartBatch")
@Transactional
public Result<Object> deleteUserInDepartBatch(
@RequestParam(name="depId") String depId,
@@ -1155,7 +1155,7 @@ public class SysUserController {
*/
//@RequiresPermissions("sys:user:list")
// @RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
@PutMapping("/putRecycleBin")
@PostMapping("/putRecycleBin")
public Result<T> putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
String userIds = jsonObject.getString("userIds");
if (StringUtils.isNotBlank(userIds)) {
@@ -1174,7 +1174,7 @@ public class SysUserController {
* @return
*/
// @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
@DeleteMapping("/deleteRecycleBin")
@PostMapping("/deleteRecycleBin")
public Result<T> deleteRecycleBin(@RequestParam("userIds") String userIds) {
if (StringUtils.isNotBlank(userIds)) {
sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
@@ -1190,7 +1190,7 @@ public class SysUserController {
*/
@RequiresPermissions("user:edit")
// @RequestMapping(value = "/appEdit", method = RequestMethod.PUT)
@PutMapping("/appEdit")
@PostMapping("/appEdit")
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<>();
try {
@@ -1251,7 +1251,7 @@ public class SysUserController {
* @return
*/
// @RequestMapping(value = "/saveClientId", method = RequestMethod.GET)
@PutMapping("/saveClientId")
@PostMapping("/saveClientId")
public Result<SysUser> saveClientId(HttpServletRequest request,@RequestParam("clientId")String clientId) {
Result<SysUser> result = new Result<>();
try {
@@ -1343,7 +1343,7 @@ public class SysUserController {
* @return
*/
// @RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
@PutMapping("/updateMobile")
@PostMapping("/updateMobile")
public Result<SysUser> changMobile(@RequestBody JSONObject json,HttpServletRequest request) {
String smscode = json.getString(SMSCODE);
String phone = json.getString(PHONE);