diff --git a/acs2/nladmin-system/nlsso-server/pom.xml b/acs2/nladmin-system/nlsso-server/pom.xml index 7a84df123..04f263103 100644 --- a/acs2/nladmin-system/nlsso-server/pom.xml +++ b/acs2/nladmin-system/nlsso-server/pom.xml @@ -18,11 +18,10 @@ UTF-8 1.8 1.16 - 2.9.2 1.1.22 1.2.0.Final 1.31.0 - 5.7.14 + 5.8.22 0.11.1 8.2.0 @@ -45,6 +44,12 @@ pom + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-webserver + 1.1.6.1 + + com.yomahub @@ -182,39 +187,6 @@ ${log4jdbc.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - 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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 6172bf843..38ce726a6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -3,14 +3,12 @@ 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.mybatis.spring.annotation.MapperScan; import org.nl.config.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -26,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) @SpringBootApplication(exclude = { QuartzAutoConfiguration.class, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class @@ -48,13 +45,6 @@ public class AppRun { return new SpringContextHolder(); } - @Bean - public ServletWebServerFactory webServerFactory() { - TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); - fa.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "[]{}")); - return fa; - } - /** * 访问首页提示 * diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java index a6246f0e0..daf062f4d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,49 +32,49 @@ import java.io.Serializable; public class Address extends CommonModel
implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "方法标识") + @TableId(type = IdType.ASSIGN_ID) private String methods_id; - @ApiModelProperty(value = "方法编码") + @NotBlank private String methods_code; - @ApiModelProperty(value = "方法名称") + @NotBlank private String methods_name; - @ApiModelProperty(value = "请求地址") + @NotBlank private String methods_url; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "创建人") + @NotNull private Long create_id; - @ApiModelProperty(value = "创建人姓名") + @NotBlank private String create_name; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改人") + private Long update_optid; - @ApiModelProperty(value = "修改人姓名") + private String update_optname; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java index e82b33d38..02927bb23 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java @@ -1,7 +1,7 @@ package org.nl.acs.address.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.address.service.AddressService; import org.nl.acs.address.service.dto.AddressDto; @@ -22,7 +22,6 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "接口方法地址管理") @RequestMapping("/api/Address") public class AddressController { @@ -30,14 +29,14 @@ public class AddressController { @GetMapping @Log("查询接口方法地址") - @ApiOperation("查询接口方法地址") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(addressService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增接口方法地址") - @ApiOperation("新增接口方法地址") + public ResponseEntity create(@Validated @RequestBody AddressDto dto) { addressService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -45,14 +44,14 @@ public class AddressController { @PutMapping @Log("修改接口方法地址") - @ApiOperation("修改接口方法地址") + public ResponseEntity update(@Validated @RequestBody AddressDto dto) { addressService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除接口方法地址") - @ApiOperation("删除接口方法地址") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { addressService.deleteAll(ids); @@ -60,7 +59,7 @@ public class AddressController { } @Log("导出接口方法地址") - @ApiOperation("导出接口方法地址") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { addressService.download(addressService.queryAll(whereJson), response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java index 41089c368..b4893a78a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,39 +26,39 @@ import io.swagger.annotations.ApiModelProperty; public class AddressDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "方法标识") + private String methods_id; - @ApiModelProperty(value = "方法编码") + private String methods_code; - @ApiModelProperty(value = "方法名称") + private String methods_name; - @ApiModelProperty(value = "请求地址") + private String methods_url; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "创建人") + private Long create_id; - @ApiModelProperty(value = "创建人姓名") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private Long update_optid; - @ApiModelProperty(value = "修改人姓名") + private String update_optname; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "是否删除") + private String is_delete; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java index 63fd698f0..71d749c85 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java @@ -1,7 +1,7 @@ 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; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "AGV任务") + @RequestMapping("/api/magic") @Slf4j public class MagicAgvController { @@ -32,7 +32,7 @@ public class MagicAgvController { */ @PostMapping("/agvack/{device}") @Log("AGV请求离开") - @ApiOperation("AGV请求离开") + public ResponseEntity requestAck(@PathVariable String device) { return new ResponseEntity<>(magicAgvService.requestAck(device), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java index d168ed0cd..90ef57340 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java @@ -1,8 +1,8 @@ package org.nl.acs.angle.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.acs.angle.domain.AcsPointAngle; import org.nl.acs.angle.service.IAcsPointAngleService; @@ -25,7 +25,7 @@ import java.util.Map; * @since 2023-12-13 */ @RestController -@Api(tags = "点位角度管理") + @RequestMapping("/api/acsPointAngle") @Slf4j public class AcsPointAngleController { @@ -34,7 +34,7 @@ public class AcsPointAngleController { @GetMapping @Log("查询点位角度") - @ApiOperation("查询点位角度") + //@PreAuthorize("@el.check('acsPointAngle:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(acsPointAngleService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +42,7 @@ public class AcsPointAngleController { @PostMapping @Log("新增点位角度") - @ApiOperation("新增点位角度") + //@PreAuthorize("@el.check('acsPointAngle:add')") public ResponseEntity create(@Validated @RequestBody AcsPointAngle dto) { acsPointAngleService.create(dto); @@ -51,7 +51,7 @@ public class AcsPointAngleController { @PutMapping @Log("修改点位角度") - @ApiOperation("修改点位角度") + //@PreAuthorize("@el.check('acsPointAngle:edit')") public ResponseEntity update(@Validated @RequestBody AcsPointAngle dto) { acsPointAngleService.update(dto); @@ -59,7 +59,7 @@ public class AcsPointAngleController { } @Log("删除点位角度") - @ApiOperation("删除点位角度") + //@PreAuthorize("@el.check('acsPointAngle:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -69,7 +69,7 @@ public class AcsPointAngleController { @GetMapping("/updateActive") @Log("是否启用") - @ApiOperation("是否启用") + public ResponseEntity updateOn(@RequestParam Long id, @RequestParam String is_active) { acsPointAngleService.updateOn(id, is_active); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java index 6218b92ca..d252a5083 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,37 +23,37 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("acs_point_angle") -@ApiModel(value="AcsPointAngle对象", description="") + public class AcsPointAngle implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "id标识") + @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "起始设备编码") + private String start_device_code; - @ApiModelProperty(value = "目标设备编码") + private String next_device_code; - @ApiModelProperty(value = "目标点位角度") + private BigDecimal next_point_angle; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java index aecf369f2..12e6529a4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java +++ b/acs2/nladmin-system/nlsso-server/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,7 +21,7 @@ import java.util.Map; */ @RestController @RequestMapping("/api/autorun") -@Api(tags = "系统：查询自动线程") + @RequiredArgsConstructor /** * Demo class @@ -34,7 +34,7 @@ public class AutoRunController { @Autowired private AutoRunService autoRunService; - @ApiOperation("查询自动线程") + @Log("查询自动线程") @GetMapping public ResponseEntity query(Map map) throws Exception { @@ -43,7 +43,7 @@ public class AutoRunController { } @Log("启动自动线程") - @ApiOperation("启动自动线程") + @PutMapping(value = "/start/{code}") public ResponseEntity start(@PathVariable String code) { autoRunService.startThread(code); @@ -51,7 +51,7 @@ public class AutoRunController { } @Log("停止自动线程") - @ApiOperation("停止自动线程") + @PutMapping(value = "/stop/{code}") public ResponseEntity execution(@PathVariable String code) { autoRunService.stopThread(code); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java index 1d7ad1430..58a218cd4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java @@ -1,7 +1,7 @@ package org.nl.acs.common.base; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiModelProperty; + import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; @@ -16,10 +16,10 @@ import java.util.List; @Builder @Accessors(chain = true) public class PageInfo implements Serializable { - @ApiModelProperty("总数量") + private long totalElements; - @ApiModelProperty("内容") + private List content; public PageInfo(long totalElements, List content) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/domain/CustomPolicy.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/domain/CustomPolicy.java index 9952bf360..791c97809 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/domain/CustomPolicy.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/domain/CustomPolicy.java @@ -3,7 +3,7 @@ package org.nl.acs.custompolicy.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; @@ -25,41 +25,41 @@ import java.util.Date; public class CustomPolicy implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "id") + private Long id; - @ApiModelProperty(value = "策略") + private String key_value; - @ApiModelProperty(value = "设备号") + private String key_code; - @ApiModelProperty(value = "策略编号") + private String unit_code; - @ApiModelProperty(value = "创建用户名") + private String create_user; - @ApiModelProperty(value = "修改用户名") + private String update_user; - @ApiModelProperty(value = "是否开启") + private Integer is_on; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date create_time; - @ApiModelProperty(value = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java index 53653ba15..802954a0e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/rest/CustomPolicyController.java @@ -1,7 +1,7 @@ package org.nl.acs.custompolicy.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.address.service.dto.AddressDto; @@ -22,7 +22,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "堆垛机自定义策略") + @RequestMapping("/api/customPolicy") @Slf4j public class CustomPolicyController { @@ -31,14 +31,14 @@ public class CustomPolicyController { @GetMapping @Log("查询自定义策略") - @ApiOperation("查询自定义策略") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(customPolicyService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增自定义策略基础信息") - @ApiOperation("新增自定义策略基础信息") + public ResponseEntity create(@Validated @RequestBody CustomPolicyDTO dto) { customPolicyService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +46,14 @@ public class CustomPolicyController { @PutMapping @Log("修改自定义策略") - @ApiOperation("修改自定义策略") + public ResponseEntity update(@Validated @RequestBody CustomPolicyDTO dto) { customPolicyService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除自定义策略") - @ApiOperation("删除自定义策略") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { customPolicyService.deleteAll(ids); @@ -63,7 +63,7 @@ public class CustomPolicyController { @PostMapping("/plantAdd") @Log("新增自定义策略") - @ApiOperation("新增自定义策略") + public ResponseEntity createPlant(@RequestBody CustomPolicyPlantVO customPolicyPlantVO) { customPolicyService.createPlant(customPolicyPlantVO); return new ResponseEntity<>(HttpStatus.CREATED); @@ -71,14 +71,14 @@ public class CustomPolicyController { @GetMapping("/plantList") @Log("自定义策略列表") - @ApiOperation("自定义策略列表") + public ResponseEntity plantList(@RequestParam Long id) { return new ResponseEntity<>(customPolicyService.plantList(id), HttpStatus.OK); } @GetMapping("/updateOn") @Log("是否启用") - @ApiOperation("是否启用") + public ResponseEntity updateOn(@RequestParam Long id, @RequestParam Integer is_on) { customPolicyService.updateOn(id, is_on); return new ResponseEntity<>(HttpStatus.OK); @@ -87,7 +87,7 @@ public class CustomPolicyController { @GetMapping("/getStrategy") @Log("自定义策略列表") - @ApiOperation("自定义策略列表") + public ResponseEntity updateOn() { List list = customPolicyService.findDeviceStrategyOption(); return new ResponseEntity<>(list, HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyDTO.java index e30057dfa..014a9c48f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyDTO.java @@ -1,7 +1,7 @@ package org.nl.acs.custompolicy.server.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; @@ -23,43 +23,43 @@ import java.util.Date; public class CustomPolicyDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "id") + private Long id; - @ApiModelProperty(value = "策略") + private String key_value; - @ApiModelProperty(value = "设备号") + @NotBlank private String key_code; @NotBlank - @ApiModelProperty(value = "策略编号") + private String unit_code; - @ApiModelProperty(value = "创建用户名") + private String create_user; - @ApiModelProperty(value = "修改用户名") + private String update_user; - @ApiModelProperty(value = "是否开启") + private Integer is_on; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date create_time; - @ApiModelProperty(value = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyPlantDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyPlantDTO.java index f45d8f790..3612046a7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyPlantDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/dto/CustomPolicyPlantDTO.java @@ -4,7 +4,7 @@ */ package org.nl.acs.custompolicy.server.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,15 +19,15 @@ import java.io.Serializable; public class CustomPolicyPlantDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "任务类型") + private Integer type; - @ApiModelProperty(value = "起始设备") + private Integer from; - @ApiModelProperty(value = "目标设备") + private Integer to; - @ApiModelProperty(value = "数量") + private Integer quantity; - @ApiModelProperty(value = "排序") + private Integer sort; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/vo/CustomPolicyPlantVO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/vo/CustomPolicyPlantVO.java index 4601832b2..fd95fbbe1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/vo/CustomPolicyPlantVO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/vo/CustomPolicyPlantVO.java @@ -4,7 +4,7 @@ */ package org.nl.acs.custompolicy.server.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.custompolicy.server.dto.CustomPolicyPlantDTO; @@ -20,10 +20,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = false) public class CustomPolicyPlantVO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "id") + private Long id; - @ApiModelProperty(value = "设备号") + private String deviceCode; - @ApiModelProperty(value = "策略") + private List plans; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java index 05bfa5357..3da93586b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java +++ b/acs2/nladmin-system/nlsso-server/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("查询设备") + public ResponseEntity query(@RequestParam Map whereJson) { return null; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java index 4cae142f4..143936d87 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -113,70 +113,70 @@ public class Device implements Serializable { @TableField(exist = false) private String barrels_status; - @ApiModelProperty(value = "设备标识") + @TableId(type = IdType.ASSIGN_ID) private String device_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "设备名字") + @NotBlank private String device_name; - @ApiModelProperty(value = "设备类型") + private String device_type; - @ApiModelProperty(value = "所属区域") + private String region; - @ApiModelProperty(value = "生产厂家") + private String manufacturer; - @ApiModelProperty(value = "生产厂家电话") + private String manufacturer_phone; - @ApiModelProperty(value = "opcServer标识") + private String opc_server_id; - @ApiModelProperty(value = "opcPlc标识") + private String opc_plc_id; - @ApiModelProperty(value = "是否为路由设备") + @NotBlank private String is_route; - @ApiModelProperty(value = "设备驱动类型") + private String driver_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "地址号") + private String address; @TableField(exist = false) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java index 33faf1e3d..f2d201608 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java @@ -3,7 +3,7 @@ package org.nl.acs.device.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.common.base.CommonModel; @@ -25,49 +25,49 @@ import java.io.Serializable; public class DeviceAssigned extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "分配标识") + @TableId(type = IdType.ASSIGN_ID) private String assigned_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "指令终点") + private String inst_nextDevice_code; - @ApiModelProperty(value = "任务终点") + private String task_nextDevice_code; - @ApiModelProperty(value = "参数") + private String param; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java index 813b2921c..4417d7081 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,60 +33,60 @@ import java.io.Serializable; public class DeviceDbitem extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "项标识") + @TableId(type = IdType.ASSIGN_ID) private String item_id; - @ApiModelProperty(value = "项编码") + @NotBlank private String item_code; - @ApiModelProperty(value = "项名字") + @NotBlank private String item_name; - @ApiModelProperty(value = "DB块编码") + private String db_code; - @ApiModelProperty(value = "DB块值") + private String db_value; - @ApiModelProperty(value = "值类型") + private String value_type; - @ApiModelProperty(value = "采集类型") + private String collect_type; - @ApiModelProperty(value = "设备标识") + @NotBlank private String device_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java index ac3953256..dbe10c333 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java @@ -4,7 +4,7 @@ import org.nl.acs.common.base.CommonModel; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -31,27 +31,27 @@ import java.io.Serializable; public class DeviceErpmapping extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + @TableId(type = IdType.ASSIGN_ID) private String device_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "设备名字") + @NotBlank private String device_name; - @ApiModelProperty(value = "设备类型") + @NotBlank private String device_type; - @ApiModelProperty(value = "设备驱动类型") + @NotBlank private String driver_code; - @ApiModelProperty(value = "所属ERP设备") + @NotBlank private String erp_code; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java index 816591a10..b12dcbe4e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java @@ -3,7 +3,7 @@ package org.nl.acs.device.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.common.base.CommonModel; @@ -27,64 +27,64 @@ import java.math.BigDecimal; public class DeviceExtra extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + @TableId(type = IdType.ASSIGN_ID) private String extra_id; - @ApiModelProperty(value = "字段编码") + @NotBlank private String extra_code; - @ApiModelProperty(value = "字段名字") + @NotBlank private String extra_name; - @ApiModelProperty(value = "字段值") + private String extra_value; - @ApiModelProperty(value = "扩展值类型") + private String value_type; - @ApiModelProperty(value = "扩展字段类型") + private String filed_type; - @ApiModelProperty(value = "顺序号") + @NotNull private BigDecimal order_seq; - @ApiModelProperty(value = "设备标识") + @NotBlank private String device_id; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java index e5519fbd0..6030ebea4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,81 +34,81 @@ import java.io.Serializable; public class DeviceMybatis extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + @TableId(type = IdType.ASSIGN_ID) private String device_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "设备名字") + @NotBlank private String device_name; - @ApiModelProperty(value = "设备类型") + private String device_type; - @ApiModelProperty(value = "所属区域") + private String region; - @ApiModelProperty(value = "生产厂家") + private String manufacturer; - @ApiModelProperty(value = "生产厂家电话") + private String manufacturer_phone; - @ApiModelProperty(value = "是否配置") + @NotBlank private String is_config; - @ApiModelProperty(value = "opcServer标识") + private String opc_server_id; - @ApiModelProperty(value = "opcPlc标识") + private String opc_plc_id; - @ApiModelProperty(value = "是否为路由设备") + @NotBlank private String is_route; - @ApiModelProperty(value = "设备驱动类型") + private String driver_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "顺序号") + @NotNull private BigDecimal seq_num; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "地址号") + private String address; public void copyFrom(Device source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java index 8bcc0147d..cdbcf9dde 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,60 +33,60 @@ import java.io.Serializable; public class DeviceRunpoint extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + @TableId(type = IdType.ASSIGN_ID) private String device_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "有货状态") + @NotBlank private String hasgoods; - @ApiModelProperty(value = "载具号") + private String container; - @ApiModelProperty(value = "任务号") + private String taskno; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "物料类型") + private String material_type; - @ApiModelProperty(value = "批次") + private String batch; - @ApiModelProperty(value = "锁定") + private String islock; public void copyFrom(DeviceRunpoint source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java index a83433556..5158bdf75 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,37 +33,37 @@ import java.io.Serializable; public class Deviceisonline extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "在线标识") + @TableId(type = IdType.ASSIGN_ID) private String online_id; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "订单编码") + @NotBlank private String order_code; - @ApiModelProperty(value = "在线状态") + @NotBlank private String online_status; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java index 6470b688c..7a776a5f1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java @@ -1,7 +1,7 @@ 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.DeviceAssignedService; import org.nl.acs.device.service.dto.DeviceAssignedDto; @@ -22,7 +22,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备任务分配信息管理") + @RequestMapping("/api/deviceAssigned") public class DeviceAssignedController { @@ -30,14 +30,14 @@ public class DeviceAssignedController { @GetMapping @Log("查询设备任务分配信息") - @ApiOperation("查询设备任务分配信息") + public ResponseEntity query(DeviceAssignedQueryParam query, Pageable pageable) { return new ResponseEntity<>(deviceAssignedService.queryAll(query, pageable), HttpStatus.OK); } @PostMapping @Log("新增设备任务分配信息") - @ApiOperation("新增设备任务分配信息") + public ResponseEntity create(@Validated @RequestBody Map resources) { deviceAssignedService.create(resources); return new ResponseEntity<>(HttpStatus.CREATED); @@ -45,7 +45,7 @@ public class DeviceAssignedController { @PutMapping @Log("修改设备任务分配信息") - @ApiOperation("修改设备任务分配信息") + public ResponseEntity update(@Validated @RequestBody Map resources) { deviceAssignedService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -53,7 +53,7 @@ public class DeviceAssignedController { @DeleteMapping @Log("删除设备任务分配信息") - @ApiOperation("删除设备任务分配信息") + public ResponseEntity delete(@RequestBody Set ids) { deviceAssignedService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java index ca3cf632e..b77d6ac3e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java @@ -19,7 +19,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -35,7 +35,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备服务管理") + @RequestMapping("/api/device") public class DeviceController { @@ -46,27 +46,27 @@ public class DeviceController { @GetMapping @Log("查询设备") - @ApiOperation("查询设备") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/protocol") @Log("查询设备协议") - @ApiOperation("查询设备协议") + public ResponseEntity protocol(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceService.queryDeviceProtocol(whereJson, page), HttpStatus.OK); } @Log("导出设备协议") - @ApiOperation("导出设备协议") + @GetMapping(value = "/protocol/download") public void downDeviceDBload(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { deviceService.downDeviceDBload(deviceService.queryDeviceProtocol(whereJson), response); } @Log("导出设备协议") - @ApiOperation("导出设备协议CSV") + @GetMapping(value = "/protocol/downloadCSV") public void downDeviceDBloadCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { deviceService.downDeviceDBloadCSV(deviceService.queryDeviceProtocol(whereJson), response); @@ -74,7 +74,7 @@ public class DeviceController { @PostMapping @Log("新增设备") - @ApiOperation("新增设备") + public ResponseEntity create(@Validated @RequestBody DeviceDto dto) { deviceService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -82,14 +82,14 @@ public class DeviceController { @PutMapping @Log("修改设备") - @ApiOperation("修改设备") + public ResponseEntity update(@Validated @RequestBody DeviceDto dto) { deviceService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除设备") - @ApiOperation("删除设备") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -98,7 +98,7 @@ public class DeviceController { } @Log("导出设备") - @ApiOperation("导出设备") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { deviceService.download(deviceService.queryAll(whereJson), response); @@ -106,56 +106,56 @@ public class DeviceController { @GetMapping("/selectList") @Log("下拉选设备") - @ApiOperation("下拉选设备") + public ResponseEntity selectList() { return new ResponseEntity<>(deviceService.selectList(), HttpStatus.OK); } @GetMapping("/region/{region}") @Log("根据区域查询设备") - @ApiOperation("根据区域查询设备") + public ResponseEntity selectList(@PathVariable String region) { return new ResponseEntity<>(deviceService.selectDeviceListByRegion(region), HttpStatus.OK); } @GetMapping("/selectListOne") @Log("查询区域一设备") - @ApiOperation("查询区域一设备") + public ResponseEntity selectListOne() { return new ResponseEntity<>(deviceService.selectDeviceListOne(), HttpStatus.OK); } @GetMapping("/selectListTwo") @Log("查询区域二设备") - @ApiOperation("查询区域二设备") + public ResponseEntity selectListTwo() { return new ResponseEntity<>(deviceService.selectDeviceListTwo(), HttpStatus.OK); } @GetMapping("/selectListThree") @Log("查询区域三设备") - @ApiOperation("查询区域三设备") + public ResponseEntity selectListThree() { return new ResponseEntity<>(deviceService.selectDeviceListThree(), HttpStatus.OK); } @GetMapping("/type/{type}") @Log("根据设备类型查询已配置设备") - @ApiOperation("根据类型查询设备") + public ResponseEntity selectListByType(@PathVariable String type) { return new ResponseEntity<>(deviceService.selectDeviceListByType(type), HttpStatus.OK); } @GetMapping("/selectDeviceDevicerInfo/{status}") @Log("根据状态查询设备信息") - @ApiOperation("根据区域查询设备信息") + public ResponseEntity selectDeviceDevicerInfo(@PathVariable String status) { return new ResponseEntity<>(deviceService.selectDeviceDevicerInfo(status), HttpStatus.OK); } @PostMapping("/callAgv") @Log("呼叫请求") - @ApiOperation("呼叫请求") + public ResponseEntity callAgv(@RequestBody JSONObject json) { deviceService.callAgv(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -163,7 +163,7 @@ public class DeviceController { @PostMapping("/addMaterial") @Log("添加物料信息") - @ApiOperation("添加物料信息") + public ResponseEntity addMaterial(@RequestBody JSONObject json) { deviceService.addMaterial(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -171,7 +171,7 @@ public class DeviceController { @PostMapping("/changeDeviceStatus") @Log("改变设备状态") - @ApiOperation("改变设备状态") + public ResponseEntity changeDeviceStatus(@RequestBody JSONObject json) { deviceService.changeDeviceStatus(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -179,7 +179,7 @@ public class DeviceController { @PostMapping("/changeFenceStatus") @Log("改变电子围栏状态") - @ApiOperation("改变电子围栏状态") + public ResponseEntity changeFenceStatus(@RequestBody JSONObject json) { deviceService.changeFenceStatus(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -187,7 +187,7 @@ public class DeviceController { @PostMapping("/responseAgv") @Log("响应请求") - @ApiOperation("响应请求") + public ResponseEntity responseAgv(@RequestBody JSONObject json) { deviceService.responseAgv(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -195,7 +195,7 @@ public class DeviceController { @PostMapping("/autoCreateTask") @Log("自动创建接任务") - @ApiOperation("自动创建接任务") + public ResponseEntity autoCreateTask(@RequestBody JSONObject json) { deviceService.autoCreateTask(json); @@ -204,7 +204,7 @@ public class DeviceController { @PostMapping("/cleanTask") @Log("清除设备状态为空位") - @ApiOperation("清除设备状态为空位") + public ResponseEntity cleanTask(@RequestBody JSONObject json) { deviceService.cleanTask(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -212,7 +212,7 @@ public class DeviceController { @PostMapping("/cleanMaterial") @Log("清除设备物料信息") - @ApiOperation("清除设备物料信息") + public ResponseEntity cleanMaterial(@RequestBody JSONObject json) { deviceService.cleanMaterial(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -220,14 +220,14 @@ public class DeviceController { @GetMapping("/selectDriverCodeList/{device_code}") @Log("下拉选设备驱动") - @ApiOperation("下拉选设备驱动") + public ResponseEntity selectDriverCodeList(@PathVariable String device_code) { DeviceDto device = deviceService.findByCode(device_code); JSONArray ja = deviceService.selectDriverCodeList(device_code); return new ResponseEntity<>(ja, HttpStatus.OK); } - @ApiOperation("查询") + @GetMapping({"/{device_code}"}) public ResponseEntity query(@PathVariable String device_code) { final JSONObject model = new JSONObject(); @@ -236,7 +236,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); @@ -245,7 +245,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"); @@ -258,7 +258,7 @@ public class DeviceController { @PostMapping({"/updateConfig"}) @Log("配置设备驱动") - @ApiOperation("配置设备驱动") + @Transactional(rollbackFor = Exception.class) public ResponseEntity updateConfig(@RequestBody Map map) { JSONObject jsonObject = (JSONObject) JSONObject.toJSON(map); @@ -268,25 +268,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); @@ -295,27 +295,27 @@ public class DeviceController { @GetMapping("/selectConveyorList") @Log("下拉选输送设备") - @ApiOperation("下拉选输送设备") + 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); @@ -324,13 +324,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") public void downloadProtocolConfig(HttpServletResponse response, @RequestBody JSONObject whereJson) throws IOException { deviceService.downloadProtocolConfig(whereJson, response); @@ -338,20 +338,20 @@ public class DeviceController { @GetMapping("/getAllDriverCodeList") @Log("协议配置下拉选设备驱动") - @ApiOperation("协议配置下拉选设备驱动") + public ResponseEntity getAllDriverCodeList() { return new ResponseEntity<>(DriverTypeEnum.getList(), HttpStatus.OK); } @Log("导出Smart设备协议CSV") - @ApiOperation("导出Smart设备协议CSV") + @GetMapping(value = "/protocol/downloadSmartCSV") public void downDeviceDBloadOumulongCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { deviceService.downDeviceDBloadSmartCSV(deviceService.queryDeviceProtocol(whereJson), response); } @Log("导出FX5U设备协议CSV") - @ApiOperation("导出FX5U设备协议CSV") + @GetMapping(value = "/protocol/downloadFX5UCSV") public void downDeviceDBloadFX5UCSV(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { deviceService.downDeviceDBloadFX5UCSV(deviceService.queryDeviceProtocol(whereJson), response); @@ -359,7 +359,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java index 66400b6b0..671453c38 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -20,7 +20,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备DB项管理") + @RequestMapping("/api/deviceDbitem") public class DeviceDbitemController { @@ -28,21 +28,21 @@ public class DeviceDbitemController { @GetMapping @Log("查询设备DB项") - @ApiOperation("查询设备DB项") + public ResponseEntity query(DeviceDbitemQueryParam query, Pageable pageable) { return new ResponseEntity<>(deviceDbitemService.queryAll(query, pageable), HttpStatus.OK); } @PostMapping @Log("新增设备DB项") - @ApiOperation("新增设备DB项") + public ResponseEntity create(@Validated @RequestBody DeviceDbitemDto resources) { return new ResponseEntity<>(deviceDbitemService.insert(resources), HttpStatus.CREATED); } @PutMapping @Log("修改设备DB项") - @ApiOperation("修改设备DB项") + public ResponseEntity update(@Validated @RequestBody DeviceDbitemDto resources) { deviceDbitemService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -50,7 +50,7 @@ public class DeviceDbitemController { @DeleteMapping @Log("删除设备DB项") - @ApiOperation("删除设备DB项") + public ResponseEntity delete(@RequestBody Set ids) { deviceDbitemService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -58,7 +58,7 @@ public class DeviceDbitemController { /* @Log("导出设备DB项") - @ApiOperation("导出设备DB项") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceDbitem:list')") public void download(HttpServletResponse response, DeviceDbitemQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java index 669144c66..0efc7ec8b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java @@ -9,7 +9,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备-ERP关系映射管理") + @RequestMapping("/api/acsDeviceErpmapping") public class DeviceErpmappingController { @@ -30,14 +30,14 @@ public class DeviceErpmappingController { @GetMapping @Log("查询设备-ERP映射") - @ApiOperation("查询设备-ERP映射") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(acsDeviceErpmappingService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增设备-ERP映射") - @ApiOperation("新增设备-ERP映射") + public ResponseEntity create(@Validated @RequestBody AcsDeviceErpmappingDto dto) { acsDeviceErpmappingService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -45,14 +45,14 @@ public class DeviceErpmappingController { @PutMapping @Log("修改设备-ERP映射") - @ApiOperation("修改设备-ERP映射") + public ResponseEntity update(@Validated @RequestBody AcsDeviceErpmappingDto dto) { acsDeviceErpmappingService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除设备-ERP映射") - @ApiOperation("删除设备-ERP映射") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { acsDeviceErpmappingService.deleteAll(ids); @@ -60,7 +60,7 @@ public class DeviceErpmappingController { } @Log("导出设备-ERP映射") - @ApiOperation("导出设备-ERP映射") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { acsDeviceErpmappingService.download(acsDeviceErpmappingService.queryAll(whereJson), response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java index 5913e6795..f28f1b382 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java @@ -1,7 +1,7 @@ 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.DeviceExtraService; import org.nl.acs.device.service.dto.DeviceExtraDto; @@ -21,7 +21,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备扩展管理") + @RequestMapping("/api/deviceExtra") public class DeviceExtraController { @@ -29,21 +29,21 @@ public class DeviceExtraController { @GetMapping @Log("查询设备扩展") - @ApiOperation("查询设备扩展") + public ResponseEntity query(DeviceExtraQueryParam query, Pageable pageable) { return new ResponseEntity<>(deviceExtraService.queryAll(query, pageable), HttpStatus.OK); } @PostMapping @Log("新增设备扩展") - @ApiOperation("新增设备扩展") + public ResponseEntity create(@Validated @RequestBody DeviceExtraDto resources) { return new ResponseEntity<>(deviceExtraService.insert(resources), HttpStatus.CREATED); } @PutMapping @Log("修改设备扩展") - @ApiOperation("修改设备扩展") + public ResponseEntity update(@Validated @RequestBody DeviceExtraDto resources) { deviceExtraService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -51,7 +51,7 @@ public class DeviceExtraController { @DeleteMapping @Log("删除设备扩展") - @ApiOperation("删除设备扩展") + public ResponseEntity delete(@RequestBody Set ids) { deviceExtraService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class DeviceExtraController { /* @Log("导出设备扩展") - @ApiOperation("导出设备扩展") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceExtra:list')") public void download(HttpServletResponse response, DeviceExtraQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java index 6eff3db70..ebb71be1d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -20,7 +20,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备点位管理") + @RequestMapping("/api/deviceRunpoint") public class DeviceRunpointController { @@ -28,21 +28,21 @@ public class DeviceRunpointController { @GetMapping @Log("查询设备点位") - @ApiOperation("查询设备点位") + public ResponseEntity query(DeviceRunpointQueryParam query, Pageable pageable) { return new ResponseEntity<>(deviceRunpointService.queryAll(query, pageable), HttpStatus.OK); } @PostMapping @Log("新增设备点位") - @ApiOperation("新增设备点位") + public ResponseEntity create(@Validated @RequestBody DeviceRunpointDto resources) { return new ResponseEntity<>(deviceRunpointService.insert(resources), HttpStatus.CREATED); } @PutMapping @Log("修改设备点位") - @ApiOperation("修改设备点位") + public ResponseEntity update(@Validated @RequestBody DeviceRunpointDto resources) { deviceRunpointService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -50,7 +50,7 @@ public class DeviceRunpointController { @DeleteMapping @Log("删除设备点位") - @ApiOperation("删除设备点位") + public ResponseEntity delete(@RequestBody Set ids) { deviceRunpointService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -58,7 +58,7 @@ public class DeviceRunpointController { /* @Log("导出设备点位") - @ApiOperation("导出设备点位") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceRunpoint:list')") public void download(HttpServletResponse response, DeviceRunpointQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java index c585e0249..d6278b231 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -20,7 +20,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备在线状态管理") + @RequestMapping("/api/deviceisonline") public class DeviceisonlineController { @@ -28,21 +28,21 @@ public class DeviceisonlineController { @GetMapping @Log("查询设备在线状态") - @ApiOperation("查询设备在线状态") + public ResponseEntity query(DeviceisonlineQueryParam query, Pageable pageable) { return new ResponseEntity<>(deviceisonlineService.queryAll(query, pageable), HttpStatus.OK); } @PostMapping @Log("新增设备在线状态") - @ApiOperation("新增设备在线状态") + public ResponseEntity create(@Validated @RequestBody DeviceisonlineDto resources) { return new ResponseEntity<>(deviceisonlineService.insert(resources), HttpStatus.CREATED); } @PutMapping @Log("修改设备在线状态") - @ApiOperation("修改设备在线状态") + public ResponseEntity update(@Validated @RequestBody DeviceisonlineDto resources) { deviceisonlineService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -50,7 +50,7 @@ public class DeviceisonlineController { @DeleteMapping @Log("删除设备在线状态") - @ApiOperation("删除设备在线状态") + public ResponseEntity delete(@RequestBody Set ids) { deviceisonlineService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -58,7 +58,7 @@ public class DeviceisonlineController { /* @Log("导出设备在线状态") - @ApiOperation("导出设备在线状态") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('deviceisonline:list')") public void download(HttpServletResponse response, DeviceisonlineQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java index eca62b1c4..5d06d516c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,21 +26,21 @@ import io.swagger.annotations.ApiModelProperty; public class AcsDeviceErpmappingDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + private String device_id; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "设备名字") + private String device_name; - @ApiModelProperty(value = "设备类型") + private String device_type; - @ApiModelProperty(value = "设备驱动类型") + private String driver_code; - @ApiModelProperty(value = "所属ERP设备") + private String erp_code; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java index 4585a0718..9fd6843c7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java @@ -1,6 +1,6 @@ package org.nl.acs.device.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,39 +19,39 @@ import java.io.Serializable; public class DeviceAssignedDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "分配标识") + private String assigned_id; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "指令终点") + private String inst_nextDevice_code; - @ApiModelProperty(value = "任务终点") + private String task_nextDevice_code; - @ApiModelProperty(value = "参数") + private String param; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java index eaaa3ae50..bc81a5752 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,48 +26,48 @@ import io.swagger.annotations.ApiModelProperty; public class DeviceDbitemDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "项标识") + private String item_id; - @ApiModelProperty(value = "项编码") + private String item_code; - @ApiModelProperty(value = "项名字") + private String item_name; - @ApiModelProperty(value = "DB块编码") + private String db_code; - @ApiModelProperty(value = "DB块值") + private String db_value; - @ApiModelProperty(value = "值类型") + private String value_type; - @ApiModelProperty(value = "采集类型") + private String collect_type; - @ApiModelProperty(value = "设备标识") + private String device_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java index 141983674..79cc86b0b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java index edcade67b..02d94b9c0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java @@ -1,6 +1,6 @@ package org.nl.acs.device.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java index 1266c9b30..1ee656af4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,48 +26,48 @@ import io.swagger.annotations.ApiModelProperty; public class DeviceRunpointDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备标识") + private String device_id; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "有货状态") + private String hasgoods; - @ApiModelProperty(value = "载具号") + private String container; - @ApiModelProperty(value = "任务号") + private String taskno; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "物料类型") + private String material_type; - @ApiModelProperty(value = "批次") + private String batch; - @ApiModelProperty(value = "锁定") + private String islock; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java index fb85dc228..7e4065f6f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,27 +26,27 @@ import io.swagger.annotations.ApiModelProperty; public class DeviceisonlineDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "在线标识") + private String online_id; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "订单编码") + private String order_code; - @ApiModelProperty(value = "在线状态") + private String online_status; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java index d572ed130..9c2b35382 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java @@ -2,8 +2,8 @@ package org.nl.acs.ext.wms.rest; -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.*; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "立库接口") + @RequestMapping("/api/liku") @Slf4j public class AcsToLiKuController { @@ -31,77 +31,77 @@ public class AcsToLiKuController { @PostMapping("/inStore") @Log(value = "下发立库入库任务") - @ApiOperation("下发立库物料入库任务") + public ResponseEntity inStore(@RequestBody InStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.inStore(requestParam), HttpStatus.OK); } @PostMapping("/outStore") @Log(value = "下发立库出库任务") - @ApiOperation("下发立库出库任务") + public ResponseEntity outStore(@RequestBody OutStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.outStore(requestParam), HttpStatus.OK); } @PostMapping("/emptyVehicleOutStore") @Log(value = "下发立库空盘出库任务") - @ApiOperation("下发立库空盘出库任务") + public ResponseEntity emptyVehicleOutStore(@RequestBody EmptyVehicleOutStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.emptyVehicleOutStore(requestParam), HttpStatus.OK); } @PostMapping("/moveStore") @Log(value = "下发立库移库任务") - @ApiOperation("下发立库移库任务") + public ResponseEntity moveStore(@RequestBody MoveStoreRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.moveStore(requestParam), HttpStatus.OK); } @PostMapping("/inStoreReset") @Log(value = "下发立库入库任务调整") - @ApiOperation("下发立库入库任务调整") + public ResponseEntity inStoreReset(@RequestBody InStoreResetRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.inStoreReset(requestParam), HttpStatus.OK); } @PostMapping("/moveStoreReset") @Log(value = "下发立库移库任务调整") - @ApiOperation("下发立库移库任务调整") + public ResponseEntity moveStoreReset(@RequestBody MoveStoreResetRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.moveStoreReset(requestParam), HttpStatus.OK); } @PostMapping("/roadWayIsLock") @Log(value = "下发立库巷道锁定或解锁") - @ApiOperation("向立库下发巷道锁定或解锁") + public ResponseEntity roadWayIsLock(@RequestBody RoadWayIsLockRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.roadWayIsLock(requestParam), HttpStatus.OK); } @PostMapping("/cancelTask") @Log(value = "取消立库任务") - @ApiOperation("取消立库任务") + public ResponseEntity cancelTask(@RequestBody CancelTaskRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.cancelTask(requestParam), HttpStatus.OK); } @PostMapping("/queryCarStatus") @Log(value = "查询四向车状态") - @ApiOperation("查询四向车状态") + public ResponseEntity queryCarStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryCarDeviceStatus(requestParam), HttpStatus.OK); } @PostMapping("/queryTsjStatus") @Log(value = "查询提升机状态") - @ApiOperation("查询提升机状态") + public ResponseEntity queryTsjStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); } @PostMapping("/querySsxStatus") @Log(value = "查询提升机状态") - @ApiOperation("查询提升机状态") + public ResponseEntity querySsxStatus(@RequestBody DeviceStatusRequest requestParam) { return new ResponseEntity<>(acsToLiKuService.queryTsjDeviceStatus(requestParam), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java index e03dfeb2a..21b3348ed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java +++ b/acs2/nladmin-system/nlsso-server/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.service.AcsToWmsService; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms接口") + @RequestMapping("/api/wms") @Slf4j public class AcsToWmsController { @@ -33,7 +33,7 @@ public class AcsToWmsController { // @PostMapping("/applyTask") // @Log("向WMS申请任务") -// @ApiOperation("向WMS申请任务") +// // public ResponseEntity applyTaskToWms(@RequestBody String device_code, String container_code, int height, int weight) { // return new ResponseEntity<>(acstowmsService.applyTaskToWms(device_code, container_code, height, weight), HttpStatus.OK); // } @@ -41,7 +41,7 @@ public class AcsToWmsController { @PostMapping("/taskStatusFeedback") @Log("向WMS反馈任务状态") - @ApiOperation("向WMS反馈任务状态") + public ResponseEntity feedbackTaskStatusToWms(@RequestBody Map whereJson) { JSONArray data = JSONArray.parseArray(String.valueOf(whereJson)); return new ResponseEntity<>(acstowmsService.feedbackTaskStatusToWms(data), HttpStatus.OK); @@ -50,14 +50,14 @@ public class AcsToWmsController { @PostMapping("/feedbackAgvStatus") @Log("反馈AGV设备状态") - @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("反馈AGV设备信息") - @ApiOperation("反馈AGV设备信息") + public ResponseEntity feedbackAgv(@RequestBody JSONArray from) { return new ResponseEntity<>(acstowmsService.feedbackAgv(from), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java index 065ea39f1..75bbcb26a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/LiKuToACSController.java +++ b/acs2/nladmin-system/nlsso-server/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 lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.liKuData.InStoreReportRequest; @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "立库接口") + @RequestMapping("/api/likuToACS") @Slf4j public class LiKuToACSController { @@ -36,7 +36,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/inStoreReport") @Log(value = "立库反馈入库任务状态") - @ApiOperation("立库反馈入库任务状态") + public ResponseEntity inStoreReport(@RequestBody InStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.inStoreReport(requestParam), HttpStatus.OK); } @@ -44,7 +44,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/outStoreReport") @Log(value = "立库反馈出库任务状态") - @ApiOperation("立库反馈出库任务状态") + public ResponseEntity outStoreReport(@RequestBody OutStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.outStoreReport(requestParam), HttpStatus.OK); } @@ -52,7 +52,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/moveStoreReport") @Log(value = "立库反馈移库任务状态") - @ApiOperation("立库反馈移库任务状态") + public ResponseEntity moveStoreReport(@RequestBody MoveStoreReportRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.moveStoreReport(requestParam), HttpStatus.OK); } @@ -60,7 +60,7 @@ public class LiKuToACSController { @SaIgnore @PostMapping("/putEmptyPallet") @Log(value = "立库请求放空盘") - @ApiOperation("立库请求放空盘") + public ResponseEntity putEmptyPallet(@RequestBody putEmptyPalletRequest requestParam) throws Exception { return new ResponseEntity<>(liKuToAcsService.putEmptyPallet(requestParam), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index 10a4ae6fc..de85c8d6d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/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.one.CancelTaskRequest; @@ -28,7 +28,7 @@ import java.util.List; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms接口") + @RequestMapping("/api/wms") @Slf4j public class WmsToAcsController { @@ -36,7 +36,7 @@ public class WmsToAcsController { @PostMapping("/task") @Log(value = "ACS接收WMS任务") - @ApiOperation("接收WMS任务") + @SaIgnore public ResponseEntity createFromWms(@RequestBody List reqs) { return new ResponseEntity<>(wmstoacsService.crateTask(reqs), HttpStatus.OK); @@ -44,7 +44,7 @@ public class WmsToAcsController { @PostMapping("/cancelTask") @Log(value = "WMS取消任务") - @ApiOperation("WMS取消任务") + @SaIgnore public ResponseEntity cancelFromWms(@RequestBody List reqs) throws Exception { return new ResponseEntity<>(wmstoacsService.cancelFromWms(reqs), HttpStatus.OK); @@ -52,21 +52,21 @@ public class WmsToAcsController { @PostMapping("/updateDeviceGoodsFromWms") @Log(value = "WMS修改点位状态") - @ApiOperation("WMS修改点位状态") + public ResponseEntity updateDeviceGoodsFromWms(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.updateDeviceGoodsFromWms(whereJson), HttpStatus.OK); } @PostMapping("/areaControl") @Log(value = "区域控制") - @ApiOperation("区域控制") + public ResponseEntity areaControl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(wmstoacsService.areaControl(whereJson), HttpStatus.OK); } @PostMapping("/action") @Log(value = "WMS下发点位信号") - @ApiOperation("WMS下发点位信号") + @SaIgnore public ResponseEntity putAction(@RequestBody String whereJson) throws Exception { return new ResponseEntity<>(wmstoacsService.putAction(whereJson), HttpStatus.OK); @@ -74,7 +74,7 @@ public class WmsToAcsController { @PostMapping("/querydevice") @Log(value = "WMS查询设备状态") - @ApiOperation("WMS查询设备状态") + @SaIgnore public ResponseEntity queryDevice(@RequestBody String whereJson) throws Exception { return new ResponseEntity<>(wmstoacsService.queryDevice(whereJson), HttpStatus.OK); @@ -82,7 +82,7 @@ public class WmsToAcsController { @PostMapping("/queryDeviceDBValue") @Log(value = "WMS查询设备DB值") - @ApiOperation("WMS查询设备DB值") + @SaIgnore public ResponseEntity queryDeviceDBValue(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.queryDeviceDBValue(whereJson), HttpStatus.OK); @@ -91,7 +91,7 @@ public class WmsToAcsController { @PostMapping("/putPlusPullAction") @Log(value = "WMS下发插拔轴动作") - @ApiOperation("WMS下发插拔轴动作") + @SaIgnore public ResponseEntity putPlusPullAction(@RequestBody String whereJson) { return new ResponseEntity<>(wmstoacsService.putPlusPullAction(whereJson), HttpStatus.OK); @@ -99,7 +99,7 @@ public class WmsToAcsController { @PostMapping("/notify") @Log("wms下发任务动作") - @ApiOperation("wms下发任务动作") + @SaIgnore public ResponseEntity notify(@RequestBody JSONObject param) { return new ResponseEntity<>(wmstoacsService.notifyAcs(param), HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java index 6d571f998..abb4aea43 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java @@ -3,7 +3,7 @@ package org.nl.acs.history.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,20 +19,20 @@ import java.io.Serializable; public class AcsDeviceErrorLog implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "设备报警记录标识") + @TableId(type = IdType.ASSIGN_ID) private String error_log_uuid; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "错误码") + private String error_code; - @ApiModelProperty(value = "错误信息") + private String error_info; - @ApiModelProperty(value = "错误时间") + private String error_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java index 2e37de3a4..8bbae3c41 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java +++ b/acs2/nladmin-system/nlsso-server/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 { @@ -40,7 +40,7 @@ public class DeviceErrorLogController { */ @GetMapping @Log("查询设备报警记录") - @ApiOperation("查询设备报警记录") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(acsDeviceErrorLogService.queryAll(whereJson,page),HttpStatus.OK); } @@ -52,7 +52,7 @@ public class DeviceErrorLogController { */ @PostMapping @Log("新增设备报警记录") - @ApiOperation("新增设备报警记录") + public ResponseEntity create(@Validated @RequestBody DeviceErrorLogDto dto){ acsDeviceErrorLogService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -65,7 +65,7 @@ public class DeviceErrorLogController { */ @PutMapping @Log("修改设备报警记录") - @ApiOperation("修改设备报警记录") + public ResponseEntity update(@Validated @RequestBody DeviceErrorLogDto dto){ acsDeviceErrorLogService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -77,7 +77,7 @@ public class DeviceErrorLogController { * @return */ @Log("删除设备报警记录") - @ApiOperation("删除设备报警记录") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { acsDeviceErrorLogService.deleteAll(ids); @@ -91,7 +91,7 @@ public class DeviceErrorLogController { * @throws IOException */ @Log("导出设备报警记录") - @ApiOperation("导出设备报警记录") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { acsDeviceErrorLogService.download(acsDeviceErrorLogService.queryAll(whereJson), response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java index b7c06e931..8b9bdbfee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,209 +34,209 @@ import java.io.Serializable; public class InstructionMybatis extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "指令标识") + @TableId(type = IdType.ASSIGN_ID) private String instruction_id; - @ApiModelProperty(value = "任务标识") + private String task_id; - @ApiModelProperty(value = "指令编码") + @NotBlank private String instruction_code; - @ApiModelProperty(value = "关联编号") + private String link_num; - @ApiModelProperty(value = "指令由哪台设备做") + private String execute_device_code; - @ApiModelProperty(value = "执行状态") + private String execute_status; - @ApiModelProperty(value = "执行状态描述") + private String execute_status_description; - @ApiModelProperty(value = "下一条指令由哪台设备做") + private String follow_device_code; - @ApiModelProperty(value = "复合任务") + @NotBlank private String compound_inst; - @ApiModelProperty(value = "复合任务数据") + private String compound_inst_data; - @ApiModelProperty(value = "物料类型") + private String material; - @ApiModelProperty(value = "物料数量") + @NotNull private BigDecimal quantity; - @ApiModelProperty(value = "指令类型") + private String instruction_type; - @ApiModelProperty(value = "指令状态") + private String instruction_status; - @ApiModelProperty(value = "创建类型") + private String create_type; - @ApiModelProperty(value = "完成类型") + private String finish_type; - @ApiModelProperty(value = "优先级") + private String priority; - @ApiModelProperty(value = "执行编码") + private String execute_code; - @ApiModelProperty(value = "执行信息") + private String execute_message; - @ApiModelProperty(value = "起始点位编码") + private String start_point_code; - @ApiModelProperty(value = "起始设备编码") + private String start_device_code; - @ApiModelProperty(value = "起始点位编码2") + private String start_point_code2; - @ApiModelProperty(value = "起始设备编码2") + private String start_device_code2; - @ApiModelProperty(value = "目标点位编码") + private String next_point_code; - @ApiModelProperty(value = "目标设备编码") + private String next_device_code; - @ApiModelProperty(value = "目标点位编码2") + private String next_point_code2; - @ApiModelProperty(value = "目标设备编码2") + private String next_device_code2; - @ApiModelProperty(value = "放货点位编码") + private String put_point_code; - @ApiModelProperty(value = "放货设备编码") + private String put_device_code; - @ApiModelProperty(value = "任务号") + private String task_code; - @ApiModelProperty(value = "载具号") + private String vehicle_code; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "排") + private String from_x; - @ApiModelProperty(value = "列") + private String from_y; - @ApiModelProperty(value = "层") + private String from_z; - @ApiModelProperty(value = "排2") + private String from_x2; - @ApiModelProperty(value = "列2") + private String from_y2; - @ApiModelProperty(value = "层2") + private String from_z2; - @ApiModelProperty(value = "排") + private String put_x; - @ApiModelProperty(value = "列") + private String put_y; - @ApiModelProperty(value = "层") + private String put_z; - @ApiModelProperty(value = "排") + private String to_x; - @ApiModelProperty(value = "列") + private String to_y; - @ApiModelProperty(value = "层") + private String to_z; - @ApiModelProperty(value = "排2") + private String to_x2; - @ApiModelProperty(value = "列2") + private String to_y2; - @ApiModelProperty(value = "层2") + private String to_z2; - @ApiModelProperty(value = "最后一条指令标识") + private String last_instruction_id; - @ApiModelProperty(value = "是否允许修改") + @NotBlank private String can_modify; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "车号") + private String carno; - @ApiModelProperty(value = "AGV任务号") + private String agv_jobno; - @ApiModelProperty(value = "下发AGV状态") + private String send_status; - @ApiModelProperty(value = "重量") + private String weight; - @ApiModelProperty(value = "路由方案编码") + private String route_plan_code; - @ApiModelProperty(value = "空盘数量") + private String emptypallet_num; - @ApiModelProperty(value = "AGV指令类型") + private String agv_inst_type; - @ApiModelProperty(value = "AGV系统类型") + private String agv_system_type; public void copyFrom(Instruction source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 937648033..fa8d507bf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -13,7 +13,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -26,7 +26,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "指令服务管理") + @RequestMapping("/api/instruction") public class InstructionController { @@ -34,14 +34,14 @@ public class InstructionController { @GetMapping @Log("查询指令") - @ApiOperation("查询指令") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(instructionService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/getAll") @Log("历史查询指令") - @ApiOperation("历史查询指令") + public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(instructionService.getAll(whereJson, page), HttpStatus.OK); @@ -49,7 +49,7 @@ public class InstructionController { @GetMapping("/unfinish") @Log("查询所有未完成指令") - @ApiOperation("查询所有未完成指令") + public ResponseEntity queryUnFinish() { return new ResponseEntity<>(instructionService.queryAll("instruction_status < 2"), HttpStatus.OK); @@ -57,7 +57,7 @@ public class InstructionController { @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + public ResponseEntity reload() { instructionService.reload(); @@ -66,7 +66,7 @@ public class InstructionController { @PostMapping @Log("新增指令") - @ApiOperation("新增指令") + public ResponseEntity create(@Validated @RequestBody Instruction dto) throws Exception { instructionService.create(dto); @@ -75,7 +75,7 @@ public class InstructionController { @PutMapping @Log("修改指令") - @ApiOperation("修改指令") + public ResponseEntity update(@Validated @RequestBody Instruction dto) { instructionService.update(dto); @@ -83,7 +83,7 @@ public class InstructionController { } @Log("删除指令") - @ApiOperation("删除指令") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws Exception { instructionService.deleteAll(ids); @@ -91,7 +91,7 @@ public class InstructionController { } @Log("完成指令") - @ApiOperation("完成指令") + @PostMapping(value = "/finish/{id}") public ResponseEntity finish(@RequestBody String id) throws Exception { instructionService.finish(id); @@ -99,7 +99,7 @@ public class InstructionController { } @Log("取消指令") - @ApiOperation("取消指令") + @PostMapping(value = "/cancel/{id}") public ResponseEntity cancel(@RequestBody String id) throws Exception { instructionService.cancel(id); @@ -107,7 +107,7 @@ public class InstructionController { } @Log("强制取消指令") - @ApiOperation("强制取消指令") + @PostMapping(value = "/forceCancel/{id}") public ResponseEntity forceCancel(@RequestBody String id) throws Exception { instructionService.forceCancel(id); @@ -115,7 +115,7 @@ public class InstructionController { } @Log("导出指令") - @ApiOperation("导出指令") + @GetMapping(value = "/download") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -124,7 +124,7 @@ public class InstructionController { @Log("缓存查询指令") - @ApiOperation("缓存查询指令") + @PostMapping(value = "/findByCodeFromCache/{id}") public ResponseEntity findByCodeFromCache(@RequestBody String id) { return new ResponseEntity<>(instructionService.findByCodeFromCache(id), HttpStatus.OK); @@ -132,21 +132,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); @@ -155,7 +155,7 @@ public class InstructionController { @GetMapping("/downloadInstLogging") @Log("导出指令记录") - @ApiOperation("导出指令记录") + public void downloadInstLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { instructionService.downloadInstLogging(instructionService.getInstList(whereJson), response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java index 3b70575b5..dee5c0adc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,48 +33,48 @@ import java.io.Serializable; public class LabelingTemplate extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "模板标识") + @TableId(type = IdType.ASSIGN_ID) private String template_id; - @ApiModelProperty(value = "模板编码") + @NotBlank private String template_code; - @ApiModelProperty(value = "模板名称 ") + @NotBlank private String template_name; - @ApiModelProperty(value = "模板地址") + @NotBlank private String template_address; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "启用时间") + private String is_used_time; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_used; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java index f914d7ad2..504b5f27d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -21,7 +21,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "贴标模板基本信息管理") + @RequestMapping("/api/labelingTemplate") public class LabelingTemplateController { @@ -35,7 +35,7 @@ public class LabelingTemplateController { */ @GetMapping @Log("查询贴标模板基本信息") - @ApiOperation("查询贴标模板基本信息") + public ResponseEntity query(LabelingTemplateQueryParam query, Pageable pageable) { return new ResponseEntity<>(labelingTemplateService.queryAll(query, pageable), HttpStatus.OK); } @@ -47,7 +47,7 @@ public class LabelingTemplateController { */ @PostMapping @Log("新增贴标模板基本信息") - @ApiOperation("新增贴标模板基本信息") + public ResponseEntity create(@Validated @RequestBody LabelingTemplateDto resources) { return new ResponseEntity<>(labelingTemplateService.insert(resources), HttpStatus.CREATED); } @@ -59,7 +59,7 @@ public class LabelingTemplateController { */ @PutMapping @Log("修改贴标模板基本信息") - @ApiOperation("修改贴标模板基本信息") + public ResponseEntity update(@Validated @RequestBody LabelingTemplateDto resources) { labelingTemplateService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -72,7 +72,7 @@ public class LabelingTemplateController { */ @DeleteMapping @Log("删除贴标模板基本信息") - @ApiOperation("删除贴标模板基本信息") + public ResponseEntity delete(@RequestBody Set ids) { labelingTemplateService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -80,7 +80,7 @@ public class LabelingTemplateController { /* @Log("导出贴标模板基本信息") - @ApiOperation("导出贴标模板基本信息") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('labelingTemplate:list')") public void download(HttpServletResponse response, LabelingTemplateQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java index 3b73236fb..d3709225a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,36 +26,36 @@ import io.swagger.annotations.ApiModelProperty; public class LabelingTemplateDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "模板标识") + private String template_id; - @ApiModelProperty(value = "模板编码") + private String template_code; - @ApiModelProperty(value = "模板名称 ") + private String template_name; - @ApiModelProperty(value = "模板地址") + private String template_address; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "启用时间") + private String is_used_time; - @ApiModelProperty(value = "是否启用") + private String is_used; - @ApiModelProperty(value = "是否删除") + private String is_delete; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java index a808dcb34..91f292191 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,66 +33,66 @@ import java.io.Serializable; public class Log extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "日志标识") + @TableId(type = IdType.ASSIGN_ID) private String log_uuid; - @ApiModelProperty(value = "任务编码") + @NotBlank private String task_code; - @ApiModelProperty(value = "任务标识") + @NotBlank private String task_id; private String vehicle_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "日志类型") + @NotBlank private String log_type; - @ApiModelProperty(value = "方法") + @NotBlank private String method; - @ApiModelProperty(value = "请求参数") + @NotBlank private String requestparam; - @ApiModelProperty(value = "返回参数") + @NotBlank private String responseparam; - @ApiModelProperty(value = "请求地址") + @NotBlank private String requesturl; - @ApiModelProperty(value = "状态码") + @NotBlank private String status_code; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/rest/LogController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/rest/LogController.java index 5afdf07f4..7c5d64342 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/rest/LogController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/rest/LogController.java @@ -10,7 +10,7 @@ //import org.springframework.http.ResponseEntity; //import org.springframework.validation.annotation.Validated; //import org.springframework.web.bind.annotation.*; -//import io.swagger.annotations.*; +// //import java.util.Set; // ///** @@ -19,7 +19,7 @@ //**/ //@RestController //@RequiredArgsConstructor -//@Api(tags = "acs日志管理") +// //@RequestMapping("/api/log") //public class LogController { // @@ -27,7 +27,7 @@ // // @GetMapping // @Log("查询acs日志") -// @ApiOperation("查询acs日志") +// // //@PreAuthorize("@el.check('log:list')") // public ResponseEntity query(LogQueryParam query, Pageable pageable){ // return new ResponseEntity<>(logService.queryAll(query,pageable),HttpStatus.OK); @@ -35,7 +35,7 @@ // // @PostMapping // @Log("新增acs日志") -// @ApiOperation("新增acs日志") +// // //@PreAuthorize("@el.check('log:add')") // public ResponseEntity create(@Validated @RequestBody LogDto resources){ // return new ResponseEntity<>(logService.insert(resources),HttpStatus.CREATED); @@ -43,7 +43,7 @@ // // @PutMapping // @Log("修改acs日志") -// @ApiOperation("修改acs日志") +// // //@PreAuthorize("@el.check('log:edit')") // public ResponseEntity update(@Validated @RequestBody LogDto resources){ // logService.updateById(resources); @@ -52,7 +52,7 @@ // // @DeleteMapping // @Log("删除acs日志") -// @ApiOperation("删除acs日志") +// // //@PreAuthorize("@el.check('log:del')") // public ResponseEntity delete(@RequestBody Set ids) { // logService.removeByIds(ids); @@ -61,7 +61,7 @@ // // /* // @Log("导出acs日志") -// @ApiOperation("导出acs日志") +// // @GetMapping(value = "/download") // //@PreAuthorize("@el.check('log:list')") // public void download(HttpServletResponse response, LogQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java index 04becdc17..72935dfa9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,50 +26,50 @@ import io.swagger.annotations.ApiModelProperty; public class LogDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "日志标识") + private String log_uuid; - @ApiModelProperty(value = "任务编码") + private String task_code; - @ApiModelProperty(value = "任务标识") + private String task_id; private String vehicle_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "日志类型") + private String log_type; - @ApiModelProperty(value = "方法") + private String method; - @ApiModelProperty(value = "请求参数") + private String requestparam; - @ApiModelProperty(value = "返回参数") + private String responseparam; - @ApiModelProperty(value = "请求地址") + private String requesturl; - @ApiModelProperty(value = "状态码") + private String status_code; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java index cab56cf5b..ddf6e1ecc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,90 +34,90 @@ import java.io.Serializable; public class Materialbase extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "物料标识") + @TableId(type = IdType.ASSIGN_ID) private String material_id; - @ApiModelProperty(value = "物料编码") + @NotBlank private String material_code; - @ApiModelProperty(value = "物料名称 ") + @NotBlank private String material_name; - @ApiModelProperty(value = "规格") + private String material_spec; - @ApiModelProperty(value = "型号") + private String material_model; - @ApiModelProperty(value = "基本计量单位") + @NotBlank private String base_unit_id; - @ApiModelProperty(value = "工程图号") + private String print_no; - @ApiModelProperty(value = "长度单位") + private String len_unit_id; - @ApiModelProperty(value = "物料长度") + private BigDecimal length; - @ApiModelProperty(value = "物料宽度") + private BigDecimal width; - @ApiModelProperty(value = "物料高度") + private BigDecimal height; - @ApiModelProperty(value = "重量单位") + private String weight_unit_id; - @ApiModelProperty(value = "物料毛重") + private BigDecimal gross_weight; - @ApiModelProperty(value = "物料净重") + private BigDecimal net_weight; - @ApiModelProperty(value = "体积单位") + private String cubage_unit_id; - @ApiModelProperty(value = "物料体积") + private BigDecimal cubage; - @ApiModelProperty(value = "外径") + private BigDecimal outer_diameter; - @ApiModelProperty(value = "壁厚") + private BigDecimal wall_thickness; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "启用时间") + private String is_used_time; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_used; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java index 7dfc1bda9..f5b7cdc9b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -21,7 +21,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "物料基本信息管理") + @RequestMapping("/api/materialbase") public class MaterialbaseController { @@ -35,7 +35,7 @@ public class MaterialbaseController { */ @GetMapping @Log("查询物料基本信息") - @ApiOperation("查询物料基本信息") + //@PreAuthorize("@el.check('materialbase:list')") public ResponseEntity query(MaterialbaseQueryParam query, Pageable pageable) { return new ResponseEntity<>(materialbaseService.queryAll(query, pageable), HttpStatus.OK); @@ -48,7 +48,7 @@ public class MaterialbaseController { */ @PostMapping @Log("新增物料基本信息") - @ApiOperation("新增物料基本信息") + //@PreAuthorize("@el.check('materialbase:add')") public ResponseEntity create(@Validated @RequestBody MaterialbaseDto resources) { return new ResponseEntity<>(materialbaseService.insert(resources), HttpStatus.CREATED); @@ -61,7 +61,7 @@ public class MaterialbaseController { */ @PutMapping @Log("修改物料基本信息") - @ApiOperation("修改物料基本信息") + //@PreAuthorize("@el.check('materialbase:edit')") public ResponseEntity update(@Validated @RequestBody MaterialbaseDto resources) { materialbaseService.updateById(resources); @@ -75,7 +75,7 @@ public class MaterialbaseController { */ @DeleteMapping @Log("删除物料基本信息") - @ApiOperation("删除物料基本信息") + //@PreAuthorize("@el.check('materialbase:del')") public ResponseEntity delete(@RequestBody Set ids) { materialbaseService.removeByIds(ids); @@ -84,7 +84,7 @@ public class MaterialbaseController { /* @Log("导出物料基本信息") - @ApiOperation("导出物料基本信息") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('materialbase:list')") public void download(HttpServletResponse response, MaterialbaseQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java index 505ff018a..188487581 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -27,78 +27,78 @@ import io.swagger.annotations.ApiModelProperty; public class MaterialbaseDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "物料标识") + private String material_id; - @ApiModelProperty(value = "物料编码") + private String material_code; - @ApiModelProperty(value = "物料名称 ") + private String material_name; - @ApiModelProperty(value = "规格") + private String material_spec; - @ApiModelProperty(value = "型号") + private String material_model; - @ApiModelProperty(value = "基本计量单位") + private String base_unit_id; - @ApiModelProperty(value = "工程图号") + private String print_no; - @ApiModelProperty(value = "长度单位") + private String len_unit_id; - @ApiModelProperty(value = "物料长度") + private BigDecimal length; - @ApiModelProperty(value = "物料宽度") + private BigDecimal width; - @ApiModelProperty(value = "物料高度") + private BigDecimal height; - @ApiModelProperty(value = "重量单位") + private String weight_unit_id; - @ApiModelProperty(value = "物料毛重") + private BigDecimal gross_weight; - @ApiModelProperty(value = "物料净重") + private BigDecimal net_weight; - @ApiModelProperty(value = "体积单位") + private String cubage_unit_id; - @ApiModelProperty(value = "物料体积") + private BigDecimal cubage; - @ApiModelProperty(value = "外径") + private BigDecimal outer_diameter; - @ApiModelProperty(value = "壁厚") + private BigDecimal wall_thickness; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "启用时间") + private String is_used_time; - @ApiModelProperty(value = "是否启用") + private String is_used; - @ApiModelProperty(value = "是否删除") + private String is_delete; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java index b7d3ff61a..a783bfe1b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java +++ b/acs2/nladmin-system/nlsso-server/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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java index d09f16e10..a97d7e0d0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,63 +33,63 @@ import java.io.Serializable; public class Opc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "OPC标识") + @TableId(type = IdType.ASSIGN_ID) private String opc_id; - @ApiModelProperty(value = "OPC编码") + @NotBlank private String opc_code; - @ApiModelProperty(value = "OPC名称") + @NotBlank private String opc_name; - @ApiModelProperty(value = "OPC地址") + private String opc_host; - @ApiModelProperty(value = "用户名") + private String user; - @ApiModelProperty(value = "密码") + @NotBlank private String password; - @ApiModelProperty(value = "程序ID") + private String prog_id; - @ApiModelProperty(value = "注册表ID") + private String cls_id; - @ApiModelProperty(value = "domain") + private String domain; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java index f08bbb924..91e7f43e4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,50 +33,50 @@ import java.io.Serializable; public class OpcPlc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "plc标识") + @TableId(type = IdType.ASSIGN_ID) private String plc_id; - @ApiModelProperty(value = "plc编码") + @NotBlank private String plc_code; - @ApiModelProperty(value = "plc名字") + @NotBlank private String plc_name; - @ApiModelProperty(value = "plc地址") + private String plc_host; - @ApiModelProperty(value = "opcServer标识") + private String opc_server_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java index cdb6d2da6..f62e83ce0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java @@ -12,7 +12,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -25,7 +25,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "opc服务管理") + @RequestMapping("/api/opc") public class OpcController { @@ -33,14 +33,14 @@ public class OpcController { @GetMapping @Log("查询opc") - @ApiOperation("查询opc") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(opcService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增opc") - @ApiOperation("新增opc") + //@PreAuthorize("@el.check('opc:add')") public ResponseEntity create(@Validated @RequestBody OpcDto dto) { opcService.insert(dto); @@ -49,7 +49,7 @@ public class OpcController { @PutMapping @Log("修改opc") - @ApiOperation("修改opc") + //@PreAuthorize("@el.check('opc:edit')") public ResponseEntity update(@Validated @RequestBody OpcDto dto) { opcService.update(dto); @@ -57,7 +57,7 @@ public class OpcController { } @Log("删除opc") - @ApiOperation("删除opc") + //@PreAuthorize("@el.check('opc:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,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 { @@ -75,14 +75,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 { @@ -90,7 +90,7 @@ public class OpcController { } @Log("新增PLC") - @ApiOperation("新增PLC") + @PostMapping(value = "/addPLC") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity createPlc(@RequestBody Map whereJson) throws IOException { @@ -98,7 +98,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) { @@ -106,7 +106,7 @@ public class OpcController { } @Log("删除PLC") - @ApiOperation("删除PLC") + @PostMapping(value = "/delPLC") //@PreAuthorize("@el.check('opc:list')") public ResponseEntity delPLC(@RequestBody Map whereJson) throws IOException { @@ -115,7 +115,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java index 61cf81160..e7b816932 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,52 +26,52 @@ import io.swagger.annotations.ApiModelProperty; public class OpcDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "OPC标识") + private String opc_id; - @ApiModelProperty(value = "OPC编码") + private String opc_code; - @ApiModelProperty(value = "OPC名称") + private String opc_name; - @ApiModelProperty(value = "OPC地址") + private String opc_host; - @ApiModelProperty(value = "用户名") + private String user; - @ApiModelProperty(value = "密码") + private String password; - @ApiModelProperty(value = "程序ID") + private String prog_id; - @ApiModelProperty(value = "注册表ID") + private String cls_id; - @ApiModelProperty(value = "domain") + private String domain; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; private String hasChildren; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java index f857062ea..1c662f243 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,39 +26,39 @@ import io.swagger.annotations.ApiModelProperty; public class OpcPlcDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "plc标识") + private String plc_id; - @ApiModelProperty(value = "plc编码") + private String plc_code; - @ApiModelProperty(value = "plc名字") + private String plc_name; - @ApiModelProperty(value = "plc地址") + private String plc_host; - @ApiModelProperty(value = "opcServer标识") + private String opc_server_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java index 4dc3209be..1fa0c7e43 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -20,7 +20,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "plc服务管理") + @RequestMapping("/api/opcPlc") public class OpcPlcController { @@ -28,7 +28,7 @@ public class OpcPlcController { @GetMapping @Log("查询plc服务") - @ApiOperation("查询plc服务") + //@PreAuthorize("@el.check('opcPlc:list')") public ResponseEntity query(OpcPlcQueryParam query, Pageable pageable) { return new ResponseEntity<>(opcPlcService.queryAll(query, pageable), HttpStatus.OK); @@ -36,7 +36,7 @@ public class OpcPlcController { @PostMapping @Log("新增plc服务") - @ApiOperation("新增plc服务") + //@PreAuthorize("@el.check('opcPlc:add')") public ResponseEntity create(@Validated @RequestBody OpcPlcDto resources) { return new ResponseEntity<>(opcPlcService.insert(resources), HttpStatus.CREATED); @@ -44,7 +44,7 @@ public class OpcPlcController { @PutMapping @Log("修改plc服务") - @ApiOperation("修改plc服务") + //@PreAuthorize("@el.check('opcPlc:edit')") public ResponseEntity update(@Validated @RequestBody OpcPlcDto resources) { opcPlcService.updateById(resources); @@ -53,7 +53,7 @@ public class OpcPlcController { @DeleteMapping @Log("删除plc服务") - @ApiOperation("删除plc服务") + //@PreAuthorize("@el.check('opcPlc:del')") public ResponseEntity delete(@RequestBody Set ids) { opcPlcService.removeByIds(ids); @@ -62,7 +62,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); @@ -70,7 +70,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); @@ -78,7 +78,7 @@ public class OpcPlcController { /* @Log("导出plc服务") - @ApiOperation("导出plc服务") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('opcPlc:list')") public void download(HttpServletResponse response, OpcPlcQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java index 39b030d4b..a42440e3d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,73 +34,73 @@ import java.io.Serializable; public class Produceshiftorder extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "工单标识") + @TableId(type = IdType.ASSIGN_ID) private String order_id; - @ApiModelProperty(value = "工单编码") + @NotBlank private String order_code; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "工单状态") + @NotBlank private String order_status; - @ApiModelProperty(value = "下料数量") + @NotNull private BigDecimal qty; - @ApiModelProperty(value = "产品编码") + @NotBlank private String product_code; - @ApiModelProperty(value = "物料编码") + @NotBlank private String material_code; - @ApiModelProperty(value = "物料名称") + @NotBlank private String material_name; - @ApiModelProperty(value = "物料标识") + @NotBlank private String material_uuid; - @ApiModelProperty(value = "客户编码") + private String cust_code; - @ApiModelProperty(value = "客户名称") + private String cust_name; - @ApiModelProperty(value = "型号") + private String model; - @ApiModelProperty(value = "熔池") + private String molten_pool; - @ApiModelProperty(value = "重量") + private String weight; - @ApiModelProperty(value = "创建者") + @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_deleted; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/rest/ProduceshiftorderController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/rest/ProduceshiftorderController.java index 73351dc1c..bb969a067 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/rest/ProduceshiftorderController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/rest/ProduceshiftorderController.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -21,7 +21,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "工单管理") + @RequestMapping("/api/produceshiftorder") public class ProduceshiftorderController { @@ -29,7 +29,7 @@ public class ProduceshiftorderController { @GetMapping @Log("查询工单") - @ApiOperation("查询工单") + //@PreAuthorize("@el.check('produceshiftorder:list')") public ResponseEntity query(ProduceshiftorderQueryParam query, Pageable pageable) { return new ResponseEntity<>(produceshiftorderService.queryAll(query, pageable), HttpStatus.OK); @@ -37,7 +37,7 @@ public class ProduceshiftorderController { @PostMapping @Log("新增工单") - @ApiOperation("新增工单") + //@PreAuthorize("@el.check('produceshiftorder:add')") public ResponseEntity create(@Validated @RequestBody ProduceshiftorderDto resources) { return new ResponseEntity<>(produceshiftorderService.insert(resources), HttpStatus.CREATED); @@ -45,7 +45,7 @@ public class ProduceshiftorderController { @PutMapping @Log("修改工单") - @ApiOperation("修改工单") + //@PreAuthorize("@el.check('produceshiftorder:edit')") public ResponseEntity update(@Validated @RequestBody ProduceshiftorderDto resources) { produceshiftorderService.updateById(resources); @@ -54,7 +54,7 @@ public class ProduceshiftorderController { @DeleteMapping @Log("删除工单") - @ApiOperation("删除工单") + //@PreAuthorize("@el.check('produceshiftorder:del')") public ResponseEntity delete(@RequestBody Set ids) { produceshiftorderService.removeByIds(ids); @@ -63,7 +63,7 @@ public class ProduceshiftorderController { /* @Log("导出工单") - @ApiOperation("导出工单") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('produceshiftorder:list')") public void download(HttpServletResponse response, ProduceshiftorderQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java index 34d097fa4..d172d5c08 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -27,60 +27,60 @@ import io.swagger.annotations.ApiModelProperty; public class ProduceshiftorderDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "工单标识") + private String order_id; - @ApiModelProperty(value = "工单编码") + private String order_code; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "工单状态") + private String order_status; - @ApiModelProperty(value = "下料数量") + private BigDecimal qty; - @ApiModelProperty(value = "产品编码") + private String product_code; - @ApiModelProperty(value = "物料编码") + private String material_code; - @ApiModelProperty(value = "物料名称") + private String material_name; - @ApiModelProperty(value = "物料标识") + private String material_uuid; - @ApiModelProperty(value = "客户编码") + private String cust_code; - @ApiModelProperty(value = "客户名称") + private String cust_name; - @ApiModelProperty(value = "型号") + private String model; - @ApiModelProperty(value = "熔池") + private String molten_pool; - @ApiModelProperty(value = "重量") + private String weight; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "是否删除") + private String is_deleted; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java index 5996e94ff..e7fd7069f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,121 +34,121 @@ import java.io.Serializable; public class Produceshiftorderdetail extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "工单明细标识") + @TableId(type = IdType.ASSIGN_ID) private String orderDetail_id; - @ApiModelProperty(value = "工单明细编码") + @NotBlank private String orderDetail_code; - @ApiModelProperty(value = "工单明细类型") + private String orderDetail_type; - @ApiModelProperty(value = "优先级") + private BigDecimal priority; - @ApiModelProperty(value = "顺序号") + private BigDecimal sequence_number; - @ApiModelProperty(value = "工单标识") + private String order_id; - @ApiModelProperty(value = "工单编码") + private String order_code; - @ApiModelProperty(value = "客户信息") + private String customer_name; - @ApiModelProperty(value = "客户编码") + private String customer_code; - @ApiModelProperty(value = "明细状态") + private String order_status; - @ApiModelProperty(value = "工单数量") + private BigDecimal order_qty; - @ApiModelProperty(value = "刻字信息") + private String lettering_message; - @ApiModelProperty(value = "当前刻字数量") + private BigDecimal present_lettering_numer; - @ApiModelProperty(value = "贴标完成时间") + private String labeling_finish_time; - @ApiModelProperty(value = "创建者") + @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "捆扎完成时间") + private String starp_finish_time; - @ApiModelProperty(value = "裹膜数量") + private BigDecimal wraping_number; - @ApiModelProperty(value = "当前裹膜数量") + private BigDecimal present_wraping_number; - @ApiModelProperty(value = "裹膜合格数量") + private BigDecimal qualified_wraping_number; - @ApiModelProperty(value = "裹膜完成时间") + private String wraping_finish_time; - @ApiModelProperty(value = "贴标信息") + private String labeling_message; - @ApiModelProperty(value = "当前贴标数量") + private BigDecimal present_labeling_number; - @ApiModelProperty(value = "刻字合格数量") + private BigDecimal qualified_lettering_numer; - @ApiModelProperty(value = "刻字完成时间") + private String lettering_finish_time; - @ApiModelProperty(value = "当前套冒数量") + private BigDecimal present_sleeveing_numer; - @ApiModelProperty(value = "套冒合格数量") + private BigDecimal qualified_sleeveing_number; - @ApiModelProperty(value = "套冒完成时间") + private String sleeveing_finish_time; - @ApiModelProperty(value = "捆扎包数") + private BigDecimal strap_pack_number; - @ApiModelProperty(value = "每捆数量") + private BigDecimal strap_number; - @ApiModelProperty(value = "捆扎尾料数量") + private BigDecimal strap_tailint_number; - @ApiModelProperty(value = "捆扎直径") + private String starp_diameter; - @ApiModelProperty(value = "捆扎尾料直径") + private String starp_tailint_diameter; - @ApiModelProperty(value = "当前捆扎包数") + private BigDecimal present_strap_pack_number; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_deleted; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java index fe08304a8..d1bd02079 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Set; @@ -21,7 +21,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "工单明细管理") + @RequestMapping("/api/produceshiftorderdetail") public class ProduceshiftorderdetailController { @@ -29,7 +29,7 @@ public class ProduceshiftorderdetailController { @GetMapping @Log("查询工单明细") - @ApiOperation("查询工单明细") + //@PreAuthorize("@el.check('produceshiftorderdetail:list')") public ResponseEntity query(ProduceshiftorderdetailQueryParam query, Pageable pageable) { return new ResponseEntity<>(produceshiftorderdetailService.queryAll(query, pageable), HttpStatus.OK); @@ -37,7 +37,7 @@ public class ProduceshiftorderdetailController { @PostMapping @Log("新增工单明细") - @ApiOperation("新增工单明细") + //@PreAuthorize("@el.check('produceshiftorderdetail:add')") public ResponseEntity create(@Validated @RequestBody ProduceshiftorderdetailDto resources) { return new ResponseEntity<>(produceshiftorderdetailService.insert(resources), HttpStatus.CREATED); @@ -45,7 +45,7 @@ public class ProduceshiftorderdetailController { @PutMapping @Log("修改工单明细") - @ApiOperation("修改工单明细") + //@PreAuthorize("@el.check('produceshiftorderdetail:edit')") public ResponseEntity update(@Validated @RequestBody ProduceshiftorderdetailDto resources) { produceshiftorderdetailService.updateById(resources); @@ -54,7 +54,7 @@ public class ProduceshiftorderdetailController { @DeleteMapping @Log("删除工单明细") - @ApiOperation("删除工单明细") + //@PreAuthorize("@el.check('produceshiftorderdetail:del')") public ResponseEntity delete(@RequestBody Set ids) { produceshiftorderdetailService.removeByIds(ids); @@ -63,7 +63,7 @@ public class ProduceshiftorderdetailController { /* @Log("导出工单明细") - @ApiOperation("导出工单明细") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('produceshiftorderdetail:list')") public void download(HttpServletResponse response, ProduceshiftorderdetailQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java index 002dadf1d..52e82c809 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -27,114 +27,114 @@ import io.swagger.annotations.ApiModelProperty; public class ProduceshiftorderdetailDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "工单明细标识") + private String orderDetail_id; - @ApiModelProperty(value = "工单明细编码") + private String orderDetail_code; - @ApiModelProperty(value = "工单明细类型") + private String orderDetail_type; - @ApiModelProperty(value = "优先级") + private BigDecimal priority; - @ApiModelProperty(value = "顺序号") + private BigDecimal sequence_number; - @ApiModelProperty(value = "工单标识") + private String order_id; - @ApiModelProperty(value = "工单编码") + private String order_code; - @ApiModelProperty(value = "客户信息") + private String customer_name; - @ApiModelProperty(value = "客户编码") + private String customer_code; - @ApiModelProperty(value = "明细状态") + private String order_status; - @ApiModelProperty(value = "工单数量") + private BigDecimal order_qty; - @ApiModelProperty(value = "刻字信息") + private String lettering_message; - @ApiModelProperty(value = "当前刻字数量") + private BigDecimal present_lettering_numer; - @ApiModelProperty(value = "贴标完成时间") + private String labeling_finish_time; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "捆扎完成时间") + private String starp_finish_time; - @ApiModelProperty(value = "裹膜数量") + private BigDecimal wraping_number; - @ApiModelProperty(value = "当前裹膜数量") + private BigDecimal present_wraping_number; - @ApiModelProperty(value = "裹膜合格数量") + private BigDecimal qualified_wraping_number; - @ApiModelProperty(value = "裹膜完成时间") + private String wraping_finish_time; - @ApiModelProperty(value = "贴标信息") + private String labeling_message; - @ApiModelProperty(value = "当前贴标数量") + private BigDecimal present_labeling_number; - @ApiModelProperty(value = "刻字合格数量") + private BigDecimal qualified_lettering_numer; - @ApiModelProperty(value = "刻字完成时间") + private String lettering_finish_time; - @ApiModelProperty(value = "当前套冒数量") + private BigDecimal present_sleeveing_numer; - @ApiModelProperty(value = "套冒合格数量") + private BigDecimal qualified_sleeveing_number; - @ApiModelProperty(value = "套冒完成时间") + private String sleeveing_finish_time; - @ApiModelProperty(value = "捆扎包数") + private BigDecimal strap_pack_number; - @ApiModelProperty(value = "每捆数量") + private BigDecimal strap_number; - @ApiModelProperty(value = "捆扎尾料数量") + private BigDecimal strap_tailint_number; - @ApiModelProperty(value = "捆扎直径") + private String starp_diameter; - @ApiModelProperty(value = "捆扎尾料直径") + private String starp_tailint_diameter; - @ApiModelProperty(value = "当前捆扎包数") + private BigDecimal present_strap_pack_number; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "是否删除") + private String is_deleted; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java index de70c86f0..11c7c7161 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,65 +33,65 @@ import java.io.Serializable; public class RouteLine extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "路线标识") + @TableId(type = IdType.ASSIGN_ID) private String line_uuid; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "设备类型") + @NotBlank private String start_device_type; - @ApiModelProperty(value = "下一设备") + @NotBlank private String next_device_code; - @ApiModelProperty(value = "下一设备类型") + @NotBlank private String next_device_type; - @ApiModelProperty(value = "路线类型") + private String type; - @ApiModelProperty(value = "坐标值") + @NotBlank private String weights; - @ApiModelProperty(value = "points") + private String points; - @ApiModelProperty(value = "路由方案标识") + private String route_plan_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java index 2bbe48542..a67a46487 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java @@ -3,7 +3,7 @@ package org.nl.acs.route.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.common.base.CommonModel; @@ -25,47 +25,47 @@ import java.io.Serializable; public class RouteLoc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "坐标标识") + @TableId(type = IdType.ASSIGN_ID) private String ioc_uuid; - @ApiModelProperty(value = "设备编码") + @NotBlank private String device_code; - @ApiModelProperty(value = "坐标值") + @NotBlank private String ioc_value; - @ApiModelProperty(value = "路由方案标识") + private String route_plan_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java index b41288cde..b0de3412d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java @@ -3,7 +3,7 @@ package org.nl.acs.route.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.common.base.CommonModel; @@ -25,44 +25,44 @@ import java.io.Serializable; public class RoutePlan extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "方案标识") + @TableId(type = IdType.ASSIGN_ID) private String plan_uuid; - @ApiModelProperty(value = "方案编码") + @NotBlank private String plan_code; - @ApiModelProperty(value = "方案名称") + @NotBlank private String plan_name; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java index 06434fd8e..7a1626272 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由路线管理") + @RequestMapping("/api/routeLine") public class RouteLineController { @@ -33,14 +33,14 @@ public class RouteLineController { @GetMapping @Log("查询路由路线") - @ApiOperation("查询路由路线") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routeLineService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增路由路线") - @ApiOperation("新增路由路线") + //@PreAuthorize("@el.check('routeLine:add')") public ResponseEntity create(@RequestBody Map data) throws SQLException { routeLineService.create(data); @@ -49,7 +49,7 @@ public class RouteLineController { @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + public ResponseEntity reload() throws SQLException { routeLineService.reload(); @@ -59,7 +59,7 @@ public class RouteLineController { @PutMapping @Log("修改路由路线") - @ApiOperation("修改路由路线") + //@PreAuthorize("@el.check('routeLine:edit')") public ResponseEntity update(@Validated @RequestBody RouteLineDto dto) throws SQLException { routeLineService.update(dto); @@ -68,7 +68,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()); @@ -77,7 +77,7 @@ public class RouteLineController { @Log("删除路由路线") - @ApiOperation("删除路由路线") + //@PreAuthorize("@el.check('routeLine:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws SQLException { @@ -86,7 +86,7 @@ public class RouteLineController { } @Log("导出路由路线") - @ApiOperation("导出路由路线") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('routeLine:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -95,7 +95,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java index 318e41861..10546ded2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java @@ -1,7 +1,7 @@ package org.nl.acs.route.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.route.service.RouteLocService; import org.nl.acs.route.service.dto.RouteLocDto; @@ -24,7 +24,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由坐标管理") + @RequestMapping("/api/routeLoc") public class RouteLocController { @@ -32,14 +32,14 @@ public class RouteLocController { @GetMapping @Log("查询路由坐标") - @ApiOperation("查询路由坐标") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routeLocService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增路由坐标") - @ApiOperation("新增路由坐标") + //@PreAuthorize("@el.check('routeLoc:add')") public ResponseEntity create(@Validated @RequestBody RouteLocDto dto) { routeLocService.create(dto); @@ -48,7 +48,7 @@ public class RouteLocController { @PutMapping @Log("修改路由坐标") - @ApiOperation("修改路由坐标") + //@PreAuthorize("@el.check('routeLoc:edit')") public ResponseEntity update(@Validated @RequestBody RouteLocDto dto) { routeLocService.update(dto); @@ -56,7 +56,7 @@ public class RouteLocController { } @Log("删除路由坐标") - @ApiOperation("删除路由坐标") + //@PreAuthorize("@el.check('routeLoc:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +65,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java index 9b2d6efea..f25e84866 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java @@ -1,7 +1,7 @@ package org.nl.acs.route.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.route.service.RoutePlanService; import org.nl.acs.route.service.dto.RoutePlanDto; @@ -24,7 +24,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "路由计划管理") + @RequestMapping("/api/routePlan") public class RoutePlanController { @@ -32,14 +32,14 @@ public class RoutePlanController { @GetMapping @Log("查询路由方案") - @ApiOperation("查询路由方案") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(routePlanService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增路由方案") - @ApiOperation("新增路由方案") + //@PreAuthorize("@el.check('routePlan:add')") public ResponseEntity create(@Validated @RequestBody RoutePlanDto dto) { routePlanService.create(dto); @@ -48,7 +48,7 @@ public class RoutePlanController { @PutMapping @Log("修改路由方案") - @ApiOperation("修改路由方案") + //@PreAuthorize("@el.check('routePlan:edit')") public ResponseEntity update(@Validated @RequestBody RoutePlanDto dto) { routePlanService.update(dto); @@ -56,7 +56,7 @@ public class RoutePlanController { } @Log("删除路由方案") - @ApiOperation("删除路由方案") + //@PreAuthorize("@el.check('routePlan:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +65,7 @@ public class RoutePlanController { } @Log("导出路由方案") - @ApiOperation("导出路由方案") + @GetMapping(value = "/download") //@PreAuthorize("@el.check('routePlan:list')") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -74,7 +74,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java index 0effe1e73..be927d352 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -24,55 +24,55 @@ import io.swagger.annotations.ApiModelProperty; public class RouteLineDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "路线标识") + private String line_uuid; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "起点设备类型") + private String start_device_type; - @ApiModelProperty(value = "下一设备") + private String next_device_code; - @ApiModelProperty(value = "终点设备类型") + private String next_device_type; - @ApiModelProperty(value = "路线类型") + private String type; /** * 路由路线 */ private String path; - @ApiModelProperty(value = "坐标值") + private String weights; - @ApiModelProperty(value = "points") + private String points; - @ApiModelProperty(value = "路由方案标识") + private String route_plan_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java index 84ca4ea9f..ce8088bba 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java @@ -1,6 +1,6 @@ package org.nl.acs.route.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,36 +19,36 @@ import java.io.Serializable; public class RouteLocDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "坐标标识") + private String ioc_uuid; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "坐标值") + private String ioc_value; - @ApiModelProperty(value = "路由方案标识") + private String route_plan_id; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java index 54f5ebdaa..125f4384f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java @@ -1,6 +1,6 @@ package org.nl.acs.route.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,33 +19,33 @@ import java.io.Serializable; public class RoutePlanDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "方案标识") + private String plan_uuid; - @ApiModelProperty(value = "方案编码") + private String plan_code; - @ApiModelProperty(value = "方案名称") + private String plan_name; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java index de163356d..ab18a3e8f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,59 +33,59 @@ import java.io.Serializable; public class StorageCell extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "货位标识") + @TableId(type = IdType.ASSIGN_ID) private String storage_id; - @ApiModelProperty(value = "货位编码") + @NotBlank private String storage_code; - @ApiModelProperty(value = "排") + @NotBlank private String x; - @ApiModelProperty(value = "列") + @NotBlank private String y; - @ApiModelProperty(value = "层") + @NotBlank private String z; - @ApiModelProperty(value = "地址") + private Integer address; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "父级货位编码") + private String parent_storage_code; public void copyFrom(StorageCell source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java index ddf3231c3..07b0de577 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java @@ -11,7 +11,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -24,7 +24,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "货位信息管理") + @RequestMapping("/api/storageCell") public class StorageCellController { @@ -32,7 +32,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); @@ -40,7 +40,7 @@ public class StorageCellController { @PostMapping @Log("新增库位管理") - @ApiOperation("新增库位管理") + //@PreAuthorize("@el.check('storageCell:add')") public ResponseEntity create(@Validated @RequestBody StorageCellDto dto) { storageCellService.create(dto); @@ -49,7 +49,7 @@ public class StorageCellController { @PutMapping @Log("修改库位管理") - @ApiOperation("修改库位管理") + //@PreAuthorize("@el.check('storageCell:edit')") public ResponseEntity update(@Validated @RequestBody StorageCellDto dto) { storageCellService.update(dto); @@ -57,7 +57,7 @@ public class StorageCellController { } @Log("删除库位管理") - @ApiOperation("删除库位管理") + //@PreAuthorize("@el.check('storageCell:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java index fe0dece60..3ef167a04 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.util.Date; import java.sql.Timestamp; -import io.swagger.annotations.ApiModelProperty; + /** * @author jiaolm @@ -26,45 +26,45 @@ import io.swagger.annotations.ApiModelProperty; public class StorageCellDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "货位标识") + private String storage_id; - @ApiModelProperty(value = "货位编码") + private String storage_code; - @ApiModelProperty(value = "排") + private String x; - @ApiModelProperty(value = "列") + private String y; - @ApiModelProperty(value = "层") + private String z; - @ApiModelProperty(value = "地址") + private Integer address; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "父级货位编码") + private String parent_storage_code; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java index a09862b4f..7a48e24ae 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.IdType; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,206 +34,206 @@ import java.io.Serializable; public class Task extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "任务标识") + @TableId(type = IdType.ASSIGN_ID) private String task_id; - @ApiModelProperty(value = "任务外部标识") + private String ext_task_id; - @ApiModelProperty(value = "任务号") + @NotBlank private String task_code; - @ApiModelProperty(value = "载具号") + private String vehicle_code; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "任务类型") + @NotBlank private String task_type; - @ApiModelProperty(value = "任务状态") + @NotBlank private String task_status; - @ApiModelProperty(value = "复合任务") + @NotBlank private String compound_task; - @ApiModelProperty(value = "复合任务数据") + private String compound_task_data; - @ApiModelProperty(value = "再次请求") + private String request_again; - @ApiModelProperty(value = "再次请求成功") + private String request_again_success; - @ApiModelProperty(value = "关联编号") + private String link_num; - @ApiModelProperty(value = "是否下发") + private String is_send; - @ApiModelProperty(value = "物料类型") + private String material; - @ApiModelProperty(value = "物料数量") + @NotNull private BigDecimal quantity; - @ApiModelProperty(value = "任务优先级") + private String priority; - @ApiModelProperty(value = "创建类型") + @NotBlank private String create_type; - @ApiModelProperty(value = "完成类型") + @NotBlank private String finish_type; - @ApiModelProperty(value = "执行描述编码") + private String execute_code; - @ApiModelProperty(value = "执行描述信息") + private String execute_message; - @ApiModelProperty(value = "起始点位编码") + private String start_point_code; - @ApiModelProperty(value = "起始设备编码") + private String start_device_code; - @ApiModelProperty(value = "放货点位编码") + private String put_point_code; - @ApiModelProperty(value = "放货设备编码") + private String put_device_code; - @ApiModelProperty(value = "起始点位编码2") + private String start_point_code2; - @ApiModelProperty(value = "起始设备编码2") + private String start_device_code2; - @ApiModelProperty(value = "目标点位编码") + private String next_point_code; - @ApiModelProperty(value = "目标设备编码") + private String next_device_code; - @ApiModelProperty(value = "目标点位编码2") + private String next_point_code2; - @ApiModelProperty(value = "目标设备编码2") + private String next_device_code2; - @ApiModelProperty(value = "排") + private String from_x; - @ApiModelProperty(value = "列") + private String from_y; - @ApiModelProperty(value = "层") + private String from_z; - @ApiModelProperty(value = "排") + private String put_x; - @ApiModelProperty(value = "列") + private String put_y; - @ApiModelProperty(value = "层") + private String put_z; - @ApiModelProperty(value = "排") + private String to_x; - @ApiModelProperty(value = "列") + private String to_y; - @ApiModelProperty(value = "层") + private String to_z; - @ApiModelProperty(value = "排2") + private String from_x2; - @ApiModelProperty(value = "列2") + private String from_y2; - @ApiModelProperty(value = "层2") + private String from_z2; - @ApiModelProperty(value = "排2") + private String to_x2; - @ApiModelProperty(value = "列2") + private String to_y2; - @ApiModelProperty(value = "层2") + private String to_z2; - @ApiModelProperty(value = "路由方案名称") + private String route_plan_name; - @ApiModelProperty(value = "路由方案编码") + private String route_plan_code; - @ApiModelProperty(value = "是否需要反馈上位系统") + private String is_needfeedback; - @ApiModelProperty(value = "空盘数量") + private String emptypallet_num; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "重量") + private String weight; - @ApiModelProperty(value = "agv系统类型") + private String agv_system_type; - @ApiModelProperty(value = "立库任务类型") + private String storage_task_type; - @ApiModelProperty(value = "温度") + private String temperature; - @ApiModelProperty(value = "时间") + private String oven_time; - @ApiModelProperty(value = "交互字段") + private String interaction_json; public void copyFrom(Task source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java index a5a573b1d..b5f25235c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java @@ -3,7 +3,7 @@ package org.nl.acs.task.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; import org.nl.acs.common.base.CommonModel; @@ -25,98 +25,98 @@ import java.io.Serializable; public class TaskFeedback extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "任务反馈标识") + @TableId(type = IdType.ASSIGN_ID) private String taskback_id; - @ApiModelProperty(value = "任务标识") + private String task_id; - @ApiModelProperty(value = "任务号") + @NotBlank private String task_code; - @ApiModelProperty(value = "载具号") + private String vehicle_code; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "任务类型") + @NotBlank private String task_type; - @ApiModelProperty(value = "任务状态") + @NotBlank private String task_status; - @ApiModelProperty(value = "是否完成") + @NotBlank private String is_finished; - @ApiModelProperty(value = "错误编码") + private String error_code; - @ApiModelProperty(value = "开始时间") + private String start_time; - @ApiModelProperty(value = "完成时间") + private String finish_time; - @ApiModelProperty(value = "创建类型") + @NotBlank private String create_type; - @ApiModelProperty(value = "完成类型") + @NotBlank private String finish_type; - @ApiModelProperty(value = "重试次数") + @NotBlank private String retry_times; - @ApiModelProperty(value = "起始点位编码") + private String start_point_code; - @ApiModelProperty(value = "起始设备编码") + private String start_device_code; - @ApiModelProperty(value = "目标点位编码") + private String next_point_code; - @ApiModelProperty(value = "目标设备编码") + private String next_device_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + @NotBlank private String is_active; - @ApiModelProperty(value = "是否删除") + @NotBlank private String is_delete; - @ApiModelProperty(value = "创建者") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_by; - @ApiModelProperty(value = "创建时间") + @NotBlank @TableField(fill = FieldFill.INSERT) private String create_time; - @ApiModelProperty(value = "修改者") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_by; - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private String update_time; - @ApiModelProperty(value = "1-诺宝agv 2-叉车agv") + private String agv_system_type; public void copyFrom(TaskFeedback source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java index dcd011905..b70a5f062 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java @@ -14,7 +14,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -27,7 +27,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/task") public class TaskController { @@ -35,14 +35,14 @@ public class TaskController { @GetMapping @Log("查询任务") - @ApiOperation("查询任务") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/reload") @Log("数据同步") - @ApiOperation("数据同步") + @SaIgnore public ResponseEntity reload() { @@ -52,7 +52,7 @@ public class TaskController { @GetMapping("/getAll") @Log("历史查询任务") - @ApiOperation("历史查询任务") + public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskService.getAll(whereJson, page), HttpStatus.OK); @@ -60,7 +60,7 @@ public class TaskController { @PostMapping @Log("新增任务") - @ApiOperation("新增任务") + //@PreAuthorize("@el.check('task:add')") public ResponseEntity create(@Validated @RequestBody TaskDto dto) throws Exception { taskService.create(dto); @@ -69,7 +69,7 @@ public class TaskController { @PostMapping(value = "/adds") @Log("常规任务保存") - @ApiOperation("常规任务保存") + //@PreAuthorize("@el.check('task:add')") public ResponseEntity ordinaryTaskCreate(@RequestBody JSONObject json) throws Exception { @@ -79,7 +79,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); @@ -87,7 +87,7 @@ public class TaskController { @PutMapping @Log("修改任务") - @ApiOperation("修改任务") + //@PreAuthorize("@el.check('task:edit')") public ResponseEntity update(@Validated @RequestBody TaskDto dto) { taskService.update(dto); @@ -95,7 +95,7 @@ public class TaskController { } @Log("删除任务") - @ApiOperation("删除任务") + //@PreAuthorize("@el.check('task:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) throws Exception { @@ -104,7 +104,7 @@ public class TaskController { } @Log("完成任务") - @ApiOperation("完成任务") + @PostMapping(value = "/finish/{id}") public ResponseEntity finish(@RequestBody String id) { taskService.finish(id); @@ -112,7 +112,7 @@ public class TaskController { } @Log("取消任务") - @ApiOperation("取消任务") + @PostMapping(value = "/cancel/{id}") public ResponseEntity cancel(@RequestBody String id) throws Exception { taskService.cancel(id); @@ -120,7 +120,7 @@ public class TaskController { } @Log("手动创建指令") - @ApiOperation("手动创建指令") + @PostMapping(value = "/createInst/{id}") public ResponseEntity createInst(@RequestBody String id) throws Exception { taskService.createInst(id); @@ -128,7 +128,7 @@ public class TaskController { } @Log("导出任务") - @ApiOperation("导出任务") + @GetMapping(value = "/download") public void download(HttpServletResponse response, Map whereJson) throws IOException { @@ -136,7 +136,7 @@ public class TaskController { } @Log("一体机触发任务") - @ApiOperation("一体机触发任务") + @PostMapping("/createTaskByClick") //@PreAuthorize("@el.check('task:add')") public ResponseEntity createTaskByClick(@RequestBody JSONObject json) { @@ -146,7 +146,7 @@ public class TaskController { @SaIgnore @Log("查询缓存所有任务") - @ApiOperation("查询缓存任务") + @PostMapping(value = "/findAllTaskFromCache") public ResponseEntity findAllTaskFromCache() { return new ResponseEntity<>(taskService.findAllTaskFromCache(), HttpStatus.OK); @@ -154,7 +154,7 @@ public class TaskController { @GetMapping("/downloadTaskTreeLogging") @Log("导出任务树形记录") - @ApiOperation("导出任务树形记录") + public void downloadTaskTreeLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { taskService.downloadTaskTreeLogging(taskService.getTaskAndInst(whereJson), response); @@ -163,7 +163,7 @@ public class TaskController { @GetMapping("/downloadTaskLogging") @Log("导出任务树形记录") - @ApiOperation("导出任务树形记录") + public void downloadTaskLogging(HttpServletResponse response,@RequestParam Map whereJson) throws IOException { taskService.downloadTaskLogging(taskService.getTaskList(whereJson), response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java index bd6d4e1ec..0e1eb61f8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java @@ -1,7 +1,7 @@ package org.nl.acs.task.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.acs.task.service.TaskFeedbackService; import org.nl.acs.task.service.dto.TaskFeedbackDto; @@ -24,7 +24,7 @@ import java.util.Set; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务反馈管理") + @RequestMapping("/api/taskFeedback") 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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java index d065538a0..08467af5e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java @@ -1,6 +1,6 @@ package org.nl.acs.task.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.Accessors; @@ -19,81 +19,81 @@ import java.io.Serializable; public class TaskFeedbackDto implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "任务反馈标识") + private String taskback_id; - @ApiModelProperty(value = "任务标识") + private String task_id; - @ApiModelProperty(value = "任务号") + private String task_code; - @ApiModelProperty(value = "载具号") + private String vehicle_code; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "任务类型") + private String task_type; - @ApiModelProperty(value = "任务状态") + private String task_status; - @ApiModelProperty(value = "是否完成") + private String is_finished; - @ApiModelProperty(value = "错误编码") + private String error_code; - @ApiModelProperty(value = "开始时间") + private String start_time; - @ApiModelProperty(value = "完成时间") + private String finish_time; - @ApiModelProperty(value = "创建类型") + private String create_type; - @ApiModelProperty(value = "完成类型") + private String finish_type; - @ApiModelProperty(value = "重试次数") + private String retry_times; - @ApiModelProperty(value = "起始点位编码") + private String start_point_code; - @ApiModelProperty(value = "起始设备编码") + private String start_device_code; - @ApiModelProperty(value = "目标点位编码") + private String next_point_code; - @ApiModelProperty(value = "目标设备编码") + private String next_device_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private String is_active; - @ApiModelProperty(value = "是否删除") + private String is_delete; - @ApiModelProperty(value = "创建者") + private String create_by; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改者") + private String update_by; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "1-诺宝agv 2-叉车agv") + private String agv_system_type; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java index 570fe819d..a5df0d0a0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java @@ -1,6 +1,6 @@ package org.nl.acs.task.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; @@ -17,6 +17,6 @@ import org.springframework.format.annotation.DateTimeFormat; @Getter @Setter public class TaskQueryParam { - @ApiModelProperty(value = "任务状态") + private String task_status; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java index 4e5d4279b..57eb3b726 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java @@ -1,7 +1,7 @@ package org.nl.acs.taskscreen.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.acs.taskscreen.service.TaskScreenService; import org.nl.common.logging.annotation.Log; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; * @date 2023-11-18 */ @RestController -@Api(tags = "任务看板") + @RequestMapping("/api/screen") public class TaskScreenController { @@ -23,14 +23,14 @@ public class TaskScreenController { @GetMapping @Log("下拉选设备") - @ApiOperation("下拉选设备") + public ResponseEntity selectLedList() { return new ResponseEntity<>(taskScreenService.selectLedList(), HttpStatus.OK); } @GetMapping("/getLedMessage/{device}") @Log("根据关联设备获取任务信息") - @ApiOperation("根据关联设备获取任务信息") + public ResponseEntity getLedMessage(@PathVariable String device) { return new ResponseEntity<>(taskScreenService.getLedMessage(device), HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java index 829963ef4..4e2c77e9e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java @@ -3,8 +3,8 @@ package org.nl.acs.udw.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.udw.service.UdwManageService; @@ -20,7 +20,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "内存点位管理") + @RequestMapping("/api/udw") @Slf4j public class UdwManagerController { @@ -29,14 +29,14 @@ public class UdwManagerController { // @GetMapping // @Log("查询内存点位") -// @ApiOperation("查询内存点位") +// // @SaIgnore // public ResponseEntity query(@RequestParam JSONObject whereJson) { // return new ResponseEntity<>(udwManageService.queryByConditions(whereJson), HttpStatus.OK); // } @GetMapping - @ApiOperation("查询内存点位") + @SaIgnore //@PreAuthorize("@el.check('device:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java index 3a5acefc3..784d248c9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java @@ -15,7 +15,7 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.common.base.BaseDTO; @@ -41,31 +41,31 @@ public class DeptVo extends BaseDTO implements Serializable { private String ext_id; - @ApiModelProperty(value = "排序") + private Integer dept_sort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; @NotBlank - @ApiModelProperty(value = "中文名称") + private String zh_name; @NotBlank - @ApiModelProperty(value = "英文名称") + private String en_name; @NotBlank - @ApiModelProperty(value = "印尼名称") + private String in_name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer sub_count = 0; /** * 前端显示 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java index 88cb9d161..2a8b33492 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java @@ -15,7 +15,7 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; @@ -32,23 +32,23 @@ import java.io.Serializable; public class RoleVo implements Serializable { - @ApiModelProperty(value = "ID", hidden = true) + private Long role_id; @NotBlank - @ApiModelProperty(value = "名称", hidden = true) + private String name; - @ApiModelProperty(value = "级别，数值越小，级别越大") + private Integer level = 3; - @ApiModelProperty(value = "描述") + private String remark; - @ApiModelProperty(value = "描述") + private String order_seq; - @ApiModelProperty(value = "描述") + private String is_used; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java deleted file mode 100644 index fa7ae7416..000000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/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.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("${sa-token.token-name}") - private String tokenHeader; - - @Value("${sa-token.token-prefix}") - 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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java index 633a6dbc1..fbf7b0086 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java @@ -1,7 +1,7 @@ package org.nl.config.lucene.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; @@ -19,7 +19,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "日志检索") + @RequestMapping("/api/lucene") @Slf4j public class LuceneController { @@ -30,7 +30,7 @@ public class LuceneController { @GetMapping("/getAll") @Log("日志检索") - @ApiOperation("日志检索") + //@PreAuthorize("@el.check('task:list')") public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 2e59dc353..0b8dd913b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -48,7 +48,6 @@ public class CodeGenerator { gc.setOutputDir(projectPath + "/src/main/java/"); gc.setAuthor("generator"); gc.setOpen(false); -// gc.setSwagger2(true); gc.setEntityName("%s"); gc.setServiceName("I%sService"); gc.setServiceImplName("%sServiceImpl"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java index bdfe2dbe7..68eaf42c4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -28,13 +28,12 @@ import java.util.Set; * @since 2022-12-19 */ @RestController -@Api(tags = "系统：编码生成") @RequestMapping("/api/genCode") public class SysCodeRuleController { @Autowired private ISysCodeRuleService codeRuleService; - @ApiOperation("查询编码") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, PageQuery pageable) { @@ -42,7 +41,7 @@ public class SysCodeRuleController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody SysCodeRule codeRule) { @@ -51,7 +50,7 @@ public class SysCodeRuleController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -60,7 +59,7 @@ public class SysCodeRuleController { } @Log("修改编码") - @ApiOperation("修改编码") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRule codeRule) { @@ -68,7 +67,7 @@ public class SysCodeRuleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + @GetMapping(value = "/codeDemo") @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java index c0268dcf9..5344ac80b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; * @author generator * @since 2022-12-20 */ -@Api(tags = "系统：编码详情管理") + @RestController @RequestMapping("/api/codeDetail") public class SysCodeRuleDetailController { @@ -31,7 +31,7 @@ public class SysCodeRuleDetailController { @Autowired private ISysCodeRuleDetailService codeDetailService; - @ApiOperation("查询编码明细") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable){ @@ -39,7 +39,7 @@ public class SysCodeRuleDetailController { } @Log("新增编码明细") - @ApiOperation("新增编码明细") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail){ @@ -48,7 +48,7 @@ public class SysCodeRuleDetailController { } @Log("删除编码明细") - @ApiOperation("删除编码明细") + @DeleteMapping(value = "/{id}") @SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id){ @@ -57,7 +57,7 @@ public class SysCodeRuleDetailController { } @Log("修改编码明细") - @ApiOperation("修改编码明细") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRuleDetail json){ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index bf9320279..11d1161b2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -18,8 +18,8 @@ package org.nl.system.controller.dept; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -44,21 +44,21 @@ import java.util.Set; * @date 2019-03-25 */ @RestController -@Api(tags = "系统：部门管理") + @RequestMapping("/api/dept") public class DeptController { @Autowired private ISysDeptService deptService; - @ApiOperation("查询部门") + @GetMapping public ResponseEntity query(DeptQuery query) throws Exception { List list = deptService.list(query.build()); return new ResponseEntity<>(PageUtil.toPage(list, list.size()),HttpStatus.OK); } - @ApiOperation("查询部门") + @GetMapping("/vo") public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception { Page deptPage = deptService.queryVo(query, pageQuery); @@ -66,13 +66,13 @@ public class DeptController { } - @ApiOperation("查询所有部门树") + @GetMapping("/allTree") public ResponseEntity allTree(DeptQuery query) { return new ResponseEntity<>(deptService.buildTree(query),HttpStatus.OK); } - @ApiOperation("查询部门:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { @@ -83,7 +83,7 @@ public class DeptController { } @Log("新增部门") - @ApiOperation("新增部门") + @PostMapping public ResponseEntity create(@Validated @RequestBody SysDept resources){ deptService.createDept(resources); @@ -91,7 +91,7 @@ public class DeptController { } @Log("修改部门") - @ApiOperation("修改部门") + @PutMapping public ResponseEntity update(@Validated @RequestBody SysDept dept){ if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { @@ -102,7 +102,7 @@ public class DeptController { } @Log("删除部门") - @ApiOperation("删除部门") + @DeleteMapping public ResponseEntity delete(@RequestBody Set deptIds){ if (CollectionUtils.isEmpty(deptIds)){ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index 66b7adb50..689441eae 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,7 +1,7 @@ package org.nl.system.controller.dict; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -36,13 +36,13 @@ public class SysDictController { @Log("查询字典") @GetMapping - @ApiOperation("查询字典") + // @SaCheckPermission("dict:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); } - @ApiOperation("查询所有字典信息") + @GetMapping(value = "/all") // @SaCheckPermission("dict:list") public ResponseEntity queryAll(){ @@ -51,7 +51,7 @@ public class SysDictController { @Log("新增字典") @PostMapping - @ApiOperation("新增字典") + // @SaCheckPermission("dict:add") public ResponseEntity create(@RequestBody Dict dict){ dictService.create(dict); @@ -60,7 +60,7 @@ public class SysDictController { @PutMapping @Log("修改字典") - @ApiOperation("修改字典") + //@SaCheckPermission("@el.check('dict:edit')") public ResponseEntity updateDict(@Validated @RequestBody Dict dto){ dictService.updateDict(dto); @@ -68,7 +68,7 @@ public class SysDictController { } @Log("删除字典") - @ApiOperation("删除字典") + @DeleteMapping // @SaCheckPermission("dict:del") public ResponseEntity delete(@RequestBody Set ids){ @@ -77,13 +77,13 @@ public class SysDictController { } @GetMapping("/dictDetail") - @ApiOperation("查询字典详情") + public ResponseEntity queryDetails(@RequestParam Map criteria, PageQuery pageable){ DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class); return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); } - @ApiOperation("查询多个字典详情") + @GetMapping(value = "/dictDetail/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -95,7 +95,7 @@ public class SysDictController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + @PostMapping("/dictDetail") // @SaCheckPermission("dict:add") public ResponseEntity createDetail(@RequestBody Dict resources){ @@ -104,7 +104,7 @@ public class SysDictController { } @Log("修改字典详情") - @ApiOperation("修改字典详情") + @PutMapping("/dictDetail") // @SaCheckPermission("dict:edit") public ResponseEntity updateDetail(@RequestBody Dict resources){ @@ -113,7 +113,7 @@ public class SysDictController { } @Log("删除字典详情") - @ApiOperation("删除字典详情") + @DeleteMapping(value = "/dictDetail/{id}") // @SaCheckPermission("dict:del") public ResponseEntity deleteDetail(@PathVariable String id){ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 81d06dad5..12f578f80 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; @@ -23,20 +23,20 @@ import org.springframework.web.bind.annotation.*; */ @SaIgnore @RestController -@Api(tags = "系统：代码生成管理") + @RequestMapping("api/genConfig") public class CodeGenConfigController { @Autowired private ICodeGenConfigService genConfigService; - @ApiOperation("查询表数据") + @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.findByTableName(tableName), HttpStatus.OK); } - @ApiOperation("修改") + @PutMapping public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index 9d204e0cd..72c2c1180 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.apache.ibatis.annotations.Lang; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -32,7 +32,7 @@ import java.util.List; @SaIgnore @RestController @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") + public class CodeGeneratorController { @Autowired private ICodeGeneratorService generatorService; @@ -42,26 +42,26 @@ public class CodeGeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getTables(name, pageable)), HttpStatus.OK); } - @ApiOperation("查询字段数据") + @GetMapping(value = "/columns") public ResponseEntity queryColumns(@RequestParam String tableName){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getColumns(tableName)), HttpStatus.OK); } - @ApiOperation("批量修改字段数据") + @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ generatorService.updateBatchById(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + @PostMapping(value = "sync") public ResponseEntity sync(@RequestBody List tables){ for (String table : tables) { @@ -70,7 +70,7 @@ public class CodeGeneratorController { 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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java index 532331247..e99c5b6f1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logging; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -25,12 +25,12 @@ import java.util.Map; */ @RestController @RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") + public class SysLogController { @Autowired private ISysLogService logService; @GetMapping - @ApiOperation("日志查询") + //@SaCheckPermission("@el.check()") public ResponseEntity query(@RequestParam Map criteria, PageQuery pageable){ criteria.put("log_type","INFO"); @@ -38,7 +38,7 @@ public class SysLogController { } @GetMapping(value = "/user") - // @ApiOperation("用户日志查询") + // public ResponseEntity queryUserLog(@RequestParam Map criteria, PageQuery pageable){ criteria.put("log_type","INFO"); criteria.put("username", SecurityUtils.getCurrentUsername()); @@ -46,7 +46,7 @@ public class SysLogController { } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLog(@RequestParam Map criteria, PageQuery pageable){ criteria.put("log_type","ERROR"); @@ -54,7 +54,7 @@ public class SysLogController { } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLogs(@PathVariable String id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); @@ -62,7 +62,7 @@ public class SysLogController { @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllErrorLog(){ logService.delAllByError(); @@ -71,7 +71,7 @@ public class SysLogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllInfoLog(){ logService.delAllByInfo(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java index 65e23de8d..7e421bd54 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logicflow; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -28,7 +28,7 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "舞台管理") + @RequestMapping("/api/stage") public class StageController { @@ -37,7 +37,7 @@ public class StageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stage:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageService.queryAll(whereJson, page)), HttpStatus.OK); @@ -45,7 +45,7 @@ public class StageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stage:add") public ResponseEntity create(@Validated @RequestBody Stage dto) { stageService.create(dto); @@ -54,7 +54,7 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stage:edit") public ResponseEntity update(@Validated @RequestBody Stage dto) { stageService.update(dto); @@ -62,7 +62,7 @@ public class StageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stage:del") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -72,7 +72,7 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); @@ -80,7 +80,7 @@ public class StageController { @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + public ResponseEntity addNewStage(@Validated @RequestBody Stage dto) { log.info("dto{}",dto); stageService.addNewStage(dto); @@ -89,7 +89,7 @@ public class StageController { @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + public ResponseEntity getNewStageDataByCode(@RequestBody String code) { Stage one = stageService.getOne(new LambdaQueryWrapper().eq(Stage::getStage_code, code)); return new ResponseEntity<>(one, HttpStatus.CREATED); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java index c8e5f2da2..e487343fb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logicflow; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; @@ -27,7 +27,7 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { @@ -36,7 +36,7 @@ public class StageImageController { private IStageImageService stageImageService; @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stageImage:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageImageService.queryAll(whereJson, page)), HttpStatus.OK); @@ -44,7 +44,7 @@ public class StageImageController { @PostMapping @Log("新增舞台图片") - @ApiOperation("新增舞台图片") + //@SaCheckPermission("stageImage:add") public ResponseEntity create(@Validated @RequestBody StageImage entity) { stageImageService.create(entity); @@ -53,7 +53,7 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stageImage:edit") public ResponseEntity update(@Validated @RequestBody StageImage entity) { stageImageService.update(entity); @@ -61,7 +61,7 @@ public class StageImageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stageImage:del") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +71,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 987d3e6c4..cbe1c4857 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -7,7 +7,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -39,19 +39,19 @@ public class SysMenuController { private ISysMenuService iSysMenuService; @GetMapping(value = "/build") - @ApiOperation("根据用户获取菜单") + public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); } - @ApiOperation("返回全部的菜单") + @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } - @ApiOperation("获取菜单列表") + @PostMapping(value = "/getMenusByRole") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { @@ -61,7 +61,7 @@ public class SysMenuController { return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK); } - @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") + @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { @@ -74,7 +74,7 @@ public class SysMenuController { } @GetMapping - @ApiOperation("查询菜单") + @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { if (ObjectUtil.isEmpty(page.getSort())) { @@ -84,7 +84,7 @@ public class SysMenuController { return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { @@ -98,7 +98,7 @@ public class SysMenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -107,7 +107,7 @@ public class SysMenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update( @RequestBody SysMenu form) { @@ -116,7 +116,7 @@ public class SysMenuController { } @Log("删除菜单") - @ApiOperation("删除菜单") + @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java index 092e749e8..f5d73e80c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java @@ -16,8 +16,8 @@ package org.nl.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.system.service.monitor.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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java index 5d630427b..bfedf225a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.notice; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -23,7 +23,7 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "消息通知管理") + @RequestMapping("/api/notice") public class SysNoticeController { @@ -32,7 +32,7 @@ public class SysNoticeController { @GetMapping @Log("查询消息通知") - @ApiOperation("查询消息通知") + //@SaCheckPermission("@el.check('sysNotice:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson,page)),HttpStatus.OK); @@ -40,7 +40,7 @@ public class SysNoticeController { @PostMapping @Log("新增消息通知") - @ApiOperation("新增消息通知") + //@SaCheckPermission("@el.check('sysNotice:add')") public ResponseEntity create(@Validated @RequestBody SysNotice entity){ noticeService.create(entity); @@ -49,7 +49,7 @@ public class SysNoticeController { @PutMapping @Log("修改消息通知") - @ApiOperation("修改消息通知") + //@SaCheckPermission("@el.check('sysNotice:edit')") public ResponseEntity update(@Validated @RequestBody SysNotice entity){ noticeService.update(entity); @@ -57,7 +57,7 @@ public class SysNoticeController { } @Log("删除消息通知") - @ApiOperation("删除消息通知") + //@SaCheckPermission("@el.check('sysNotice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -99,7 +99,7 @@ public class SysNoticeController { @Log("批量已读") @PostMapping("/changeRead") - @ApiOperation("批量已读") + public ResponseEntity changeRead(@RequestBody JSONObject jsonObject) { noticeService.changeRead(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java index b78ffb0fd..d206ae5a3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.param; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -27,7 +27,7 @@ import java.util.Map; * @author generator * @since 2022-12-14 */ -@Api(tags = "系统参数管理") + @Slf4j @RestController @RequestMapping("/api/param") @@ -37,7 +37,7 @@ class SysParamController { private ISysParamService paramService; @GetMapping @Log("查询系统参数") - @ApiOperation("查询系统参数") + //@SaCheckPermission("param:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK); @@ -45,7 +45,7 @@ class SysParamController { @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + //@SaCheckPermission("param:add") public ResponseEntity create(@Validated @RequestBody Param param){ paramService.create(param); @@ -54,7 +54,7 @@ class SysParamController { @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + //@SaCheckPermission("param:edit") public ResponseEntity update(@Validated @RequestBody Param param){ paramService.update(param); @@ -62,7 +62,7 @@ class SysParamController { } @Log("删除系统参数") - @ApiOperation("删除系统参数") + //@SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -73,7 +73,7 @@ class SysParamController { @PostMapping("/getValueByCode/{code}") @Log("根据编码获取值") - @ApiOperation("根据编码获取值") + @SaIgnore public ResponseEntity getValueByCode(@PathVariable String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index 4a9436616..283afca7b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.permission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -29,7 +29,7 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "数据管理") + @RequestMapping("/api/dataPermission") public class SysDataPermissionController { @@ -38,7 +38,7 @@ public class SysDataPermissionController { @GetMapping @Log("查询数据权限") - @ApiOperation("查询数据权限") + //@SaCheckPermission("@el.check('dataPermission:list')") public ResponseEntity query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK); @@ -46,7 +46,7 @@ public class SysDataPermissionController { @PostMapping @Log("新增数据权限") - @ApiOperation("新增数据权限") + //@SaCheckPermission("@el.check('dataPermission:add')") public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); @@ -55,7 +55,7 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") - @ApiOperation("修改数据权限") + //@SaCheckPermission("@el.check('dataPermission:edit')") public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); @@ -63,7 +63,7 @@ public class SysDataPermissionController { } @Log("删除数据权限") - @ApiOperation("删除数据权限") + //@SaCheckPermission("@el.check('dataPermission:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -73,21 +73,21 @@ public class SysDataPermissionController { @GetMapping("/scopeType") @Log("获取数据权限范围") - @ApiOperation("获取数据权限范围") + public ResponseEntity getDataScopeType(){ return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK); } @GetMapping("/dataPermissionOption") @Log("获取数据权限下拉框") - @ApiOperation("获取数据权限下拉框") + public ResponseEntity getDataPermissionOption(){ return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK); } @PostMapping("/saveDataPermission") @Log("保存数据权限") - @ApiOperation("保存数据权限") + public ResponseEntity saveDataPermission(@RequestBody JSONObject datas){ dataPermissionService.savePermission(datas); return new ResponseEntity<>(HttpStatus.CREATED); @@ -95,14 +95,14 @@ public class SysDataPermissionController { @PostMapping("/dataShow") @Log("查看数据权限") - @ApiOperation("查看数据权限") + public ResponseEntity getDataShow(@RequestBody String id){ return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK); } @PostMapping("/dataDetail") @Log("查看数据明细") - @ApiOperation("查看数据明细") + public ResponseEntity getDataDetail(@RequestBody JSONObject data){ return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 1b6bdf2a7..8b0c81bea 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -31,21 +31,21 @@ import java.util.Set; @Slf4j @RestController @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") + public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; @Autowired private ISysQuartzJobService quartzJobService; - @ApiOperation("查询定时任务") + @GetMapping @SaCheckPermission("timing:list") public ResponseEntity query(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("查询任务执行日志") + @GetMapping(value = "/logs") @SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQuery criteria, PageQuery pageable) { @@ -53,7 +53,7 @@ public class SysQuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { @@ -65,7 +65,7 @@ public class SysQuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { @@ -74,7 +74,7 @@ public class SysQuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { @@ -83,7 +83,7 @@ public class SysQuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { @@ -92,7 +92,7 @@ public class SysQuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java index ec89c8679..409c47377 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java @@ -1,7 +1,7 @@ package org.nl.system.controller.redis; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java index 2eacfa3c5..a28497619 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -2,7 +2,7 @@ package org.nl.system.controller.role; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -30,21 +30,21 @@ public class SysRoleController { @Autowired private ISysRoleService roleService; - @ApiOperation("分页查询角色") + @GetMapping @SaCheckPermission("roles:list") public ResponseEntity pageQuery(@RequestParam Map param, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK); } - @ApiOperation("查询所有角色") + @GetMapping("/all") public ResponseEntity queryAll() { return new ResponseEntity<>(roleService.list(), HttpStatus.OK); } @Log("新增角色") - @ApiOperation("新增角色") + @PostMapping @SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { @@ -53,7 +53,7 @@ public class SysRoleController { } @Log("修改角色") - @ApiOperation("修改角色") + @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { @@ -62,7 +62,7 @@ public class SysRoleController { } @Log("删除角色") - @ApiOperation("删除角色") + @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +71,7 @@ public class SysRoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index e084fc399..adf99f6b4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.acs.common.base.CommonFinalParam; import org.nl.common.utils.RedisUtils; @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") -@Api(tags = "系统：系统授权接口") + public class AuthorizationController { @Autowired private RedisUtils redisUtils; @@ -48,7 +48,7 @@ public class AuthorizationController { @Autowired private LoginProperties loginProperties; - @ApiOperation("登录授权") + @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap) throws Exception { if (ObjectUtil.isEmpty(authMap)){ @@ -58,7 +58,7 @@ public class AuthorizationController { } - @ApiOperation("获取用户信息") + @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -68,7 +68,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取指定用户信息") + @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null){ @@ -78,7 +78,7 @@ public class AuthorizationController { return ResponseEntity.noContent().build(); } - @ApiOperation("获取验证码") + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -100,7 +100,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - @ApiOperation("退出登录") + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java index e042e036c..eea859a1d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java @@ -3,8 +3,8 @@ package org.nl.system.controller.tools; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -31,20 +31,20 @@ import java.util.Set; * @since 2022-12-20 */ @RestController -@Api(tags = "工具：本地存储管理") + @RequestMapping("/api/localStorage") public class ToolLocalStorageController { @Autowired private IToolLocalStorageService localStorageService; - @ApiOperation("查询文件") + @GetMapping // @SaCheckPermission("storage:list") public ResponseEntity query(ToolLocalStorageQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(localStorageService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("上传文件") + @PostMapping @SaIgnore // @SaCheckPermission("storage:add") @@ -53,7 +53,7 @@ public class ToolLocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -64,7 +64,7 @@ public class ToolLocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody ToolLocalStorage resources) { @@ -74,7 +74,7 @@ public class ToolLocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + public ResponseEntity delete(@RequestBody Set ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java index 567898e03..565664e64 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java @@ -15,8 +15,8 @@ */ package org.nl.system.controller.user; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.utils.EncryptUtils; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -34,27 +34,27 @@ import java.util.Set; */ @RestController @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") + public class OnlineController { @Autowired private 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/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index f433583d6..6a123a101 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -21,8 +21,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -48,7 +48,7 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") + @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -58,14 +58,14 @@ public class UserController { private ISysUserService userService; - @ApiOperation("查询用户") + @GetMapping public ResponseEntity query(UserQuery query, PageQuery page){ return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK); } @Log("新增用户") - @ApiOperation("新增用户") + @PostMapping // @SaCheckPermission("user:add") public ResponseEntity create(@RequestBody Map user){ @@ -74,7 +74,7 @@ public class UserController { } @Log("修改用户") - @ApiOperation("修改用户") + @PutMapping // @SaCheckPermission("user:edit") public ResponseEntity update( @RequestBody Map resources) throws Exception { @@ -83,7 +83,7 @@ public class UserController { } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + public ResponseEntity center(@RequestBody SysUser resources){ if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ throw new BadRequestException(LangProcess.msg("error_sysAuth")); @@ -93,14 +93,14 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { userService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { // 解密，得到字符密码 @@ -118,14 +118,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 SysUser user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index f5427fc0a..46c0c9488 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; + import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,42 +32,42 @@ public class CodeColumnConfig implements Serializable { @TableId(value = "column_id", type = IdType.ASSIGN_ID) private String column_id; - @ApiModelProperty(value = "表名") + private String table_name; - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java index 79e389f6f..9ed98b361 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java @@ -1,6 +1,6 @@ package org.nl.system.service.generator.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; /** @@ -10,39 +10,39 @@ import lombok.Data; */ @Data public class ColumnInfo { - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java index b5a8daa00..5566baa8b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java @@ -3,7 +3,7 @@ package org.nl.system.service.notice.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,28 +26,28 @@ public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "notice_id", type = IdType.NONE) - @ApiModelProperty(value = "信息标识") + private String notice_id; - @ApiModelProperty(value = "信息标题") + private String notice_title; - @ApiModelProperty(value = "信息内容") + private String notice_content; - @ApiModelProperty(value = "信息类型") + private String notice_type; - @ApiModelProperty(value = "读取状态") + private String have_read; - @ApiModelProperty(value = "读取时间") + private String read_time; - @ApiModelProperty(value = "处理状态") + private String deal_status; - @ApiModelProperty(value = "创建时间") + private String create_time; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java index c00c0f373..b3b88e52e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java @@ -9,6 +9,8 @@ import org.springframework.scheduling.quartz.AdaptableJobFactory; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.stereotype.Component; +import java.util.Properties; + /** * 定时任务配置 * @author / @@ -48,6 +50,14 @@ public class QuartzConfig { @Bean(name = "scheduler") public Scheduler scheduler(QuartzJobFactory quartzJobFactory) throws Exception { SchedulerFactoryBean factoryBean=new SchedulerFactoryBean(); + + //https://blog.csdn.net/YuChenIT/article/details/133344898 + Properties prop = new Properties(); + prop.put("org.quartz.threadPool.threadCount", "9"); + factoryBean.setWaitForJobsToCompleteOnShutdown(true); + + factoryBean.setQuartzProperties(prop); + factoryBean.setJobFactory(quartzJobFactory); factoryBean.afterPropertiesSet(); Scheduler scheduler=factoryBean.getScheduler(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java index 4f36fa754..0b4821f53 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java @@ -1,7 +1,7 @@ package org.nl.system.service.redis.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,26 +15,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 = CommonFinalParam.ONE) + private RedisKeyDefine.TimeoutTypeEnum timeoutType; - @ApiModelProperty(value = "过期时间，单位：毫秒", required = true, example = "1024") + private Duration timeout; - @ApiModelProperty(value = "备注", required = true, example = "啦啦啦啦~") + private String memo; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java index ce0794b17..a3a051eb7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java @@ -1,7 +1,7 @@ package org.nl.system.service.redis.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/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 0ccb0c649..b335b9386 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -105,10 +105,6 @@ login: generator: enabled: true -#是否开启 swagger-ui -swagger: - enabled: true - # IP 本地解析 ip: local-parsing: true diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index af346c841..a3bb23c63 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -117,18 +117,6 @@ ip: #是否允许生成代码，生产环境设置为false generator: enabled: false - -#如果生产环境要开启swagger，需要配置请求地址 -#springfox: -# documentation: -# swagger: -# v2: -# host: # 接口域名或外网ip - -#是否开启 swagger-ui -swagger: - enabled: false - # 文件存储路径 file: mac: diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml index 4819ab133..0323ff94e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml @@ -116,18 +116,6 @@ ip: #是否允许生成代码，生产环境设置为false generator: enabled: false - -#如果生产环境要开启swagger，需要配置请求地址 -#springfox: -# documentation: -# swagger: -# v2: -# host: # 接口域名或外网ip - -#是否开启 swagger-ui -swagger: - enabled: false - # 文件存储路径 file: mac: diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 6b4b310d6..387ab2798 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -1,3 +1,7 @@ +server: + tomcat: + relaxed-query-chars: [ '|','{','}','[',']' ] #字符问题：https://blog.csdn.net/CanYue_Yi/article/details/109182577 + relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118 spring: freemarker: check-template-location: false @@ -19,6 +23,45 @@ spring: hibernate: dialect: org.hibernate.dialect.MySQL5InnoDBDialect enable_lazy_load_no_trans: true + dynamic: + tp: + enabled: false # 是否启用 dynamictp，默认true + enabledBanner: false # 是否启用 控制台banner，默认true + enabledCollect: true # 是否开启监控指标采集，默认true + collectorTypes: logging,test_collect # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer + logPath: C:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置 + monitorInterval: 8 + tomcatTp: # tomcat webserver 线程池配置 + threadPoolAliasName: tomcat 线程池 # 线程池别名，可选 + corePoolSize: 100 + maximumPoolSize: 200 + keepAliveTime: 60 + runTimeout: 10000 + queueTimeout: 100 + notifyItems: # 报警项，不配置自动会按默认值配置（变更通知、容量报警、活性报警、拒绝报警、任务超时报警） + - type: change + enabled: true + + - type: capacity # 队列容量使用率，报警项类型，查看源码 NotifyTypeEnum枚举类 + enabled: true + threshold: 80 # 报警阈值，默认70，意思是队列使用率达到70%告警 + interval: 120 # 报警间隔（单位：s），默认120 + + - type: liveness # 线程池活性 + enabled: true + threshold: 80 # 报警阈值，默认 70，意思是活性达到70%告警 + + - type: reject # 触发任务拒绝告警 + enabled: true + threshold: 100 # 默认阈值10 + + - type: run_timeout # 任务执行超时告警 + enabled: true + threshold: 100 # 默认阈值10 + + - type: queue_timeout # 任务排队超时告警 + enabled: true + threshold: 100 # 默认阈值10 task: pool: # 核心线程池大小 @@ -55,9 +98,6 @@ security: - /auth/code - /auth/logout - /sys-user-do/** - # swagger - - /swagger-ui.html - - /swagger-resources/** - /webjars/** - /file/** - /webSocket/** @@ -66,10 +106,6 @@ security: - /**/*.html - /**/*.css - /**/*.js - # swagger 文档配置 - - /favicon.ico - - /*/api-docs - - /*/api-docs/** # druid 监控配置 - /druid/** # actuator 监控配置 diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl index 5962e5c6a..9eee0c084 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl @@ -1,7 +1,7 @@ package ${package}.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,7 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "${apiAlias}管理") + @RequestMapping("/api/${changeClassName}") public class ${className}Controller { @@ -31,7 +31,7 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - @ApiOperation("查询${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(${changeClassName}Service.queryAll(whereJson,page)),HttpStatus.OK); @@ -39,7 +39,7 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - @ApiOperation("新增${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.create(entity); @@ -48,7 +48,7 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - @ApiOperation("修改${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.update(entity); @@ -56,7 +56,7 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - @ApiOperation("删除${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl index 93dfaa8b5..da1a90eb8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,9 +35,9 @@ public class ${className} implements Serializable { @TableId(value = "${column.columnName}", type = <#if auto>IdType.AUTO<#else>IdType.NONE) <#if column.remark != ''> - @ApiModelProperty(value = "${column.remark}") + <#else> - @ApiModelProperty(value = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}; diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index 02edcca57..d5ca9ad63 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -45,7 +45,8 @@ spring: reset-enable: false filters: DruidFilter,stat -# stat: + validation-query-timeout: 5000 + # stat: # enabled: true # # 记录慢SQL # log-slow-sql: true diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index c5e679827..9908fdd44 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -15,7 +15,7 @@ spring: enabled: false dynamic: tp: - enabled: true # 是否启用 dynamictp，默认true + enabled: false # 是否启用 dynamictp，默认true enabledBanner: false # 是否启用 控制台banner，默认true enabledCollect: true # 是否开启监控指标采集，默认true collectorTypes: logging # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer