From 0ec00360d5b2f0d462696c0e8470e67c60f416cb Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 26 Dec 2023 16:51:54 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8E=BB=E6=8E=89ACS=E7=9A=84SWAGGER?= =?UTF-8?q?=E3=80=81=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-system/pom.xml | 46 +---- .../src/main/java/org/nl/AppRun.java | 4 +- .../nl/acs/agv/rest/MagicAgvController.java | 7 +- .../org/nl/acs/auto/AutoRunController.java | 12 +- .../address/rest/AddressController.java | 16 +- .../DeviceDriverConfigController.java | 10 +- .../rest/AcsDeviceErpmappingController.java | 16 +- .../device/rest/DeviceAssignedController.java | 16 +- .../nl/acs/device/rest/DeviceController.java | 84 ++++----- .../device/rest/DeviceDbitemController.java | 16 +- .../device/rest/DeviceExtraController.java | 14 +- .../org/nl/acs/device/rest/OpcController.java | 28 +-- .../nl/acs/device/rest/OpcPlcController.java | 20 +-- .../device/rest/StorageCellController.java | 16 +- .../acs/ext/wms/rest/AcsToLiKuController.java | 30 ++-- .../acs/ext/wms/rest/AcsToWmsController.java | 30 ++-- .../acs/ext/wms/rest/LiKuToACSController.java | 14 +- .../acs/ext/wms/rest/WmsToAcsController.java | 36 ++-- .../rest/DeviceErrorLogController.java | 16 +- .../rest/InstructionController.java | 38 ++--- .../rest/DeviceStageMonitorController.java | 8 +- .../acs/route/rest/RouteLineController.java | 22 +-- .../nl/acs/route/rest/RouteLocController.java | 16 +- .../acs/route/rest/RoutePlanController.java | 18 +- .../org/nl/acs/task/rest/TaskController.java | 36 ++-- .../acs/task/rest/TaskFeedbackController.java | 14 +- .../org/nl/acs/test/rest/TestController.java | 22 +-- .../nl/acs/udw/rest/UdwManagerController.java | 10 +- .../nl/modules/common/base/BaseEntity.java | 10 +- .../modules/common/config/SwaggerConfig.java | 161 ------------------ .../org/nl/modules/common/utils/CacheKey.java | 2 +- .../org/nl/modules/common/utils/DateUtil.java | 2 +- .../modules/generator/domain/ColumnInfo.java | 30 ++-- .../modules/generator/domain/GenConfig.java | 22 +-- .../generator/rest/GenConfigController.java | 10 +- .../generator/rest/GeneratorController.java | 18 +- .../logging/rest/InterfaceLogController.java | 12 +- .../modules/logging/rest/LogController.java | 18 +- .../logicflow/rest/StageController.java | 20 +-- .../logicflow/rest/StageImageController.java | 16 +- .../nl/modules/loki/rest/LokiController.java | 10 +- .../nl/modules/quartz/domain/QuartzJob.java | 26 +-- .../nl/modules/quartz/domain/QuartzLog.java | 22 +-- .../quartz/rest/QuartzJobController.java | 20 +-- .../config/ConfigBeanConfiguration.java | 2 +- .../rest/AuthorizationController.java | 14 +- .../rest/MobileAuthorizationController.java | 8 +- .../security/rest/OnlineController.java | 12 +- .../security/service/UserCacheClean.java | 2 +- .../org/nl/modules/system/domain/Dept.java | 16 +- .../org/nl/modules/system/domain/Dict.java | 8 +- .../nl/modules/system/domain/DictDetail.java | 14 +- .../org/nl/modules/system/domain/Menu.java | 32 ++-- .../org/nl/modules/system/domain/Param.java | 24 +-- .../org/nl/modules/system/domain/Role.java | 18 +- .../org/nl/modules/system/domain/User.java | 30 ++-- .../system/rest/CodeDetailController.java | 14 +- .../modules/system/rest/DeptController.java | 16 +- .../modules/system/rest/DictController.java | 18 +- .../system/rest/DictDetailController.java | 16 +- .../system/rest/GenCodeController.java | 16 +- .../modules/system/rest/GridController.java | 16 +- .../system/rest/GridFieldController.java | 20 +-- .../modules/system/rest/LimitController.java | 8 +- .../modules/system/rest/MenuController.java | 22 +-- .../system/rest/MonitorController.java | 8 +- .../modules/system/rest/ParamController.java | 18 +- .../modules/system/rest/RedisController.java | 14 +- .../modules/system/rest/RoleController.java | 24 +-- .../modules/system/rest/UserController.java | 24 +-- .../service/vo/RedisKeyDefineRespVO.java | 18 +- .../system/service/vo/RedisMonitorRespVO.java | 20 +-- .../nl/modules/tools/domain/LocalStorage.java | 16 +- .../tools/rest/LocalStorageController.java | 18 +- .../src/main/resources/log/AcsToLk.xml | 4 +- .../src/main/resources/log/AcsToWms.xml | 4 +- .../resources/log/AgvNdcOneDeviceDriver.xml | 4 +- .../resources/log/AgvNdcTwoDeviceDriver.xml | 4 +- .../src/main/resources/log/AutoCreateInst.xml | 2 +- .../src/main/resources/log/LkToAcs.xml | 4 +- .../main/resources/log/NDCAgvServiceImpl.xml | 4 +- .../log/OneNDCSocketConnectionAutoRun.xml | 4 +- .../src/main/resources/log/OpcUtil.xml | 4 +- .../log/TwoNDC2SocketConnectionAutoRun.xml | 4 +- .../log/TwoNDCSocketConnectionAutoRun.xml | 4 +- .../src/main/resources/log/WmsToAcs.xml | 4 +- .../src/main/resources/logback-spring.xml | 42 ++--- .../template/generator/admin/Controller.ftl | 12 +- .../template/generator/admin/Entity.ftl | 6 +- 89 files changed, 706 insertions(+), 900 deletions(-) delete mode 100644 acs/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml index 32af48f4c..f768189d3 100644 --- a/acs/nladmin-system/pom.xml +++ b/acs/nladmin-system/pom.xml @@ -33,6 +33,12 @@ + + + com.yomahub + tlog-all-spring-boot-starter + 1.5.0 + @@ -128,11 +134,11 @@ - + org.springframework.boot @@ -300,42 +306,6 @@ ${log4jdbc.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - mapstruct - org.mapstruct - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - io.swagger - swagger-annotations - 1.5.21 - - - io.swagger - swagger-models - 1.5.21 - - mysql diff --git a/acs/nladmin-system/src/main/java/org/nl/AppRun.java b/acs/nladmin-system/src/main/java/org/nl/AppRun.java index cac91ec93..331a9e372 100644 --- a/acs/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/AppRun.java @@ -3,7 +3,7 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; -import io.swagger.annotations.Api; + import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) + @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java index 4badde50f..1a84eedb4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java @@ -1,7 +1,4 @@ package org.nl.acs.agv.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.MagicAgvService; @@ -15,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "AGV任务") + @RequestMapping("/api/magic") @Slf4j public class MagicAgvController { @@ -23,7 +20,7 @@ public class MagicAgvController { @PostMapping("/agvack/{device}") @Log("AGV请求离开") - @ApiOperation("AGV请求离开") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity requestAck(@PathVariable String device) { return new ResponseEntity<>(magicAgvService.requestAck(device), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java index 0c5b1563e..125a7e6df 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java @@ -1,7 +1,7 @@ package org.nl.acs.auto; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.auto.run.AutoRunService; import org.nl.acs.auto.run.ThreadDto; @@ -21,14 +21,14 @@ import java.util.Map; */ @RestController @RequestMapping("/api/autorun") -@Api(tags = "系统：查询自动线程") + @RequiredArgsConstructor public class AutoRunController { @Autowired private AutoRunService autoRunService; - @ApiOperation("查询自动线程") + @Log("查询自动线程") @GetMapping public ResponseEntity query(Map map) throws Exception { @@ -38,7 +38,7 @@ public class AutoRunController { } @Log("启动自动线程") - @ApiOperation("启动自动线程") + @PutMapping(value = "/start/{code}") public ResponseEntity start(@PathVariable String code) { autoRunService.startThread(code); @@ -46,7 +46,7 @@ public class AutoRunController { } @Log("停止自动线程") - @ApiOperation("停止自动线程") + @PutMapping(value = "/stop/{code}") public ResponseEntity execution(@PathVariable String code) { autoRunService.stopThread(code); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java index 27d14cf5c..bef051874 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java @@ -1,7 +1,7 @@ package org.nl.acs.device.address.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.address.service.AddressService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "接口方法地址管理") + @RequestMapping("/api/Address") @Slf4j public class AddressController { @@ -32,7 +32,7 @@ public class AddressController { @GetMapping @Log("查询接口方法地址") - @ApiOperation("查询接口方法地址") + //@PreAuthorize("@el.check('Address:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(AddressService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +40,7 @@ public class AddressController { @PostMapping @Log("新增接口方法地址") - @ApiOperation("新增接口方法地址") + //@PreAuthorize("@el.check('Address:add')") public ResponseEntity create(@Validated @RequestBody AddressDto dto) { AddressService.create(dto); @@ -49,7 +49,7 @@ public class AddressController { @PutMapping @Log("修改接口方法地址") - @ApiOperation("修改接口方法地址") + //@PreAuthorize("@el.check('Address:edit')") public ResponseEntity update(@Validated @RequestBody AddressDto dto) { AddressService.update(dto); @@ -57,7 +57,7 @@ public class AddressController { } @Log("删除接口方法地址") - @ApiOperation("删除接口方法地址") + //@PreAuthorize("@el.check('Address:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class AddressController { } @Log("导出接口方法地址") - @ApiOperation("导出接口方法地址") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('Address:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java index c2c1bfddb..e210f36b2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java @@ -1,8 +1,8 @@ package org.nl.acs.device.device_driver; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.DeviceExtraService; @@ -19,7 +19,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备驱动配置") + @RequestMapping("/api/device/driver/config") @Slf4j public class DeviceDriverConfigController { @@ -29,7 +29,7 @@ public class DeviceDriverConfigController { @PostMapping() @Log("设备驱动配置保存") - @ApiOperation("设备驱动配置保存") + public ResponseEntity save(@RequestBody Map map) throws Exception { final JSONObject model = new JSONObject(); JSONObject jsonObject = (JSONObject) JSONObject.toJSON(map); @@ -44,7 +44,7 @@ public class DeviceDriverConfigController { @GetMapping @Log("查询设备") - @ApiOperation("查询设备") + //@PreAuthorize("@el.check('device:list')") public ResponseEntity query(@RequestParam Map whereJson) { return null; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java index bdca74140..f4b79e478 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.AcsDeviceErpmappingService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备-ERP映射管理") + @RequestMapping("/api/acsDeviceErpmapping") @Slf4j public class AcsDeviceErpmappingController { @@ -34,7 +34,7 @@ public class AcsDeviceErpmappingController { @GetMapping @Log("查询设备-ERP映射") - @ApiOperation("查询设备-ERP映射") + //@PreAuthorize("@el.check('acsDeviceErpmapping:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(acsDeviceErpmappingService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class AcsDeviceErpmappingController { @PostMapping @Log("新增设备-ERP映射") - @ApiOperation("新增设备-ERP映射") + //@PreAuthorize("@el.check('acsDeviceErpmapping:add')") public ResponseEntity create(@Validated @RequestBody AcsDeviceErpmappingDto dto) { acsDeviceErpmappingService.create(dto); @@ -51,7 +51,7 @@ public class AcsDeviceErpmappingController { @PutMapping @Log("修改设备-ERP映射") - @ApiOperation("修改设备-ERP映射") + //@PreAuthorize("@el.check('acsDeviceErpmapping:edit')") public ResponseEntity update(@Validated @RequestBody AcsDeviceErpmappingDto dto) { acsDeviceErpmappingService.update(dto); @@ -59,7 +59,7 @@ public class AcsDeviceErpmappingController { } @Log("删除设备-ERP映射") - @ApiOperation("删除设备-ERP映射") + //@PreAuthorize("@el.check('acsDeviceErpmapping:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class AcsDeviceErpmappingController { } @Log("导出设备-ERP映射") - @ApiOperation("导出设备-ERP映射") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('acsDeviceErpmapping:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java index a319c0f71..506272cb0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.DeviceAssignedService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备任务分配管理") + @RequestMapping("/api/deviceAssigned") @Slf4j public class DeviceAssignedController { @@ -32,7 +32,7 @@ public class DeviceAssignedController { @GetMapping @Log("查询设备任务分配") - @ApiOperation("查询设备任务分配") + //@PreAuthorize("@el.check('deviceAssigned:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceAssignedService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +40,7 @@ public class DeviceAssignedController { @PostMapping @Log("新增设备任务分配") - @ApiOperation("新增设备任务分配") + //@PreAuthorize("@el.check('deviceAssigned:add')") public ResponseEntity create(@RequestBody Map whereJson) { deviceAssignedService.create(whereJson); @@ -49,7 +49,7 @@ public class DeviceAssignedController { @PutMapping @Log("修改设备任务分配") - @ApiOperation("修改设备任务分配") + //@PreAuthorize("@el.check('deviceAssigned:edit')") public ResponseEntity update(@RequestBody Map whereJson) { deviceAssignedService.update(whereJson); @@ -57,7 +57,7 @@ public class DeviceAssignedController { } @Log("删除设备任务分配") - @ApiOperation("删除设备任务分配") + //@PreAuthorize("@el.check('deviceAssigned:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class DeviceAssignedController { } @Log("导出设备任务分配") - @ApiOperation("导出设备任务分配") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceAssigned:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java index db9a42596..c7bd4c673 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java @@ -4,8 +4,8 @@ package org.nl.acs.device.rest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.DriverTypeEnum; @@ -35,7 +35,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备管理") + @RequestMapping("/api/device") @Slf4j public class DeviceController { @@ -45,7 +45,7 @@ public class DeviceController { @GetMapping @Log("查询设备") - @ApiOperation("查询设备") + //@PreAuthorize("@el.check('device:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceService.queryAll(whereJson, page), HttpStatus.OK); @@ -53,14 +53,14 @@ public class DeviceController { @GetMapping("/protocol") @Log("查询设备协议") - @ApiOperation("查询设备协议") + //@PreAuthorize("@el.check('device:list')") public ResponseEntity protocol(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceService.queryDeviceProtocol(whereJson, page), HttpStatus.OK); } @Log("导出设备协议") - @ApiOperation("导出设备协议") + @GetMapping(value = "/protocol/download") //@PreAuthorize("@el.check('device:list')") public void downDeviceDBload(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -68,7 +68,7 @@ public class DeviceController { } @Log("导出设备协议") - @ApiOperation("导出设备协议CSV") + @GetMapping(value = "/protocol/downloadCSV") //@PreAuthorize("@el.check('device:list')") public void downDeviceDBloadCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -77,7 +77,7 @@ public class DeviceController { @PostMapping @Log("新增设备") - @ApiOperation("新增设备") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity create(@Validated @RequestBody DeviceDto dto) { deviceService.create(dto); @@ -86,7 +86,7 @@ public class DeviceController { @PutMapping @Log("修改设备") - @ApiOperation("修改设备") + //@PreAuthorize("@el.check('device:edit')") public ResponseEntity update(@Validated @RequestBody DeviceDto dto) { deviceService.update(dto); @@ -94,7 +94,7 @@ public class DeviceController { } @Log("删除设备") - @ApiOperation("删除设备") + //@PreAuthorize("@el.check('device:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -104,7 +104,7 @@ public class DeviceController { } @Log("导出设备") - @ApiOperation("导出设备") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('device:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -113,7 +113,7 @@ public class DeviceController { @GetMapping("/selectList") @Log("下拉选设备") - @ApiOperation("下拉选设备") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(deviceService.selectList(), HttpStatus.OK); @@ -121,7 +121,7 @@ public class DeviceController { @GetMapping("/region/{region}") @Log("根据区域查询设备") - @ApiOperation("根据区域查询设备") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList(@PathVariable String region) { return new ResponseEntity<>(deviceService.selectDeviceListByRegion(region), HttpStatus.OK); @@ -129,7 +129,7 @@ public class DeviceController { @GetMapping("/type/{type}") @Log("根据设备类型查询已配置设备") - @ApiOperation("根据类型查询设备") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectListByType(@PathVariable String type) { return new ResponseEntity<>(deviceService.selectDeviceListByType(type), HttpStatus.OK); @@ -137,7 +137,7 @@ public class DeviceController { @GetMapping("/selectDeviceDevicerInfo/{status}") @Log("根据状态查询设备信息") - @ApiOperation("根据区域查询设备信息") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectDeviceDevicerInfo(@PathVariable String status) { return new ResponseEntity<>(deviceService.selectDeviceDevicerInfo(status), HttpStatus.OK); @@ -145,7 +145,7 @@ public class DeviceController { @PostMapping("/callAgv") @Log("呼叫请求") - @ApiOperation("呼叫请求") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity callAgv(@RequestBody JSONObject json) { deviceService.callAgv(json); @@ -154,7 +154,7 @@ public class DeviceController { @PostMapping("/addMaterial") @Log("添加物料信息") - @ApiOperation("添加物料信息") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity addMaterial(@RequestBody JSONObject json) { deviceService.addMaterial(json); @@ -163,7 +163,7 @@ public class DeviceController { @PostMapping("/changeDeviceStatus") @Log("改变设备状态") - @ApiOperation("改变设备状态") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity changeDeviceStatus(@RequestBody JSONObject json) { deviceService.changeDeviceStatus(json); @@ -172,7 +172,7 @@ public class DeviceController { @PostMapping("/changeFenceStatus") @Log("改变电子围栏状态") - @ApiOperation("改变电子围栏状态") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity changeFenceStatus(@RequestBody JSONObject json) { deviceService.changeFenceStatus(json); @@ -181,7 +181,7 @@ public class DeviceController { @PostMapping("/responseAgv") @Log("响应请求") - @ApiOperation("响应请求") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity responseAgv(@RequestBody JSONObject json) { deviceService.responseAgv(json); @@ -190,7 +190,7 @@ public class DeviceController { @PostMapping("/autoCreateTask") @Log("自动创建接任务") - @ApiOperation("自动创建接任务") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity autoCreateTask(@RequestBody JSONObject json) { deviceService.autoCreateTask(json); @@ -200,7 +200,7 @@ public class DeviceController { @PostMapping("/cleanTask") @Log("清除设备状态为空位") - @ApiOperation("清除设备状态为空位") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity cleanTask(@RequestBody JSONObject json) { deviceService.cleanTask(json); @@ -209,7 +209,7 @@ public class DeviceController { @PostMapping("/cleanMaterial") @Log("清除设备物料信息") - @ApiOperation("清除设备物料信息") + //@PreAuthorize("@el.check('device:add')") public ResponseEntity cleanMaterial(@RequestBody JSONObject json) { deviceService.cleanMaterial(json); @@ -218,14 +218,14 @@ public class DeviceController { @GetMapping("/selectDriverCodeList/{device_code}") @Log("下拉选设备驱动") - @ApiOperation("下拉选设备驱动") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectDriverCodeList(@PathVariable String device_code) { DeviceDto device = deviceService.findByCode(device_code); return new ResponseEntity<>(DriverTypeEnum.getListByType(device.getDevice_type()), HttpStatus.OK); } - @ApiOperation("查询") + @GetMapping({"/{device_code}"}) public ResponseEntity query(@PathVariable String device_code) { final JSONObject model = new JSONObject(); @@ -234,7 +234,7 @@ public class DeviceController { return new ResponseEntity(model, HttpStatus.OK); } - @ApiOperation("查询货架扩展信息") + @GetMapping({"/queryStorageExtra/{storage_code}"}) public ResponseEntity queryStorageExtra(@PathVariable String storage_code) { return new ResponseEntity(deviceService.queryStorageExtra(storage_code), HttpStatus.OK); @@ -243,7 +243,7 @@ public class DeviceController { @PutMapping({"/getOpcPlcs"}) @Log("获取plc列表") - @ApiOperation("获取plc列表") + public ResponseEntity getOpcPlcs(@RequestBody Map map) throws Exception { final JSONObject model = new JSONObject(); Map form = (Map) map.get("form"); @@ -256,7 +256,7 @@ public class DeviceController { @PostMapping({"/updateConfig"}) @Log("配置设备驱动") - @ApiOperation("配置设备驱动") + @Transactional(rollbackFor = Exception.class) public ResponseEntity updateConfig(@RequestBody Map map) { JSONObject jsonObject = (JSONObject) JSONObject.toJSON(map); @@ -266,25 +266,25 @@ public class DeviceController { @PostMapping({"/driverConfig"}) @Log("配置驱动查询") - @ApiOperation("配置驱动查询") + public ResponseEntity queryDriverConfigByDeviceId(@RequestBody Map map) { return new ResponseEntity(deviceService.queryDriverConfigByDeviceId((String) map.get("device_id"), (String) map.get("driver_code")), HttpStatus.OK); } - @ApiOperation("测试读DB值") + @PostMapping({"/testRead"}) public ResponseEntity testRead(@RequestBody Map map) { return new ResponseEntity(deviceService.testRead(map), HttpStatus.OK); } - @ApiOperation("测试写DB值") + @PostMapping({"/testWrite"}) public ResponseEntity testWrite(@RequestBody Map map) { deviceService.testWrite(map); return new ResponseEntity(HttpStatus.NO_CONTENT); } - @ApiOperation("查询条码") + @GetMapping({"/queryScanner/{device_code}"}) public ResponseEntity queryScannerByCode(@PathVariable String device_code) throws Exception { String bcr = deviceService.queryScannerByCode(device_code); @@ -293,28 +293,28 @@ public class DeviceController { @GetMapping("/selectConveyorList") @Log("下拉选输送设备") - @ApiOperation("下拉选输送设备") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectConveyorList() { return new ResponseEntity<>(deviceService.selectConveyorList(), HttpStatus.OK); } @Log("查询缓存所有指令") - @ApiOperation("查询缓存指令") + @PostMapping(value = "/findAllStorageCellFromCache") public ResponseEntity findAllInstFromCache() { return new ResponseEntity<>(deviceService.findAllStorageCellFromCache(), HttpStatus.OK); } @Log("查询缓存所有设备") - @ApiOperation("查询缓存设备") + @PostMapping(value = "/findCacheDevice") public ResponseEntity findCacheDevice() { return new ResponseEntity<>(deviceService.findCacheDevice(), HttpStatus.OK); } @Log("更新条码") - @ApiOperation("更新条码") + @PostMapping(value = "/updateBarcode") public ResponseEntity updateBarcode(@RequestBody JSONObject json) throws Exception { deviceService.updateBarcode(json); @@ -323,13 +323,13 @@ public class DeviceController { @GetMapping({"/queryDBInfoByDriverCode/{driverCode}"}) @Log("根据驱动编码获取db信息") - @ApiOperation("根据驱动编码获取db信息") + public ResponseEntity queryDBInfoByDriverCode(@PathVariable String driverCode) { return new ResponseEntity(deviceService.queryDBInfoByDriverCode(driverCode), HttpStatus.OK); } @Log("导出设备db") - @ApiOperation("导出设备") + @PostMapping(value = "/downloadProtocolConfig") //@PreAuthorize("@el.check('device:list')") public void downloadProtocolConfig(HttpServletResponse response, @RequestBody JSONObject whereJson) throws IOException { @@ -338,14 +338,14 @@ public class DeviceController { @GetMapping("/getAllDriverCodeList") @Log("协议配置下拉选设备驱动") - @ApiOperation("协议配置下拉选设备驱动") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity getAllDriverCodeList() { return new ResponseEntity<>(DriverTypeEnum.getList(), HttpStatus.OK); } @Log("导出Smart设备协议CSV") - @ApiOperation("导出Smart设备协议CSV") + @GetMapping(value = "/protocol/downloadSmartCSV") //@PreAuthorize("@el.check('device:list')") public void downDeviceDBloadOumulongCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -353,7 +353,7 @@ public class DeviceController { } @Log("导出FX5U设备协议CSV") - @ApiOperation("导出FX5U设备协议CSV") + @GetMapping(value = "/protocol/downloadFX5UCSV") //@PreAuthorize("@el.check('device:list')") public void downDeviceDBloadFX5UCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -362,7 +362,7 @@ public class DeviceController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { deviceService.excelImport(file, request); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java index 46925e581..863a4a724 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.device.service.DeviceDbitemService; import org.nl.acs.device.service.dto.DeviceDbitemDto; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备采集项管理") + @RequestMapping("/api/deviceDbitem") public class DeviceDbitemController { @@ -32,7 +32,7 @@ public class DeviceDbitemController { @GetMapping @Log("查询设备采集项") - @ApiOperation("查询设备采集项") + //@PreAuthorize("@el.check('deviceDbitem:list')") public ResponseEntity query(Map whereJson, Pageable page) { return new ResponseEntity<>(deviceDbitemService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +40,7 @@ public class DeviceDbitemController { @PostMapping @Log("新增设备采集项") - @ApiOperation("新增设备采集项") + //@PreAuthorize("@el.check('deviceDbitem:add')") public ResponseEntity create(@Validated @RequestBody DeviceDbitemDto dto) { deviceDbitemService.create(dto); @@ -49,7 +49,7 @@ public class DeviceDbitemController { @PutMapping @Log("修改设备采集项") - @ApiOperation("修改设备采集项") + //@PreAuthorize("@el.check('deviceDbitem:edit')") public ResponseEntity update(@Validated @RequestBody DeviceDbitemDto dto) { deviceDbitemService.update(dto); @@ -57,7 +57,7 @@ public class DeviceDbitemController { } @Log("删除设备采集项") - @ApiOperation("删除设备采集项") + //@PreAuthorize("@el.check('deviceDbitem:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class DeviceDbitemController { } @Log("导出设备采集项") - @ApiOperation("导出设备采集项") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceDbitem:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java index 1f878a809..1c1093b63 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.DeviceExtraService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备扩展管理") + @RequestMapping("/api/deviceExtra") @Slf4j public class DeviceExtraController { @@ -32,7 +32,7 @@ public class DeviceExtraController { @GetMapping @Log("查询设备扩展") - @ApiOperation("查询设备扩展") + //@PreAuthorize("@el.check('deviceExtra:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceExtraService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +40,7 @@ public class DeviceExtraController { @PostMapping @Log("新增设备扩展") - @ApiOperation("新增设备扩展") + //@PreAuthorize("@el.check('deviceExtra:add')") public ResponseEntity create(@Validated @RequestBody DeviceExtraDto dto) { deviceExtraService.create(dto); @@ -49,7 +49,7 @@ public class DeviceExtraController { @PutMapping @Log("修改设备扩展") - @ApiOperation("修改设备扩展") + //@PreAuthorize("@el.check('deviceExtra:edit')") public ResponseEntity update(@Validated @RequestBody DeviceExtraDto dto) { deviceExtraService.update(dto); @@ -57,7 +57,7 @@ public class DeviceExtraController { } @Log("删除设备扩展") - @ApiOperation("删除设备扩展") + //@PreAuthorize("@el.check('deviceExtra:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java index e649545c0..dd9dbd7f9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java @@ -3,8 +3,8 @@ package org.nl.acs.device.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.OpcService; @@ -26,7 +26,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "opc管理") + @RequestMapping("/api/opc") @Slf4j public class OpcController { @@ -35,7 +35,7 @@ public class OpcController { @GetMapping @Log("查询opc") - @ApiOperation("查询opc") + //@PreAuthorize("@el.check('opc:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(opcService.queryAll(whereJson, page), HttpStatus.OK); @@ -43,7 +43,7 @@ public class OpcController { @PostMapping @Log("新增opc") - @ApiOperation("新增opc") + //@PreAuthorize("@el.check('opc:add')") public ResponseEntity create(@Validated @RequestBody OpcDto dto) { opcService.create(dto); @@ -52,7 +52,7 @@ public class OpcController { @PutMapping @Log("修改opc") - @ApiOperation("修改opc") + //@PreAuthorize("@el.check('opc:edit')") public ResponseEntity update(@Validated @RequestBody OpcDto dto) { opcService.update(dto); @@ -60,7 +60,7 @@ public class OpcController { } @Log("删除opc") - @ApiOperation("删除opc") + //@PreAuthorize("@el.check('opc:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -69,7 +69,7 @@ public class OpcController { } @Log("导出opc") - @ApiOperation("导出opc") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('opc:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -78,14 +78,14 @@ public class OpcController { @GetMapping("/selectList") @Log("下拉选OPC") - @ApiOperation("下拉选OPC") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(opcService.selectList(), HttpStatus.OK); } @Log("导出opc") - @ApiOperation("导出opc") + @PostMapping(value = "/getmeteal") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity getmeteal(@RequestBody Map whereJson) throws IOException { @@ -93,7 +93,7 @@ public class OpcController { } @Log("新增PLC") - @ApiOperation("新增PLC") + @PostMapping(value = "/addPLC") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity createPlc(@RequestBody Map whereJson) throws IOException { @@ -101,7 +101,7 @@ public class OpcController { return new ResponseEntity<>(HttpStatus.CREATED); } - @ApiOperation("查询plc") + @GetMapping(value = "/queryServerPlc") //@PreAuthorize("@el.ceck('menu:list','roles:list')") public ResponseEntity query(@RequestParam String id) { @@ -109,7 +109,7 @@ public class OpcController { } @Log("删除PLC") - @ApiOperation("删除PLC") + @PostMapping(value = "/delPLC") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity delPLC(@RequestBody Map whereJson) throws IOException { @@ -118,7 +118,7 @@ public class OpcController { } @Log("编辑PLC") - @ApiOperation("编辑PLC") + @PostMapping(value = "/editPLC") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity editPLC(@RequestBody JSONObject json) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java index ac6e8bae7..ae30c2aae 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.OpcPlcService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "plc管理") + @RequestMapping("/api/opcPlc") @Slf4j public class OpcPlcController { @@ -34,7 +34,7 @@ public class OpcPlcController { @GetMapping @Log("查询plc") - @ApiOperation("查询plc") + //@PreAuthorize("@el.check('opcPlc:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(opcPlcService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class OpcPlcController { @PostMapping @Log("新增plc") - @ApiOperation("新增plc") + //@PreAuthorize("@el.check('opcPlc:add')") public ResponseEntity create(@Validated @RequestBody OpcPlcDto dto) { opcPlcService.create(dto); @@ -51,7 +51,7 @@ public class OpcPlcController { @PutMapping @Log("修改plc") - @ApiOperation("修改plc") + //@PreAuthorize("@el.check('opcPlc:edit')") public ResponseEntity update(@Validated @RequestBody OpcPlcDto dto) { opcPlcService.update(dto); @@ -59,7 +59,7 @@ public class OpcPlcController { } @Log("删除plc") - @ApiOperation("删除plc") + //@PreAuthorize("@el.check('opcPlc:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class OpcPlcController { } @Log("导出plc") - @ApiOperation("导出plc") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('opcPlc:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -77,7 +77,7 @@ public class OpcPlcController { @GetMapping("/selectList") @Log("下拉选PLC") - @ApiOperation("下拉选PLC") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(opcPlcService.selectList(), HttpStatus.OK); @@ -85,7 +85,7 @@ public class OpcPlcController { @GetMapping("/selectList/{opc_uuid}") @Log("下拉选PLC") - @ApiOperation("下拉选PLC") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectListByOpcID(@PathVariable String opc_uuid) { return new ResponseEntity<>(opcPlcService.selectListByOpcID(opc_uuid), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java index 72f4968c7..832edf0cb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java @@ -2,8 +2,8 @@ package org.nl.acs.device.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.service.StorageCellService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "库位管理") + @RequestMapping("/api/storageCell") @Slf4j public class StorageCellController { @@ -34,7 +34,7 @@ public class StorageCellController { @GetMapping @Log("查询库位管理") - @ApiOperation("查询库位管理") + //@PreAuthorize("@el.check('storageCell:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(storageCellService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class StorageCellController { @PostMapping @Log("新增库位管理") - @ApiOperation("新增库位管理") + //@PreAuthorize("@el.check('storageCell:add')") public ResponseEntity create(@Validated @RequestBody StorageCellDto dto) { storageCellService.create(dto); @@ -51,7 +51,7 @@ public class StorageCellController { @PutMapping @Log("修改库位管理") - @ApiOperation("修改库位管理") + //@PreAuthorize("@el.check('storageCell:edit')") public ResponseEntity update(@Validated @RequestBody StorageCellDto dto) { storageCellService.update(dto); @@ -59,7 +59,7 @@ public class StorageCellController { } @Log("删除库位管理") - @ApiOperation("删除库位管理") + //@PreAuthorize("@el.check('storageCell:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class StorageCellController { } @Log("导出库位管理") - @ApiOperation("导出库位管理") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('storageCell:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java index beedf6fa4..04164a1aa 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java @@ -4,8 +4,8 @@ package org.nl.acs.ext.wms.rest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.liKuData.*; @@ -28,7 +28,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "立库接口") + @RequestMapping("/api/liku") @Slf4j public class AcsToLiKuController { @@ -36,84 +36,84 @@ public class AcsToLiKuController { @PostMapping("/inStore") @Log(value = "下发立库入库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库物料入库任务") + public ResponseEntity inStore(@RequestBody InStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.inStore(requestParam), HttpStatus.OK); } @PostMapping("/outStore") @Log(value = "下发立库出库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库出库任务") + public ResponseEntity outStore(@RequestBody OutStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.outStore(requestParam), HttpStatus.OK); } @PostMapping("/emptyVehicleOutStore") @Log(value = "下发立库空盘出库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库空盘出库任务") + public ResponseEntity emptyVehicleOutStore(@RequestBody EmptyVehicleOutStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.emptyVehicleOutStore(requestParam), HttpStatus.OK); } @PostMapping("/moveStore") @Log(value = "下发立库移库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库移库任务") + public ResponseEntity moveStore(@RequestBody MoveStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.moveStore(requestParam), HttpStatus.OK); } @PostMapping("/inStoreReset") @Log(value = "下发立库入库任务调整",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库入库任务调整") + public ResponseEntity inStoreReset(@RequestBody InStoreResetRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.inStoreReset(requestParam), HttpStatus.OK); } @PostMapping("/moveStoreReset") @Log(value = "下发立库移库任务调整",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发立库移库任务调整") + public ResponseEntity moveStoreReset(@RequestBody MoveStoreResetRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.moveStoreReset(requestParam), HttpStatus.OK); } @PostMapping("/roadWayIsLock") @Log(value = "下发立库巷道锁定或解锁",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("向立库下发巷道锁定或解锁") + public ResponseEntity roadWayIsLock(@RequestBody RoadWayIsLockRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.roadWayIsLock(requestParam), HttpStatus.OK); } @PostMapping("/cancelTask") @Log(value = "取消立库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("取消立库任务") + public ResponseEntity cancelTask(@RequestBody CancelTaskRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.cancelTask(requestParam), HttpStatus.OK); } @PostMapping("/queryCarStatus") @Log(value = "查询四向车状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("查询四向车状态") + public ResponseEntity queryCarStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryCarDeviceStatus(requestParam), HttpStatus.OK); } @PostMapping("/queryTsjStatus") @Log(value = "查询提升机状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("查询提升机状态") + public ResponseEntity queryTsjStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); } @PostMapping("/querySsxStatus") @Log(value = "查询提升机状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("查询提升机状态") + public ResponseEntity querySsxStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); } @PostMapping("/outConfirm") @Log(value = "下发解锁出库口",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LK) - @ApiOperation("下发解锁出库口") + public ResponseEntity outConfirm(@RequestBody OutConfirmRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.outConfirm(requestParam), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java index fa57630d6..4e712e694 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java @@ -4,8 +4,8 @@ package org.nl.acs.ext.wms.rest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.data.ApplyLabelingAndBindingRequest; @@ -29,7 +29,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms接口") + @RequestMapping("/api/wms") @Slf4j public class AcsToWmsController { @@ -37,14 +37,14 @@ public class AcsToWmsController { @PostMapping("/applyTask") @Log(value = "ACS向WMS申请任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS向WMS申请任务") + public ResponseEntity applyTaskToWms(@RequestBody JSONObject jo) { return new ResponseEntity<>(acstowmsService.applyTaskToWms(jo), HttpStatus.OK); } @PostMapping("/taskStatusFeedback") @Log(value = "ACS向WMS反馈任务状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS向WMS反馈任务状态") + public ResponseEntity feedbackTaskStatusToWms(@RequestBody Map whereJson) { JSONArray data = JSONArray.parseArray(String.valueOf(whereJson)); return new ResponseEntity<>(acstowmsService.feedbackTaskStatusToWms(data), HttpStatus.OK); @@ -52,28 +52,28 @@ public class AcsToWmsController { @PostMapping("/feedbackAgvStatus") @Log(value = "反馈AGV设备状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("反馈AGV设备状态") + public ResponseEntity feedbackAgvStatus(@RequestBody String device_code, String error, String error_message) { return new ResponseEntity<>(acstowmsService.feedbackAgvStatus(device_code, error, error_message), HttpStatus.OK); } @PostMapping("/feedbackAgv") @Log(value = "反馈AGV设备信息",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("反馈AGV设备信息") + public ResponseEntity feedbackAgv(@RequestBody JSONArray from) { return new ResponseEntity<>(acstowmsService.feedbackAgv(from), HttpStatus.OK); } @PostMapping("/feedbackDeviceStatus") @Log(value = "反馈设备状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("反馈设备状态") + public ResponseEntity feedbackDeviceStatus(@RequestBody String device_code, String code, String value) { return new ResponseEntity<>(acstowmsService.feedbackDeviceStatus(device_code, code, value), HttpStatus.OK); } @PostMapping("/feedbackOrderStatus") @Log(value = "ACS强制完成向WMS反馈",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("acs强制完成向wms反馈") + public ResponseEntity feedbackOrderStatus(@RequestBody JSONObject param) { return new ResponseEntity<>(acstowmsService.feedbackOrderStatus(param), HttpStatus.OK); } @@ -81,42 +81,42 @@ public class AcsToWmsController { @PostMapping("/applyInCacheLineTask") @Log(value = "ACS申请缓存线入库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS申请缓存线入库任务") + public ResponseEntity applyInCacheLineTask(@RequestBody JSONObject param) { return new ResponseEntity<>(acstowmsService.applyInCacheLineTask(param), HttpStatus.OK); } @PostMapping("/applyOutCacheLineTask") @Log(value = "ACS系统申请出库任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS系统申请出库任务") + public ResponseEntity applyOutCacheLineTask(@RequestBody JSONObject param) { return new ResponseEntity<>(acstowmsService.applyOutCacheLineTask(param), HttpStatus.OK); } @PostMapping("/applyLabelingAndBindingRequest") @Log(value = "ACS系统申请贴标、捆扎",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS系统申请贴标、捆扎") + public ResponseEntity applyLabelingAndBindingRequest(@RequestBody ApplyLabelingAndBindingRequest param) { return new ResponseEntity<>(acstowmsService.applyLabelingAndBindingRequest(param), HttpStatus.OK); } @PostMapping("/applyManipulatorActionRequest") @Log(value = "申请行架任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("申请行架任务") + public ResponseEntity applyManipulatorActionRequest(@RequestBody ApplyManipulatorActionRequest param) { return new ResponseEntity<>(acstowmsService.applyManipulatorActionRequest(param), HttpStatus.OK); } @PostMapping("/actionFinishRequest") @Log(value = "动作完成请求",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("动作完成请求") + public ResponseEntity actionFinishRequest(@RequestBody ApplyManipulatorActionRequest param) { return new ResponseEntity<>(acstowmsService.actionFinishRequest(param), HttpStatus.OK); } @PostMapping("/liKuApplyTaskRequest") @Log(value = "立库申请任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("立库申请任务") + public ResponseEntity liKuApplyTaskRequest(@RequestBody LiKuApplyTaskRequest param) { return new ResponseEntity<>(acstowmsService.liKuApplyTaskRequest(param), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java index e140f01ba..f3dc5285d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java @@ -3,8 +3,8 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "立库接口") + @RequestMapping("/api/likuToACS") @Slf4j public class LiKuToACSController { @@ -35,7 +35,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/inStoreReport") @Log(value = "立库反馈入库任务状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LK_TO_ACS) - @ApiOperation("立库反馈入库任务状态") + public ResponseEntity inStoreReport(@RequestBody InStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.inStoreReport(requestParam), HttpStatus.OK); } @@ -43,7 +43,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/outStoreReport") @Log(value = "立库反馈出库任务状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LK_TO_ACS) - @ApiOperation("立库反馈出库任务状态") + public ResponseEntity outStoreReport(@RequestBody OutStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.outStoreReport(requestParam), HttpStatus.OK); } @@ -51,7 +51,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/moveStoreReport") @Log(value = "立库反馈移库任务状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LK_TO_ACS) - @ApiOperation("立库反馈移库任务状态") + public ResponseEntity moveStoreReport(@RequestBody MoveStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.moveStoreReport(requestParam), HttpStatus.OK); } @@ -59,7 +59,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/putEmptyPallet") @Log(value = "立库请求放空盘",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LK_TO_ACS) - @ApiOperation("立库请求放空盘") + public ResponseEntity putEmptyPallet(@RequestBody putEmptyPalletRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.putEmptyPallet(requestParam), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index 7a44dff3f..6fadb47c9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java @@ -4,8 +4,8 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.data.CreateTaskResponse; @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms接口") + @RequestMapping("/api/wms") @Slf4j public class WmsToAcsController { @@ -33,7 +33,7 @@ public class WmsToAcsController { @PostMapping("/task") @Log(value = "ACS接收WMS任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("接收WMS任务") + @SaIgnore public ResponseEntity createFromWms(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.crateTask(whereJson), HttpStatus.OK); @@ -41,7 +41,7 @@ public class WmsToAcsController { @PostMapping("/unLock") @Log(value = "解锁立库点位",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("解锁立库点位") + @SaIgnore public ResponseEntity unLock(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.unLock(whereJson), HttpStatus.OK); @@ -49,7 +49,7 @@ public class WmsToAcsController { @PostMapping("/cancelTask") @Log(value = "WMS取消任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS取消任务") + @SaIgnore public ResponseEntity cancelFromWms(@RequestBody String whereJson) throws Exception { return new ResponseEntity<>(wmstoacsService.cancelFromWms(whereJson), HttpStatus.OK); @@ -57,7 +57,7 @@ public class WmsToAcsController { @PostMapping("/updateDeviceGoodsFromWms") @Log(value = "WMS修改点位状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS修改点位状态") + @SaIgnore public ResponseEntity updateDeviceGoodsFromWms(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.updateDeviceGoodsFromWms(whereJson), HttpStatus.OK); @@ -65,7 +65,7 @@ public class WmsToAcsController { @PostMapping("/areaControl") @Log(value = "区域控制",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("区域控制") + @SaIgnore public ResponseEntity areaControl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(wmstoacsService.areaControl(whereJson), HttpStatus.OK); @@ -73,7 +73,7 @@ public class WmsToAcsController { @PostMapping("/action") @Log(value = "WMS下发点位信号",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS下发点位信号") + @SaIgnore public ResponseEntity putAction(@RequestBody String whereJson) throws Exception { return new ResponseEntity<>(wmstoacsService.putAction(whereJson), HttpStatus.OK); @@ -81,7 +81,7 @@ public class WmsToAcsController { @PostMapping("/querydevice") // @Log(value = "WMS查询设备状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS查询设备状态") + @SaIgnore public ResponseEntity queryDevice(@RequestBody String whereJson) throws Exception { return new ResponseEntity<>(wmstoacsService.queryDevice(whereJson), HttpStatus.OK); @@ -89,7 +89,7 @@ public class WmsToAcsController { @PostMapping("/queryDeviceDBValue") @Log(value = "WMS查询设备DB值",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS查询设备DB值") + @SaIgnore public ResponseEntity queryDeviceDBValue(@RequestBody String whereJson){ return new ResponseEntity<>(wmstoacsService.queryDeviceDBValue(whereJson), HttpStatus.OK); @@ -98,7 +98,7 @@ public class WmsToAcsController { @PostMapping("/putPlusPullAction") @Log(value = "WMS下发插拔轴动作",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS下发插拔轴动作") + @SaIgnore public ResponseEntity putPlusPullAction(@RequestBody String whereJson){ return new ResponseEntity<>(wmstoacsService.putPlusPullAction(whereJson), HttpStatus.OK); @@ -106,7 +106,7 @@ public class WmsToAcsController { @PostMapping("/updateTask") @Log(value = "WMS更新任务点位状态",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS更新任务点位状态") + @SaIgnore public ResponseEntity updateTask(@RequestBody String whereJson){ return new ResponseEntity<>(wmstoacsService.updateTask(whereJson), HttpStatus.OK); @@ -114,7 +114,7 @@ public class WmsToAcsController { @PostMapping("/sendAgvChargeTask") @Log(value = "LMS下发agv充电任务",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS下发agv充电任务") + @SaIgnore public ResponseEntity sendAgvChargeTask(@RequestBody JSONObject param){ return new ResponseEntity<>(wmstoacsService.sendAgvChargeTask(param), HttpStatus.OK); @@ -122,7 +122,7 @@ public class WmsToAcsController { @PostMapping("/queryDeviceInfo") @Log(value = "查询agv车辆信息",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("查询agv车辆信息") + @SaIgnore public ResponseEntity queryDeviceInfo(@RequestBody JSONObject param){ return new ResponseEntity<>(wmstoacsService.queryDeviceInfo(param), HttpStatus.OK); @@ -130,7 +130,7 @@ public class WmsToAcsController { @PostMapping("/syncfaultInfo") @Log(value = "LMS同步报警码信息",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS同步报警码信息") + @SaIgnore public ResponseEntity syncfaultInfo(){ return new ResponseEntity<>(wmstoacsService.syncfaultInfo(), HttpStatus.OK); @@ -138,7 +138,7 @@ public class WmsToAcsController { @PostMapping("/realTimefaultInfo") @Log(value = "查询所有设备报警信息",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("查询所有设备报警信息") + @SaIgnore public ResponseEntity realTimefaultInfo(@RequestBody JSONObject param){ return new ResponseEntity<>(wmstoacsService.realTimefaultInfo(param), HttpStatus.OK); @@ -146,7 +146,7 @@ public class WmsToAcsController { @PostMapping("/paperTubeAction") @Log(value = "下发纸管库动作",isInterfaceLog = true,interfaceLogType= InterfaceLogType.LMS_TO_ACS) - @ApiOperation("下发纸管库动作") + @SaIgnore public ResponseEntity paperTubeAction(@RequestBody JSONObject param){ return new ResponseEntity<>(wmstoacsService.paperTubeAction(param), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java b/acs/nladmin-system/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java index 694440fea..c9b90ef8a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java @@ -2,8 +2,8 @@ package org.nl.acs.history.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.history.service.DeviceErrorLogService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备报警记录管理") + @RequestMapping("/api/deviceErrorLog") @Slf4j public class DeviceErrorLogController { @@ -34,7 +34,7 @@ public class DeviceErrorLogController { @GetMapping @Log("查询设备报警记录") - @ApiOperation("查询设备报警记录") + //@PreAuthorize("@el.check('acsDeviceErrorLog:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(acsDeviceErrorLogService.queryAll(whereJson,page),HttpStatus.OK); @@ -42,7 +42,7 @@ public class DeviceErrorLogController { @PostMapping @Log("新增设备报警记录") - @ApiOperation("新增设备报警记录") + //@PreAuthorize("@el.check('acsDeviceErrorLog:add')") public ResponseEntity create(@Validated @RequestBody DeviceErrorLogDto dto){ acsDeviceErrorLogService.create(dto); @@ -51,7 +51,7 @@ public class DeviceErrorLogController { @PutMapping @Log("修改设备报警记录") - @ApiOperation("修改设备报警记录") + //@PreAuthorize("@el.check('acsDeviceErrorLog:edit')") public ResponseEntity update(@Validated @RequestBody DeviceErrorLogDto dto){ acsDeviceErrorLogService.update(dto); @@ -59,7 +59,7 @@ public class DeviceErrorLogController { } @Log("删除设备报警记录") - @ApiOperation("删除设备报警记录") + //@PreAuthorize("@el.check('acsDeviceErrorLog:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class DeviceErrorLogController { } @Log("导出设备报警记录") - @ApiOperation("导出设备报警记录") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('acsDeviceErrorLog:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 43e95bb4b..8bd690291 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -3,8 +3,8 @@ package org.nl.acs.instruction.rest; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.instruction.service.InstructionService; @@ -26,7 +26,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "指令管理") + @RequestMapping("/api/instruction") @Slf4j public class InstructionController { @@ -35,7 +35,7 @@ public class InstructionController { @GetMapping @Log("查询指令") - @ApiOperation("查询指令") + //@PreAuthorize("@el.check('instruction:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(instructionService.queryAll(whereJson, page), HttpStatus.OK); @@ -43,14 +43,14 @@ public class InstructionController { @GetMapping("/getAll") @Log("历史查询指令") - @ApiOperation("历史查询指令") + //@PreAuthorize("@el.check('instruction:list')") public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(instructionService.getAll(whereJson, page), HttpStatus.OK); } @Log("导出指令") - @ApiOperation("导出指令") + @GetMapping(value = "/getAll/download") //@PreAuthorize("@el.check('instruction:list')") public void getAllDownload(HttpServletResponse response, Map whereJson) throws IOException { @@ -59,7 +59,7 @@ public class InstructionController { @GetMapping("/unfinish") @Log("查询所有未完成指令") - @ApiOperation("查询所有未完成指令") + //@PreAuthorize("@el.check('instruction:list')") public ResponseEntity queryUnFinish() { return new ResponseEntity<>(instructionService.queryAll("instruction_status < 2"), HttpStatus.OK); @@ -67,7 +67,7 @@ public class InstructionController { @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + //@PreAuthorize("@el.check('task:list')") public ResponseEntity reload() { instructionService.reload(); @@ -76,7 +76,7 @@ public class InstructionController { @PostMapping @Log("新增指令") - @ApiOperation("新增指令") + //@PreAuthorize("@el.check('instruction:add')") public ResponseEntity create(@Validated @RequestBody Instruction dto) throws Exception { instructionService.create(dto); @@ -85,7 +85,7 @@ public class InstructionController { @PutMapping @Log("修改指令") - @ApiOperation("修改指令") + //@PreAuthorize("@el.check('instruction:edit')") public ResponseEntity update(@Validated @RequestBody Instruction dto) { instructionService.update(dto); @@ -93,7 +93,7 @@ public class InstructionController { } @Log("删除指令") - @ApiOperation("删除指令") + //@PreAuthorize("@el.check('instruction:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws Exception { @@ -102,7 +102,7 @@ public class InstructionController { } @Log("完成指令") - @ApiOperation("完成指令") + @PostMapping(value = "/finish/{id}") public ResponseEntity finish(@RequestBody String id) throws Exception { instructionService.finish(id); @@ -110,7 +110,7 @@ public class InstructionController { } @Log("取消指令") - @ApiOperation("取消指令") + @PostMapping(value = "/cancel/{id}") public ResponseEntity cancel(@RequestBody String id) throws Exception { instructionService.cancel(id); @@ -118,7 +118,7 @@ public class InstructionController { } @Log("强制取消指令") - @ApiOperation("强制取消指令") + @PostMapping(value = "/forceCancel/{id}") public ResponseEntity forceCancel(@RequestBody String id) throws Exception { instructionService.forceCancel(id); @@ -126,7 +126,7 @@ public class InstructionController { } @Log("导出指令") - @ApiOperation("导出指令") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('instruction:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -135,7 +135,7 @@ public class InstructionController { @Log("缓存查询指令") - @ApiOperation("缓存查询指令") + @PostMapping(value = "/findByCodeFromCache/{id}") public ResponseEntity findByCodeFromCache(@RequestBody String id) { return new ResponseEntity<>(instructionService.findByCodeFromCache(id), HttpStatus.OK); @@ -143,21 +143,21 @@ public class InstructionController { @SaIgnore @Log("查询缓存所有指令") - @ApiOperation("查询缓存指令") + @PostMapping(value = "/findAllInstFromCache") public ResponseEntity findAllInstFromCache() { return new ResponseEntity<>(instructionService.findAllInstFromCache(), HttpStatus.OK); } @Log("查询指定任务的所有指令") - @ApiOperation("查询指定任务的所有指令") + @PostMapping(value = "/queryByTaskId/{taskId}") public ResponseEntity queryByTaskId(@RequestBody String taskId) { return new ResponseEntity<>(instructionService.getByTaskId(taskId), HttpStatus.OK); } @Log("初始化") - @ApiOperation("初始化") + @PostMapping(value = "/init/{id}") public ResponseEntity init(@RequestBody String id) throws Exception { instructionService.init(id); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java b/acs/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java index 66692b255..10a151586 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java @@ -1,8 +1,8 @@ package org.nl.acs.monitor.rest; import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.monitor.service.DeviceStageMonitorService; @@ -22,14 +22,14 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequiredArgsConstructor -@Api(tags = "设备信息") + @RequestMapping("/api/deviceInfo") public class DeviceStageMonitorController { private final DeviceStageMonitorService deviceStageMonitorService; @Log("获取舞台设备信息") - @ApiOperation("获取舞台设备信息") + @PostMapping("/getDeviceByCodes") public ResponseEntity getDeviceByCodes(@RequestBody String json) throws Exception { JSONArray jsonArray = JSONArray.parseArray(json); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLineController.java b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLineController.java index 6df63060a..ac67318f7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLineController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLineController.java @@ -2,8 +2,8 @@ package org.nl.acs.route.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.route.service.RouteLineService; @@ -26,7 +26,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由路线管理") + @RequestMapping("/api/routeLine") @Slf4j public class RouteLineController { @@ -35,7 +35,7 @@ public class RouteLineController { @GetMapping @Log("查询路由路线") - @ApiOperation("查询路由路线") + //@PreAuthorize("@el.check('routeLine:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routeLineService.queryAll(whereJson, page), HttpStatus.OK); @@ -43,7 +43,7 @@ public class RouteLineController { @PostMapping @Log("新增路由路线") - @ApiOperation("新增路由路线") + //@PreAuthorize("@el.check('routeLine:add')") public ResponseEntity create(@RequestBody Map data) throws SQLException { routeLineService.create(data); @@ -52,7 +52,7 @@ public class RouteLineController { @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + //@PreAuthorize("@el.check('task:list')") public ResponseEntity reload() throws SQLException { routeLineService.reload(); @@ -62,7 +62,7 @@ public class RouteLineController { @PutMapping @Log("修改路由路线") - @ApiOperation("修改路由路线") + //@PreAuthorize("@el.check('routeLine:edit')") public ResponseEntity update(@Validated @RequestBody RouteLineDto dto) throws SQLException { routeLineService.update(dto); @@ -71,7 +71,7 @@ public class RouteLineController { @PutMapping("/enabled") @Log("启用禁用路由路线") - @ApiOperation("启用禁用路由路线") + //@PreAuthorize("@el.check('routeLine:edit')") public ResponseEntity enabled(@Validated @RequestBody RouteLineDto dto) throws SQLException { routeLineService.enabled(dto.getLine_uuid(), dto.getIs_active()); @@ -80,7 +80,7 @@ public class RouteLineController { @Log("删除路由路线") - @ApiOperation("删除路由路线") + //@PreAuthorize("@el.check('routeLine:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws SQLException { @@ -89,7 +89,7 @@ public class RouteLineController { } @Log("导出路由路线") - @ApiOperation("导出路由路线") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('routeLine:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -98,7 +98,7 @@ public class RouteLineController { @Log("查询最优路由路线") - @ApiOperation("查询最优路由路线") + @PostMapping(value = "/getShortPathLines") public ResponseEntity getShortPathLines(String device_code, String next_device_code, String route_plan_code) { return new ResponseEntity<>(routeLineService.getShortPathLines(device_code, next_device_code, route_plan_code), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLocController.java b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLocController.java index f7ca91c16..d16ead93a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLocController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RouteLocController.java @@ -2,8 +2,8 @@ package org.nl.acs.route.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.route.service.RouteLocService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由坐标管理") + @RequestMapping("/api/routeLoc") @Slf4j public class RouteLocController { @@ -34,7 +34,7 @@ public class RouteLocController { @GetMapping @Log("查询路由坐标") - @ApiOperation("查询路由坐标") + //@PreAuthorize("@el.check('routeLoc:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routeLocService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class RouteLocController { @PostMapping @Log("新增路由坐标") - @ApiOperation("新增路由坐标") + //@PreAuthorize("@el.check('routeLoc:add')") public ResponseEntity create(@Validated @RequestBody RouteLocDto dto) { routeLocService.create(dto); @@ -51,7 +51,7 @@ public class RouteLocController { @PutMapping @Log("修改路由坐标") - @ApiOperation("修改路由坐标") + //@PreAuthorize("@el.check('routeLoc:edit')") public ResponseEntity update(@Validated @RequestBody RouteLocDto dto) { routeLocService.update(dto); @@ -59,7 +59,7 @@ public class RouteLocController { } @Log("删除路由坐标") - @ApiOperation("删除路由坐标") + //@PreAuthorize("@el.check('routeLoc:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class RouteLocController { } @Log("导出路由坐标") - @ApiOperation("导出路由坐标") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('routeLoc:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java index 1bf6c4164..dd38e71a8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/route/rest/RoutePlanController.java @@ -2,8 +2,8 @@ package org.nl.acs.route.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.route.service.RoutePlanService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由方案管理") + @RequestMapping("/api/routePlan") @Slf4j public class RoutePlanController { @@ -34,7 +34,7 @@ public class RoutePlanController { @GetMapping @Log("查询路由方案") - @ApiOperation("查询路由方案") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routePlanService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class RoutePlanController { @PostMapping @Log("新增路由方案") - @ApiOperation("新增路由方案") + //@PreAuthorize("@el.check('routePlan:add')") public ResponseEntity create(@Validated @RequestBody RoutePlanDto dto) { routePlanService.create(dto); @@ -51,7 +51,7 @@ public class RoutePlanController { @PutMapping @Log("修改路由方案") - @ApiOperation("修改路由方案") + //@PreAuthorize("@el.check('routePlan:edit')") public ResponseEntity update(@Validated @RequestBody RoutePlanDto dto) { routePlanService.update(dto); @@ -59,7 +59,7 @@ public class RoutePlanController { } @Log("删除路由方案") - @ApiOperation("删除路由方案") + //@PreAuthorize("@el.check('routePlan:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class RoutePlanController { } @Log("导出路由方案") - @ApiOperation("导出路由方案") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('routePlan:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -77,7 +77,7 @@ public class RoutePlanController { @GetMapping("/selectList") @Log("下拉选路由方案") - @ApiOperation("下拉选路由方案") + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(routePlanService.selectList(), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskController.java index 225aeb77c..87f3b010a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskController.java @@ -4,8 +4,8 @@ package org.nl.acs.task.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -28,7 +28,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/task") @Slf4j public class TaskController { @@ -38,7 +38,7 @@ public class TaskController { @GetMapping @Log("查询任务") - @ApiOperation("查询任务") + //@PreAuthorize("@el.check('task:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskService.queryAllByCache(whereJson, page), HttpStatus.OK); @@ -46,7 +46,7 @@ public class TaskController { @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + @SaIgnore //@PreAuthorize("@el.check('task:list')") public ResponseEntity reload() { @@ -56,14 +56,14 @@ public class TaskController { @GetMapping("/getAll") @Log("历史查询任务") - @ApiOperation("历史查询任务") + //@PreAuthorize("@el.check('task:list')") public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskService.getAll(whereJson, page), HttpStatus.OK); } @Log("导出历史任务") - @ApiOperation("导出历史任务") + @GetMapping(value = "/getAll/download") //@PreAuthorize("@el.check('task:list')") public void getAllDownload(HttpServletResponse response, Map whereJson) throws IOException { @@ -72,7 +72,7 @@ public class TaskController { @PostMapping @Log("新增任务") - @ApiOperation("新增任务") + //@PreAuthorize("@el.check('task:add')") public ResponseEntity create(@Validated @RequestBody TaskDto dto) throws Exception { taskService.create(dto); @@ -81,7 +81,7 @@ public class TaskController { @PostMapping(value = "/adds") @Log("常规任务保存") - @ApiOperation("常规任务保存") + //@PreAuthorize("@el.check('task:add')") public ResponseEntity ordinaryTaskCreate(@RequestBody JSONObject json) throws Exception { @@ -91,7 +91,7 @@ public class TaskController { @PostMapping(value = "/addes") @Log("特殊任务保存") - @ApiOperation("特殊任务保存") + public ResponseEntity specialTaskCreate(@RequestBody JSONObject json) throws Exception { taskService.specialTaskCreate(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -99,7 +99,7 @@ public class TaskController { @PutMapping @Log("修改任务") - @ApiOperation("修改任务") + //@PreAuthorize("@el.check('task:edit')") public ResponseEntity update(@Validated @RequestBody TaskDto dto) { taskService.update(dto); @@ -107,7 +107,7 @@ public class TaskController { } @Log("删除任务") - @ApiOperation("删除任务") + //@PreAuthorize("@el.check('task:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws Exception { @@ -116,7 +116,7 @@ public class TaskController { } @Log("完成任务") - @ApiOperation("完成任务") + @PostMapping(value = "/finish/{id}") public ResponseEntity finish(@RequestBody String id) { taskService.finish(id); @@ -124,7 +124,7 @@ public class TaskController { } @Log("取消任务") - @ApiOperation("取消任务") + @PostMapping(value = "/cancel/{id}") public ResponseEntity cancel(@RequestBody String id) throws Exception { taskService.cancel(id); @@ -132,7 +132,7 @@ public class TaskController { } @Log("手动创建指令") - @ApiOperation("手动创建指令") + @PostMapping(value = "/createInst/{id}") public ResponseEntity createInst(@RequestBody String id) throws Exception { taskService.createInst(id); @@ -140,7 +140,7 @@ public class TaskController { } @Log("导出任务") - @ApiOperation("导出任务") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('task:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -148,7 +148,7 @@ public class TaskController { } @Log("一体机触发任务") - @ApiOperation("一体机触发任务") + @PostMapping("/createTaskByClick") //@PreAuthorize("@el.check('task:add')") public ResponseEntity createTaskByClick(@RequestBody JSONObject json) { @@ -158,7 +158,7 @@ public class TaskController { @SaIgnore @Log("查询缓存所有任务") - @ApiOperation("查询缓存任务") + @PostMapping(value = "/findAllTaskFromCache") public ResponseEntity findAllTaskFromCache() { return new ResponseEntity<>(taskService.findAllTaskFromCache(), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java index a4c22038b..e56e6893b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java @@ -2,8 +2,8 @@ package org.nl.acs.task.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.task.service.TaskFeedbackService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务反馈管理") + @RequestMapping("/api/taskFeedback") @Slf4j public class TaskFeedbackController { @@ -32,14 +32,14 @@ public class TaskFeedbackController { @GetMapping @Log("查询任务反馈") - @ApiOperation("查询任务反馈") + //@PreAuthorize("@el.check('taskFeedback:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskFeedbackService.queryAll(whereJson, page), HttpStatus.OK); } @Log("导出任务反馈") - @ApiOperation("导出任务反馈") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('taskFeedback:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { @@ -47,7 +47,7 @@ public class TaskFeedbackController { } @Log("重置任务反馈") - @ApiOperation("重置任务反馈") + @PostMapping(value = "/retry/{id}") public ResponseEntity retry(@RequestBody String id) { taskFeedbackService.retry(id); @@ -55,7 +55,7 @@ public class TaskFeedbackController { } @Log("作废任务反馈") - @ApiOperation("作废任务反馈") + @PostMapping(value = "/invalid/{id}") public ResponseEntity invalid(@RequestBody String id) { taskFeedbackService.invalid(id); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/test/rest/TestController.java b/acs/nladmin-system/src/main/java/org/nl/acs/test/rest/TestController.java index 50d710c72..44ffe89e7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/test/rest/TestController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/test/rest/TestController.java @@ -2,8 +2,8 @@ package org.nl.acs.test.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.test.service.TestService; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/test") @Slf4j public class TestController { @@ -32,7 +32,7 @@ public class TestController { private final TestService testService; @Log("test1") - @ApiOperation("test1") + @PostMapping("/test1") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test1() throws IOException { @@ -41,7 +41,7 @@ public class TestController { } @Log("test2") - @ApiOperation("test2") + @PostMapping("/test2") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test2() throws IOException { @@ -50,7 +50,7 @@ public class TestController { } @Log("test3") - @ApiOperation("test3") + @PostMapping("/test3") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test3() throws IOException { @@ -59,7 +59,7 @@ public class TestController { } @Log("test4") - @ApiOperation("test4") + @PostMapping("/test4") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test4(@RequestBody Map map) throws IOException { @@ -68,7 +68,7 @@ public class TestController { } @Log("test5") - @ApiOperation("test5") + @PostMapping("/test5") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test5() throws IOException { @@ -77,7 +77,7 @@ public class TestController { } @Log("test6") - @ApiOperation("test6") + @PostMapping("/test6") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test6(@RequestBody Map map) throws IOException { @@ -86,7 +86,7 @@ public class TestController { } @Log("test7") - @ApiOperation("test7") + @PostMapping("/test7") //@PreAuthorize("@el.check('task:add')") public ResponseEntity test7() throws IOException { @@ -95,7 +95,7 @@ public class TestController { } @Log("print") - @ApiOperation("print") + @PostMapping("/print") //@PreAuthorize("@el.check('task:add')") public ResponseEntity print() throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java b/acs/nladmin-system/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java index cd0f85f0a..c6d473f8f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java @@ -5,8 +5,8 @@ package org.nl.acs.udw.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.DriverTypeEnum; @@ -33,7 +33,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "内存点位管理") + @RequestMapping("/api/udw") @Slf4j public class UdwManagerController { @@ -42,7 +42,7 @@ public class UdwManagerController { // @GetMapping // @Log("查询内存点位") -// @ApiOperation("查询内存点位") +// // @SaIgnore // public ResponseEntity query(@RequestParam JSONObject whereJson) { // return new ResponseEntity<>(udwManageService.queryByConditions(whereJson), HttpStatus.OK); @@ -50,7 +50,7 @@ public class UdwManagerController { @GetMapping @Log("查询内存点位") - @ApiOperation("查询内存点位") + @SaIgnore //@PreAuthorize("@el.check('device:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java b/acs/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java index 582cb1a21..7da6edad1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java @@ -15,7 +15,7 @@ */ package org.nl.modules.common.base; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; @@ -43,22 +43,22 @@ public class BaseEntity implements Serializable { @CreatedBy @Column(name = "create_by", updatable = false) - @ApiModelProperty(value = "创建人", hidden = true) + private String createBy; @LastModifiedBy @Column(name = "update_by") - @ApiModelProperty(value = "更新人", hidden = true) + private String updatedBy; @CreationTimestamp @Column(name = "create_time", updatable = false) - @ApiModelProperty(value = "创建时间", hidden = true) + private Timestamp createTime; @UpdateTimestamp @Column(name = "update_time") - @ApiModelProperty(value = "更新时间", hidden = true) + private Timestamp updateTime; /* 分组校验 */ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java b/acs/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java deleted file mode 100644 index 0085cb03f..000000000 --- a/acs/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.common.config; - -import com.fasterxml.classmate.TypeResolver; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.data.domain.Pageable; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.schema.AlternateTypeRule; -import springfox.documentation.schema.AlternateTypeRuleConvention; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.util.ArrayList; -import java.util.List; - -import static com.google.common.collect.Lists.newArrayList; -import static springfox.documentation.schema.AlternateTypeRules.newRule; - -/** - * api页面 /doc.html - * @author Zheng Jie - * @date 2018-11-23 - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - @Value("${jwt.header}") - private String tokenHeader; - - @Value("${jwt.token-start-with}") - private String tokenStartWith; - - @Value("${swagger.enabled}") - private Boolean enabled; - - @Bean - @SuppressWarnings("all") - public Docket createRestApi() { -// ParameterBuilder ticketPar = new ParameterBuilder(); -//// List pars = new ArrayList<>(); -//// ticketPar.name(tokenHeader).description("token") -//// .modelRef(new ModelRef("string")) -//// .parameterType("header") -//// .defaultValue(tokenStartWith + " ") -//// .required(true) -//// .build(); -// pars.add(ticketPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(enabled) - .apiInfo(apiInfo()) - .select() -// .paths(Predicates.not(PathSelectors.regex("/error.*"))) - .paths(PathSelectors.any()) - .build() -// .globalOperationParameters(pars) - //添加登陆认证 - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .description("一个简单且易上手的 Spring boot 后台管理框架") - .title("EL-ADMIN 接口文档") - .version("2.4") - .build(); - } - - private List securitySchemes() { - //设置请求头信息 - List securitySchemes = new ArrayList<>(); - ApiKey apiKey = new ApiKey(tokenHeader, tokenHeader, "header"); - securitySchemes.add(apiKey); - return securitySchemes; - } - - private List securityContexts() { - //设置需要登录认证的路径 - List securityContexts = new ArrayList<>(); - // ^(?!auth).*$ 表示所有包含auth的接口不需要使用securitySchemes即不需要带token - // ^标识开始 ()里是一子表达式 ?!/auth表示匹配不是/auth的位置，匹配上则添加请求头，注意路径已/开头 .表示任意字符 *表示前面的字符匹配多次 $标识结束 - securityContexts.add(getContextByPath("^(?!/auth).*$")); - return securityContexts; - } - - private SecurityContext getContextByPath(String pathRegex) { - return SecurityContext.builder() - .securityReferences(defaultAuth()) - .forPaths(PathSelectors.regex(pathRegex)) - .build(); - } - - private List defaultAuth() { - List securityReferences = new ArrayList<>(); - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - securityReferences.add(new SecurityReference(tokenHeader, authorizationScopes)); - return securityReferences; - } -} - -/** - * 将Pageable转换展示在swagger中 - */ -@Configuration -class SwaggerDataConfig { - - @Bean - public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { - return new AlternateTypeRuleConvention() { - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - - @Override - public List rules() { - return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); - } - }; - } - - @ApiModel - @Data - private static class Page { - @ApiModelProperty("页码 (0..N)") - private Integer page; - - @ApiModelProperty("每页显示的数目") - private Integer size; - - @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") - private List sort; - } -} diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java b/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java index abbb456f0..2afeef080 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java @@ -18,7 +18,7 @@ package org.nl.modules.common.utils; /** * @author: liaojinlong * @date: 2020/6/11 15:49 - * @apiNote: 关于缓存的Key集合 + * */ public interface CacheKey { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java b/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java index 2edc7107b..cf91de559 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java @@ -23,7 +23,7 @@ import java.util.Date; /** * @author: liaojinlong * @date: 2020/6/11 16:28 - * @apiNote: JDK 8 新日期类 格式化与字符串转换 工具类 + * */ public class DateUtil { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java b/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java index cc23dd560..629392366 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -38,47 +38,47 @@ public class ColumnInfo implements Serializable { @Id @Column(name = "column_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "数据库字段名称") + private String columnName; - @ApiModelProperty(value = "数据库字段类型") + private String columnType; - @ApiModelProperty(value = "数据库字段键类型") + private String keyType; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean notNull; - @ApiModelProperty(value = "是否在列表显示") + private Boolean listShow; - @ApiModelProperty(value = "是否表单显示") + private Boolean formShow; - @ApiModelProperty(value = "表单类型") + private String formType; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String queryType; - @ApiModelProperty(value = "字典名称") + private String dictName; - @ApiModelProperty(value = "日期注解") + private String dateAnnotation; public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java b/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java index 454b1e93f..f5984fa82 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -42,38 +42,38 @@ public class GenConfig implements Serializable { @Id @Column(name = "config_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @NotBlank - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "接口名称") + private String apiAlias; @NotBlank - @ApiModelProperty(value = "包路径") + private String pack; @NotBlank - @ApiModelProperty(value = "模块名") + private String moduleName; @NotBlank - @ApiModelProperty(value = "前端文件路径") + private String path; - @ApiModelProperty(value = "前端文件路径") + private String apiPath; - @ApiModelProperty(value = "作者") + private String author; - @ApiModelProperty(value = "表前缀") + private String prefix; - @ApiModelProperty(value = "是否覆盖") + private Boolean cover = false; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java b/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java index 75ee5b512..6e5e45fa5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.generator.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.generator.domain.GenConfig; import org.nl.modules.generator.service.GenConfigService; @@ -32,18 +32,18 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/genConfig") -@Api(tags = "系统：代码生成器配置管理") + public class GenConfigController { private final GenConfigService genConfigService; - @ApiOperation("查询") + @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } - @ApiOperation("修改") + @PutMapping public ResponseEntity update(@Validated @RequestBody GenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java b/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java index 10238435f..c1636d7d9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.generator.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; @@ -39,7 +39,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") + public class GeneratorController { private final GeneratorService generatorService; @@ -48,13 +48,13 @@ public class GeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables/all") public ResponseEntity queryTables(){ return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK); } - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "0")Integer page, @@ -63,21 +63,21 @@ public class GeneratorController { return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK); } - @ApiOperation("查询字段数据") + @GetMapping(value = "/columns") public ResponseEntity queryColumns(@RequestParam String tableName){ List columnInfos = generatorService.getColumns(tableName); return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK); } - @ApiOperation("保存字段数据") + @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ generatorService.save(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + @PostMapping(value = "sync") public ResponseEntity sync(@RequestBody List tables){ for (String table : tables) { @@ -86,7 +86,7 @@ public class GeneratorController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("生成代码") + @PostMapping(value = "/{tableName}/{type}") public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ if(!generatorEnabled && type == 0){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java b/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java index 847d8f5f5..fb3b86b5b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java @@ -1,7 +1,7 @@ package org.nl.modules.logging.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.logging.service.InterfaceLogService; @@ -22,13 +22,13 @@ import java.util.Map; @RestController @RequiredArgsConstructor @RequestMapping("/api/interfaceLog") -@Api(tags = "系统：接口日志管理") + public class InterfaceLogController { private final InterfaceLogService interfaceLogService; @GetMapping @Log("查询接口日志") - @ApiOperation("查询接口日志") + //@SaCheckPermission("point:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(interfaceLogService.queryAll(whereJson, page), HttpStatus.OK); @@ -36,7 +36,7 @@ public class InterfaceLogController { @DeleteMapping(value = "/delLogs") @Log("删除所有接口日志") - @ApiOperation("删除所有接口日志") + public ResponseEntity delLogs(){ interfaceLogService.delLogs(); return new ResponseEntity<>(HttpStatus.OK); @@ -44,7 +44,7 @@ public class InterfaceLogController { @GetMapping("/logTypeList") @Log("查询接口日志类型下拉框") - @ApiOperation("查询接口日志类型下拉框") + public ResponseEntity logTypeList() { return new ResponseEntity<>(interfaceLogService.logTypeList(), HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java b/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java index 27e5d2d84..79118fa00 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.logging.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logging.annotation.Log; @@ -34,12 +34,12 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") + public class LogController { private final LogService logService; @GetMapping - @ApiOperation("日志查询") + //@SaCheckPermission("@el.check()") public ResponseEntity query(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); @@ -47,7 +47,7 @@ public class LogController { } @GetMapping(value = "/user") - // @ApiOperation("用户日志查询") + // public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); criteria.setBlurry(SecurityUtils.getCurrentUsername()); @@ -55,7 +55,7 @@ public class LogController { } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("ERROR"); @@ -63,14 +63,14 @@ public class LogController { } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLogs(@PathVariable Long id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllErrorLog(){ logService.delAllByError(); @@ -79,7 +79,7 @@ public class LogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllInfoLog(){ logService.delAllByInfo(); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java index ebd4d90a1..d2edd88f1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java @@ -1,7 +1,7 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,14 +22,14 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stage") @Slf4j public class StageController { private final StageService stageService; @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageService.queryAll(whereJson, page), HttpStatus.OK); @@ -37,7 +37,7 @@ public class StageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stage:add") public ResponseEntity create(@Validated @RequestBody StageDto dto) { stageService.create(dto); @@ -46,7 +46,7 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stage:edit") public ResponseEntity update(@Validated @RequestBody StageDto dto) { stageService.update(dto); @@ -54,7 +54,7 @@ public class StageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -64,7 +64,7 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); @@ -72,7 +72,7 @@ public class StageController { @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + public ResponseEntity addNewStage(@Validated @RequestBody StageDto dto) { log.info("dto{}",dto); stageService.addNewStage(dto); @@ -81,7 +81,7 @@ public class StageController { @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + public ResponseEntity getNewStageDataByCode(@RequestBody String code) { return new ResponseEntity<>(stageService.findByCode(code), HttpStatus.CREATED); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java index cb193cfd0..33f7ae774 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java @@ -1,7 +1,7 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +22,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { @@ -30,7 +30,7 @@ public class StageImageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stageImage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageImageService.queryAll(whereJson, page), HttpStatus.OK); @@ -38,7 +38,7 @@ public class StageImageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stageImage:add") public ResponseEntity create(@Validated @RequestBody StageImageDto dto) { stageImageService.create(dto); @@ -47,7 +47,7 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stageImage:edit") public ResponseEntity update(@Validated @RequestBody StageImageDto dto) { stageImageService.update(dto); @@ -55,7 +55,7 @@ public class StageImageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stageImage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +65,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java b/acs/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java index e498cb664..983baf7e6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/loki/rest/LokiController.java @@ -1,8 +1,8 @@ package org.nl.modules.loki.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.annotation.RateLimiter; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "日志监控") + @RequestMapping("/api/loki") @Slf4j public class LokiController { @@ -26,13 +26,13 @@ public class LokiController { private final LokiService lokiService; @GetMapping("/labels/values") - @ApiOperation("获取标签") + public ResponseEntity labelsValues() { return new ResponseEntity<>(lokiService.getLabelsValues(), HttpStatus.OK); } @PostMapping("/logs") - @ApiOperation("获取日志") + @RateLimiter(value = 1, timeout = 300) // 限流 public ResponseEntity getLogData(@RequestBody JSONObject json) { return new ResponseEntity<>(lokiService.getLogData(json), HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java index bce16045d..f67fabb23 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzJob.java @@ -15,7 +15,7 @@ */ package org.nl.modules.quartz.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -44,43 +44,43 @@ public class QuartzJob extends BaseEntity implements Serializable { private Long id; @Transient - @ApiModelProperty(value = "用于子任务唯一标识", hidden = true) + private String uuid; - @ApiModelProperty(value = "定时器名称") + private String jobName; @NotBlank - @ApiModelProperty(value = "Bean名称") + private String beanName; @NotBlank - @ApiModelProperty(value = "方法名称") + private String methodName; - @ApiModelProperty(value = "参数") + private String params; @NotBlank - @ApiModelProperty(value = "cron表达式") + private String cronExpression; - @ApiModelProperty(value = "状态，暂时或启动") + private Boolean isPause = false; - @ApiModelProperty(value = "负责人") + private String personInCharge; - @ApiModelProperty(value = "报警邮箱") + private String email; - @ApiModelProperty(value = "子任务") + private String subTask; - @ApiModelProperty(value = "失败后暂停") + private Boolean pauseAfterFailure; @NotBlank - @ApiModelProperty(value = "备注") + private String description; } \ No newline at end of file diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzLog.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzLog.java index fbdb2d1e4..dd68354c7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzLog.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/domain/QuartzLog.java @@ -15,7 +15,7 @@ */ package org.nl.modules.quartz.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import org.hibernate.annotations.CreationTimestamp; @@ -34,35 +34,35 @@ public class QuartzLog implements Serializable { @Id @Column(name = "log_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "任务名称", hidden = true) + private String jobName; - @ApiModelProperty(value = "bean名称", hidden = true) + private String beanName; - @ApiModelProperty(value = "方法名称", hidden = true) + private String methodName; - @ApiModelProperty(value = "参数", hidden = true) + private String params; - @ApiModelProperty(value = "cron表达式", hidden = true) + private String cronExpression; - @ApiModelProperty(value = "状态", hidden = true) + private Boolean isSuccess; - @ApiModelProperty(value = "异常详情", hidden = true) + private String exceptionDetail; - @ApiModelProperty(value = "执行耗时", hidden = true) + private Long time; @CreationTimestamp - @ApiModelProperty(value = "创建时间", hidden = true) + private Timestamp createTime; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java index f84511bab..3e8567919 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/rest/QuartzJobController.java @@ -16,8 +16,8 @@ package org.nl.modules.quartz.rest; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; @@ -41,20 +41,20 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") + public class QuartzJobController { private static final String ENTITY_NAME = "quartzJob"; private final QuartzJobService quartzJobService; - @ApiOperation("查询定时任务") + @GetMapping @SaCheckPermission("timing:list") public ResponseEntity query(JobQueryCriteria criteria, Pageable pageable) { return new ResponseEntity<>(quartzJobService.queryAll(criteria, pageable), HttpStatus.OK); } - @ApiOperation("查询任务执行日志") + @GetMapping(value = "/logs") @SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQueryCriteria criteria, Pageable pageable) { @@ -62,7 +62,7 @@ public class QuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody QuartzJob resources) { @@ -74,7 +74,7 @@ public class QuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources) { @@ -83,7 +83,7 @@ public class QuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable Long id) { @@ -92,7 +92,7 @@ public class QuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable Long id) { @@ -101,7 +101,7 @@ public class QuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java index 141c6fc83..e227f05a2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @apiNote 配置文件转换Pojo类的 统一配置 类 + * * @author: liaojinlong * @date: 2020/6/10 19:04 */ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index d4325e284..654942f2a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -22,8 +22,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.config.RsaProperties; @@ -60,7 +60,7 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/auth") @RequiredArgsConstructor -@Api(tags = "系统：系统授权接口") + public class AuthorizationController { private final RedisUtils redisUtils; private final OnlineUserService onlineUserService; @@ -70,7 +70,7 @@ public class AuthorizationController { @Resource private LoginProperties loginProperties; - @ApiOperation("登录授权") + @PostMapping(value = "/login") public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { // 密码解密 - 前端的加密规则: encrypt @@ -129,7 +129,7 @@ public class AuthorizationController { return ResponseEntity.ok(authInfo); } - @ApiOperation("获取用户信息") + @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -139,7 +139,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取验证码") + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -160,7 +160,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - @ApiOperation("退出登录") + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { onlineUserService.logout(StpUtil.getTokenValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java index c21b4ebbc..21973efd0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java @@ -5,8 +5,8 @@ import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.config.RsaProperties; @@ -39,13 +39,13 @@ import java.util.Map; @RestController @RequestMapping("/mobile/auth") @RequiredArgsConstructor -@Api(tags = "手持：系统授权接口") + public class MobileAuthorizationController { private final RedisUtils redisUtils; private final UserService userService; private final RoleService roleService; - @ApiOperation("登录授权") + @PostMapping(value = "/login") @SaIgnore public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java index e5b183944..8b7a25b97 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/OnlineController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.security.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.EncryptUtils; import org.nl.modules.security.service.OnlineUserService; @@ -35,26 +35,26 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") + public class OnlineController { private final OnlineUserService onlineUserService; - @ApiOperation("查询在线用户") + @GetMapping // @SaCheckPermission("@el.check()") public ResponseEntity query(String filter, Pageable pageable){ return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") // @SaCheckPermission("@el.check()") public void download(HttpServletResponse response, String filter) throws IOException { onlineUserService.download(onlineUserService.getAll(filter), response); } - @ApiOperation("踢出用户") + @DeleteMapping // @SaCheckPermission("@el.check()") public ResponseEntity delete(@RequestBody Set keys) throws Exception { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/service/UserCacheClean.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/service/UserCacheClean.java index 28a0d0ce4..fb4090695 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/service/UserCacheClean.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/service/UserCacheClean.java @@ -22,7 +22,7 @@ ///** // * @author: liaojinlong // * @date: 2020/6/11 18:01 -// * @apiNote: 用于清理 用户登录信息缓存，为防止Spring循环依赖与安全考虑 ，单独构成工具类 +// * // */ //@Component //public class UserCacheClean { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java index 9a68cb5a9..c8760abaf 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dept.java @@ -16,7 +16,7 @@ package org.nl.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -41,30 +41,30 @@ public class Dept extends BaseEntity implements Serializable { @Id @Column(name = "dept_id") @NotNull(groups = Update.class) - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @JsonIgnore @ManyToMany(mappedBy = "depts") - @ApiModelProperty(value = "角色") + private Set roles; - @ApiModelProperty(value = "排序") + private Integer deptSort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean enabled; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer subCount = 0; @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java index a1a4e29a8..9a2d2aab4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Dict.java @@ -15,7 +15,7 @@ */ package org.nl.modules.system.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -39,7 +39,7 @@ public class Dict extends BaseEntity implements Serializable { @Id @Column(name = "dict_id") @NotNull(groups = Update.class) - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -47,9 +47,9 @@ public class Dict extends BaseEntity implements Serializable { private List dictDetails; @NotBlank - @ApiModelProperty(value = "名称") + private String name; - @ApiModelProperty(value = "描述") + private String description; } \ No newline at end of file diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java index e56d1d867..a112bece0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/DictDetail.java @@ -15,7 +15,7 @@ */ package org.nl.modules.system.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -37,25 +37,25 @@ public class DictDetail extends BaseEntity implements Serializable { @Id @Column(name = "detail_id") @NotNull(groups = Update.class) - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @JoinColumn(name = "dict_id") @ManyToOne(fetch=FetchType.LAZY) - @ApiModelProperty(value = "字典", hidden = true) + private Dict dict; - @ApiModelProperty(value = "字典标签") + private String label; - @ApiModelProperty(value = "字典名称") + private String name; - @ApiModelProperty(value = "字典值") + private String value; - @ApiModelProperty(value = "排序") + private Integer dictSort = 999; diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java index c7510e6a3..6f47cc3dc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Menu.java @@ -16,7 +16,7 @@ package org.nl.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -40,57 +40,57 @@ public class Menu extends BaseEntity implements Serializable { @Id @Column(name = "menu_id") @NotNull(groups = {Update.class}) - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @JsonIgnore @ManyToMany(mappedBy = "menus") - @ApiModelProperty(value = "菜单角色") + private Set roles; - @ApiModelProperty(value = "菜单标题") + private String title; @Column(name = "name") - @ApiModelProperty(value = "菜单组件名称") + private String componentName; - @ApiModelProperty(value = "排序") + private Integer menuSort = 999; - @ApiModelProperty(value = "组件路径") + private String component; - @ApiModelProperty(value = "路由地址") + private String path; - @ApiModelProperty(value = "菜单类型，目录、菜单、按钮") + private Integer type; - @ApiModelProperty(value = "权限标识") + private String permission; - @ApiModelProperty(value = "菜单图标") + private String icon; @Column(columnDefinition = "bit(1) default 0") - @ApiModelProperty(value = "缓存") + private Boolean cache; @Column(columnDefinition = "bit(1) default 0") - @ApiModelProperty(value = "是否隐藏") + private Boolean hidden; - @ApiModelProperty(value = "上级菜单") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer subCount = 0; - @ApiModelProperty(value = "外链菜单") + private Boolean iFrame; @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java index 39d79b844..2d4da7f31 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Param.java @@ -2,7 +2,7 @@ package org.nl.modules.system.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import org.nl.modules.common.base.BaseEntity; @@ -25,54 +25,54 @@ public class Param extends BaseEntity implements Serializable { @Id @Column(name = "id") - @ApiModelProperty(value = "id") + private String id; @Column(name = "code",nullable = false) @NotBlank - @ApiModelProperty(value = "code") + private String code; @Column(name = "name",nullable = false) @NotBlank - @ApiModelProperty(value = "name") + private String name; @Column(name = "value",nullable = false) @NotBlank - @ApiModelProperty(value = "value") + private String value; @Column(name = "remark") - @ApiModelProperty(value = "remark") + private String remark; @Column(name = "is_active",nullable = false) @NotBlank - @ApiModelProperty(value = "is_active") + private String is_active; @Column(name = "is_delete",nullable = false) @NotBlank - @ApiModelProperty(value = "is_delete") + private String is_delete; @Column(name = "create_by",nullable = false,updatable = false,insertable = false) @NotBlank - @ApiModelProperty(value = "create_by") + private String create_by; @Column(name = "create_time",nullable = false,updatable = false,insertable = false) @NotBlank - @ApiModelProperty(value = "create_time") + private String create_time; @Column(name = "update_by",updatable = false,insertable = false) - @ApiModelProperty(value = "update_by") + private String update_by; @Column(name = "update_time",updatable = false,insertable = false) - @ApiModelProperty(value = "update_time") + private String update_time; public void copy(Param source){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java index da649e224..44e799b15 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/Role.java @@ -16,7 +16,7 @@ package org.nl.modules.system.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseEntity; @@ -44,40 +44,40 @@ public class Role extends BaseEntity implements Serializable { @Column(name = "role_id") @NotNull(groups = {Update.class}) @GeneratedValue(strategy = GenerationType.IDENTITY) - @ApiModelProperty(value = "ID", hidden = true) + private Long id; @JsonIgnore @ManyToMany(mappedBy = "roles") - @ApiModelProperty(value = "用户", hidden = true) + private Set users; @ManyToMany @JoinTable(name = "sys_roles_menus", joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")}, inverseJoinColumns = {@JoinColumn(name = "menu_id",referencedColumnName = "menu_id")}) - @ApiModelProperty(value = "菜单", hidden = true) + private Set menus; @ManyToMany @JoinTable(name = "sys_roles_depts", joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")}, inverseJoinColumns = {@JoinColumn(name = "dept_id",referencedColumnName = "dept_id")}) - @ApiModelProperty(value = "部门", hidden = true) + private Set depts; @NotBlank - @ApiModelProperty(value = "名称", hidden = true) + private String name; - @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义") + private String dataScope = DataScopeEnum.THIS_LEVEL.getValue(); @Column(name = "level") - @ApiModelProperty(value = "级别，数值越小，级别越大") + private Integer level = 3; - @ApiModelProperty(value = "描述") + private String description; @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java index b7d8d0770..aadf93b97 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java @@ -15,7 +15,7 @@ */ package org.nl.modules.system.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.NotFound; @@ -44,11 +44,11 @@ public class User extends BaseEntity implements Serializable { @Column(name = "user_id") @NotNull(groups = Update.class) @GeneratedValue(strategy = GenerationType.IDENTITY) - @ApiModelProperty(value = "ID", hidden = true) + private Long id; @ManyToMany - @ApiModelProperty(value = "用户角色") + @JoinTable(name = "sys_users_roles", joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")}, inverseJoinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")}) @@ -56,46 +56,46 @@ public class User extends BaseEntity implements Serializable { @OneToOne @JoinColumn(name = "dept_id") - @ApiModelProperty(value = "用户部门") + @NotFound(action= NotFoundAction.IGNORE) private Dept dept; @NotBlank @Column(unique = true) - @ApiModelProperty(value = "用户名称") + private String username; @NotBlank - @ApiModelProperty(value = "用户昵称") + private String nickName; - @ApiModelProperty(value = "邮箱") + private String email; - @ApiModelProperty(value = "电话号码") + private String phone; - @ApiModelProperty(value = "用户性别") + private String gender; - @ApiModelProperty(value = "头像真实名称",hidden = true) + private String avatarName; - @ApiModelProperty(value = "头像存储的路径", hidden = true) + private String avatarPath; - @ApiModelProperty(value = "密码") + private String password; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean enabled; - @ApiModelProperty(value = "是否为admin账号", hidden = true) + private Boolean isAdmin = false; @Column(name = "pwd_reset_time") - @ApiModelProperty(value = "最后修改密码的时间", hidden = true) + private Date pwdResetTime; @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java index 973770d10..ed63a5822 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java @@ -2,8 +2,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.CodeDetailService; @@ -16,14 +16,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@Api(tags = "系统：编码详情管理") + @RequiredArgsConstructor @RequestMapping("/api/codeDetail") public class CodeDetailController { private final CodeDetailService codeDetailService; - @ApiOperation("查询编码明细") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, Pageable pageable){ @@ -31,7 +31,7 @@ public class CodeDetailController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody Map form){ @@ -40,7 +40,7 @@ public class CodeDetailController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping(value = "/{id}") @SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id){ @@ -49,7 +49,7 @@ public class CodeDetailController { } @Log("修改字典") - @ApiOperation("修改字典") + @PutMapping @SaCheckPermission("dict:edit") public ResponseEntity update(@RequestBody JSONObject json){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java index b9d9cac90..bec49d599 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DeptController.java @@ -18,8 +18,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.collection.CollectionUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; @@ -41,14 +41,14 @@ import java.util.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：部门管理") + @RequestMapping("/api/dept") public class DeptController { private final DeptService deptService; private static final String ENTITY_NAME = "dept"; - @ApiOperation("查询部门") + @GetMapping @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity query(DeptQueryCriteria criteria) throws Exception { @@ -56,7 +56,7 @@ public class DeptController { return new ResponseEntity<>(PageUtil.toPage(deptDtos, deptDtos.size()),HttpStatus.OK); } - @ApiOperation("查询部门:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { @@ -70,7 +70,7 @@ public class DeptController { } @Log("新增部门") - @ApiOperation("新增部门") + @PostMapping @SaCheckPermission("dept:add") public ResponseEntity create(@Validated @RequestBody Dept resources){ @@ -82,7 +82,7 @@ public class DeptController { } @Log("修改部门") - @ApiOperation("修改部门") + @PutMapping @SaCheckPermission("dept:edit") public ResponseEntity update(@Validated(Dept.Update.class) @RequestBody Dept resources){ @@ -91,7 +91,7 @@ public class DeptController { } @Log("删除部门") - @ApiOperation("删除部门") + @DeleteMapping @SaCheckPermission("dept:del") public ResponseEntity delete(@RequestBody Set ids){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java index 5d563a4c6..525268c9d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictController.java @@ -16,8 +16,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.logging.annotation.Log; @@ -40,28 +40,28 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：字典管理") + @RequestMapping("/api/dict") public class DictController { private final DictService dictService; private static final String ENTITY_NAME = "dict"; - @ApiOperation("导出字典数据") + @GetMapping(value = "/download") @SaCheckPermission("dict:list") public void download(HttpServletResponse response, DictQueryCriteria criteria) throws IOException { dictService.download(dictService.queryAll(criteria), response); } - @ApiOperation("查询字典") + @GetMapping(value = "/all") // @SaCheckPermission("dict:list") public ResponseEntity queryAll(){ return new ResponseEntity<>(dictService.queryAll(new DictQueryCriteria()),HttpStatus.OK); } - @ApiOperation("查询字典") + @GetMapping // @SaCheckPermission("dict:list") public ResponseEntity query(DictQueryCriteria resources, Pageable pageable){ @@ -69,7 +69,7 @@ public class DictController { } @Log("新增字典") - @ApiOperation("新增字典") + @PostMapping @SaCheckPermission("dict:add") public ResponseEntity create(@Validated @RequestBody Dict resources){ @@ -81,7 +81,7 @@ public class DictController { } @Log("修改字典") - @ApiOperation("修改字典") + @PutMapping @SaCheckPermission("dict:edit") public ResponseEntity update(@Validated(Dict.Update.class) @RequestBody Dict resources){ @@ -90,7 +90,7 @@ public class DictController { } @Log("删除字典") - @ApiOperation("删除字典") + @DeleteMapping @SaCheckPermission("dict:del") public ResponseEntity delete(@RequestBody Set ids){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java index f81d986f5..198392264 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/DictDetailController.java @@ -16,8 +16,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.logging.annotation.Log; @@ -46,21 +46,21 @@ import java.util.Optional; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：字典详情管理") + @RequestMapping("/api/dictDetail") public class DictDetailController { private final DictRepository dictRepository; private final DictDetailService dictDetailService; private static final String ENTITY_NAME = "dictDetail"; - @ApiOperation("查询字典详情") + @GetMapping public ResponseEntity query(DictDetailQueryCriteria criteria, @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable){ return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK); } - @ApiOperation("查询多个字典详情") + @GetMapping(value = "/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -72,7 +72,7 @@ public class DictDetailController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + @PostMapping @SaCheckPermission("dict:add") public ResponseEntity create(@Validated @RequestBody DictDetail resources){ @@ -86,7 +86,7 @@ public class DictDetailController { } @Log("修改字典详情") - @ApiOperation("修改字典详情") + @PutMapping @SaCheckPermission("dict:edit") public ResponseEntity update(@Validated(DictDetail.Update.class) @RequestBody DictDetail resources){ @@ -96,7 +96,7 @@ public class DictDetailController { } @Log("删除字典详情") - @ApiOperation("删除字典详情") + @DeleteMapping(value = "/{id}") @SaCheckPermission("dict:del") public ResponseEntity delete(@PathVariable Long id){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java index 39ea3e8b7..dec51a207 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java @@ -2,8 +2,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.GenCodeService; @@ -18,13 +18,13 @@ import java.util.Map; import java.util.Set; @RestController -@Api(tags = "系统：编码生成") + @RequiredArgsConstructor @RequestMapping("/api/genCode") public class GenCodeController { private final GenCodeService genCodeService; - @ApiOperation("查询编码") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, Pageable pageable) { @@ -32,7 +32,7 @@ public class GenCodeController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody Map form) { @@ -42,7 +42,7 @@ public class GenCodeController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -51,7 +51,7 @@ public class GenCodeController { } @Log("修改字典") - @ApiOperation("修改字典") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody JSONObject json) { @@ -59,7 +59,7 @@ public class GenCodeController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + @GetMapping(value = "/codeDemo") @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java index 121bcc8d3..789ad1b65 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java @@ -1,7 +1,7 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +22,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/grid") @Slf4j public class GridController { @@ -30,14 +30,14 @@ public class GridController { @GetMapping @Log("查询系统表格") - @ApiOperation("查询系统表格") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(gridService.queryAll(whereJson,page),HttpStatus.OK); } @PostMapping @Log("新增系统表格") - @ApiOperation("新增系统表格") + public ResponseEntity create(@Validated @RequestBody GridDto dto){ gridService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -45,14 +45,14 @@ public class GridController { @PutMapping @Log("修改系统表格") - @ApiOperation("修改系统表格") + public ResponseEntity update(@Validated @RequestBody GridDto dto){ gridService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除系统表格") - @ApiOperation("删除系统表格") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { gridService.deleteAll(ids); @@ -61,7 +61,7 @@ public class GridController { @GetMapping("/selectList") @Log("下拉框获取表格数据") - @ApiOperation("下拉框获取表格数据") + public ResponseEntity getGridList(){ return new ResponseEntity<>(gridService.getGridList(),HttpStatus.OK); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java index bc6bb259e..f87ddfa26 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java @@ -1,8 +1,8 @@ package org.nl.modules.system.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格字段管理") + @RequestMapping("/api/gridField") @Slf4j public class GridFieldController { @@ -31,14 +31,14 @@ public class GridFieldController { @GetMapping @Log("查询系统表格") - @ApiOperation("查询系统表格") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(gridFieldService.queryAll(whereJson,page),HttpStatus.OK); } @PostMapping @Log("单个新增表格字段") - @ApiOperation("单个新增表格字段") + public ResponseEntity create(@Validated @RequestBody GridFieldDto dto){ gridFieldService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +46,14 @@ public class GridFieldController { @PutMapping @Log("修改表格字段") - @ApiOperation("修改表格字段") + public ResponseEntity update(@Validated @RequestBody GridFieldDto dto){ gridFieldService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除表格字段") - @ApiOperation("删除表格字段") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { gridFieldService.deleteAll(ids); @@ -62,7 +62,7 @@ public class GridFieldController { @PostMapping("/batchAdd") @Log("批量新增表格字段") - @ApiOperation("批量新增表格字段") + public ResponseEntity batchAdd(@RequestBody JSONObject json){ // log.info("json{}",json); gridFieldService.batchAdd(json); @@ -71,7 +71,7 @@ public class GridFieldController { @PostMapping("/getGridFields") @Log("根据gridId获取所有字段") - @ApiOperation("根据gridId获取所有字段") + public ResponseEntity getGridFieldsById(@RequestBody String id){ log.info("dto:{}",id); return new ResponseEntity<>(gridFieldService.getGridFieldsById(id),HttpStatus.CREATED); @@ -79,7 +79,7 @@ public class GridFieldController { @PostMapping("/getGridFieldsByCode") @Log("根据gridCode获取所有字段") - @ApiOperation("根据gridCode获取所有字段") + public ResponseEntity getGridFieldsByCode(@RequestBody String grid_code){ log.info("dto:{}",grid_code); return new ResponseEntity<>(gridFieldService.getGridFieldsByCode(grid_code),HttpStatus.CREATED); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java index da7daffc8..92b0da8fd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.modules.common.annotation.Limit; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @RestController @RequestMapping("/api/limit") -@Api(tags = "系统：限流测试管理") + public class LimitController { private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger(); @@ -39,7 +39,7 @@ public class LimitController { * 测试限流注解，下面配置说明该接口 60秒内最多只能访问 10次，保存到redis的键名为 limit_test， */ @GetMapping - @ApiOperation("测试") + @Limit(key = "test", period = 60, count = 10, name = "testLimit", prefix = "limit") public int test() { return ATOMIC_INTEGER.incrementAndGet(); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java index 15d3c11f1..c0dc12db6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java @@ -19,8 +19,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollectionUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; @@ -45,7 +45,7 @@ import java.util.stream.Collectors; @RestController @RequiredArgsConstructor -@Api(tags = "系统：菜单管理") + @RequestMapping("/api/menus") public class MenuController { @@ -54,21 +54,21 @@ public class MenuController { private static final String ENTITY_NAME = "menu"; @GetMapping(value = "/build") - @ApiOperation("获取前端所需菜单") + public ResponseEntity buildMenus(){ List menuDtoList = menuService.findByUser(StpUtil.getLoginIdAsLong()); List menuDtos = menuService.buildTree(menuDtoList); return new ResponseEntity<>(menuService.buildMenus(menuDtos),HttpStatus.OK); } - @ApiOperation("返回全部的菜单") + @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam Long pid){ return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK); } - @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") + @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam Long id){ @@ -81,14 +81,14 @@ public class MenuController { } @GetMapping - @ApiOperation("查询菜单") + @SaCheckPermission("menu:list") public ResponseEntity query(MenuQueryCriteria criteria) throws Exception { List menuDtoList = menuService.queryAll(criteria, true); return new ResponseEntity<>(PageUtil.toPage(menuDtoList, menuDtoList.size()),HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody List ids) { @@ -104,7 +104,7 @@ public class MenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@Validated @RequestBody Menu resources){ @@ -116,7 +116,7 @@ public class MenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Menu resources){ @@ -125,7 +125,7 @@ public class MenuController { } @Log("删除菜单") - @ApiOperation("删除菜单") + @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java index 3852b66c2..6ac455120 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java @@ -16,8 +16,8 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.system.service.MonitorService; import org.springframework.http.HttpStatus; @@ -32,14 +32,14 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统-服务监控管理") + @RequestMapping("/api/monitor") public class MonitorController { private final MonitorService serverService; @GetMapping - @ApiOperation("查询服务监控") + @SaCheckPermission("monitor:list") public ResponseEntity query() { return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java index fcad651d5..c1cf0dc73 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/ParamController.java @@ -1,8 +1,8 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.log.LokiLog; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "系统参数管理") + @RequestMapping("/api/param") @Slf4j public class ParamController { @@ -35,14 +35,14 @@ public class ParamController { @LokiLog @GetMapping @Log("查询系统参数") - @ApiOperation("查询系统参数") + //@SaCheckPermission("param:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(paramService.queryAll(whereJson,page),HttpStatus.OK); } @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + //@SaCheckPermission("param:add") public ResponseEntity create(@Validated @RequestBody ParamDto dto){ paramService.create(dto); @@ -51,7 +51,7 @@ public class ParamController { @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + //@SaCheckPermission("param:edit") public ResponseEntity update(@Validated @RequestBody ParamDto dto){ paramService.update(dto); @@ -59,7 +59,7 @@ public class ParamController { } @Log("删除系统参数") - @ApiOperation("删除系统参数") + //@SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -68,7 +68,7 @@ public class ParamController { } @Log("导出系统参数") - @ApiOperation("导出系统参数") + @GetMapping(value = "/download") //@SaCheckPermission("param:list") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -77,7 +77,7 @@ public class ParamController { @PostMapping("/getValueByCode") @Log("根据编码获取值") - @ApiOperation("根据编码获取值") + public ResponseEntity getValueByCode(@RequestBody String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java index 18fc4beba..f37d9e109 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java @@ -1,7 +1,7 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/redis") @Slf4j public class RedisController { @@ -26,27 +26,27 @@ public class RedisController { @GetMapping("/get-monitor-info") @Log("查询redis的信息") - @ApiOperation("查询redis的信息") + public ResponseEntity getRedisMonitorInfo() { return new ResponseEntity<>(redisService.getRedisMonitorInfo(),HttpStatus.OK); } @GetMapping("/get-key-define-list") @Log("获得 Redis Key 模板列表") - @ApiOperation("获得 Redis Key 模板列表") + public ResponseEntity getKeyDefineList() { return new ResponseEntity<>(redisService.getKeyDefineList(),HttpStatus.OK); } @GetMapping("/get-key-value-list") @Log("获得 Redis Key Value列表") - @ApiOperation("获得 Redis Key Value列表") + public ResponseEntity getKeyValueList() { return new ResponseEntity<>( redisService.getKeyValueList(),HttpStatus.OK); } @Log("根据key删除Redis数据") - @ApiOperation("根据key删除Redis数据") + @DeleteMapping public ResponseEntity deleteByKey(@RequestBody String[] ids) { redisService.deleteByKey(ids); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java index 1e2088a7c..ab085f282 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java @@ -19,8 +19,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.lang.Dict; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.logging.annotation.Log; @@ -48,7 +48,7 @@ import java.util.stream.Collectors; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：角色管理") + @RequestMapping("/api/roles") public class RoleController { @@ -56,42 +56,42 @@ public class RoleController { private static final String ENTITY_NAME = "role"; - @ApiOperation("获取单个role") + @GetMapping(value = "/{id}") @SaCheckPermission("roles:list") public ResponseEntity query(@PathVariable Long id){ return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK); } - @ApiOperation("导出角色数据") + @GetMapping(value = "/download") @SaCheckPermission("role:list") public void download(HttpServletResponse response, RoleQueryCriteria criteria) throws IOException { roleService.download(roleService.queryAll(criteria), response); } - @ApiOperation("返回全部的角色") + @GetMapping(value = "/all") @SaCheckPermission(value = {"roles:list", "user:add", "user:edit"}, mode = SaMode.AND) public ResponseEntity query(){ return new ResponseEntity<>(roleService.queryAll(),HttpStatus.OK); } - @ApiOperation("查询角色") + @GetMapping @SaCheckPermission("roles:list") public ResponseEntity query(RoleQueryCriteria criteria, Pageable pageable){ return new ResponseEntity<>(roleService.queryAll(criteria,pageable),HttpStatus.OK); } - @ApiOperation("获取用户级别") + @GetMapping(value = "/level") public ResponseEntity getLevel(){ return new ResponseEntity<>(Dict.create().set("level", getLevels(null)),HttpStatus.OK); } @Log("新增角色") - @ApiOperation("新增角色") + @PostMapping @SaCheckPermission("roles:add") public ResponseEntity create(@Validated @RequestBody Role resources){ @@ -104,7 +104,7 @@ public class RoleController { } @Log("修改角色") - @ApiOperation("修改角色") + @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@Validated(Role.Update.class) @RequestBody Role resources){ @@ -114,7 +114,7 @@ public class RoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody Role resources){ @@ -125,7 +125,7 @@ public class RoleController { } @Log("删除角色") - @ApiOperation("删除角色") + @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids){ diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index 623cd09e1..0c7d47757 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -20,8 +20,8 @@ import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.config.RsaProperties; import org.nl.modules.common.exception.BadRequestException; @@ -59,7 +59,7 @@ import java.util.stream.Collectors; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") + @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -71,14 +71,14 @@ public class UserController { private final RoleService roleService; private final RedisUtils redisUtils; - @ApiOperation("导出用户数据") + @GetMapping(value = "/download") @SaCheckPermission("user:list") public void download(HttpServletResponse response, UserQueryCriteria criteria) throws IOException { userService.download(userService.queryAll(criteria), response); } - @ApiOperation("查询用户") + @GetMapping @SaCheckPermission("user:list") public ResponseEntity query(UserQueryCriteria criteria, Pageable pageable){ @@ -104,7 +104,7 @@ public class UserController { } @Log("新增用户") - @ApiOperation("新增用户") + @PostMapping @SaCheckPermission("user:add") public ResponseEntity create(@Validated @RequestBody User resources){ @@ -119,7 +119,7 @@ public class UserController { } @Log("修改用户") - @ApiOperation("修改用户") + @PutMapping @SaCheckPermission("user:edit") public ResponseEntity update(@Validated(User.Update.class) @RequestBody User resources) throws Exception { @@ -129,7 +129,7 @@ public class UserController { } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + @PutMapping(value = "center") public ResponseEntity center(@Validated(User.Update.class) @RequestBody User resources){ if(!resources.getId().equals(StpUtil.getLoginIdAsLong())){ @@ -140,7 +140,7 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + @DeleteMapping @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -161,7 +161,7 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody UserPassVo passVo) throws Exception { // 解密，得到字符密码 @@ -178,14 +178,14 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改头像") + @PostMapping(value = "/updateAvatar") public ResponseEntity updateAvatar(@RequestParam MultipartFile avatar){ return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); } @Log("修改邮箱") - @ApiOperation("修改邮箱") + @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateEmail(@PathVariable String code,@RequestBody User user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java index cfc2e3478..4a79bd4f5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java @@ -1,7 +1,7 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,26 +14,26 @@ import java.time.Duration; * @Description: 管理后台 - Redis Key 信息 Response VO * @Date: 2022-08-04 */ -@ApiModel("管理后台 - Redis Key 信息 Response VO") + @Data @Builder @AllArgsConstructor public class RedisKeyDefineRespVO { - @ApiModelProperty(value = "Key 模板", required = true, example = "login_user:%s") + private String keyTemplate; - @ApiModelProperty(value = "Key 类型的枚举", required = true, example = "String") + private RedisKeyDefine.KeyTypeEnum keyType; - @ApiModelProperty(value = "Value 类型", required = true, example = "java.lang.String") + private Class valueType; - @ApiModelProperty(value = "超时类型", required = true, example = "1") + private RedisKeyDefine.TimeoutTypeEnum timeoutType; - @ApiModelProperty(value = "过期时间，单位：毫秒", required = true, example = "1024") + private Duration timeout; - @ApiModelProperty(value = "备注", required = true, example = "啦啦啦啦~") + private String memo; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java index 53c2625a1..9054a4a4d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java @@ -1,7 +1,7 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,33 +14,33 @@ import java.util.Properties; * @Description: 管理后台 - Redis 监控信息 Response VO * @Date: 2022-08-04 */ -@ApiModel("管理后台 - Redis 监控信息 Response VO") + @Data @Builder @AllArgsConstructor public class RedisMonitorRespVO { - @ApiModelProperty(value = "Redis info 指令结果", required = true, notes = "具体字段，查看 Redis 文档") + private Properties info; - @ApiModelProperty(value = "Redis key 数量", required = true, example = "1024") + private Long dbSize; - @ApiModelProperty(value = "CommandStat 数组", required = true) + private List commandStats; - @ApiModel("Redis 命令统计结果") + @Data @Builder @AllArgsConstructor public static class CommandStat { - @ApiModelProperty(value = "Redis 命令", required = true, example = "get") + private String command; - @ApiModelProperty(value = "调用次数", required = true, example = "1024") + private Integer calls; - @ApiModelProperty(value = "消耗 CPU 秒数", required = true, example = "666") + private Long usec; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java b/acs/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java index b9e535ec1..c339dcd15 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java @@ -17,7 +17,7 @@ package org.nl.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -39,26 +39,26 @@ public class LocalStorage extends BaseEntity implements Serializable { @Id @Column(name = "storage_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "真实文件名") + private String realName; - @ApiModelProperty(value = "文件名") + private String name; - @ApiModelProperty(value = "后缀") + private String suffix; - @ApiModelProperty(value = "路径") + private String path; - @ApiModelProperty(value = "类型") + private String type; - @ApiModelProperty(value = "大小") + private String size; public LocalStorage(String realName,String name, String suffix, String path, String type, String size) { diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/acs/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 8d7d93625..453a7b931 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -16,8 +16,8 @@ package org.nl.modules.tools.rest; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; @@ -41,27 +41,27 @@ import java.io.IOException; */ @RestController @RequiredArgsConstructor -@Api(tags = "工具：本地存储管理") + @RequestMapping("/api/localStorage") public class LocalStorageController { private final LocalStorageService localStorageService; - @ApiOperation("查询文件") + @GetMapping @SaCheckPermission("storage:list") public ResponseEntity query(LocalStorageQueryCriteria criteria, Pageable pageable) { return new ResponseEntity<>(localStorageService.queryAll(criteria, pageable), HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") @SaCheckPermission("storage:list") public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { localStorageService.download(localStorageService.queryAll(criteria), response); } - @ApiOperation("上传文件") + @PostMapping @SaCheckPermission("storage:add") public ResponseEntity create(@RequestParam String name, @RequestParam("file") MultipartFile file) { @@ -70,7 +70,7 @@ public class LocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -82,7 +82,7 @@ public class LocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody LocalStorage resources) { @@ -92,7 +92,7 @@ public class LocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + public ResponseEntity delete(@RequestBody Long[] ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml index c8c2d049c..76f95f2be 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml index 670abbeef..b7b3978eb 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml index cb94a38ea..8abb83afb 100644 --- a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml +++ b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml index d78b20402..60427e421 100644 --- a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml +++ b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml index 8d66a53c8..7dda9dfd5 100644 --- a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml @@ -21,7 +21,7 @@ - diff --git a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml index 2df63ce06..9f827c3d3 100644 --- a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml +++ b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml index ac2843205..016b46e9c 100644 --- a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml +++ b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml index 7387ef7ad..ca3f78791 100644 --- a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml index 2db942892..63531d7ba 100644 --- a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml +++ b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml index b6936e2ce..4eec0b7a0 100644 --- a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml index db008300d..4ea34f9f4 100644 --- a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml index f26a6ef74..03c1a31d6 100644 --- a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml @@ -22,12 +22,12 @@ - - + diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index d9726de06..c5780b3a5 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -49,7 +49,7 @@ https://juejin.cn/post/6844903775631572999 true - + ${log.pattern} @@ -76,7 +76,7 @@ https://juejin.cn/post/6844903775631572999 - + 0 500 @@ -136,44 +136,44 @@ https://juejin.cn/post/6844903775631572999 - + - + - + - + - + - + - + - + - + - + @@ -190,36 +190,36 @@ https://juejin.cn/post/6844903775631572999 - + - + - + - + - + - + - + - + - + diff --git a/acs/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/acs/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl index 53f849f0b..ec934f094 100644 --- a/acs/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/acs/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -10,7 +10,7 @@ import org.springframework.http.ResponseEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Map; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; **/ @RestController @RequiredArgsConstructor -@Api(tags = "${apiAlias}管理") + @RequestMapping("/api/${changeClassName}") @Slf4j public class ${className}Controller { @@ -29,7 +29,7 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - @ApiOperation("查询${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(${changeClassName}Service.queryAll(whereJson,page),HttpStatus.OK); @@ -37,7 +37,7 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - @ApiOperation("新增${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.create(dto); @@ -46,7 +46,7 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - @ApiOperation("修改${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.update(dto); @@ -54,7 +54,7 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - @ApiOperation("删除${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody ${pkColumnType}[] ids) { diff --git a/acs/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/acs/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl index 347e72914..c164f6f53 100644 --- a/acs/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/acs/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -2,7 +2,7 @@ package ${package}.domain; import lombok.Data; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; + import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; <#if isNotNullColumns??> @@ -55,9 +55,9 @@ public class ${className} implements Serializable { <#if column.remark != ''> - @ApiModelProperty(value = "${column.remark}") + <#else> - @ApiModelProperty(value = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName};