Merge remote-tracking branch 'origin/admin' into lms_v1.0.0

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java

@@ -41,7 +41,6 @@ public class SysCodeRuleController {
     }
 
     @Log("新增编码")
-
     @PostMapping
     @SaCheckPermission("genCode:add")
     public ResponseEntity<Object> create(@Validated @RequestBody SysCodeRule codeRule) {
@@ -50,7 +49,6 @@ public class SysCodeRuleController {
     }
 
     @Log("删除编码")
-
     @DeleteMapping
     @SaCheckPermission("genCode:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -59,7 +57,6 @@ public class SysCodeRuleController {
     }
 
     @Log("修改编码")
-
     @PutMapping
     @SaCheckPermission("genCode:edit")
     public ResponseEntity<Object> update(@RequestBody SysCodeRule codeRule) {

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java

@@ -38,7 +38,6 @@ public class SysCodeRuleDetailController {
     }
 
     @Log("新增编码明细")
-
     @PostMapping
     @SaCheckPermission("genCode:add")
     public ResponseEntity<Object> create(@RequestBody SysCodeRuleDetail codeRuleDetail){
@@ -47,7 +46,6 @@ public class SysCodeRuleDetailController {
     }
 
     @Log("删除编码明细")
-
     @DeleteMapping(value = "/{id}")
     @SaCheckPermission("genCode:del")
     public ResponseEntity<Object> delete(@PathVariable String id){
@@ -56,7 +54,6 @@ public class SysCodeRuleDetailController {
     }
 
     @Log("修改编码明细")
-
     @PutMapping
     @SaCheckPermission("genCode:edit")
     public ResponseEntity<Object> update(@RequestBody SysCodeRuleDetail json){

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java

@@ -82,7 +82,6 @@ public class DeptController {
     }
 
     @Log("新增部门")
-
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody SysDept resources){
         deptService.createDept(resources);
@@ -90,7 +89,6 @@ public class DeptController {
     }
 
     @Log("修改部门")
-
     @PutMapping
     public ResponseEntity<Object> update(@Validated @RequestBody SysDept dept){
         if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) {
@@ -101,7 +99,6 @@ public class DeptController {
     }
 
     @Log("删除部门")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> deptIds){
         if (CollectionUtils.isEmpty(deptIds)){

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java

@@ -49,7 +49,6 @@ public class SysDictController {
 
     @Log("新增字典")
     @PostMapping
-    
     public ResponseEntity<Object> create(@RequestBody Dict dict){
         dictService.create(dict);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -57,14 +56,12 @@ public class SysDictController {
 
     @PutMapping
     @Log("修改字典")
-    
     public ResponseEntity<Object> updateDict(@Validated @RequestBody Dict dto){
         dictService.updateDict(dto);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除字典")
-    
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
         dictService.deleteBatchByIds(ids);
@@ -72,7 +69,6 @@ public class SysDictController {
     }
 
     @GetMapping("/dictDetail")
-    
     public ResponseEntity<Object> queryDetails(@RequestParam Map criteria, PageQuery pageable){
         DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class);
         return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK);
@@ -90,7 +86,6 @@ public class SysDictController {
     }
 
     @Log("新增字典详情")
-    
     @PostMapping("/dictDetail")
     public ResponseEntity<Object> createDetail(@RequestBody Dict resources){
         dictService.createDetail(resources);
@@ -98,7 +93,6 @@ public class SysDictController {
     }
 
     @Log("修改字典详情")
-    
     @PutMapping("/dictDetail")
     public ResponseEntity<Object> updateDetail(@RequestBody Dict resources){
         dictService.updateDetail(resources);
@@ -106,7 +100,6 @@ public class SysDictController {
     }
 
     @Log("删除字典详情")
-    
     @DeleteMapping(value = "/dictDetail/{id}")
     public ResponseEntity<Object> deleteDetail(@PathVariable String id){
         dictService.deleteDetail(id);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java

@@ -43,14 +43,12 @@ public class SysLogController {
     }
 
     @GetMapping(value = "/error")
-
     public ResponseEntity<Object> queryErrorLog(@RequestParam Map criteria, PageQuery pageable){
         criteria.put("log_type","ERROR");
         return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK);
     }
 
     @GetMapping(value = "/error/{id}")
-
     public ResponseEntity<Object> queryErrorLogs(@PathVariable String id){
         return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
     }
@@ -65,7 +63,6 @@ public class SysLogController {
 
     @DeleteMapping(value = "/del/info")
     @Log("删除所有INFO日志")
-
     public ResponseEntity<Object> delAllInfoLog(){
         logService.delAllByInfo();
         return new ResponseEntity<>(HttpStatus.OK);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java

@@ -36,14 +36,12 @@ public class StageController {
 
     @GetMapping
     @Log("查询舞台")
-
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
         return new ResponseEntity<>(TableDataInfo.build(stageService.queryAll(whereJson, page)), HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增舞台")
-
     public ResponseEntity<Object> create(@Validated @RequestBody Stage dto) {
         stageService.create(dto);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -51,14 +49,12 @@ public class StageController {
 
     @PutMapping
     @Log("修改舞台")
-
     public ResponseEntity<Object> update(@Validated @RequestBody Stage dto) {
         stageService.update(dto);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除舞台")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         stageService.deleteAll(ids);
@@ -67,14 +63,12 @@ public class StageController {
 
     @GetMapping("/selectList")
     @Log("下拉选舞台")
-
     public ResponseEntity<Object> selectList() {
         return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK);
     }
 
     @PostMapping("/addNewStage")
     @Log("保存舞台数据")
-
     public ResponseEntity<Object> addNewStage(@Validated @RequestBody Stage dto) {
         log.info("dto{}",dto);
         stageService.addNewStage(dto);
@@ -83,7 +77,6 @@ public class StageController {
 
     @PostMapping("/getNewStageDataByCode")
     @Log("根据stage_code获取舞台数据")
-
     public ResponseEntity<Object> getNewStageDataByCode(@RequestBody String code) {
         Stage one = stageService.getOne(new LambdaQueryWrapper<Stage>().eq(Stage::getStage_code, code));
         return new ResponseEntity<>(one, HttpStatus.CREATED);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java

@@ -42,7 +42,6 @@ public class StageImageController {
 
     @PostMapping
     @Log("新增舞台图片")
-
     public ResponseEntity<Object> create(@Validated @RequestBody StageImage entity) {
         stageImageService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -50,14 +49,12 @@ public class StageImageController {
 
     @PutMapping
     @Log("修改舞台")
-
     public ResponseEntity<Object> update(@Validated @RequestBody StageImage entity) {
         stageImageService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除舞台")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         stageImageService.deleteAll(ids);
@@ -66,7 +63,6 @@ public class StageImageController {
 
     @GetMapping("/selectList")
     @Log("下拉选设备图标")
-
     public ResponseEntity<Object> selectList() {
         return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK);
     }

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java

@@ -31,14 +31,12 @@ public class SysNoticeController {
 
     @GetMapping
     @Log("查询消息通知")
-
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson,page)),HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增消息通知")
-
     public ResponseEntity<Object> create(@Validated @RequestBody SysNotice entity){
         noticeService.create(entity);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -46,14 +44,12 @@ public class SysNoticeController {
 
     @PutMapping
     @Log("修改消息通知")
-
     public ResponseEntity<Object> update(@Validated @RequestBody SysNotice entity){
         noticeService.update(entity);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除消息通知")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         noticeService.deleteAll(ids);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java

@@ -36,14 +36,12 @@ class SysParamController {
     private ISysParamService paramService;
     @GetMapping
     @Log("查询系统参数")
-
     public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
         return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增系统参数")
-
     public ResponseEntity<Object> create(@Validated @RequestBody Param param){
         paramService.create(param);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -51,14 +49,12 @@ class SysParamController {
 
     @PutMapping
     @Log("修改系统参数")
-
     public ResponseEntity<Object> update(@Validated @RequestBody Param param){
         paramService.update(param);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除系统参数")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         List<String> Ids = Arrays.asList(ids);
@@ -68,7 +64,6 @@ class SysParamController {
 
     @PostMapping("/getValueByCode/{code}")
     @Log("根据编码获取值")
-
     @SaIgnore
     public ResponseEntity<Object> getValueByCode(@PathVariable String code) {
         return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java

@@ -44,7 +44,6 @@ public class SysDataPermissionController {
 
     @PostMapping
     @Log("新增数据权限")
-
     public ResponseEntity<Object> create(@Validated @RequestBody SysDataPermission permission) {
         dataPermissionService.create(permission);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -52,14 +51,12 @@ public class SysDataPermissionController {
 
     @PutMapping
     @Log("修改数据权限")
-
     public ResponseEntity<Object> update(@Validated @RequestBody SysDataPermission permission) {
         dataPermissionService.update(permission);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除数据权限")
-
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         dataPermissionService.deleteAll(ids);
@@ -68,21 +65,18 @@ public class SysDataPermissionController {
 
     @GetMapping("/scopeType")
     @Log("获取数据权限范围")
-
     public ResponseEntity<Object> getDataScopeType(){
         return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK);
     }
 
     @GetMapping("/dataPermissionOption")
     @Log("获取数据权限下拉框")
-
     public ResponseEntity<Object> getDataPermissionOption(){
         return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK);
     }
 
     @PostMapping("/saveDataPermission")
     @Log("保存数据权限")
-
     public ResponseEntity<Object> saveDataPermission(@RequestBody JSONObject datas){
         dataPermissionService.savePermission(datas);
         return new ResponseEntity<>(HttpStatus.CREATED);
@@ -90,14 +84,12 @@ public class SysDataPermissionController {
 
     @PostMapping("/dataShow")
     @Log("查看数据权限")
-
     public ResponseEntity<Object> getDataShow(@RequestBody String id){
         return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK);
     }
 
     @PostMapping("/dataDetail")
     @Log("查看数据明细")
-
     public ResponseEntity<Object> getDataDetail(@RequestBody JSONObject data){
         return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK);
     }

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java

@@ -52,7 +52,6 @@ public class SysQuartzJobController {
     }
 
     @Log("新增定时任务")
-
     @PostMapping
     @SaCheckPermission("timing:add")
     public ResponseEntity<Object> create(@Validated @RequestBody SysQuartzJob resources) {
@@ -64,7 +63,6 @@ public class SysQuartzJobController {
     }
 
     @Log("修改定时任务")
-
     @PutMapping
     @SaCheckPermission("timing:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody SysQuartzJob resources) {
@@ -73,7 +71,6 @@ public class SysQuartzJobController {
     }
 
     @Log("更改定时任务状态")
-
     @PutMapping(value = "/{id}")
     @SaCheckPermission("timing:edit")
     public ResponseEntity<Object> update(@PathVariable String id) {
@@ -82,7 +79,6 @@ public class SysQuartzJobController {
     }
 
     @Log("执行定时任务")
-
     @PutMapping(value = "/exec/{id}")
     @SaCheckPermission("timing:edit")
     public ResponseEntity<Object> execution(@PathVariable String id) {
@@ -91,7 +87,6 @@ public class SysQuartzJobController {
     }
 
     @Log("删除定时任务")
-
     @DeleteMapping
     @SaCheckPermission("timing:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java

@@ -25,27 +25,23 @@ public class RedisController {
 
     @GetMapping("/get-monitor-info")
     @Log("查询redis的信息")
-
     public ResponseEntity<Object> getRedisMonitorInfo() {
         return new ResponseEntity<>(redisService.getRedisMonitorInfo(),HttpStatus.OK);
     }
 
     @GetMapping("/get-key-define-list")
     @Log("获得 Redis Key 模板列表")
-
     public ResponseEntity<Object> getKeyDefineList() {
         return new ResponseEntity<>(redisService.getKeyDefineList(),HttpStatus.OK);
     }
 
     @GetMapping("/get-key-value-list")
     @Log("获得 Redis Key Value列表")
-
     public ResponseEntity<Object> getKeyValueList() {
         return new ResponseEntity<>( redisService.getKeyValueList(),HttpStatus.OK);
     }
 
     @Log("根据key删除Redis数据")
-
     @DeleteMapping
     public ResponseEntity<Object> deleteByKey(@RequestBody String[] ids) {
         redisService.deleteByKey(ids);

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java

@@ -44,7 +44,6 @@ public class SysRoleController {
     }
 
     @Log("新增角色")
-    
     @PostMapping
     @SaCheckPermission("roles:add")
     public ResponseEntity<Object> create(@RequestBody JSONObject param) {
@@ -53,7 +52,6 @@ public class SysRoleController {
     }
 
     @Log("修改角色")
-    
     @PutMapping
     @SaCheckPermission("roles:edit")
     public ResponseEntity<Object> update(@RequestBody JSONObject param) {
@@ -62,7 +60,6 @@ public class SysRoleController {
     }
 
     @Log("删除角色")
-    
     @DeleteMapping
     @SaCheckPermission("roles:del")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
@@ -71,7 +68,6 @@ public class SysRoleController {
     }
 
     @Log("修改角色菜单")
-    
     @PutMapping(value = "/menu")
     @SaCheckPermission("roles:edit")
     public ResponseEntity<Object> updateMenu(@RequestBody JSONObject form) {

nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java

@@ -51,7 +51,6 @@ public class ToolLocalStorageController {
     }
 
     @PostMapping("/pictures")
-
     public ResponseEntity<Object> upload(@RequestParam MultipartFile file) {
         // 判断文件是否为图片
         String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
@@ -62,7 +61,6 @@ public class ToolLocalStorageController {
     }
 
     @Log("修改文件")
-
     @PutMapping
     @SaCheckPermission("storage:edit")
     public ResponseEntity<Object> update(@Validated @RequestBody ToolLocalStorage resources) {
@@ -72,7 +70,6 @@ public class ToolLocalStorageController {
 
     @Log("删除文件")
     @DeleteMapping
-
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         localStorageService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);