fix 安全规范,deleteMapping和PutMapping改为GetMapping和PostMapping
This commit is contained in:
+3
-3
@@ -76,7 +76,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
|
|||||||
* @param sysMessage
|
* @param sysMessage
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysMessage sysMessage) {
|
public Result<?> edit(@RequestBody SysMessage sysMessage) {
|
||||||
sysMessageService.updateById(sysMessage);
|
sysMessageService.updateById(sysMessage);
|
||||||
return Result.OK("修改成功!");
|
return Result.OK("修改成功!");
|
||||||
@@ -89,7 +89,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysMessageService.removeById(id);
|
sysMessageService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -101,7 +101,7 @@ public class SysMessageController extends JeroController<SysMessage, ISysMessage
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
|
|
||||||
this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysMessageService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
|
|||||||
+3
-3
@@ -82,7 +82,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
|
|||||||
* @param sysMessageTemplate
|
* @param sysMessageTemplate
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
|
public Result<?> edit(@RequestBody SysMessageTemplate sysMessageTemplate) {
|
||||||
sysMessageTemplateService.updateById(sysMessageTemplate);
|
sysMessageTemplateService.updateById(sysMessageTemplate);
|
||||||
return Result.OK("更新成功!");
|
return Result.OK("更新成功!");
|
||||||
@@ -94,7 +94,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysMessageTemplateService.removeById(id);
|
sysMessageTemplateService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -106,7 +106,7 @@ public class SysMessageTemplateController extends JeroController<SysMessageTempl
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ public class OSSFileController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@DeleteMapping("/delete")
|
@GetMapping("/delete")
|
||||||
public Result delete(@RequestParam(name = "id") String id) {
|
public Result delete(@RequestParam(name = "id") String id) {
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
OSSFile file = ossFileService.getById(id);
|
OSSFile file = ossFileService.getById(id);
|
||||||
|
|||||||
+3
-3
@@ -104,7 +104,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
||||||
public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
|
public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
|
||||||
try {
|
try {
|
||||||
quartzJobService.editAndScheduleJob(quartzJob);
|
quartzJobService.editAndScheduleJob(quartzJob);
|
||||||
@@ -122,7 +122,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
QuartzJob quartzJob = quartzJobService.getById(id);
|
QuartzJob quartzJob = quartzJobService.getById(id);
|
||||||
if (quartzJob == null) {
|
if (quartzJob == null) {
|
||||||
@@ -140,7 +140,7 @@ public class QuartzJobController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles("admin")
|
//@RequiresRoles("admin")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
if (ids == null || "".equals(ids.trim())) {
|
if (ids == null || "".equals(ids.trim())) {
|
||||||
return Result.error("参数不识别!");
|
return Result.error("参数不识别!");
|
||||||
|
|||||||
+1
-1
@@ -251,7 +251,7 @@ public class LoginController {
|
|||||||
* @param user
|
* @param user
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/selectDepart", method = RequestMethod.PUT)
|
@RequestMapping(value = "/selectDepart", method = RequestMethod.POST)
|
||||||
public Result<JSONObject> selectDepart(@RequestBody SysUser user) {
|
public Result<JSONObject> selectDepart(@RequestBody SysUser user) {
|
||||||
Result<JSONObject> result = new Result<JSONObject>();
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
String username = user.getUsername();
|
String username = user.getUsername();
|
||||||
|
|||||||
+3
-3
@@ -126,7 +126,7 @@ public class SysAnnouncementController {
|
|||||||
* @param sysAnnouncement
|
* @param sysAnnouncement
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
||||||
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
|
public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
|
||||||
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
||||||
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
|
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
|
||||||
@@ -148,7 +148,7 @@ public class SysAnnouncementController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
||||||
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
|
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
|
||||||
@@ -170,7 +170,7 @@ public class SysAnnouncementController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
|
||||||
if(ids==null || "".equals(ids.trim())) {
|
if(ids==null || "".equals(ids.trim())) {
|
||||||
|
|||||||
+5
-5
@@ -105,7 +105,7 @@ public class SysAnnouncementSendController {
|
|||||||
* @param sysAnnouncementSend
|
* @param sysAnnouncementSend
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
|
public Result<SysAnnouncementSend> eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
|
||||||
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
||||||
SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
|
SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
|
||||||
@@ -127,7 +127,7 @@ public class SysAnnouncementSendController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysAnnouncementSend> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
||||||
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
|
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
|
||||||
@@ -148,7 +148,7 @@ public class SysAnnouncementSendController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<SysAnnouncementSend> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysAnnouncementSend> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
||||||
if(ids==null || "".equals(ids.trim())) {
|
if(ids==null || "".equals(ids.trim())) {
|
||||||
@@ -183,7 +183,7 @@ public class SysAnnouncementSendController {
|
|||||||
* @param json
|
* @param json
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/editByAnntIdAndUserId")
|
@PostMapping(value = "/editByAnntIdAndUserId")
|
||||||
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
|
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
|
||||||
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
||||||
String anntId = json.getString("anntId");
|
String anntId = json.getString("anntId");
|
||||||
@@ -224,7 +224,7 @@ public class SysAnnouncementSendController {
|
|||||||
* @功能:一键已读
|
* @功能:一键已读
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/readAll")
|
@PostMapping(value = "/readAll")
|
||||||
public Result<SysAnnouncementSend> readAll() {
|
public Result<SysAnnouncementSend> readAll() {
|
||||||
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
|
||||||
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|||||||
+3
-3
@@ -116,7 +116,7 @@ public class SysCategoryController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:category:edit")
|
@RequiresPermissions("sys:category:edit")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
|
public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
|
||||||
Result<SysCategory> result = new Result<SysCategory>();
|
Result<SysCategory> result = new Result<SysCategory>();
|
||||||
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
|
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
|
||||||
@@ -135,7 +135,7 @@ public class SysCategoryController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:category:list")
|
@RequiresPermissions("sys:category:list")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<SysCategory> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysCategory> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysCategory> result = new Result<SysCategory>();
|
Result<SysCategory> result = new Result<SysCategory>();
|
||||||
SysCategory sysCategory = sysCategoryService.getById(id);
|
SysCategory sysCategory = sysCategoryService.getById(id);
|
||||||
@@ -155,7 +155,7 @@ public class SysCategoryController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:category:del")
|
@RequiresPermissions("sys:category:del")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<SysCategory> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysCategory> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysCategory> result = new Result<SysCategory>();
|
Result<SysCategory> result = new Result<SysCategory>();
|
||||||
if(ids==null || "".equals(ids.trim())) {
|
if(ids==null || "".equals(ids.trim())) {
|
||||||
|
|||||||
+3
-3
@@ -112,7 +112,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "编码校验规则-编辑")
|
@AutoLog(value = "编码校验规则-编辑")
|
||||||
@ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑")
|
@ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result edit(@RequestBody SysCheckRule sysCheckRule) {
|
public Result edit(@RequestBody SysCheckRule sysCheckRule) {
|
||||||
sysCheckRuleService.updateById(sysCheckRule);
|
sysCheckRuleService.updateById(sysCheckRule);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
@@ -126,7 +126,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "编码校验规则-通过id删除")
|
@AutoLog(value = "编码校验规则-通过id删除")
|
||||||
@ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除")
|
@ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result delete(@RequestParam(name = "id", required = true) String id) {
|
public Result delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysCheckRuleService.removeById(id);
|
sysCheckRuleService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -140,7 +140,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "编码校验规则-批量删除")
|
@AutoLog(value = "编码校验规则-批量删除")
|
||||||
@ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除")
|
@ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
|
|||||||
+3
-3
@@ -94,7 +94,7 @@ public class SysConfusionController extends JeroController<SysConfusion, ISysCon
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "混淆表-编辑")
|
@AutoLog(value = "混淆表-编辑")
|
||||||
@ApiOperation(value = "混淆表-编辑", notes = "混淆表-编辑")
|
@ApiOperation(value = "混淆表-编辑", notes = "混淆表-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@Validated @RequestBody SysConfusion sysConfusion) {
|
public Result<?> edit(@Validated @RequestBody SysConfusion sysConfusion) {
|
||||||
sysConfusionService.editById(sysConfusion);
|
sysConfusionService.editById(sysConfusion);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
@@ -108,7 +108,7 @@ public class SysConfusionController extends JeroController<SysConfusion, ISysCon
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "混淆表-通过id删除")
|
@AutoLog(value = "混淆表-通过id删除")
|
||||||
@ApiOperation(value = "混淆表-通过id删除", notes = "混淆表-通过id删除")
|
@ApiOperation(value = "混淆表-通过id删除", notes = "混淆表-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysConfusionService.deleteById(id);
|
sysConfusionService.deleteById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -122,7 +122,7 @@ public class SysConfusionController extends JeroController<SysConfusion, ISysCon
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "混淆表-批量删除")
|
@AutoLog(value = "混淆表-批量删除")
|
||||||
@ApiOperation(value = "混淆表-批量删除", notes = "混淆表-批量删除")
|
@ApiOperation(value = "混淆表-批量删除", notes = "混淆表-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
this.sysConfusionService.deleteByIds(Arrays.asList(ids.split(",")));
|
this.sysConfusionService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
|
|||||||
+3
-3
@@ -124,7 +124,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "多数据源管理-编辑")
|
@AutoLog(value = "多数据源管理-编辑")
|
||||||
@ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑")
|
@ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysDataSource sysDataSource) {
|
public Result<?> edit(@RequestBody SysDataSource sysDataSource) {
|
||||||
try {
|
try {
|
||||||
SysDataSource d = sysDataSourceService.getById(sysDataSource.getId());
|
SysDataSource d = sysDataSourceService.getById(sysDataSource.getId());
|
||||||
@@ -149,7 +149,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "多数据源管理-通过id删除")
|
@AutoLog(value = "多数据源管理-通过id删除")
|
||||||
@ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除")
|
@ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name = "id") String id) {
|
public Result<?> delete(@RequestParam(name = "id") String id) {
|
||||||
SysDataSource sysDataSource = sysDataSourceService.getById(id);
|
SysDataSource sysDataSource = sysDataSourceService.getById(id);
|
||||||
DataSourceCachePool.removeCache(sysDataSource.getCode());
|
DataSourceCachePool.removeCache(sysDataSource.getCode());
|
||||||
@@ -165,7 +165,7 @@ public class SysDataSourceController extends JeroController<SysDataSource, ISysD
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "多数据源管理-批量删除")
|
@AutoLog(value = "多数据源管理-批量删除")
|
||||||
@ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除")
|
@ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
|
||||||
List<String> idList = Arrays.asList(ids.split(","));
|
List<String> idList = Arrays.asList(ids.split(","));
|
||||||
idList.forEach(item->{
|
idList.forEach(item->{
|
||||||
|
|||||||
+3
-3
@@ -147,7 +147,7 @@ public class SysDepartController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:depart:edit")
|
@RequiresPermissions("sys:depart:edit")
|
||||||
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
|
||||||
String username = JwtUtil.getUserNameByToken(request);
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
@@ -176,7 +176,7 @@ public class SysDepartController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:depart:del")
|
@RequiresPermissions("sys:depart:del")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
|
|
||||||
@@ -205,7 +205,7 @@ public class SysDepartController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:depart:del")
|
@RequiresPermissions("sys:depart:del")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||||
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -96,7 +96,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑")
|
@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) {
|
public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) {
|
||||||
sysDepartPermissionService.updateById(sysDepartPermission);
|
sysDepartPermissionService.updateById(sysDepartPermission);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
@@ -109,7 +109,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除")
|
@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
sysDepartPermissionService.removeById(id);
|
sysDepartPermissionService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -122,7 +122,7 @@ public class SysDepartPermissionController extends JeroController<SysDepartPermi
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除")
|
@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
|
|||||||
+3
-3
@@ -112,7 +112,7 @@ public class SysDepartRoleController extends JeroController<SysDepartRole, ISysD
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑")
|
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
|
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
|
||||||
sysDepartRoleService.updateById(sysDepartRole);
|
sysDepartRoleService.updateById(sysDepartRole);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
@@ -127,7 +127,7 @@ public class SysDepartRoleController extends JeroController<SysDepartRole, ISysD
|
|||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@AutoLog(value = "部门角色-通过id删除")
|
@AutoLog(value = "部门角色-通过id删除")
|
||||||
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除")
|
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
sysDepartRoleService.removeById(id);
|
sysDepartRoleService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -142,7 +142,7 @@ public class SysDepartRoleController extends JeroController<SysDepartRole, ISysD
|
|||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@AutoLog(value = "部门角色-批量删除")
|
@AutoLog(value = "部门角色-批量删除")
|
||||||
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除")
|
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
|
|||||||
+5
-5
@@ -93,7 +93,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "填值规则-编辑")
|
@AutoLog(value = "填值规则-编辑")
|
||||||
@ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
|
@ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
|
public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
|
||||||
sysFillRuleService.updateById(sysFillRule);
|
sysFillRuleService.updateById(sysFillRule);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
@@ -107,7 +107,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "填值规则-通过id删除")
|
@AutoLog(value = "填值规则-通过id删除")
|
||||||
@ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除")
|
@ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除")
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysFillRuleService.removeById(id);
|
sysFillRuleService.removeById(id);
|
||||||
return Result.OK("删除成功!");
|
return Result.OK("删除成功!");
|
||||||
@@ -121,7 +121,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "填值规则-批量删除")
|
@AutoLog(value = "填值规则-批量删除")
|
||||||
@ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除")
|
@ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除")
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
|
this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
|
||||||
return Result.OK("批量删除成功!");
|
return Result.OK("批量删除成功!");
|
||||||
@@ -171,7 +171,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
|
|||||||
* @param formData 表单数据,可根据表单数据的不同生成不同的填值结果
|
* @param formData 表单数据,可根据表单数据的不同生成不同的填值结果
|
||||||
* @return 运行后的结果
|
* @return 运行后的结果
|
||||||
*/
|
*/
|
||||||
@PutMapping("/executeRuleByCode/{ruleCode}")
|
@PostMapping("/executeRuleByCode/{ruleCode}")
|
||||||
public Result executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
|
public Result executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
|
||||||
Object result = FillRuleUtil.executeRule(ruleCode, formData);
|
Object result = FillRuleUtil.executeRule(ruleCode, formData);
|
||||||
return Result.OK(result);
|
return Result.OK(result);
|
||||||
@@ -186,7 +186,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
|
|||||||
* @return 运行后的结果,返回示例: [{"ruleCode": "order_num_rule", "result": "CN2019111117212984"}]
|
* @return 运行后的结果,返回示例: [{"ruleCode": "order_num_rule", "result": "CN2019111117212984"}]
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@PutMapping("/executeRuleByCodeBatch")
|
@PostMapping("/executeRuleByCodeBatch")
|
||||||
public Result executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
|
public Result executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
|
||||||
JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
|
JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
|
||||||
JSONArray rules = ruleData.getJSONArray("rules");
|
JSONArray rules = ruleData.getJSONArray("rules");
|
||||||
|
|||||||
+1
-1
@@ -67,7 +67,7 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
sysGatewayRouteService.deleteById(id);
|
sysGatewayRouteService.deleteById(id);
|
||||||
return Result.OK("删除路由成功");
|
return Result.OK("删除路由成功");
|
||||||
|
|||||||
+2
-2
@@ -77,7 +77,7 @@ public class SysLogController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<SysLog> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysLog> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysLog> result = new Result<SysLog>();
|
Result<SysLog> result = new Result<SysLog>();
|
||||||
SysLog sysLog = sysLogService.getById(id);
|
SysLog sysLog = sysLogService.getById(id);
|
||||||
@@ -97,7 +97,7 @@ public class SysLogController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
if(ids==null || "".equals(ids.trim())) {
|
if(ids==null || "".equals(ids.trim())) {
|
||||||
|
|||||||
+5
-5
@@ -269,7 +269,7 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresRoles({ "admin" })
|
||||||
@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
|
@RequestMapping(value = "/edit", method = { RequestMethod.POST, RequestMethod.POST })
|
||||||
public Result<SysPermission> edit(@RequestBody SysPermission permission) {
|
public Result<SysPermission> edit(@RequestBody SysPermission permission) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
try {
|
try {
|
||||||
@@ -289,7 +289,7 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresRoles({ "admin" })
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
try {
|
try {
|
||||||
@@ -308,7 +308,7 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresRoles({ "admin" })
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
||||||
Result<SysPermission> result = new Result<>();
|
Result<SysPermission> result = new Result<>();
|
||||||
try {
|
try {
|
||||||
@@ -710,7 +710,7 @@ public class SysPermissionController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresRoles({ "admin" })
|
||||||
@RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
|
@RequestMapping(value = "/editPermissionRule", method = { RequestMethod.POST, RequestMethod.POST })
|
||||||
public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
|
||||||
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
||||||
try {
|
try {
|
||||||
@@ -730,7 +730,7 @@ public class SysPermissionController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({ "admin" })
|
//@RequiresRoles({ "admin" })
|
||||||
@RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deletePermissionRule", method = RequestMethod.GET)
|
||||||
public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
|
public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
|
||||||
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
|
||||||
try {
|
try {
|
||||||
|
|||||||
+3
-3
@@ -130,7 +130,7 @@ public class SysRoleController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:role:edit")
|
@RequiresPermissions("sys:role:edit")
|
||||||
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
||||||
public Result<SysRole> edit(@RequestBody SysRole role) {
|
public Result<SysRole> edit(@RequestBody SysRole role) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
SysRole sysrole = sysRoleService.getById(role.getId());
|
SysRole sysrole = sysRoleService.getById(role.getId());
|
||||||
@@ -155,7 +155,7 @@ public class SysRoleController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:role:del")
|
@RequiresPermissions("sys:role:del")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
IPage<SysUser> pageInfo = sysUserService.getUserByRoleId(new Page<>(), id, null);
|
IPage<SysUser> pageInfo = sysUserService.getUserByRoleId(new Page<>(), id, null);
|
||||||
long total = pageInfo.getTotal();
|
long total = pageInfo.getTotal();
|
||||||
@@ -174,7 +174,7 @@ public class SysRoleController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:role:del")
|
@RequiresPermissions("sys:role:del")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysRole> result = new Result<SysRole>();
|
Result<SysRole> result = new Result<SysRole>();
|
||||||
if(oConvertUtils.isEmpty(ids)) {
|
if(oConvertUtils.isEmpty(ids)) {
|
||||||
|
|||||||
+3
-3
@@ -107,7 +107,7 @@ public class SysUserAgentController {
|
|||||||
* @param sysUserAgent
|
* @param sysUserAgent
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PutMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<SysUserAgent> edit(@RequestBody SysUserAgent sysUserAgent) {
|
public Result<SysUserAgent> edit(@RequestBody SysUserAgent sysUserAgent) {
|
||||||
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
||||||
SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId());
|
SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId());
|
||||||
@@ -129,7 +129,7 @@ public class SysUserAgentController {
|
|||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/delete")
|
@GetMapping(value = "/delete")
|
||||||
public Result<SysUserAgent> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<SysUserAgent> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
||||||
SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
|
SysUserAgent sysUserAgent = sysUserAgentService.getById(id);
|
||||||
@@ -150,7 +150,7 @@ public class SysUserAgentController {
|
|||||||
* @param ids
|
* @param ids
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping(value = "/deleteBatch")
|
@GetMapping(value = "/deleteBatch")
|
||||||
public Result<SysUserAgent> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<SysUserAgent> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
Result<SysUserAgent> result = new Result<SysUserAgent>();
|
||||||
if(ids==null || "".equals(ids.trim())) {
|
if(ids==null || "".equals(ids.trim())) {
|
||||||
|
|||||||
+14
-14
@@ -194,7 +194,7 @@ public class SysUserController {
|
|||||||
|
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("user:edit")
|
@RequiresPermissions("user:edit")
|
||||||
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/edit", method = RequestMethod.POST)
|
||||||
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
||||||
String rsaPublicKey = jsonObject.getString("rsaPublicKey");
|
String rsaPublicKey = jsonObject.getString("rsaPublicKey");
|
||||||
String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
|
String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
|
||||||
@@ -240,7 +240,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/delete", method = RequestMethod.GET)
|
||||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3);
|
baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3);
|
||||||
this.sysUserService.deleteUser(id);
|
this.sysUserService.deleteUser(id);
|
||||||
@@ -252,7 +252,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.GET)
|
||||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
baseCommonService.addLog("批量删除用户, ids: " +ids ,CommonConstant.LOG_TYPE_2, 3);
|
baseCommonService.addLog("批量删除用户, ids: " +ids ,CommonConstant.LOG_TYPE_2, 3);
|
||||||
this.sysUserService.deleteBatchUsers(ids);
|
this.sysUserService.deleteBatchUsers(ids);
|
||||||
@@ -266,7 +266,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:list")
|
@RequiresPermissions("sys:user:list")
|
||||||
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
|
@RequestMapping(value = "/frozenBatch", method = RequestMethod.POST)
|
||||||
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
try {
|
try {
|
||||||
@@ -355,7 +355,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("user:edit")
|
@RequiresPermissions("user:edit")
|
||||||
@RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
|
@RequestMapping(value = "/changePassword", method = RequestMethod.POST)
|
||||||
public Result<?> changePassword(@RequestBody SysUser sysUser) {
|
public Result<?> changePassword(@RequestBody SysUser sysUser) {
|
||||||
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
|
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
|
||||||
if (u == null) {
|
if (u == null) {
|
||||||
@@ -584,7 +584,7 @@ public class SysUserController {
|
|||||||
* 首页用户修改密码
|
* 首页用户修改密码
|
||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
|
@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
|
||||||
public Result<?> changPassword(@RequestBody JSONObject json) {
|
public Result<?> changPassword(@RequestBody JSONObject json) {
|
||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String username = json.getString("username");
|
String username = json.getString("username");
|
||||||
@@ -651,7 +651,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserRole", method = RequestMethod.GET)
|
||||||
public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
|
public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
|
||||||
@RequestParam(name="userId",required=true) String userId
|
@RequestParam(name="userId",required=true) String userId
|
||||||
) {
|
) {
|
||||||
@@ -676,7 +676,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.GET)
|
||||||
public Result<SysUserRole> deleteUserRoleBatch(
|
public Result<SysUserRole> deleteUserRoleBatch(
|
||||||
@RequestParam(name="roleId") String roleId,
|
@RequestParam(name="roleId") String roleId,
|
||||||
@RequestParam(name="userIds",required=true) String userIds) {
|
@RequestParam(name="userIds",required=true) String userIds) {
|
||||||
@@ -790,7 +790,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.GET)
|
||||||
public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
|
public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
|
||||||
@RequestParam(name="userId",required=true) String userId
|
@RequestParam(name="userId",required=true) String userId
|
||||||
) {
|
) {
|
||||||
@@ -823,7 +823,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.GET)
|
||||||
public Result<SysUserDepart> deleteUserInDepartBatch(
|
public Result<SysUserDepart> deleteUserInDepartBatch(
|
||||||
@RequestParam(name="depId") String depId,
|
@RequestParam(name="depId") String depId,
|
||||||
@RequestParam(name="userIds",required=true) String userIds) {
|
@RequestParam(name="userIds",required=true) String userIds) {
|
||||||
@@ -1159,7 +1159,7 @@ public class SysUserController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:user:list")
|
@RequiresPermissions("sys:user:list")
|
||||||
@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
|
@RequestMapping(value = "/putRecycleBin", method = RequestMethod.POST)
|
||||||
public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
|
public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
|
||||||
String userIds = jsonObject.getString("userIds");
|
String userIds = jsonObject.getString("userIds");
|
||||||
if (StringUtils.isNotBlank(userIds)) {
|
if (StringUtils.isNotBlank(userIds)) {
|
||||||
@@ -1179,7 +1179,7 @@ public class SysUserController {
|
|||||||
*/
|
*/
|
||||||
//@RequiresRoles({"admin"})
|
//@RequiresRoles({"admin"})
|
||||||
@RequiresPermissions("sys:user:del")
|
@RequiresPermissions("sys:user:del")
|
||||||
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
|
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.GET)
|
||||||
public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {
|
public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {
|
||||||
if (StringUtils.isNotBlank(userIds)) {
|
if (StringUtils.isNotBlank(userIds)) {
|
||||||
sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
|
sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
|
||||||
@@ -1194,7 +1194,7 @@ public class SysUserController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("user:edit")
|
@RequiresPermissions("user:edit")
|
||||||
@RequestMapping(value = "/appEdit", method = RequestMethod.PUT)
|
@RequestMapping(value = "/appEdit", method = RequestMethod.POST)
|
||||||
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
|
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
|
||||||
Result<SysUser> result = new Result<SysUser>();
|
Result<SysUser> result = new Result<SysUser>();
|
||||||
try {
|
try {
|
||||||
@@ -1341,7 +1341,7 @@ public class SysUserController {
|
|||||||
* @param json
|
* @param json
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
|
@RequestMapping(value = "/updateMobile", method = RequestMethod.POST)
|
||||||
public Result<?> changMobile(@RequestBody JSONObject json,HttpServletRequest request) {
|
public Result<?> changMobile(@RequestBody JSONObject json,HttpServletRequest request) {
|
||||||
String smscode = json.getString("smscode");
|
String smscode = json.getString("smscode");
|
||||||
String phone = json.getString("phone");
|
String phone = json.getString("phone");
|
||||||
|
|||||||
Reference in New Issue
Block a user