diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml index cb7cb459a..9b9392bb3 100644 --- a/lms/nladmin-system/pom.xml +++ b/lms/nladmin-system/pom.xml @@ -178,38 +178,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/lms/nladmin-system/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/src/main/java/org/nl/AppRun.java index 983dad243..2b8801ed6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/src/main/java/org/nl/AppRun.java @@ -3,7 +3,6 @@ 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.modules.wql.util.SpringContextHolder; import org.springframework.boot.SpringApplication; @@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) @@ -35,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController; @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation @MapperScan("org.nl.**.mapper") -//@EnableElasticsearchRepositories(basePackages = {"org.nl.modules.logging.repository.*"}) public class AppRun { public static void main(String[] args) { diff --git a/lms/nladmin-system/src/main/java/org/nl/config/CustomJsonConfiguration.java b/lms/nladmin-system/src/main/java/org/nl/config/CustomJsonConfiguration.java index 9e0e74982..66c472fd8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/CustomJsonConfiguration.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/CustomJsonConfiguration.java @@ -19,6 +19,9 @@ import java.util.List; *

* 序列换成json时,将所有的long变成string * 因为js中得数字类型不能包含所有的java long值 + *

+ * 序列换成json时,将所有的long变成string + * 因为js中得数字类型不能包含所有的java long值 *//* @Configuration diff --git a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java index e69791f70..f2ebd783a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/DruidFilter.java @@ -10,8 +10,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; import com.mysql.cj.jdbc.result.ResultSetImpl; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.MDC; import java.sql.SQLException; import java.util.ArrayList; @@ -46,7 +44,7 @@ public class DruidFilter extends FilterEventAdapter { count = statement.getUpdateCount(); } catch (Exception ex) { } - if ( count > 0) { + if (count > 0) { if (size > 0) { Collection values = statement.getParameters().values(); List params = new ArrayList<>(); diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java index 6a0573a55..a048c91b3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java @@ -19,11 +19,11 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender { @Override protected void append(ILoggingEvent event) { String traceId = LuceneAppender.traceIdTL.get(); - if (StringUtils.isNotEmpty(traceId)){ - MDC.put("traceId",traceId); + if (StringUtils.isNotEmpty(traceId)) { + MDC.put("traceId", traceId); Map mdcPropertyMap = event.getMDCPropertyMap(); - if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")){ - mdcPropertyMap.put("traceId",traceId); + if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")) { + mdcPropertyMap.put("traceId", traceId); } MDC.clear(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LogMessageConstant.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LogMessageConstant.java index 14ddcca0c..60881c648 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LogMessageConstant.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LogMessageConstant.java @@ -6,41 +6,75 @@ package org.nl.config.lucene; * @Date: 2023/8/25 */ public class LogMessageConstant { - /** */ + /** + * + */ public final static String SORT_NAME = "time"; - /** 级别 */ + /** + * 级别 + */ public final static String FIELD_LEVEL = "level"; - /** 时间 */ + /** + * 时间 + */ public final static String FIELD_TIMESTAMP = "timestamp"; - /** 类的限定名 */ + /** + * 类的限定名 + */ public final static String FIELD_CLASS_NAME = "logger"; - /** 线程名 */ + /** + * 线程名 + */ public final static String FIELD_THREAD = "thread"; - /** 日志内容 */ + /** + * 日志内容 + */ public final static String FIELD_MESSAGE = "message"; public final static String FIELD_TRACEID = "tlogTraceId"; // 定义颜色值 - /** 文本颜色：黑色 */ + /** + * 文本颜色：黑色 + */ public final static String COLOR_BLACK = "\u001B[30m"; - /** 文本颜色：红色 */ + /** + * 文本颜色：红色 + */ public final static String COLOR_RED = "\u001B[31m"; - /** 文本颜色：绿色 */ + /** + * 文本颜色：绿色 + */ public final static String COLOR_GREEN = "\u001B[32m"; - /** 文本颜色：黄色 */ + /** + * 文本颜色：黄色 + */ public final static String COLOR_YELLOW = "\u001B[33m"; - /** 文本颜色：蓝色 */ + /** + * 文本颜色：蓝色 + */ public final static String COLOR_BLUE = "\u001B[34m"; - /** 文本颜色：品红色 */ + /** + * 文本颜色：品红色 + */ public final static String COLOR_MAGENTA = "\u001B[35m"; - /** 文本颜色：青色 */ + /** + * 文本颜色：青色 + */ public final static String COLOR_CYAN = "\u001B[36m"; - /** 文本颜色：白色 */ + /** + * 文本颜色：白色 + */ public final static String COLOR_WHITE = "\u001B[37m"; - /** 文本颜色重置 */ + /** + * 文本颜色重置 + */ public final static String COLOR_RESET = "\u001B[0m"; - /** 背景颜色：黄色 */ + /** + * 背景颜色：黄色 + */ public final static String BACKGROUND_YELLOW = "\u001B[43m"; - /** 索引路径 */ + /** + * 索引路径 + */ public final static String INDEX_DIR = "E:\\lucene\\index"; } diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java index 385da8e06..f4f6fe5ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -32,11 +32,10 @@ public class LuceneAppender extends AppenderBase { public static final TransmittableThreadLocal traceIdTL = new TransmittableThreadLocal(); public LuceneProperties properties; public static Directory index; - private List encoders; + private List encoders; public static IndexWriter indexWriter; - @Override public void start() { super.start(); @@ -54,7 +53,7 @@ public class LuceneAppender extends AppenderBase { Properties properties = yamlPropertiesFactoryBean.getObject(); // 获取配置值 String luceneDir = properties.getProperty("lucene.index.path"); - System.out.println("---index地址----"+luceneDir); + System.out.println("---index地址----" + luceneDir); index = FSDirectory.open(Paths.get(luceneDir)); // 初始化 Lucene 索引 Analyzer analyzer = new IKAnalyzer(); @@ -72,14 +71,14 @@ public class LuceneAppender extends AppenderBase { doc.add(new StringField(property.getName(), encode, Field.Store.YES)); } Map map = event.getMDCPropertyMap(); - if (!map.isEmpty() && StringUtils.isNotEmpty(map.get("traceId"))){ - doc.add(new StringField("traceId",map.get("traceId"), Field.Store.YES)); - }else { - doc.add(new StringField("traceId"," ", Field.Store.YES)); + if (!map.isEmpty() && StringUtils.isNotEmpty(map.get("traceId"))) { + doc.add(new StringField("traceId", map.get("traceId"), Field.Store.YES)); + } else { + doc.add(new StringField("traceId", " ", Field.Store.YES)); } doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, event.getFormattedMessage(), Field.Store.YES)); doc.add(new StringField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName(), Field.Store.YES)); - doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, String.valueOf(event.getTimeStamp()),Field.Store.YES)); + doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, String.valueOf(event.getTimeStamp()), Field.Store.YES)); doc.add(new NumericDocValuesField(LogMessageConstant.SORT_NAME, event.getTimeStamp())); try { indexWriter.addDocument(doc); diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneProperties.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneProperties.java index c0442277a..805f5490c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneProperties.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LuceneProperties.java @@ -6,18 +6,18 @@ import java.util.List; public class LuceneProperties { - private List properties; + private List properties; - public LuceneProperties() { - this.properties = new ArrayList(); - } + public LuceneProperties() { + this.properties = new ArrayList(); + } - public List getProperties() { - return properties; - } + public List getProperties() { + return properties; + } - public void addProperty(Property property) { - properties.add(property); - } + public void addProperty(Property property) { + properties.add(property); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LucenePropertyAndEncoder.java b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LucenePropertyAndEncoder.java index 7ad3ecfa0..80b9e02a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/lucene/LucenePropertyAndEncoder.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/lucene/LucenePropertyAndEncoder.java @@ -13,7 +13,7 @@ public class LucenePropertyAndEncoder { private Property property; - private PatternLayoutBase layout = new PatternLayout(); + private PatternLayoutBase layout = new PatternLayout(); public LucenePropertyAndEncoder(Property property, Context context) { this.property = property; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java index b68c65370..eb2e1081d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java @@ -15,7 +15,7 @@ */ package org.nl.modules.common.base; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; @@ -44,22 +44,22 @@ public class BaseEntity implements Serializable { @CreatedBy @Column(name = "create_by", updatable = false) - @ApiModelProperty(value = "创建人", hidden = true) + private String createBy; @LastModifiedBy @Column(name = "update_by") - @ApiModelProperty(value = "更新人", hidden = true) + private String updatedBy; @CreationTimestamp @Column(name = "create_time", updatable = false) - @ApiModelProperty(value = "创建时间", hidden = true) + private Timestamp createTime; @UpdateTimestamp @Column(name = "update_time") - @ApiModelProperty(value = "更新时间", hidden = true) + private Timestamp updateTime; /* 分组校验 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java deleted file mode 100644 index 68457d342..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.modules.common.config; - -import com.fasterxml.classmate.TypeResolver; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.data.domain.Pageable; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.schema.AlternateTypeRule; -import springfox.documentation.schema.AlternateTypeRuleConvention; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.util.ArrayList; -import java.util.List; - -import static com.google.common.collect.Lists.newArrayList; -import static springfox.documentation.schema.AlternateTypeRules.newRule; - -/** - * api页面 /doc.html - * - * @author Zheng Jie - * @date 2018-11-23 - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - @Value("${jwt.header}") - private String tokenHeader; - - @Value("${jwt.token-start-with}") - private String tokenStartWith; - - @Value("${swagger.enabled}") - private Boolean enabled; - - @Bean - @SuppressWarnings("all") - public Docket createRestApi() { -// ParameterBuilder ticketPar = new ParameterBuilder(); -//// List pars = new ArrayList<>(); -//// ticketPar.name(tokenHeader).description("token") -//// .modelRef(new ModelRef("string")) -//// .parameterType("header") -//// .defaultValue(tokenStartWith + " ") -//// .required(true) -//// .build(); -// pars.add(ticketPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(enabled) - .apiInfo(apiInfo()) - .select() -// .paths(Predicates.not(PathSelectors.regex("/error.*"))) - .paths(PathSelectors.any()) - .build() -// .globalOperationParameters(pars) - //添加登陆认证 - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .description("一个简单且易上手的 Spring boot 后台管理框架") - .title("EL-ADMIN 接口文档") - .version("2.4") - .build(); - } - - private List securitySchemes() { - //设置请求头信息 - List securitySchemes = new ArrayList<>(); - ApiKey apiKey = new ApiKey(tokenHeader, tokenHeader, "header"); - securitySchemes.add(apiKey); - return securitySchemes; - } - - private List securityContexts() { - //设置需要登录认证的路径 - List securityContexts = new ArrayList<>(); - // ^(?!auth).*$ 表示所有包含auth的接口不需要使用securitySchemes即不需要带token - // ^标识开始 ()里是一子表达式 ?!/auth表示匹配不是/auth的位置，匹配上则添加请求头，注意路径已/开头 .表示任意字符 *表示前面的字符匹配多次 $标识结束 - securityContexts.add(getContextByPath("^(?!/auth).*$")); - return securityContexts; - } - - private SecurityContext getContextByPath(String pathRegex) { - return SecurityContext.builder() - .securityReferences(defaultAuth()) - .forPaths(PathSelectors.regex(pathRegex)) - .build(); - } - - private List defaultAuth() { - List securityReferences = new ArrayList<>(); - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - securityReferences.add(new SecurityReference(tokenHeader, authorizationScopes)); - return securityReferences; - } -} - -/** - * 将Pageable转换展示在swagger中 - */ -@Configuration -class SwaggerDataConfig { - - @Bean - public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { - return new AlternateTypeRuleConvention() { - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - - @Override - public List rules() { - return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); - } - }; - } - - @ApiModel - @Data - private static class Page { - @ApiModelProperty("页码 (0..N)") - private Integer page; - - @ApiModelProperty("每页显示的数目") - private Integer size; - - @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") - private List sort; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java index abbb456f0..1a63afcae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java @@ -18,7 +18,6 @@ package org.nl.modules.common.utils; /** * @author: liaojinlong * @date: 2020/6/11 15:49 - * @apiNote: 关于缓存的Key集合 */ public interface CacheKey { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java index ace16bb06..803d8336f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/DateUtil.java @@ -23,7 +23,6 @@ import java.util.Date; /** * @author: liaojinlong * @date: 2020/6/11 16:28 - * @apiNote: JDK 8 新日期类 格式化与字符串转换 工具类 */ public class DateUtil { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java b/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java index 2460bc828..e0b008568 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -39,47 +39,47 @@ public class ColumnInfo implements Serializable { @Id @Column(name = "column_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "数据库字段名称") + private String columnName; - @ApiModelProperty(value = "数据库字段类型") + private String columnType; - @ApiModelProperty(value = "数据库字段键类型") + private String keyType; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean notNull; - @ApiModelProperty(value = "是否在列表显示") + private Boolean listShow; - @ApiModelProperty(value = "是否表单显示") + private Boolean formShow; - @ApiModelProperty(value = "表单类型") + private String formType; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String queryType; - @ApiModelProperty(value = "字典名称") + private String dictName; - @ApiModelProperty(value = "日期注解") + private String dateAnnotation; public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java b/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java index 189fac82d..448f672ef 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -43,38 +43,38 @@ public class GenConfig implements Serializable { @Id @Column(name = "config_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @NotBlank - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "接口名称") + private String apiAlias; @NotBlank - @ApiModelProperty(value = "包路径") + private String pack; @NotBlank - @ApiModelProperty(value = "模块名") + private String moduleName; @NotBlank - @ApiModelProperty(value = "前端文件路径") + private String path; - @ApiModelProperty(value = "前端文件路径") + private String apiPath; - @ApiModelProperty(value = "作者") + private String author; - @ApiModelProperty(value = "表前缀") + private String prefix; - @ApiModelProperty(value = "是否覆盖") + private Boolean cover = false; } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java b/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java index 904d5de2b..64c0619b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java @@ -15,8 +15,7 @@ */ package org.nl.modules.generator.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.modules.generator.domain.GenConfig; import org.nl.modules.generator.service.GenConfigService; @@ -32,18 +31,18 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/genConfig") -@Api(tags = "系统：代码生成器配置管理") + public class GenConfigController { private final GenConfigService genConfigService; - @ApiOperation("查询") + @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName) { return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } - @ApiOperation("修改") + @PutMapping public ResponseEntity update(@Validated @RequestBody GenConfig genConfig) { return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java b/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java index 517314127..eab6e43aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java @@ -15,8 +15,7 @@ */ package org.nl.modules.generator.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; @@ -39,7 +38,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") + public class GeneratorController { private final GeneratorService generatorService; @@ -48,13 +47,13 @@ public class GeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables/all") public ResponseEntity queryTables() { return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK); } - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "0") Integer page, @@ -63,21 +62,21 @@ public class GeneratorController { return new ResponseEntity<>(generatorService.getTables(name, startEnd), HttpStatus.OK); } - @ApiOperation("查询字段数据") + @GetMapping(value = "/columns") public ResponseEntity queryColumns(@RequestParam String tableName) { List columnInfos = generatorService.getColumns(tableName); return new ResponseEntity<>(PageUtil.toPage(columnInfos, columnInfos.size()), HttpStatus.OK); } - @ApiOperation("保存字段数据") + @PutMapping public ResponseEntity save(@RequestBody List columnInfos) { generatorService.save(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + @PostMapping(value = "sync") public ResponseEntity sync(@RequestBody List tables) { for (String table : tables) { @@ -86,7 +85,7 @@ public class GeneratorController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("生成代码") + @PostMapping(value = "/{tableName}/{type}") public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response) { if (!generatorEnabled && type == 0) { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java index 7c645fa90..ae5169a7b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java @@ -1,6 +1,6 @@ package org.nl.modules.logging.rest; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -26,19 +26,19 @@ public class EsLogController { @GetMapping("/labels/{type}") - @ApiOperation("获取标签") + public ResponseEntity labelsValues(@PathVariable String type) { return new ResponseEntity<>(esLogService.getLabelsValues(type), HttpStatus.OK); } @PostMapping("/query") - @ApiOperation("日志查询") + public ResponseEntity queryAll(@RequestBody LogQuery query) { return new ResponseEntity<>(esLogService.query(query), HttpStatus.OK); } @DeleteMapping("/clearLogs") - @ApiOperation("清空日志") + public ResponseEntity clearLogs(@RequestBody LogQuery query) { esLogService.clearLogs(query); return new ResponseEntity<>(HttpStatus.OK); @@ -48,17 +48,17 @@ public class EsLogController { @DeleteMapping("/thread") @Log("清空日志") public ResponseEntity thread() { - log.info("Async线程链路测试"+Thread.currentThread().getName()); - log.error("Async线程链路测试"+Thread.currentThread().getName()); - log.info("Async线程链路测试"+Thread.currentThread().getName()); - log.info("线程链路测试"+Thread.currentThread().getName()); + log.info("Async线程链路测试" + Thread.currentThread().getName()); + log.error("Async线程链路测试" + Thread.currentThread().getName()); + log.info("Async线程链路测试" + Thread.currentThread().getName()); + log.info("线程链路测试" + Thread.currentThread().getName()); esLogService.syncdemo(); - new Thread(()->{ - log.info("线程链路测试"+Thread.currentThread().getName()); - log.error("线程链路测试"+Thread.currentThread().getName()); - log.info("线程链路测试"+Thread.currentThread().getName()); - log.info("线程链路测试"+Thread.currentThread().getName()); + new Thread(() -> { + log.info("线程链路测试" + Thread.currentThread().getName()); + log.error("线程链路测试" + Thread.currentThread().getName()); + log.info("线程链路测试" + Thread.currentThread().getName()); + log.info("线程链路测试" + Thread.currentThread().getName()); }).start(); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java index 8e2149ac7..3c3f05868 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java @@ -1,7 +1,6 @@ package org.nl.modules.logging.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.logging.service.InterfaceLogService; @@ -22,13 +21,13 @@ import java.util.Map; @RestController @RequiredArgsConstructor @RequestMapping("/api/interfaceLog") -@Api(tags = "系统：接口日志管理") + public class InterfaceLogController { private final InterfaceLogService interfaceLogService; @GetMapping @Log("查询接口日志") - @ApiOperation("查询接口日志") + //@SaCheckPermission("point:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(interfaceLogService.queryAll(whereJson, page), HttpStatus.OK); @@ -36,7 +35,7 @@ public class InterfaceLogController { @DeleteMapping(value = "/delLogs") @Log("删除所有接口日志") - @ApiOperation("删除所有接口日志") + public ResponseEntity delLogs() { interfaceLogService.delLogs(); return new ResponseEntity<>(HttpStatus.OK); @@ -44,7 +43,7 @@ public class InterfaceLogController { @GetMapping("/logTypeList") @Log("查询接口日志类型下拉框") - @ApiOperation("查询接口日志类型下拉框") + public ResponseEntity logTypeList() { return new ResponseEntity<>(interfaceLogService.logTypeList(), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java index 4887134a8..0dbb6eb6e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java @@ -15,8 +15,7 @@ */ package org.nl.modules.logging.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.common.utils.SecurityUtils; import org.nl.modules.logging.annotation.Log; @@ -34,13 +33,13 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") + public class LogController { private final LogService logService; @GetMapping - @ApiOperation("日志查询") + //@SaCheckPermission("@el.check()") public ResponseEntity query(LogQueryCriteria criteria, Pageable pageable) { criteria.setLogType("INFO"); @@ -48,7 +47,7 @@ public class LogController { } @GetMapping(value = "/user") - // @ApiOperation("用户日志查询") + // public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable) { criteria.setLogType("INFO"); criteria.setBlurry(SecurityUtils.getCurrentUsername()); @@ -56,7 +55,7 @@ public class LogController { } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable) { criteria.setLogType("ERROR"); @@ -64,7 +63,7 @@ public class LogController { } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLogs(@PathVariable Long id) { return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); @@ -72,7 +71,7 @@ public class LogController { @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllErrorLog() { logService.delAllByError(); @@ -81,7 +80,7 @@ public class LogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + // @SaCheckPermission("@el.check()") public ResponseEntity delAllInfoLog() { logService.delAllByInfo(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java index 90f6e65c5..92a557fc5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java @@ -8,11 +8,9 @@ import cn.hutool.db.PageResult; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.*; @@ -44,7 +42,7 @@ import java.util.List; @Slf4j public class LuceneLogServiceImpl implements EsLogService { - static String[] INFO_LEVEL = new String[]{"DEBUG","INFO","WARN","ERROR"}; + static String[] INFO_LEVEL = new String[]{"DEBUG", "INFO", "WARN", "ERROR"}; @Value("${lucene.index.path}") private String indexUrl; @@ -54,18 +52,18 @@ public class LuceneLogServiceImpl implements EsLogService { try { // 初始化 Lucene 索引 IndexWriter indexWriter = LuceneAppender.indexWriter; - if (indexWriter != null){ + if (indexWriter != null) { BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -10); TermRangeQuery termRangeQuery = new TermRangeQuery( - "requestTime",null, + "requestTime", null, new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true); - booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); + booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); indexWriter.deleteDocuments(termRangeQuery); indexWriter.commit(); } - }catch (Exception ex){ - throw new BadRequestException("删除失败："+ex.getMessage()); + } catch (Exception ex) { + throw new BadRequestException("删除失败：" + ex.getMessage()); } } @@ -96,25 +94,28 @@ public class LuceneLogServiceImpl implements EsLogService { BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); //时间范围查询 Date startDate = logQuery.getStartTime(); - Date endDate = logQuery.getEndTime(); + Date endDate = logQuery.getEndTime(); - if (startDate == null){ - Calendar calendar=Calendar.getInstance(); + if (startDate == null) { + Calendar calendar = Calendar.getInstance(); calendar.set(1970, 0, 1); - startDate = calendar.getTime(); } - if (endDate == null){ endDate = new DateTime(); } + startDate = calendar.getTime(); + } + if (endDate == null) { + endDate = new DateTime(); + } TermRangeQuery termRangeQuery = new TermRangeQuery( "requestTime", new BytesRef(DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss.SSS")), new BytesRef(DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss.SSS")), true, true); - booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); + booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses - if (ObjectUtil.isNotEmpty(logQuery.getTraceId())){ + if (ObjectUtil.isNotEmpty(logQuery.getTraceId())) { TermQuery termQuery = new TermQuery(new Term("traceId", logQuery.getTraceId())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (ObjectUtil.isNotEmpty(logQuery.getLogLevel())){ + if (ObjectUtil.isNotEmpty(logQuery.getLogLevel())) { TermQuery termQuery = new TermQuery(new Term("logLevel", logQuery.getLogLevel())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } @@ -127,20 +128,20 @@ public class LuceneLogServiceImpl implements EsLogService { booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } if (Boolean.TRUE.equals(logQuery.getIsRequest())) { - Term traceid = new Term("traceId"," "); + Term traceid = new Term("traceId", " "); TermQuery termQuery = new TermQuery(traceid); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST_NOT); } - if (ObjectUtil.isNotEmpty(logQuery.getMessage())){ + if (ObjectUtil.isNotEmpty(logQuery.getMessage())) { //查询解析器 QueryParser queryParser = new QueryParser("message", new IKAnalyzer(true)); Query query = queryParser.parse(logQuery.getMessage()); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); } - TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("time", SortField.Type.LONG,true)), 20000, 0); + TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("time", SortField.Type.LONG, true)), 20000, 0); searcher.search(booleanQueryBuilder.build(), collector); - TopDocs topDocs = collector.topDocs((logQuery.getPage()-1)*logQuery.getSize(), logQuery.getSize()); + TopDocs topDocs = collector.topDocs((logQuery.getPage() - 1) * logQuery.getSize(), logQuery.getSize()); int totalSize = collector.getTotalHits(); ScoreDoc[] scoreDocs = topDocs.scoreDocs; @@ -164,10 +165,10 @@ public class LuceneLogServiceImpl implements EsLogService { page.addAll(list); page.setTotal(scoreDocs.length); res.put("total", totalSize); - }catch (Exception ex){ + } catch (Exception ex) { ex.printStackTrace(); } - res.put("page",page); + res.put("page", page); return res; } @@ -176,10 +177,10 @@ public class LuceneLogServiceImpl implements EsLogService { @Override @Async public void syncdemo() { - log.info("Async线程链路测试"+Thread.currentThread().getName()); - log.error("Async线程链路测试"+Thread.currentThread().getName()); - log.info("Async线程链路测试"+Thread.currentThread().getName()); - log.info("线程链路测试"+Thread.currentThread().getName()); + log.info("Async线程链路测试" + Thread.currentThread().getName()); + log.error("Async线程链路测试" + Thread.currentThread().getName()); + log.info("Async线程链路测试" + Thread.currentThread().getName()); + log.info("线程链路测试" + Thread.currentThread().getName()); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java index 76fcb47cc..799057604 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java @@ -1,7 +1,6 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +21,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stage") @Slf4j public class StageController { @@ -30,7 +29,7 @@ public class StageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageService.queryAll(whereJson, page), HttpStatus.OK); @@ -38,7 +37,7 @@ public class StageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stage:add") public ResponseEntity create(@Validated @RequestBody StageDto dto) { stageService.create(dto); @@ -47,7 +46,7 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stage:edit") public ResponseEntity update(@Validated @RequestBody StageDto dto) { stageService.update(dto); @@ -55,7 +54,7 @@ public class StageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +64,7 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); @@ -73,7 +72,7 @@ public class StageController { @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + public ResponseEntity addNewStage(@Validated @RequestBody StageDto dto) { log.info("dto{}", dto); stageService.addNewStage(dto); @@ -82,7 +81,7 @@ public class StageController { @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + public ResponseEntity getNewStageDataByCode(@RequestBody String code) { return new ResponseEntity<>(stageService.findByCode(code), HttpStatus.CREATED); } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java index cb193cfd0..478df9132 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java @@ -1,7 +1,6 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +21,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { @@ -30,7 +29,7 @@ public class StageImageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stageImage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageImageService.queryAll(whereJson, page), HttpStatus.OK); @@ -38,7 +37,7 @@ public class StageImageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stageImage:add") public ResponseEntity create(@Validated @RequestBody StageImageDto dto) { stageImageService.create(dto); @@ -47,7 +46,7 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stageImage:edit") public ResponseEntity update(@Validated @RequestBody StageImageDto dto) { stageImageService.update(dto); @@ -55,7 +54,7 @@ public class StageImageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stageImage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +64,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java index a16bf5950..ef0845c8a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/mnt/websocket/AutoWebSocketRiKu.java @@ -1,8 +1,6 @@ package org.nl.modules.mnt.websocket; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "定时任务") + @RequestMapping("/api/autoWeb") @Slf4j public class AutoWebSocketRiKu { @@ -26,7 +24,7 @@ public class AutoWebSocketRiKu { @PostMapping("/query") @Log("查询数据") - @ApiOperation("查询数据") + public ResponseEntity query() { JSONObject data = new JSONObject(); data.put("one", autoRiKuService.getOnePoint()); @@ -40,7 +38,7 @@ public class AutoWebSocketRiKu { @PostMapping("/queryNum") @Log("查询发货区") - @ApiOperation("查询发货区") + public ResponseEntity queryNum(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(autoRiKuService.queryNum(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java b/lms/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java index 141c6fc83..a39dc5f94 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java @@ -21,7 +21,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @apiNote 配置文件转换Pojo类的 统一配置 类 * @author: liaojinlong * @date: 2020/6/10 19:04 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java b/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java index 2b63d40b5..d4fe8c8d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java @@ -7,8 +7,6 @@ import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.config.RsaProperties; @@ -41,13 +39,13 @@ import java.util.Map; @RestController @RequestMapping("/mobile/auth") @RequiredArgsConstructor -@Api(tags = "手持：系统授权接口") + public class MobileAuthorizationController { private final RedisUtils redisUtils; private final ISysUserService userService; private final ISysRoleService roleService; - @ApiOperation("登录授权") + @PostMapping(value = "/login") @SaIgnore public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java index bc2bc0fe5..9310fbca7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/CodeDetailController.java @@ -2,8 +2,6 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.CodeDetailService; @@ -16,14 +14,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@Api(tags = "系统：编码详情管理") + @RequiredArgsConstructor @RequestMapping("/api/codeDetail") public class CodeDetailController { private final CodeDetailService codeDetailService; - @ApiOperation("查询编码明细") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, Pageable pageable) { @@ -31,7 +29,7 @@ public class CodeDetailController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody Map form) { @@ -40,7 +38,7 @@ public class CodeDetailController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping(value = "/{id}") @SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id) { @@ -49,7 +47,7 @@ public class CodeDetailController { } @Log("修改字典") - @ApiOperation("修改字典") + @PutMapping @SaCheckPermission("dict:edit") public ResponseEntity update(@RequestBody JSONObject json) { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java index 39ea3e8b7..2617f6667 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/GenCodeController.java @@ -2,8 +2,6 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.GenCodeService; @@ -18,13 +16,13 @@ import java.util.Map; import java.util.Set; @RestController -@Api(tags = "系统：编码生成") + @RequiredArgsConstructor @RequestMapping("/api/genCode") public class GenCodeController { private final GenCodeService genCodeService; - @ApiOperation("查询编码") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, Pageable pageable) { @@ -32,7 +30,7 @@ public class GenCodeController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody Map form) { @@ -42,7 +40,7 @@ public class GenCodeController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -51,7 +49,7 @@ public class GenCodeController { } @Log("修改字典") - @ApiOperation("修改字典") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody JSONObject json) { @@ -59,7 +57,7 @@ public class GenCodeController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + @GetMapping(value = "/codeDemo") @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java index da7daffc8..753479cd4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/LimitController.java @@ -15,8 +15,7 @@ */ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import org.nl.modules.common.annotation.Limit; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @RestController @RequestMapping("/api/limit") -@Api(tags = "系统：限流测试管理") + public class LimitController { private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger(); @@ -39,7 +38,7 @@ public class LimitController { * 测试限流注解，下面配置说明该接口 60秒内最多只能访问 10次，保存到redis的键名为 limit_test， */ @GetMapping - @ApiOperation("测试") + @Limit(key = "test", period = 60, count = 10, name = "testLimit", prefix = "limit") public int test() { return ATOMIC_INTEGER.incrementAndGet(); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java index 0c779f2f9..296aea6c1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java @@ -15,8 +15,7 @@ */ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.modules.system.service.MonitorService; import org.springframework.http.HttpStatus; @@ -31,14 +30,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/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java index ca590dd1a..505c4aa1e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java @@ -1,7 +1,6 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/redis") @Slf4j public class RedisController { @@ -26,27 +25,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/lms/nladmin-system/src/main/java/org/nl/modules/system/service/ParamService.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/ParamService.java index 8c5db99e4..dbe60d407 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/ParamService.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/ParamService.java @@ -1,4 +1,3 @@ - package org.nl.modules.system.service; import org.nl.modules.system.service.dto.ParamDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java index cfc2e3478..70b2db54b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java @@ -1,7 +1,6 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,26 +13,26 @@ import java.time.Duration; * @Description: 管理后台 - Redis Key 信息 Response VO * @Date: 2022-08-04 */ -@ApiModel("管理后台 - Redis Key 信息 Response VO") + @Data @Builder @AllArgsConstructor public class RedisKeyDefineRespVO { - @ApiModelProperty(value = "Key 模板", required = true, example = "login_user:%s") + private String keyTemplate; - @ApiModelProperty(value = "Key 类型的枚举", required = true, example = "String") + private RedisKeyDefine.KeyTypeEnum keyType; - @ApiModelProperty(value = "Value 类型", required = true, example = "java.lang.String") + private Class valueType; - @ApiModelProperty(value = "超时类型", required = true, example = "1") + private RedisKeyDefine.TimeoutTypeEnum timeoutType; - @ApiModelProperty(value = "过期时间，单位：毫秒", required = true, example = "1024") + private Duration timeout; - @ApiModelProperty(value = "备注", required = true, example = "啦啦啦啦~") + private String memo; } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java index 53c2625a1..68e067d9e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java @@ -1,7 +1,6 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,33 +13,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/lms/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java index 052f7a0a7..2147b96d3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java @@ -17,7 +17,6 @@ package org.nl.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -39,26 +38,26 @@ public class LocalStorage extends BaseEntity implements Serializable { @Id @Column(name = "storage_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "真实文件名") + private String realName; - @ApiModelProperty(value = "文件名") + private String name; - @ApiModelProperty(value = "后缀") + private String suffix; - @ApiModelProperty(value = "路径") + private String path; - @ApiModelProperty(value = "类型") + private String type; - @ApiModelProperty(value = "大小") + private String size; public LocalStorage(String realName, String name, String suffix, String path, String type, String size) { diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 475274e80..bf5638f7d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -17,8 +17,6 @@ package org.nl.modules.tools.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; @@ -42,27 +40,27 @@ import java.io.IOException; */ @RestController @RequiredArgsConstructor -@Api(tags = "工具：本地存储管理") + @RequestMapping("/api/localStorage") public class LocalStorageController { private final LocalStorageService localStorageService; - @ApiOperation("查询文件") + @GetMapping @SaCheckPermission("storage:list") public ResponseEntity query(LocalStorageQueryCriteria criteria, Pageable pageable) { return new ResponseEntity<>(localStorageService.queryAll(criteria, pageable), HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") @SaCheckPermission("storage:list") public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { localStorageService.download(localStorageService.queryAll(criteria), response); } - @ApiOperation("上传文件") + @PostMapping @SaCheckPermission("storage:add") public ResponseEntity create(@RequestParam String name, @RequestParam("file") MultipartFile file) { @@ -71,7 +69,7 @@ public class LocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -83,7 +81,7 @@ public class LocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody LocalStorage resources) { @@ -93,13 +91,13 @@ public class LocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + public ResponseEntity delete(@RequestBody Long[] ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("导入数据") + @PostMapping("/importExcel") @SaIgnore public ResponseEntity importExcel(@RequestBody String path) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/dept/DeptController.java index c0322f457..416b3a613 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -18,8 +18,6 @@ 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 lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -44,20 +42,20 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：部门管理") + @RequestMapping("/api/dept") public class DeptController { private final 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); @@ -65,13 +63,12 @@ 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 +80,7 @@ public class DeptController { // @Log("新增部门") - @ApiOperation("新增部门") + @PostMapping // @SaCheckPermission("dept:add") public ResponseEntity create(@Validated @RequestBody SysDept resources) { @@ -93,7 +90,7 @@ public class DeptController { // @Log("修改部门") - @ApiOperation("修改部门") + @PutMapping // @SaCheckPermission("dept:edit") public ResponseEntity update(@Validated @RequestBody SysDept dept) { @@ -106,7 +103,7 @@ public class DeptController { // @Log("删除部门") - @ApiOperation("删除部门") + @DeleteMapping // @SaCheckPermission("dept:del") public ResponseEntity delete(@RequestBody Set deptIds) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java index a5c4d0be3..f307be25e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -2,7 +2,6 @@ package org.nl.system.controller.dict; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -37,7 +36,7 @@ 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); @@ -45,7 +44,7 @@ public class SysDictController { @Log("新增字典") @PostMapping - @ApiOperation("新增字典") + // @SaCheckPermission("dict:add") public ResponseEntity create(@RequestBody Dict dict) { dictService.create(dict); @@ -54,7 +53,7 @@ public class SysDictController { @PutMapping @Log("修改字典") - @ApiOperation("修改字典") + //@SaCheckPermission("@el.check('dict:edit')") public ResponseEntity updateDict(@Validated @RequestBody Dict dto) { dictService.updateDict(dto); @@ -62,7 +61,7 @@ public class SysDictController { } @Log("删除字典") - @ApiOperation("删除字典") + @DeleteMapping // @SaCheckPermission("dict:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -71,13 +70,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("[,，]"); @@ -89,7 +88,7 @@ public class SysDictController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + @PostMapping("/dictDetail") // @SaCheckPermission("dict:add") public ResponseEntity createDetail(@RequestBody Dict resources) { @@ -98,7 +97,7 @@ public class SysDictController { } @Log("修改字典详情") - @ApiOperation("修改字典详情") + @PutMapping("/dictDetail") // @SaCheckPermission("dict:edit") public ResponseEntity updateDetail(@RequestBody Dict resources) { @@ -107,7 +106,7 @@ public class SysDictController { } @Log("删除字典详情") - @ApiOperation("删除字典详情") + @DeleteMapping(value = "/dictDetail/{id}") // @SaCheckPermission("dict:del") public ResponseEntity deleteDetail(@PathVariable String id) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 68b11676f..d738a144e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -5,7 +5,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -37,20 +36,20 @@ public class SysMenuController { private final 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) { @@ -60,7 +59,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) { @@ -73,14 +72,14 @@ public class SysMenuController { } @GetMapping - @ApiOperation("查询菜单") + @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { @@ -94,7 +93,7 @@ public class SysMenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -103,7 +102,7 @@ public class SysMenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update(@RequestBody SysMenu form) { @@ -112,7 +111,7 @@ public class SysMenuController { } @Log("删除菜单") - @ApiOperation("删除菜单") + @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java index 545403fda..d3f7d6e3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java @@ -1,8 +1,6 @@ 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.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -24,7 +22,7 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "消息通知管理") + @RequestMapping("/api/notice") public class SysNoticeController { @@ -33,7 +31,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); @@ -41,7 +39,7 @@ public class SysNoticeController { @PostMapping @Log("新增消息通知") - @ApiOperation("新增消息通知") + //@SaCheckPermission("@el.check('sysNotice:add')") public ResponseEntity create(@Validated @RequestBody SysNotice entity) { noticeService.create(entity); @@ -50,7 +48,7 @@ public class SysNoticeController { @PutMapping @Log("修改消息通知") - @ApiOperation("修改消息通知") + //@SaCheckPermission("@el.check('sysNotice:edit')") public ResponseEntity update(@Validated @RequestBody SysNotice entity) { noticeService.update(entity); @@ -58,7 +56,7 @@ public class SysNoticeController { } @Log("删除消息通知") - @ApiOperation("删除消息通知") + //@SaCheckPermission("@el.check('sysNotice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -100,7 +98,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/lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java index 96f02e7c0..a9aed4a1e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.param; 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.common.TableDataInfo; @@ -27,7 +25,7 @@ import java.util.Map; * @author generator * @since 2022-12-14 */ -@Api(tags = "系统参数管理") + @Slf4j @RestController @RequestMapping("/api/param") @@ -37,7 +35,7 @@ class SysParamController { @GetMapping @Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true) - @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 +43,7 @@ class SysParamController { @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + //@SaCheckPermission("param:add") public ResponseEntity create(@Validated @RequestBody Param param) { paramService.create(param); @@ -54,7 +52,7 @@ class SysParamController { @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + //@SaCheckPermission("param:edit") public ResponseEntity update(@Validated @RequestBody Param param) { paramService.update(param); @@ -62,7 +60,7 @@ class SysParamController { } @Log("删除系统参数") - @ApiOperation("删除系统参数") + //@SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -73,7 +71,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/lms/nladmin-system/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index 0b7a0019f..1ab2c5a36 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.permission; 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.common.TableDataInfo; @@ -30,7 +28,7 @@ import java.util.Set; @Slf4j @RestController @RequiredArgsConstructor -@Api(tags = "数据管理") + @RequestMapping("/api/dataPermission") public class SysDataPermissionController { @@ -38,7 +36,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 +44,7 @@ public class SysDataPermissionController { @PostMapping @Log("新增数据权限") - @ApiOperation("新增数据权限") + //@SaCheckPermission("@el.check('dataPermission:add')") public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); @@ -55,7 +53,7 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") - @ApiOperation("修改数据权限") + //@SaCheckPermission("@el.check('dataPermission:edit')") public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); @@ -63,7 +61,7 @@ public class SysDataPermissionController { } @Log("删除数据权限") - @ApiOperation("删除数据权限") + //@SaCheckPermission("@el.check('dataPermission:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -73,21 +71,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 +93,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/lms/nladmin-system/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 51dc5c88d..9bfda8932 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -32,20 +30,20 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") + public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; private final 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 +51,7 @@ public class SysQuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { @@ -65,7 +63,7 @@ public class SysQuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { @@ -74,7 +72,7 @@ public class SysQuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { @@ -83,7 +81,7 @@ public class SysQuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { @@ -92,7 +90,7 @@ public class SysQuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java index 9e804a8bb..8e8c6e223 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -2,7 +2,6 @@ package org.nl.system.controller.role; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -30,21 +29,21 @@ public class SysRoleController { private final 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 +52,7 @@ public class SysRoleController { } @Log("修改角色") - @ApiOperation("修改角色") + @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { @@ -62,7 +61,7 @@ public class SysRoleController { } @Log("删除角色") - @ApiOperation("删除角色") + @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +70,7 @@ public class SysRoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index 51f6991ed..6286591ae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -21,8 +21,6 @@ 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.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; @@ -54,7 +52,7 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/auth") @RequiredArgsConstructor -@Api(tags = "系统：系统授权接口") + public class AuthorizationController { private final RedisUtils redisUtils; private final OnlineUserService onlineUserService; @@ -63,7 +61,7 @@ public class AuthorizationController { @Resource private LoginProperties loginProperties; - @ApiOperation("登录授权") + @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap) throws Exception { if (ObjectUtil.isEmpty(authMap)) { @@ -73,7 +71,6 @@ public class AuthorizationController { } - @ApiOperation("获取用户信息") @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -87,7 +84,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取指定用户信息") + @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null) { @@ -98,7 +95,7 @@ public class AuthorizationController { return ResponseEntity.noContent().build(); } - @ApiOperation("获取验证码") + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -119,7 +116,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/lms/nladmin-system/src/main/java/org/nl/system/controller/user/OnlineController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/OnlineController.java index 658e9f581..c28a8ae82 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/OnlineController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/OnlineController.java @@ -15,8 +15,7 @@ */ package org.nl.system.controller.user; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.EncryptUtils; import org.nl.system.service.secutiry.impl.OnlineUserService; @@ -35,26 +34,26 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") + public class OnlineController { private final OnlineUserService onlineUserService; - @ApiOperation("查询在线用户") + @GetMapping // @SaCheckPermission("@el.check()") public ResponseEntity query(String filter, Pageable pageable) { return new ResponseEntity<>(onlineUserService.getAll(filter, pageable), HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") // @SaCheckPermission("@el.check()") public void download(HttpServletResponse response, String filter) throws IOException { onlineUserService.download(onlineUserService.getAll(filter), response); } - @ApiOperation("踢出用户") + @DeleteMapping // @SaCheckPermission("@el.check()") public ResponseEntity delete(@RequestBody Set keys) throws Exception { diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java index 0785e632a..4c88bdf58 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/user/UserController.java @@ -20,8 +20,6 @@ import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONObject; 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.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; @@ -46,7 +44,7 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") + @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -56,13 +54,12 @@ public class UserController { ISysUserService userService; - @ApiOperation("查询用户") @GetMapping public ResponseEntity query(UserQuery query, PageQuery page) { return new ResponseEntity(userService.getUserDetail(query, page), HttpStatus.OK); } - @ApiOperation("查询用户") + @PostMapping(value = "/getUserList") public ResponseEntity query() { List userList = userService.list(new QueryWrapper().eq("is_used", true)); @@ -70,7 +67,7 @@ public class UserController { } @Log("新增用户") - @ApiOperation("新增用户") + @PostMapping // @SaCheckPermission("user:add") public ResponseEntity create(@RequestBody Map user) { @@ -79,7 +76,7 @@ public class UserController { } @Log("修改用户") - @ApiOperation("修改用户") + @PutMapping // @SaCheckPermission("user:edit") public ResponseEntity update(@RequestBody Map resources) throws Exception { @@ -88,7 +85,7 @@ public class UserController { } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + // @PutMapping(value = "center") public ResponseEntity center(@RequestBody SysUser resources) { if (!resources.getUserId().equals(StpUtil.getLoginIdAsLong())) { @@ -99,7 +96,7 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + @DeleteMapping // @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -107,21 +104,21 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { userService.updatePass(passVo); 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/lms/nladmin-system/src/main/java/org/nl/system/service/dept/dto/DeptVo.java b/lms/nladmin-system/src/main/java/org/nl/system/service/dept/dto/DeptVo.java index 4319028d7..88e36ee70 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/dept/dto/DeptVo.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/dept/dto/DeptVo.java @@ -15,7 +15,7 @@ */ package org.nl.system.service.dept.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseDTO; @@ -41,22 +41,21 @@ public class DeptVo extends BaseDTO implements Serializable { private String extId; - @ApiModelProperty(value = "排序") private Integer deptSort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean isUsed; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer subCount = 0; //前端显示 private Boolean hasChildren = Boolean.FALSE; diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/lms/nladmin-system/src/main/java/org/nl/system/service/notice/dao/SysNotice.java index 972f4d0ba..c8dc0b069 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/notice/dao/SysNotice.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/notice/dao/SysNotice.java @@ -3,7 +3,6 @@ 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 +25,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/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java b/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java index 88b18a99c..8a2a61a02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/param/ISysParamService.java @@ -1,8 +1,5 @@ package org.nl.system.service.param; -import com.alicp.jetcache.anno.CacheType; -import com.alicp.jetcache.anno.CacheUpdate; -import com.alicp.jetcache.anno.Cached; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java index a93687a82..b1c551c88 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java @@ -2,6 +2,7 @@ package org.nl.system.service.quartz.utils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.yomahub.tlog.task.quartz.TLogQuartzJobBean; import lombok.extern.slf4j.Slf4j; import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.modules.common.utils.RedisUtils; @@ -16,7 +17,6 @@ import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.quartz.QuartzJobBean; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; @@ -30,7 +30,7 @@ import java.util.concurrent.ThreadPoolExecutor; @SuppressWarnings({"unchecked", "all"}) @Slf4j @DisallowConcurrentExecution -public class ExecutionJob extends QuartzJobBean { +public class ExecutionJob extends TLogQuartzJobBean { /** * 该处仅供参考 @@ -38,7 +38,7 @@ public class ExecutionJob extends QuartzJobBean { private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); @Override - protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + public void executeTask(JobExecutionContext context) throws JobExecutionException { SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY); // 获取spring bean ISysQuartzJobService quartzJobService = SpringContextHolder.getBean(SysQuartzJobServiceImpl.class); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java index 6fc567ad2..14d83a63c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/ClassstandardController.java @@ -1,12 +1,9 @@ - package org.nl.wms.basedata.master.rest; import cn.hutool.core.map.MapUtil; 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.modules.logging.annotation.Log; @@ -27,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "基础类别管理") + @RequestMapping("/api/Classstandard") @Slf4j public class ClassstandardController { @@ -36,7 +33,7 @@ public class ClassstandardController { @GetMapping @Log("查询基础类别") - @ApiOperation("查询基础类别") + //@PreAuthorize("@el.check('Classstandard:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(ClassstandardService.queryAll(whereJson, page), HttpStatus.OK); @@ -44,7 +41,7 @@ public class ClassstandardController { @PostMapping @Log("新增基础类别") - @ApiOperation("新增基础类别") + //@PreAuthorize("@el.check('Classstandard:add')") public ResponseEntity create(@Validated @RequestBody ClassstandardDto dto) { ClassstandardService.create(dto); @@ -53,7 +50,7 @@ public class ClassstandardController { @PutMapping @Log("修改基础类别") - @ApiOperation("修改基础类别") + //@PreAuthorize("@el.check('Classstandard:edit')") public ResponseEntity update(@Validated @RequestBody ClassstandardDto dto) { ClassstandardService.update(dto); @@ -61,7 +58,7 @@ public class ClassstandardController { } @Log("删除基础类别") - @ApiOperation("删除基础类别") + //@PreAuthorize("@el.check('Classstandard:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -71,7 +68,7 @@ public class ClassstandardController { @GetMapping("/loadClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity query(@RequestParam Map whereJson) { return new ResponseEntity<>(ClassstandardService.loadClass(whereJson), HttpStatus.OK); @@ -79,7 +76,7 @@ public class ClassstandardController { @GetMapping("/getClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassBycode(@RequestParam Map whereJson) { return new ResponseEntity<>(ClassstandardService.queryClassBycode(whereJson), HttpStatus.OK); @@ -88,7 +85,7 @@ public class ClassstandardController { @GetMapping("/queryClassById") @Log("查询分类基础列表") - @ApiOperation("查询分类基础列表") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassById(@RequestParam Map whereJson) { return new ResponseEntity<>(ClassstandardService.queryClassById(whereJson), HttpStatus.OK); @@ -96,13 +93,13 @@ public class ClassstandardController { @GetMapping("/getClassTable") @Log("查询物料基础类型") - @ApiOperation("查询物料基础类型") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassTable(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(ClassstandardService.queryClassTable(whereJson, page), HttpStatus.OK); } - @ApiOperation("查询类别:根据ID获取同级与上级数据") + @PostMapping("/superior") //@PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity getSuperior(@RequestBody Long id) { @@ -113,7 +110,7 @@ public class ClassstandardController { @GetMapping("/getType") @Log("获取分类类型") - @ApiOperation("获取分类类型") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getType(@RequestParam Map whereJson) { String type_id = MapUtil.getStr(whereJson, "type_id"); @@ -123,7 +120,7 @@ public class ClassstandardController { @GetMapping("/getClassName") @Log("获取分类名称下拉框") - @ApiOperation("获取分类名称下拉框") + public ResponseEntity getClassName() { return new ResponseEntity<>(ClassstandardService.getClassName(), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java index dd5f04b87..54fe7ff8f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/CustomerbaseController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.master.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "客户基础表管理") + @RequestMapping("/api/customerbase") @Slf4j public class CustomerbaseController { @@ -32,7 +29,7 @@ public class CustomerbaseController { @GetMapping @Log("查询客户基础表") - @ApiOperation("查询客户基础表") + //@PreAuthorize("@el.check('customerbase:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(customerbaseService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class CustomerbaseController { @PostMapping @Log("新增客户基础表") - @ApiOperation("新增客户基础表") + //@PreAuthorize("@el.check('customerbase:add')") public ResponseEntity create(@Validated @RequestBody CustomerbaseDto dto) { customerbaseService.create(dto); @@ -49,7 +46,7 @@ public class CustomerbaseController { @PutMapping @Log("修改客户基础表") - @ApiOperation("修改客户基础表") + //@PreAuthorize("@el.check('customerbase:edit')") public ResponseEntity update(@Validated @RequestBody CustomerbaseDto dto) { customerbaseService.update(dto); @@ -57,7 +54,7 @@ public class CustomerbaseController { } @Log("删除客户基础表") - @ApiOperation("删除客户基础表") + //@PreAuthorize("@el.check('customerbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/DeviceStatusController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/DeviceStatusController.java index 063cbb743..a1d7dbe77 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/DeviceStatusController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/DeviceStatusController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.master.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备状态监控") + @RequestMapping("/api/devicestatus") @Slf4j public class DeviceStatusController { @@ -31,7 +28,7 @@ public class DeviceStatusController { @GetMapping @Log("查询设备状态监控") - @ApiOperation("查询设备状态监控") + //@PreAuthorize("@el.check('customerbase:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceStatusService.queryAll(whereJson, page), HttpStatus.OK); @@ -39,7 +36,7 @@ public class DeviceStatusController { @PostMapping @Log("新增客户基础表") - @ApiOperation("新增客户基础表") + //@PreAuthorize("@el.check('customerbase:add')") public ResponseEntity create(@RequestBody JSONObject jo) { deviceStatusService.create(jo); @@ -49,7 +46,7 @@ public class DeviceStatusController { @PutMapping @Log("修改客户基础表") - @ApiOperation("修改客户基础表") + //@PreAuthorize("@el.check('customerbase:edit')") public ResponseEntity update(@RequestBody JSONObject jo) { deviceStatusService.update(jo); @@ -57,7 +54,7 @@ public class DeviceStatusController { } @Log("删除客户基础表") - @ApiOperation("删除客户基础表") + //@PreAuthorize("@el.check('customerbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java index 8287fbab3..eb3b0d7c9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.master.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备故处理") + @RequestMapping("/api/faultdevice") @Slf4j public class FaultDeviceController { @@ -33,21 +30,21 @@ public class FaultDeviceController { @GetMapping @Log("查询设备故障处理表") - @ApiOperation("查询设备故障处理表") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(faultDeviceService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/deviceCharge") @Log("查询说有设备故障") - @ApiOperation("查询说有设备故障") + public ResponseEntity queryDeviceAll(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(faultDeviceService.queryDeviceAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增设备故障处理表") - @ApiOperation("新增设备故障处理表") + public ResponseEntity create(@Validated @RequestBody CustomerbaseDto dto) { faultDeviceService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -55,14 +52,14 @@ public class FaultDeviceController { @PutMapping @Log("修改设备故障处理表") - @ApiOperation("修改设备故障处理表") + public ResponseEntity update(@RequestBody JSONObject whereJson) { faultDeviceService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除设备故障处理表") - @ApiOperation("删除设备故障处理表") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { faultDeviceService.deleteAll(ids); @@ -70,7 +67,7 @@ public class FaultDeviceController { } @Log("同步信息") - @ApiOperation("同步信息") + @PostMapping("/syncInfo") public ResponseEntity syncInfo() { faultDeviceService.syncInfo(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java index b593fcde5..eef2f5eae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/InterfacebackController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.master.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "接口回传设置管理") + @RequestMapping("/api/interfaceback") @Slf4j public class InterfacebackController { @@ -32,7 +29,7 @@ public class InterfacebackController { @GetMapping @Log("查询接口回传设置") - @ApiOperation("查询接口回传设置") + //@SaCheckPermission("@el.check('interfaceback:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(interfacebackService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class InterfacebackController { @PostMapping @Log("新增接口回传设置") - @ApiOperation("新增接口回传设置") + //@SaCheckPermission("@el.check('interfaceback:add')") public ResponseEntity create(@Validated @RequestBody InterfacebackDto dto) { interfacebackService.create(dto); @@ -49,7 +46,7 @@ public class InterfacebackController { @PutMapping @Log("修改接口回传设置") - @ApiOperation("修改接口回传设置") + //@SaCheckPermission("@el.check('interfaceback:edit')") public ResponseEntity update(@Validated @RequestBody InterfacebackDto dto) { interfacebackService.update(dto); @@ -57,7 +54,7 @@ public class InterfacebackController { } @Log("删除接口回传设置") - @ApiOperation("删除接口回传设置") + //@SaCheckPermission("@el.check('interfaceback:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java index b25d5516b..5b7e71d47 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.master.rest; import cn.hutool.core.map.MapUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "物料管理") + @RequestMapping("/api/Materialbase") @Slf4j public class MaterialbaseController { @@ -34,7 +31,7 @@ public class MaterialbaseController { @GetMapping @Log("查询物料") - @ApiOperation("查询物料") + //@PreAuthorize("@el.check('Materialbase:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(materialBaseService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +39,7 @@ public class MaterialbaseController { @PostMapping @Log("新增物料") - @ApiOperation("新增物料") + //@PreAuthorize("@el.check('Materialbase:add')") public ResponseEntity create(@Validated @RequestBody MaterialbaseDto dto) { materialBaseService.create(dto); @@ -51,7 +48,7 @@ public class MaterialbaseController { @PutMapping @Log("修改物料") - @ApiOperation("修改物料") + //@PreAuthorize("@el.check('Materialbase:edit')") public ResponseEntity update(@Validated @RequestBody MaterialbaseDto dto) { materialBaseService.update(dto); @@ -59,7 +56,7 @@ public class MaterialbaseController { } @Log("删除物料") - @ApiOperation("删除物料") + //@PreAuthorize("@el.check('Materialbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -69,7 +66,7 @@ public class MaterialbaseController { @Log("判断物料操作类型") - @ApiOperation("判断物料操作类型") + @PostMapping("/isAlongMaterType") public ResponseEntity isAlongMaterType(@RequestBody Map map) { String materOpt_code = MapUtil.getStr(map, "materOpt_code"); @@ -79,7 +76,7 @@ public class MaterialbaseController { } @Log("查询物料操作类型") - @ApiOperation("查询物料操作类型") + @PostMapping("/getMaterOptType") public ResponseEntity getMaterOptType(@RequestBody Map map) { String materOpt_code = MapUtil.getStr(map, "materOpt_code"); @@ -88,7 +85,7 @@ public class MaterialbaseController { @PostMapping("/synchronize") @Log("物料同步") - @ApiOperation("物料同步") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity synchronize(@RequestBody Map whereJson) { materialBaseService.synchronize(whereJson); @@ -96,7 +93,7 @@ public class MaterialbaseController { } @Log("查询产品系列类型") - @ApiOperation("查询产品系列类型") + @GetMapping("/getProductSeries") public ResponseEntity getProductSeries() { return new ResponseEntity<>(materialBaseService.getProductSeries("1527572574832300032"), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java index 0fc239811..6931be729 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/StoragevehicleinfoController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.master.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "载具管理") + @RequestMapping("/api/storagevehicleinfo") @Slf4j public class StoragevehicleinfoController { @@ -33,7 +30,7 @@ public class StoragevehicleinfoController { @GetMapping @Log("查询载具") - @ApiOperation("查询载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(storagevehicleinfoService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class StoragevehicleinfoController { @PostMapping @Log("新增载具") - @ApiOperation("新增载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:add')") public ResponseEntity create(@RequestBody Map map) { return new ResponseEntity<>(storagevehicleinfoService.create(map), HttpStatus.CREATED); @@ -49,7 +46,7 @@ public class StoragevehicleinfoController { @PutMapping @Log("修改载具") - @ApiOperation("修改载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto) { storagevehicleinfoService.update(dto); @@ -57,7 +54,7 @@ public class StoragevehicleinfoController { } @Log("删除载具") - @ApiOperation("删除载具") + //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class StoragevehicleinfoController { @PutMapping("/changeActive") @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") + //@PreAuthorize("@el.check('store:edit')") public ResponseEntity changeActive(@RequestBody JSONObject json) { storagevehicleinfoService.changeActive(json); @@ -76,7 +73,7 @@ public class StoragevehicleinfoController { @GetMapping("/getVehicle/{code}") @Log("获取起始载具号") - @ApiOperation("获取起始载具号") + //@PreAuthorize("@el.check('store:edit')") public ResponseEntity getVehicle(@PathVariable String code) { JSONObject json = storagevehicleinfoService.getVehicle(code); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java index 59d7f48cf..34dc0c720 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SupplierbaseController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.master.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "供应商管理") + @RequestMapping("/api/supplierbase") @Slf4j public class SupplierbaseController { @@ -32,14 +29,14 @@ public class SupplierbaseController { @GetMapping @Log("查询供应商") - @ApiOperation("查询供应商") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(supplierbaseService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增供应商") - @ApiOperation("新增供应商") + public ResponseEntity create(@Validated @RequestBody SupplierbaseDto dto) { supplierbaseService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -47,14 +44,14 @@ public class SupplierbaseController { @PutMapping @Log("修改供应商") - @ApiOperation("修改供应商") + public ResponseEntity update(@Validated @RequestBody SupplierbaseDto dto) { supplierbaseService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除供应商") - @ApiOperation("删除供应商") + //@PreAuthorize("@el.check('mdCsSupplierbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java index 579c72d13..789ef8b2d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/TransportationbaseController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.master.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "运输公司基本信息管理") + @RequestMapping("/api/transportationbase") @Slf4j public class TransportationbaseController { @@ -32,7 +29,7 @@ public class TransportationbaseController { @GetMapping @Log("查询运输公司基本信息") - @ApiOperation("查询运输公司基本信息") + //@SaCheckPermission("@el.check('transportationbase:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(transportationbaseService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class TransportationbaseController { @PostMapping @Log("新增运输公司基本信息") - @ApiOperation("新增运输公司基本信息") + //@SaCheckPermission("@el.check('transportationbase:add')") public ResponseEntity create(@Validated @RequestBody TransportationbaseDto dto) { transportationbaseService.create(dto); @@ -49,7 +46,7 @@ public class TransportationbaseController { @PutMapping @Log("修改运输公司基本信息") - @ApiOperation("修改运输公司基本信息") + //@SaCheckPermission("@el.check('transportationbase:edit')") public ResponseEntity update(@Validated @RequestBody TransportationbaseDto dto) { transportationbaseService.update(dto); @@ -57,7 +54,7 @@ public class TransportationbaseController { } @Log("删除运输公司基本信息") - @ApiOperation("删除运输公司基本信息") + //@SaCheckPermission("@el.check('transportationbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -66,7 +63,7 @@ public class TransportationbaseController { } @Log("删除运输公司基本信息") - @ApiOperation("删除运输公司基本信息") + @PostMapping("/getTransporta") public ResponseEntity getTransporta() { return new ResponseEntity<>(transportationbaseService.getTransporta(), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java index 9278e4048..d6edf7ddd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/UnitController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.master.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "计量单位管理") + @RequestMapping("/api/mdPbMeasureunit") @Slf4j public class UnitController { @@ -31,7 +28,7 @@ public class UnitController { @GetMapping @Log("查询计量单位") - @ApiOperation("查询计量单位") + //@PreAuthorize("@el.check('Unit:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(unitService.queryAll(whereJson, page), HttpStatus.OK); @@ -39,7 +36,7 @@ public class UnitController { @PostMapping @Log("新增计量单位") - @ApiOperation("新增计量单位") + //@PreAuthorize("@el.check('Unit:add')") public ResponseEntity create(@Validated @RequestBody UnitDto dto) { unitService.create(dto); @@ -48,7 +45,7 @@ public class UnitController { @PutMapping @Log("修改计量单位") - @ApiOperation("修改计量单位") + //@PreAuthorize("@el.check('Unit:edit')") public ResponseEntity update(@Validated @RequestBody UnitDto dto) { unitService.update(dto); @@ -56,7 +53,7 @@ public class UnitController { } @Log("删除计量单位") - @ApiOperation("删除计量单位") + //@PreAuthorize("@el.check('Unit:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +63,7 @@ public class UnitController { @GetMapping("/getUnit") @Log("查询单位下拉框") - @ApiOperation("查询仓库下拉框") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryUnit(@RequestParam Map whereJson) { return new ResponseEntity<>(unitService.getUnit(whereJson), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java index 34acbe81c..a99251329 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/ClassstandardService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java index 52d0dfaaa..3173188ef 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/CustomerbaseService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import org.nl.wms.basedata.master.service.dto.CustomerbaseDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/DeviceStatusService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/DeviceStatusService.java index 49663507b..240c8cec9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/DeviceStatusService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/DeviceStatusService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/FaultDeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/FaultDeviceService.java index 452b70bab..8d79ac70a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/FaultDeviceService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/FaultDeviceService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java index 3e29e4db3..e8a5d5df0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/InterfacebackService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import org.nl.wms.basedata.master.service.dto.InterfacebackDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java index 2f01466b0..7b69d9d38 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java index 315e18997..09b005606 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/StoragevehicleinfoService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java index 327d60d39..a48fffafa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SupplierbaseService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import org.nl.wms.basedata.master.service.dto.SupplierbaseDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java index 3eaf852c7..230d2e29c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/TransportationbaseService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java index 03f307133..2d91a7374 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/UnitService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java index 8733e5b2e..b38536578 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java index af33a0a76..03f1aab13 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java index a0c5c09cf..0aacdb997 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/DeviceStatusServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java index 49ad6ce57..358478262 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java index ff99dd3b9..c16f7366f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 45baf27c1..3ad1abbb6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index 30deee9c1..2fb2338cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java index db8117f11..336780113 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java index 177591fe8..ae99387ee 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java index 006938fef..7034e07ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.master.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java index b91bd467e..9c8787905 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/SectattrController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "库区管理") + @RequestMapping("/api/sectattr") @Slf4j public class SectattrController { @@ -33,7 +30,7 @@ public class SectattrController { @GetMapping @Log("查询库区") - @ApiOperation("查询库区") + //@PreAuthorize("@el.check('sectattr:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(sectattrService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class SectattrController { @PostMapping @Log("新增库区") - @ApiOperation("新增库区") + //@PreAuthorize("@el.check('sectattr:add')") public ResponseEntity create(@Validated @RequestBody SectattrDto dto) { sectattrService.create(dto); @@ -50,7 +47,7 @@ public class SectattrController { @PutMapping @Log("修改库区") - @ApiOperation("修改库区") + //@PreAuthorize("@el.check('sectattr:edit')") public ResponseEntity update(@Validated @RequestBody SectattrDto dto) { sectattrService.update(dto); @@ -58,7 +55,7 @@ public class SectattrController { } @Log("删除库区") - @ApiOperation("删除库区") + //@PreAuthorize("@el.check('sectattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +65,7 @@ public class SectattrController { @GetMapping("/getSect") @Log("查询库区下拉框") - @ApiOperation("查询库区下拉框") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity querySect(@RequestParam Map whereJson) { return new ResponseEntity<>(sectattrService.getSect(whereJson), HttpStatus.OK); @@ -76,7 +73,7 @@ public class SectattrController { @PostMapping("/getStorSect") @Log("查询指定仓库库区") - @ApiOperation("查询指定仓库库区") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getStorSect(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(sectattrService.getStorSect(whereJson), HttpStatus.OK); @@ -84,7 +81,7 @@ public class SectattrController { @PutMapping("/changeActive") @Log("修改库区状态") - @ApiOperation("修改库区状态") + public ResponseEntity update(@RequestBody JSONObject json) { sectattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java index 77a4b9304..b0ba58e9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StorattrController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "仓库管理") + @RequestMapping("/api/Storattr") @Slf4j public class StorattrController { @@ -33,7 +30,7 @@ public class StorattrController { @GetMapping @Log("查询仓库") - @ApiOperation("查询仓库") + //@PreAuthorize("@el.check('Storattr:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(storattrService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class StorattrController { @PostMapping @Log("新增仓库") - @ApiOperation("新增仓库") + //@PreAuthorize("@el.check('Storattr:addgetStor')") public ResponseEntity create(@Validated @RequestBody StorattrDto dto) { storattrService.create(dto); @@ -50,7 +47,7 @@ public class StorattrController { @PutMapping @Log("修改仓库") - @ApiOperation("修改仓库") + //@PreAuthorize("@el.check('Storattr:edit')") public ResponseEntity update(@Validated @RequestBody StorattrDto dto) { storattrService.update(dto); @@ -58,7 +55,7 @@ public class StorattrController { } @Log("删除仓库") - @ApiOperation("删除仓库") + //@PreAuthorize("@el.check('Storattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +65,7 @@ public class StorattrController { @GetMapping("/getStor") @Log("查询仓库下拉框") - @ApiOperation("查询仓库下拉框") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryStor(@RequestParam Map whereJson) { return new ResponseEntity<>(storattrService.getStor(whereJson), HttpStatus.OK); @@ -76,7 +73,7 @@ public class StorattrController { @PutMapping("/changeActive") @Log("修改仓库管理状态") - @ApiOperation("修改仓库管理状态") + public ResponseEntity update(@RequestBody JSONObject json) { storattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java index c9e07f2bb..30e651073 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructattrController.java @@ -1,11 +1,8 @@ - package org.nl.wms.basedata.st.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.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "仓位管理") + @RequestMapping("/api/structattr") @Slf4j public class StructattrController { @@ -34,7 +31,7 @@ public class StructattrController { @GetMapping @Log("查询仓位") - @ApiOperation("查询仓位") + //@PreAuthorize("@el.check('structattr:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(structattrService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +39,7 @@ public class StructattrController { @PostMapping @Log("新增仓位") - @ApiOperation("新增仓位") + //@PreAuthorize("@el.check('structattr:add')") public ResponseEntity create(@Validated @RequestBody StructattrDto dto) { structattrService.create(dto); @@ -51,7 +48,7 @@ public class StructattrController { @PutMapping @Log("修改仓位") - @ApiOperation("修改仓位") + //@PreAuthorize("@el.check('structattr:edit')") public ResponseEntity update(@Validated @RequestBody StructattrDto dto) { structattrService.update(dto); @@ -59,7 +56,7 @@ public class StructattrController { } @Log("删除仓位") - @ApiOperation("删除仓位") + //@PreAuthorize("@el.check('structattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -69,7 +66,7 @@ public class StructattrController { @PutMapping("/changeActive") @Log("修改仓位状态") - @ApiOperation("修改仓位状态") + public ResponseEntity update(@RequestBody JSONObject json) { structattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -77,7 +74,7 @@ public class StructattrController { @PostMapping("/getStructByCodes") @Log("获取仓位信息") - @ApiOperation("获取仓位信息") + public ResponseEntity getStructByCodes(@RequestBody String json) { JSONArray jsonArray = JSONArray.parseArray(json); return new ResponseEntity<>(structattrService.getStructByCodes(jsonArray), HttpStatus.OK); @@ -85,7 +82,7 @@ public class StructattrController { @PostMapping("/getStructByCodesFs") @Log("获取点位信息") - @ApiOperation("获取点位信息") + public ResponseEntity getStructByCodesFs(@RequestBody String json) { JSONArray jsonArray = JSONArray.parseArray(json); return new ResponseEntity<>(structattrService.getStructByCodesFs(jsonArray), HttpStatus.OK); @@ -93,7 +90,7 @@ public class StructattrController { @PostMapping("/unLockPoint") @Log("解锁点位") - @ApiOperation("解锁点位") + public ResponseEntity unLockPoint(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(structattrService.unLockPoint(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java index 9bcceb9ab..27aa68b76 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java @@ -1,10 +1,7 @@ - package org.nl.wms.basedata.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -26,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "库存管理管理") + @RequestMapping("/api/structivt") @Slf4j public class StructivtController { @@ -35,7 +32,7 @@ public class StructivtController { @GetMapping @Log("查询库存管理") - @ApiOperation("查询库存管理") + //@PreAuthorize("@el.check('structivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page, String[] product_area, String[] ivt_flag) { return new ResponseEntity<>(structivtService.queryAll(whereJson, page, product_area, ivt_flag), HttpStatus.OK); @@ -43,7 +40,7 @@ public class StructivtController { @PostMapping @Log("新增库存管理") - @ApiOperation("新增库存管理") + //@PreAuthorize("@el.check('structivt:add')") public ResponseEntity create(@Validated @RequestBody StructivtDto dto) { structivtService.create(dto); @@ -52,7 +49,7 @@ public class StructivtController { @PutMapping @Log("修改库存管理") - @ApiOperation("修改库存管理") + //@PreAuthorize("@el.check('structivt:edit')") public ResponseEntity update(@Validated @RequestBody StructivtDto dto) { structivtService.update(dto); @@ -60,7 +57,7 @@ public class StructivtController { } @Log("删除库存管理") - @ApiOperation("删除库存管理") + //@PreAuthorize("@el.check('structivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -70,7 +67,7 @@ public class StructivtController { @GetMapping("/getStruct") @Log("查询仓位下拉") - @ApiOperation("查询仓位下拉") + //@PreAuthorize("@el.check('structivt:list')") public ResponseEntity getStruct() { return new ResponseEntity<>(structivtService.getStruct(), HttpStatus.OK); @@ -78,7 +75,7 @@ public class StructivtController { @PostMapping("/getStructById") @Log("根据仓位id查询仓位信息") - @ApiOperation("根据仓位id查询仓位信息") + //@PreAuthorize("@el.check('structivt:list')") public ResponseEntity getStructById(@RequestBody JSONObject param) { return new ResponseEntity<>(structivtService.getStructById(param), HttpStatus.OK); @@ -86,14 +83,14 @@ public class StructivtController { @GetMapping("/getUnits") @Log("查询计量单位下拉") - @ApiOperation("查询计量单位下拉") + //@PreAuthorize("@el.check('structivt:list')") public ResponseEntity getUnits() { return new ResponseEntity<>(structivtService.getUnits(), HttpStatus.OK); } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response, String[] product_area, String[] ivt_flag) throws IOException { structivtService.download(map, response, product_area, ivt_flag); @@ -101,7 +98,7 @@ public class StructivtController { @PostMapping("/save") @Log("保存") - @ApiOperation("保存") + public ResponseEntity save(@RequestBody JSONObject whereJson) { structivtService.save(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java index be0457b83..4c88189b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructrelamaterialController.java @@ -1,9 +1,6 @@ - package org.nl.wms.basedata.st.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "物料存放设置管理") + @RequestMapping("/api/structrelamaterial") @Slf4j public class StructrelamaterialController { @@ -32,7 +29,7 @@ public class StructrelamaterialController { @GetMapping @Log("查询物料存放设置") - @ApiOperation("查询物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(structrelamaterialService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class StructrelamaterialController { @PostMapping @Log("新增物料存放设置") - @ApiOperation("新增物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:add')") public ResponseEntity create(@Validated @RequestBody StructrelamaterialDto dto) { structrelamaterialService.create(dto); @@ -49,7 +46,7 @@ public class StructrelamaterialController { @PutMapping @Log("修改物料存放设置") - @ApiOperation("修改物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity update(@Validated @RequestBody StructrelamaterialDto dto) { structrelamaterialService.update(dto); @@ -57,7 +54,7 @@ public class StructrelamaterialController { } @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class StructrelamaterialController { @PostMapping("/insertSet") @Log("插入物料存放设置") - @ApiOperation("插入物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity insertSet(@RequestBody Map whereJson) { structrelamaterialService.insertSet(whereJson); @@ -76,7 +73,7 @@ public class StructrelamaterialController { @PostMapping("/delSet") @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") + //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity delSet(@RequestBody Map whereJson) { structrelamaterialService.delSet(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java index 86cc9f6dc..1d939c51d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java @@ -1,8 +1,6 @@ package org.nl.wms.basedata.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "用户仓库关联") + @RequestMapping("/api/userArea") @Slf4j public class UserAreaController { @@ -24,21 +22,21 @@ public class UserAreaController { @GetMapping @Log("查询用户信息") - @ApiOperation("查询用户信息") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(userAreaService.pageQuery(whereJson, page), HttpStatus.OK); } @PostMapping("/queryUserArea") @Log("查询用户对应区域") - @ApiOperation("查询用户对应区域") + public ResponseEntity queryUserArea(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(userAreaService.queryUserArea(whereJson), HttpStatus.OK); } @PostMapping("/save") @Log("保存用户仓库信息") - @ApiOperation("保存用户仓库信息") + public ResponseEntity save(@RequestBody JSONObject whereJson) { userAreaService.save(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java index ecd59efdd..b258651f7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java @@ -1,8 +1,6 @@ package org.nl.wms.basedata.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "用户仓库关联") + @RequestMapping("/api/userStor") @Slf4j public class UserStorController { @@ -24,28 +22,28 @@ public class UserStorController { @GetMapping @Log("查询用户信息") - @ApiOperation("查询用户信息") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(userStorService.pageQuery(whereJson, page), HttpStatus.OK); } @PostMapping("/queryStor") @Log("查询所有仓库") - @ApiOperation("查询所有仓库") + public ResponseEntity queryStor(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(userStorService.queryStor(whereJson), HttpStatus.OK); } @PostMapping("/queryUserStor") @Log("查询用户对应仓库") - @ApiOperation("查询用户对应仓库") + public ResponseEntity queryUserStor(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(userStorService.queryUserStor(whereJson), HttpStatus.OK); } @PostMapping("/save") @Log("保存用户仓库信息") - @ApiOperation("保存用户仓库信息") + public ResponseEntity save(@RequestBody JSONObject whereJson) { userStorService.save(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -53,14 +51,14 @@ public class UserStorController { @PostMapping("/getUserStor") @Log("获取人员对应下拉框-普通下拉框") - @ApiOperation("获取人员对应下拉框-普通下拉框") + public ResponseEntity getUserStor() { return new ResponseEntity<>(userStorService.getUserStor(), HttpStatus.OK); } @PostMapping("/getSect") @Log("获取人员对应下拉框-多级下拉框") - @ApiOperation("获取人员对应下拉框-多级下拉框") + public ResponseEntity getSect(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(userStorService.getSect(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java index 436c78dd0..3b0e19999 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/SectattrService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java index 482bb7537..29e658e1b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StorattrService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java index aeb75e60e..49eea2349 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructattrService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java index 707655fec..2f0f6131d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java index d435e1d42..5e899425a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructrelamaterialService.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service; import org.nl.wms.basedata.st.service.dto.StructrelamaterialDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java index dce258c86..8206d68ac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java index 7be5d917c..c8f014979 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index d29da145f..1b46a3387 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java index 7a4279832..5991abb72 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructrelamaterialServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.basedata.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 3c91ac34e..fdbd8f9b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -1,11 +1,8 @@ - package org.nl.wms.ext.acs.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.modules.logging.InterfaceLogType; @@ -24,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "acs接收lms") + @RequestMapping("/api/wms/task") @Slf4j public class AcsToWmsController { @@ -32,7 +29,7 @@ public class AcsToWmsController { @PostMapping("/status") @Log(value = "ACS给WMS反馈任务状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS给WMS反馈任务状态") + @SaIgnore public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); @@ -40,7 +37,7 @@ public class AcsToWmsController { @PostMapping("/orderFinish") @Log(value = "ACS给WMS下发工单完成状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("ACS给WMS下发工单完成状态") + @SaIgnore public ResponseEntity orderFinish(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.orderFinish(string), HttpStatus.OK); @@ -48,7 +45,7 @@ public class AcsToWmsController { @PostMapping("/apply") @Log(value = "申请任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("申请任务") + @SaIgnore public ResponseEntity apply(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK); @@ -56,7 +53,7 @@ public class AcsToWmsController { @PostMapping("/againApply") @Log(value = "二次申请任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("二次申请任务") + @SaIgnore public ResponseEntity againApply(@RequestBody String task_id) { @@ -72,7 +69,7 @@ public class AcsToWmsController { @PostMapping("/process") @Log(value = "RCS上报密集库任务异常处理", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("RCS上报密集库任务异常处理") + @SaIgnore public ResponseEntity process(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.process(jo), HttpStatus.OK); @@ -80,42 +77,42 @@ public class AcsToWmsController { @PostMapping("/shipDeviceUpdate") // @Log(value = "输送线光电无货上报", isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) - @ApiOperation("输送线光电无货上报") + @SaIgnore public ResponseEntity shipDeviceUpdate(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.shipDeviceUpdate(jo), HttpStatus.OK); } @PostMapping("/sendDeviceStatus") - @ApiOperation("设备状态变更上报") + @SaIgnore public ResponseEntity sendDeviceStatus(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.sendDeviceStatus(jo), HttpStatus.OK); } @PostMapping("/sendCBZInfo") - @ApiOperation("穿轴信号申请") + @SaIgnore public ResponseEntity sendCBZInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.sendCBZInfo(jo), HttpStatus.OK); } @PostMapping("/sendGetGoalStruct") - @ApiOperation("取放货申请") + @SaIgnore public ResponseEntity sendGetGoalStruct(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.sendGetGoalStruct(jo), HttpStatus.OK); } @PostMapping("/actionFinishRequest") - @ApiOperation("取放货完成信号申请") + @SaIgnore public ResponseEntity actionFinishRequest(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.actionFinishRequest(jo), HttpStatus.OK); } /*@PostMapping("/getQZZInfo") - @ApiOperation("获取气涨轴信息") + @SaIgnore public ResponseEntity getQZZInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(acsToWmsService.getQZZInfo(jo), HttpStatus.OK); @@ -123,7 +120,7 @@ public class AcsToWmsController { @PostMapping("/initialize") @Log(value = "仓位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("仓位初始化") + @SaIgnore public ResponseEntity initialize(@RequestBody JSONObject json) { acsToWmsService.initialize(json); @@ -132,7 +129,7 @@ public class AcsToWmsController { @PostMapping("/initPoint") @Log(value = "点位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - @ApiOperation("点位初始化") + @SaIgnore public ResponseEntity initPoint() { acsToWmsService.initPoint(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java index 215844ecb..3282bab65 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java @@ -1,12 +1,9 @@ - package org.nl.wms.ext.acs.rest; import com.alibaba.fastjson.JSON; 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.modules.logging.InterfaceLogType; @@ -27,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms发送acs") + @RequestMapping("/api/wms/task") @Slf4j public class WmsToAcsController { @@ -35,7 +32,7 @@ public class WmsToAcsController { @PostMapping @Log(value = "WMS给ACS发送任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS给ACS发送任务") + public ResponseEntity issueTaskToAcs(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.issueTaskToAcs(arr), HttpStatus.OK); @@ -43,7 +40,7 @@ public class WmsToAcsController { @PostMapping("/cancel") @Log(value = "WMS主动取消ACS任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS主动取消ACS任务") + public ResponseEntity cancelToAcs(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.cancelToAcs(arr), HttpStatus.OK); @@ -51,7 +48,7 @@ public class WmsToAcsController { @PostMapping("/updatePointStatus") @Log(value = "WMS更新ACS点位状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS更新ACS点位状态") + public ResponseEntity updatePointStatus(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.updatePointStatus(arr), HttpStatus.OK); @@ -59,7 +56,7 @@ public class WmsToAcsController { @PostMapping("/order") @Log(value = "WMS开工向acs下发工单", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS开工向acs下发工单") + public ResponseEntity startWork(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.order(arr), HttpStatus.OK); @@ -67,7 +64,7 @@ public class WmsToAcsController { @PostMapping("/orderStatusUpdate") @Log(value = "WMS向acs发送强制完成", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS强制完成向acs发送强制完成") + public ResponseEntity orderStatusUpdate(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.orderStatusUpdate(arr), HttpStatus.OK); @@ -75,7 +72,7 @@ public class WmsToAcsController { @PostMapping("/querydevice") @Log(value = "WMS向acs发送获取点位状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS向acs发送获取点位状态") + public ResponseEntity getPointStatus(@RequestBody JSONArray whereJson) { return new ResponseEntity<>(wmsToAcsService.getPointStatus(whereJson), HttpStatus.OK); } @@ -83,7 +80,7 @@ public class WmsToAcsController { @PostMapping("/updateTask") @Log(value = "WMS向acs发送更新任务状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("WMS向acs发送更新任务状态") + public ResponseEntity updateTask(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.updateTask(arr), HttpStatus.OK); @@ -91,7 +88,7 @@ public class WmsToAcsController { @PostMapping("/action") @Log(value = "给ACS下发修改PLC的值", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("给ACS下发修改PLC的值") + public ResponseEntity action(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.updateTask(arr), HttpStatus.OK); @@ -99,49 +96,49 @@ public class WmsToAcsController { @PostMapping("/putPlusPullAction") @Log(value = "给ACS下发修改PLC的值", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("给ACS下发修改PLC的值") + public ResponseEntity putPlusPullAction(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.putPlusPullAction(jo), HttpStatus.OK); } @PostMapping("/unLock") @Log(value = "给ACS下发修立库点位解锁", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("给ACS下发修立库点位解锁") + public ResponseEntity unLock(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.unLock(jo), HttpStatus.OK); } @PostMapping("/queryDeviceInfo") @Log(value = "LMS向acs请求设备信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS向acs请求设备信息") + public ResponseEntity queryDeviceInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.queryDeviceInfo(jo), HttpStatus.OK); } @PostMapping("/sendAgvChargeTask") @Log(value = "LMS下发AGV充电任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS下发AGV充电任务") + public ResponseEntity sendAgvChargeTask(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.sendAgvChargeTask(jo), HttpStatus.OK); } @PostMapping("/syncfaultInfo") @Log(value = "LMS同步ACS报警码信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS同步ACS报警码信息") + public ResponseEntity syncfaultInfo() { return new ResponseEntity<>(wmsToAcsService.syncfaultInfo(), HttpStatus.OK); } @PostMapping("/realTimefaultInfo") @Log(value = "LMS查看ACS实时报警信息", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS查看ACS实时报警信息") + public ResponseEntity realTimefaultInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.realTimefaultInfo(jo), HttpStatus.OK); } @PostMapping("/PaperTubeAction") @Log(value = "LMS下发纸管库指令", isInterfaceLog = true, interfaceLogType = InterfaceLogType.LMS_TO_ACS) - @ApiOperation("LMS下发纸管库指令") + public ResponseEntity PaperTubeAction(@RequestBody JSONObject jo) { return new ResponseEntity<>(wmsToAcsService.PaperTubeAction(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 1a3913d99..c8ecec110 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -24,7 +24,6 @@ import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.ShippingService; import org.nl.wms.pda.mps.service.impl.BakingServiceImpl; -import org.nl.wms.pda.st.service.PrintService; import org.nl.wms.pda.st.service.impl.PrintServiceImpl; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.CutConveyorTask; @@ -957,16 +956,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //纸管任务 String task_code2 = whereJson.getString("task_code2"); JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code1 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(task_jo)){ + if (ObjectUtil.isEmpty(task_jo)) { throw new BadRequestException("接口sendGetGoalStruct，任务号为空！"); } JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("task_code = '" + task_code2 + "'").uniqueResult(0); String product_area = task_jo.getString("product_area"); String public_area = ""; - if (product_area.equals("A1") || product_area.equals("A2")){ + if (product_area.equals("A1") || product_area.equals("A2")) { public_area = "A1"; } - if (product_area.equals("A3") || product_area.equals("A4")){ + if (product_area.equals("A3") || product_area.equals("A4")) { public_area = "A3"; } JSONObject cbz_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '0'").uniqueResult(0); @@ -1103,7 +1102,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "6") .addParam("need_size", need_size) .addParam("need_generation", need_generation) - .addParam("product_area",public_area) + .addParam("product_area", public_area) .process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)) { @@ -1127,7 +1126,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { struct_jo = WQL.getWO("QAUTO_QUERY").addParam("flag", "7") .addParam("need_size", have_size) .addParam("need_generation", have_generation) - .addParam("product_area",public_area) + .addParam("product_area", public_area) .process().uniqueResult(0); if (ObjectUtil.isEmpty(struct_jo)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java index c82545800..c8d01773f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java @@ -2,8 +2,6 @@ package org.nl.wms.ext.crm.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.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "crm发送lms") + @RequestMapping("/api/crm") @Slf4j public class CrmToLmsController { @@ -25,7 +23,7 @@ public class CrmToLmsController { @PostMapping("/getCustomerInfo") @Log("CRM给LMS推送客户信息") - @ApiOperation("CRM给LMS推送客户信息") + @SaIgnore public ResponseEntity momRollFoilWeighing(@RequestBody JSONObject jo) { return new ResponseEntity<>(crmToLmsService.getCustomerInfo(jo), HttpStatus.OK); @@ -33,7 +31,7 @@ public class CrmToLmsController { @PostMapping("/getCPIvtInfo") @Log("CRM获取LMS成品库存信息") - @ApiOperation("CRM获取LMS成品库存信息") + @SaIgnore public ResponseEntity getCPIvtInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(crmToLmsService.getCPIvtInfo(jo), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java index f9b6ca691..71a49963f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java @@ -1,8 +1,6 @@ package org.nl.wms.ext.mes.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "lms发送mes") + @RequestMapping("/api/lms") @Slf4j public class LmsToMesController { @@ -24,98 +22,98 @@ public class LmsToMesController { @PostMapping("/momRollFoilWeighing") @Log("LMS的PDA操作AGV下卷，AGV称重完成后AGV称重信息发送MES") - @ApiOperation("LMS的PDA操作AGV下卷，AGV称重完成后AGV称重信息发送MES") + public ResponseEntity momRollFoilWeighing(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.momRollFoilWeighing(jo), HttpStatus.OK); } @PostMapping("/momRollBakeInBound") @Log("智能桁架将母卷调进烘箱完成，智能物流发送MES") - @ApiOperation("智能桁架将母卷调进烘箱完成，智能物流发送MES") + public ResponseEntity momRollBakeInBound(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.momRollBakeInBound(jo), HttpStatus.OK); } @PostMapping("/momRollBakeOutBound") @Log("母卷出烘箱信息智能物流传MES") - @ApiOperation("母卷出烘箱信息智能物流传MES") + public ResponseEntity momRollBakeOutBound(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.momRollBakeOutBound(jo), HttpStatus.OK); } @PostMapping("/momRollSemiFGInboundComplete") @Log("AGV将母卷从烘箱暂存位转移至暂存区，传MES") - @ApiOperation("AGV将母卷从烘箱暂存位转移至暂存区，传MES") + public ResponseEntity momRollSemiFGInboundComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.momRollSemiFGInboundComplete(jo), HttpStatus.OK); } @PostMapping("/airSwellWithPaperTubeAssComplete") @Log("套轴任务完成，上架暂存区，智能物流PDA选任务、扫轴、扫料架货位，传MES套轴任务完成信息") - @ApiOperation("套轴任务完成，上架暂存区，智能物流PDA选任务、扫轴、扫料架货位，传MES套轴任务完成信息") + public ResponseEntity airSwellWithPaperTubeAssComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.airSwellWithPaperTubeAssComplete(jo), HttpStatus.OK); } @PostMapping("/cutPlanMomRollDeliveryComplete") @Log("LMS提前做/MES呼叫后做，立库子卷出库完成/母卷配送至分切机暂存位，AGV传MES 母卷配送完成信息/立库子卷出库完成信息") - @ApiOperation("LMS提前做/MES呼叫后做，立库子卷出库完成/母卷配送至分切机暂存位，AGV传MES 母卷配送完成信息/立库子卷出库完成信息") + public ResponseEntity cutPlanMomRollDeliveryComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.cutPlanMomRollDeliveryComplete(jo), HttpStatus.OK); } @PostMapping("/airSwellWithPaperTubeAssArrival") @Log("提前将/按呼叫指令配送（扫码校验配送先后顺序）气涨轴套装运输到分切机，智能物流传MES 到位信息") - @ApiOperation("提前将/按呼叫指令配送（扫码校验配送先后顺序）气涨轴套装运输到分切机，智能物流传MES 到位信息") + public ResponseEntity airSwellWithPaperTubeAssArrival(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.airSwellWithPaperTubeAssArrival(jo), HttpStatus.OK); } @PostMapping("/childRollFGInboundComplete") @Log("入库完成，LMS回传MES，MES成品入库Move Out") - @ApiOperation("入库完成，LMS回传MES，MES成品入库Move Out") + public ResponseEntity childRollFGInboundComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.childRollFGInboundComplete(jo), HttpStatus.OK); } @PostMapping("/childRollFGOutboundComplete") @Log("发货完成，LMS同步MES子卷及包装箱状态，MES更新信息") - @ApiOperation("发货完成，LMS同步MES子卷及包装箱状态，MES更新信息") + public ResponseEntity childRollFGOutboundComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.childRollFGOutboundComplete(jo), HttpStatus.OK); } @PostMapping("/lmsUnPackage") @Log("拆箱出库回传mes箱号、子卷号") - @ApiOperation("拆箱出库回传mes箱号、子卷号") + public ResponseEntity lmsUnPackage(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.lmsUnPackage(jo), HttpStatus.OK); } @PostMapping("/lmsPackage") @Log("拆箱入库回传mes箱号、子卷号") - @ApiOperation("拆箱入库回传mes箱号、子卷号") + public ResponseEntity lmsPackage(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.lmsPackage(jo), HttpStatus.OK); } @PostMapping("/scrapAudit") @Log("成品报废审核") - @ApiOperation("成品报废审核") + public ResponseEntity scrapAudit(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.scrapAudit(jo), HttpStatus.OK); } @PostMapping("/proudDayData") @Log("成品日报推送") - @ApiOperation("成品日报推送") + public ResponseEntity proudDayData(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.proudDayData(jo), HttpStatus.OK); } @PostMapping("/ChildScrapUpdate") @Log("成品日报推送") - @ApiOperation("成品日报推送") + public ResponseEntity ChildScrapUpdate(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.ChildScrapUpdate(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java index 1d644319e..a85f34d51 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java @@ -3,8 +3,6 @@ package org.nl.wms.ext.mes.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -18,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "mes发送lms") + @RequestMapping("/api/mes") @Slf4j public class MesToLmsController { @@ -26,7 +24,7 @@ public class MesToLmsController { @PostMapping("/momRollFoilStart") @Log("母卷批次创建信息发送智能物流（MES生箔工序Move In）") - @ApiOperation("母卷批次创建信息发送智能物流（MES生箔工序Move In）") + @SaIgnore public ResponseEntity momRollFoilStart(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilStart(jo), HttpStatus.OK); @@ -34,7 +32,7 @@ public class MesToLmsController { @PostMapping("momRollFoilWeighing") @Log("MES获取AGV称重信息") - @ApiOperation("MES获取AGV称重信息") + @SaIgnore public ResponseEntity momRollFoilWeighing(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilWeighing(jo), HttpStatus.OK); @@ -42,7 +40,7 @@ public class MesToLmsController { @PostMapping("/momRollFoilComplete") @Log("MES执行下卷动作告诉LMS") - @ApiOperation("MES执行下卷动作告诉LMS") + @SaIgnore public ResponseEntity momRollFoilComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollFoilComplete(jo), HttpStatus.OK); @@ -50,7 +48,7 @@ public class MesToLmsController { @PostMapping("/momRollBakeNextSpecTransfer") @Log("MES下达烘箱温度和时间配方给智能物流(MES 包装防护工序Move Out)") - @ApiOperation("MES下达烘箱温度和时间配方给智能物流(MES 包装防护工序Move Out)") + @SaIgnore public ResponseEntity momRollBakeNextSpecTransfer(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.momRollBakeNextSpecTransfer(jo), HttpStatus.OK); @@ -58,7 +56,7 @@ public class MesToLmsController { @PostMapping("/cutPlanTransfer") @Log("分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流") - @ApiOperation("分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流") + @SaIgnore public ResponseEntity cutPlanTransfer(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.cutPlanTransfer(jo), HttpStatus.OK); @@ -66,7 +64,7 @@ public class MesToLmsController { @PostMapping("/callNextAssAndMomRoll") @Log("分切即将完成，呼叫配送下一个母卷/改制子卷，MES传智能物流") - @ApiOperation("分切即将完成，呼叫配送下一个母卷/改制子卷，MES传智能物流") + @SaIgnore public ResponseEntity callNextAssAndMomRoll(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.callNextAssAndMomRoll(jo), HttpStatus.OK); @@ -74,7 +72,7 @@ public class MesToLmsController { @PostMapping("/childRollCutStartComp") @Log("当母卷开始分切时，MES系统会将对应的子卷进站信息发送给只能物流系统，一方面物流系统可以预估下个母卷的送达时间，也可以闭环期分切计划指令") - @ApiOperation("当母卷开始分切时，MES系统会将对应的子卷进站信息发送给只能物流系统，一方面物流系统可以预估下个母卷的送达时间，也可以闭环期分切计划指令") + @SaIgnore public ResponseEntity childRollCutStartComp(@RequestBody JSONArray ja) { return new ResponseEntity<>(mesToLmsService.childRollCutStartComp(ja), HttpStatus.OK); @@ -82,7 +80,7 @@ public class MesToLmsController { @PostMapping("/childRollPackComplete") @Log("包装完成，传智能物流包装箱与子卷关系及子卷属性值，LMS执行入库") - @ApiOperation("包装完成，传智能物流包装箱与子卷关系及子卷属性值，LMS执行入库") + @SaIgnore public ResponseEntity childRollPackComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.childRollPackComplete(jo), HttpStatus.OK); @@ -90,7 +88,7 @@ public class MesToLmsController { @PostMapping("/inventoryTransferInfoSync") @Log("转单指令在MES平台查看后，更新信息，发送LMS（是否拆包、更新后的入库日期、是否更换外包装箱标签）,LMS重打子卷标签、包装箱外标签") - @ApiOperation("转单指令在MES平台查看后，更新信息，发送LMS（是否拆包、更新后的入库日期、是否更换外包装箱标签）,LMS重打子卷标签、包装箱外标签") + @SaIgnore public ResponseEntity inventoryTransferInfoSync(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.inventoryTransferInfoSync(jo), HttpStatus.OK); @@ -98,7 +96,7 @@ public class MesToLmsController { @PostMapping("/childRollInfoUpdate") @Log("子卷信息更新:计划外需求有可能入库完成后，ERP才回传计划外需求SalesOrder") - @ApiOperation("子卷信息更新:计划外需求有可能入库完成后，ERP才回传计划外需求SalesOrder") + @SaIgnore public ResponseEntity childRollInfoUpdate(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.childRollInfoUpdate(jo), HttpStatus.OK); @@ -106,7 +104,7 @@ public class MesToLmsController { @PostMapping("/cutPlanTransferCancel") @Log("分切计划取消") - @ApiOperation("分切计划取消") + @SaIgnore public ResponseEntity cutPlanTransferCancel(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.cutPlanTransferCancel(jo), HttpStatus.OK); @@ -114,7 +112,7 @@ public class MesToLmsController { @PostMapping("/sendAuditResult") @Log("子卷审批结果") - @ApiOperation("子卷审批结果") + @SaIgnore public ResponseEntity sendAuditResult(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.sendAuditResult(jo), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java index 16f1c0050..bdb06a0f4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/LmsToSapController.java @@ -1,8 +1,6 @@ package org.nl.wms.ext.sap.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "lms发送sap") + @RequestMapping("/api/lms") @Slf4j public class LmsToSapController { @@ -24,21 +22,21 @@ public class LmsToSapController { @PostMapping("/returnDelivery") @Log("LMS回传SAP交货单") - @ApiOperation("LMS回传SAP交货单") + public ResponseEntity returnDelivery(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToSapService.returnDelivery(jo), HttpStatus.OK); } @PostMapping("/returnMoveDtl") @Log("LMS移库接口回传") - @ApiOperation("LMS移库接口回传") + public ResponseEntity returnMoveDtl(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToSapService.returnMoveDtl(jo), HttpStatus.OK); } @PostMapping("/returnOutDtl") @Log("LMS调拨出库接口回传") - @ApiOperation("LMS调拨出库接口回传") + public ResponseEntity returnOutDtl(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToSapService.returnOutDtl(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java index 121017638..86d96282b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/SapToLmsController.java @@ -2,8 +2,6 @@ package org.nl.wms.ext.sap.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.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "sap发送lms") + @RequestMapping("/api/sap") @Slf4j public class SapToLmsController { @@ -26,7 +24,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getMaterialInfo") @Log("SAP给LMS推送物料信息") - @ApiOperation("SAP给LMS推送物料信息") + public ResponseEntity getMaterialInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getMaterialInfo(jo), HttpStatus.OK); } @@ -34,7 +32,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getDeliveryInfo") @Log("SAP给LMS推送交货单信息") - @ApiOperation("SAP给LMS推送物料信息") + public ResponseEntity getDeliveryInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getDeliveryInfo(jo), HttpStatus.OK); } @@ -42,7 +40,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getReturnDeliveryInfo") @Log("SAP给LMS推送退货交货单信息") - @ApiOperation("SAP给LMS推送退货交货单信息") + public ResponseEntity getReturnDeliveryInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getReturnDeliveryInfo(jo), HttpStatus.OK); } @@ -50,7 +48,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getCannibalize") @Log("SAP给LMS推送调拨出库单") - @ApiOperation("SAP给LMS推送调拨出库单") + public ResponseEntity getCannibalize(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getCannibalize(jo), HttpStatus.OK); } @@ -58,7 +56,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getReCutInfo") @Log("SAP给LMS推送改切出库单") - @ApiOperation("SAP给LMS推送改切出库单") + public ResponseEntity getReCutInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getReCutInfo(jo), HttpStatus.OK); } @@ -66,7 +64,7 @@ public class SapToLmsController { @SaIgnore @PostMapping("/getUnPlanInfo") @Log("SAP给LMS推送计划外子卷转单信息") - @ApiOperation("SAP给LMS推送计划外子卷转单信息") + public ResponseEntity getUnPlanInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(sapToLmsService.getUnPlanInfo(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java index 46f446c73..1d8e557d7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java @@ -2,8 +2,6 @@ package org.nl.wms.ext.szls.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.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "lms发送数字孪生") + @RequestMapping("/api/szls") @Slf4j public class LmsToBigScreenController { @@ -25,7 +23,7 @@ public class LmsToBigScreenController { @PostMapping("/getDeviceInfo") @Log("数字孪生请求LMS获取设备信息") - @ApiOperation("数字孪生请求LMS获取设备信息") + @SaIgnore public ResponseEntity getDeviceInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getDeviceInfo(jo), HttpStatus.OK); @@ -33,7 +31,7 @@ public class LmsToBigScreenController { @PostMapping("/getStructInfo") @Log("数字孪生请求LMS获取设备信息") - @ApiOperation("数字孪生请求LMS获取设备信息") + @SaIgnore public ResponseEntity getStructInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getStructInfo(jo), HttpStatus.OK); @@ -41,7 +39,7 @@ public class LmsToBigScreenController { @PostMapping("/getMonthFreight") @Log("当月发货运费信息") - @ApiOperation("当月发货运费信息") + @SaIgnore public ResponseEntity getMonthFreight(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getMonthFreight(jo), HttpStatus.OK); @@ -49,7 +47,7 @@ public class LmsToBigScreenController { @PostMapping("/getMonthYield") @Log("当月产量信息") - @ApiOperation("当月产量信息") + @SaIgnore public ResponseEntity getMonthYield(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getMonthYield(jo), HttpStatus.OK); @@ -57,7 +55,7 @@ public class LmsToBigScreenController { @PostMapping("/getMonthDelivery") @Log("当月发货信息") - @ApiOperation("当月发货信息") + @SaIgnore public ResponseEntity getMonthDelivery(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getMonthDelivery(jo), HttpStatus.OK); @@ -65,7 +63,7 @@ public class LmsToBigScreenController { @PostMapping("/getProudDayData") @Log("成品日报") - @ApiOperation("成品日报") + @SaIgnore public ResponseEntity getProudDayData(@RequestBody JSONObject jo) { return new ResponseEntity<>(LmsToBigScreenService.getProudDayData(jo), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java index a75242159..8139b75e4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/AppUpdateController.java @@ -9,8 +9,6 @@ package org.nl.wms.pda; 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.modules.logging.annotation.Log; @@ -26,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/pda/update") @Slf4j public class AppUpdateController { @@ -35,7 +33,7 @@ public class AppUpdateController { @PostMapping @Log("app更新") - @ApiOperation("app更新") + @SaIgnore public ResponseEntity appUpdate() { JSONObject obj = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java index 2368b5b64..f244b8e5e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "烘烤工序") + @RequestMapping("api/pda/baking") @Slf4j public class BakingController { @@ -25,28 +23,28 @@ public class BakingController { @PostMapping("/ovenInAndOut") @Log("烘箱出入") - @ApiOperation("烘箱出入") + public ResponseEntity queryRawFoil(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson), HttpStatus.OK); } @PostMapping("/query") @Log("查询") - @ApiOperation("查询") + public ResponseEntity query(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bakingService.query(whereJson), HttpStatus.OK); } @PostMapping("/inCoolIvt") @Log("入冷却") - @ApiOperation("入冷却") + public ResponseEntity inCoolIvt(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bakingService.inCoolIvt(whereJson), HttpStatus.OK); } @PostMapping("/release") @Log("解警") - @ApiOperation("解警") + public ResponseEntity release(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bakingService.release(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java index a7048af8e..ae3c20563 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/CasingController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "子卷套管") + @RequestMapping("api/pda/casing") @Slf4j public class CasingController { @@ -26,7 +24,7 @@ public class CasingController { @PostMapping("/queryMaterialInfo") @Log("分切计划初始化查询") - @ApiOperation("分切计划初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -36,28 +34,28 @@ public class CasingController { @PostMapping("/confirm") @Log("套轴确认") - @ApiOperation("套轴确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(casingService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/outConfirm") @Log("拔轴确认") - @ApiOperation("拔轴确认") + public ResponseEntity outConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(casingService.outConfirm(whereJson), HttpStatus.OK); } @PostMapping("/wearConfirm") @Log("穿轴确认") - @ApiOperation("穿轴确认") + public ResponseEntity wearConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(casingService.wearConfirm(whereJson), HttpStatus.OK); } @PostMapping("/queryDeviceByarea") @Log("查询设备") - @ApiOperation("查询设备") + public ResponseEntity queryDeviceByarea(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(casingService.queryDeviceByarea(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java index 84d83c134..90d157e80 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyTubeController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "空管出入库") + @RequestMapping("api/pda/empty") @Slf4j public class EmptyTubeController { @@ -25,14 +23,14 @@ public class EmptyTubeController { @PostMapping("/queryMaterialInfo") @Log("空纸管库设备物料初始化查询") - @ApiOperation("空纸管库设备物料初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(emptyTubeService.queryMaterialInfo(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("入库确认") - @ApiOperation("入库确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(emptyTubeService.confirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyVehicleController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyVehicleController.java index 44f964eec..004440c8b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyVehicleController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/EmptyVehicleController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "空载具出入库") + @RequestMapping("api/pda/emptyVehicle") @Slf4j public class EmptyVehicleController { @@ -25,14 +23,14 @@ public class EmptyVehicleController { @PostMapping("/pointStatusQuery") @Log("点位载具查询") - @ApiOperation("点位载具查询") + public ResponseEntity pointStatusQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(emptyVehicleService.pointStatusQuery(whereJson), HttpStatus.OK); } @PostMapping("/pointOperate") @Log("解绑绑定") - @ApiOperation("解绑绑定") + public ResponseEntity pointOperate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(emptyVehicleService.pointOperate(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java index 18255ca0b..531800c81 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "分切上料") + @RequestMapping("api/pda/feeding") @Slf4j public class FeedingController { @@ -26,7 +24,7 @@ public class FeedingController { @PostMapping("/queryMaterialInfo") @Log("分切计划初始化查询") - @ApiOperation("分切计划初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -36,28 +34,28 @@ public class FeedingController { @PostMapping("/confirm") @Log("呼叫母卷") - @ApiOperation("呼叫母卷") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/queryPoint") @Log("扫码起点获取母卷") - @ApiOperation("扫码起点获取母卷") + public ResponseEntity queryPoint(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.queryPoint(whereJson), HttpStatus.OK); } @PostMapping("/handleConfirm") @Log("人工呼叫母卷确认") - @ApiOperation("人工呼叫母卷确认") + public ResponseEntity handleConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.handleConfirm(whereJson), HttpStatus.OK); } @PostMapping("/vehicleReturn") @Log("空轴送回") - @ApiOperation("空轴送回") + public ResponseEntity vehicleReturn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(feedingService.vehicleReturn(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/HandleBakingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/HandleBakingController.java index f6a163d0f..95e70ec66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/HandleBakingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/HandleBakingController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "人工烘烤") + @RequestMapping("api/pda/handleBaking") @Slf4j public class HandleBakingController { @@ -25,14 +23,14 @@ public class HandleBakingController { @PostMapping("/ovenInAndOut") @Log("手工烘箱出入") - @ApiOperation("手工烘箱出入") + public ResponseEntity queryRawFoil(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(handleBakingService.ovenInAndOut(whereJson), HttpStatus.OK); } @PostMapping("/checkConfirm") @Log("库存变更") - @ApiOperation("库存变更") + public ResponseEntity checkConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(handleBakingService.checkConfirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/InController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/InController.java index 6063d220b..be52d5ea5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/InController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/InController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "子卷入站") + @RequestMapping("api/pda/in") @Slf4j public class InController { @@ -25,35 +23,35 @@ public class InController { @PostMapping("/queryMaterialInfo") @Log("分切计划初始化查询") - @ApiOperation("分切计划初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inService.queryMaterialInfo(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("子卷入站") - @ApiOperation("子卷入站") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/devicePointQuery") @Log("设备点位查询") - @ApiOperation("设备点位查询") + public ResponseEntity devicePointQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inService.devicePointQuery(whereJson), HttpStatus.OK); } @PostMapping("/conveyPointQuery") @Log("缓存点位查询") - @ApiOperation("缓存点位查询") + public ResponseEntity conveyPointQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inService.conveyPointQuery(whereJson), HttpStatus.OK); } @PostMapping("/conveyConfirm") @Log("出站配送") - @ApiOperation("出站配送") + public ResponseEntity conveyConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inService.conveyConfirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java index e95e6261c..add067598 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "子卷出站") + @RequestMapping("api/pda/out") @Slf4j public class OutController { @@ -25,35 +23,35 @@ public class OutController { @PostMapping("/queryMaterialInfo") @Log("分切计划初始化查询") - @ApiOperation("分切计划初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.queryMaterialInfo(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("子卷出站") - @ApiOperation("子卷出站") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/disuseConfirm") @Log("废箔下卷") - @ApiOperation("废箔下卷") + public ResponseEntity disuseConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.disuseConfirm(whereJson), HttpStatus.OK); } @PostMapping("/conveyPointQuery") @Log("缓存点位查询") - @ApiOperation("缓存点位查询") + public ResponseEntity conveyPointQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.conveyPointQuery(whereJson), HttpStatus.OK); } @PostMapping("/conveyConfirm") @Log("出站配送") - @ApiOperation("出站配送") + public ResponseEntity conveyConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(outService.conveyConfirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PaperTubeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PaperTubeController.java index 9631aec1e..639be7403 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PaperTubeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PaperTubeController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "纸管库管理") + @RequestMapping("api/pda/paper") @Slf4j public class PaperTubeController { @@ -25,28 +23,28 @@ public class PaperTubeController { @PostMapping("/queryDeviceList") @Log("查询纸管库设备") - @ApiOperation("查询纸管库设备") + public ResponseEntity queryDeviceList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(paperTubeService.queryDeviceList(whereJson), HttpStatus.OK); } @PostMapping("/queryPaperMaterial") @Log("查询纸管物料") - @ApiOperation("查询纸管物料") + public ResponseEntity queryPaperMaterial(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(paperTubeService.queryPaperMaterial(whereJson), HttpStatus.OK); } @PostMapping("/PaperDeviceOperate") @Log("纸管库操作") - @ApiOperation("纸管库操作") + public ResponseEntity PaperDeviceOperate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(paperTubeService.PaperDeviceOperate(whereJson), HttpStatus.OK); } @PostMapping("/queryPaperTubeInfo") @Log("查询纸管库信息") - @ApiOperation("查询纸管库信息") + public ResponseEntity queryPaperTubeInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(paperTubeService.queryPaperTubeInfo(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PointStatusController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PointStatusController.java index f654efe0e..88caa42d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PointStatusController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/PointStatusController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "点位管理") + @RequestMapping("api/pda/point") @Slf4j public class PointStatusController { @@ -26,14 +24,14 @@ public class PointStatusController { @PostMapping("/pointOperate") @Log("点位解绑绑定") - @ApiOperation("点位解绑绑定") + public ResponseEntity pointOperate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pointStatusService.pointOperate(whereJson), HttpStatus.OK); } @PostMapping("/pointStatusQuery") @Log("点位状态查询") - @ApiOperation("点位状态查询") + public ResponseEntity pointStatusQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pointStatusService.pointStatusQuery(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java index 16d05890a..207c72920 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "生箔工序") + @RequestMapping("api/pda/raw") @Slf4j public class RawFoilController { @@ -26,14 +24,14 @@ public class RawFoilController { @PostMapping("/queryProductArea") @Log("查询生产区域") - @ApiOperation("查询生产区域") + public ResponseEntity queryProductArea() { return new ResponseEntity<>(rawFoilService.queryProductArea(), HttpStatus.OK); } @PostMapping("/queryRawFoil") @Log("查询生箔生产进度") - @ApiOperation("查询生箔生产进度") + public ResponseEntity queryRawFoil(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -43,7 +41,7 @@ public class RawFoilController { @PostMapping("/queryRawFoilList") @Log("查询生箔工单") - @ApiOperation("查询生箔工单") + public ResponseEntity queryRawFoilList(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -53,28 +51,28 @@ public class RawFoilController { @PostMapping("/needEmptyAxis") @Log("呼叫") - @ApiOperation("呼叫") + public ResponseEntity needEmptyAxis(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(rawFoilService.needEmptyAxis(whereJson), HttpStatus.OK); } @PostMapping("/needEmptyVehicle") @Log("呼叫空轴") - @ApiOperation("呼叫空轴") + public ResponseEntity needEmptyVehicle(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(rawFoilService.needEmptyVehicle(whereJson), HttpStatus.OK); } @PostMapping("/confirmBlanking") @Log("确认下卷") - @ApiOperation("确认下卷") + public ResponseEntity confirmBlanking(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(rawFoilService.confirmBlanking(whereJson), HttpStatus.OK); } @PostMapping("/finishBlanking") @Log("下卷完成") - @ApiOperation("下卷完成") + public ResponseEntity finishBlanking(@RequestBody JSONObject whereJson) { rawFoilService.finishBlanking(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -82,7 +80,7 @@ public class RawFoilController { @PostMapping("/finish") @Log("完成") - @ApiOperation("完成") + public ResponseEntity finish(@RequestBody JSONObject whereJson) { rawFoilService.finish(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java index 61772db4f..06e0b83e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/ShippingController.java @@ -1,8 +1,6 @@ package org.nl.wms.pda.mps.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Api(tags = "子卷配送") + @RequestMapping("api/pda/shipping") @Slf4j public class ShippingController { @@ -25,42 +23,42 @@ public class ShippingController { @PostMapping("/queryMaterialInfo") @Log("分切计划初始化查询") - @ApiOperation("分切计划初始化查询") + public ResponseEntity queryMaterialInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.queryMaterialInfo(whereJson), HttpStatus.OK); } @PostMapping("/needVehicle") @Log("呼叫载具") - @ApiOperation("呼叫载具") + public ResponseEntity needVehicle(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.needVehicle(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("配送确认") - @ApiOperation("配送确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/returnVehicle") @Log("载具送回") - @ApiOperation("载具送回") + public ResponseEntity returnVehicle(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.returnVehicle(whereJson), HttpStatus.OK); } @PostMapping("/acrossVehicle") @Log("载具横移") - @ApiOperation("载具横移") + public ResponseEntity acrossVehicle(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.acrossVehicle(whereJson), HttpStatus.OK); } @PostMapping("/check") @Log("配送校验") - @ApiOperation("配送校验") + public ResponseEntity check(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(shippingService.check(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolInController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolInController.java index c5ba2af9c..2a99d7022 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolInController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolInController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "半成品入库") + @RequestMapping("/api/pda/coolIn") @Slf4j public class CoolInController { @@ -32,7 +29,7 @@ public class CoolInController { @PostMapping("/coolIOQuery") @Log("半成品入库初始化查询") - @ApiOperation("半成品入库初始化查询") + public ResponseEntity create(@RequestBody JSONObject whereJson) { HttpContext ctx = new HttpContext("11"); ctx.setPage((String) (whereJson.get("page"))); @@ -42,14 +39,14 @@ public class CoolInController { @PostMapping("/confirmInstor") @Log("确认入库") - @ApiOperation("确认入库") + public ResponseEntity confirmInstor(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(coolInService.confirmInstor(whereJson), HttpStatus.OK); } @PostMapping("/statusList") @Log("状态下拉框") - @ApiOperation("状态下拉框") + public ResponseEntity statusList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(coolInService.statusList(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolOutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolOutController.java index 286d315ab..e306e3f4a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolOutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/CoolOutController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "半成品出库") + @RequestMapping("/api/pda/coolOut") @Slf4j public class CoolOutController { @@ -31,21 +28,21 @@ public class CoolOutController { @PostMapping("/coolIOQuery") @Log("半成品出库初始化查询") - @ApiOperation("半成品出库初始化查询") + public ResponseEntity coolIOQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(coolOutService.coolIOQuery(whereJson), HttpStatus.OK); } @PostMapping("/confirmInstor") @Log("出库确认") - @ApiOperation("出库确认") + public ResponseEntity confirmInstor(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(coolOutService.confirmInstor(whereJson), HttpStatus.OK); } @PostMapping("/areaQuery") @Log("半成品出库区域下拉框查询") - @ApiOperation("半成品出库区域下拉框查询") + public ResponseEntity areaQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(coolOutService.areaQuery(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PdaCheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PdaCheckController.java index 864207f63..cbb06ef25 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PdaCheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PdaCheckController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持盘点") + @RequestMapping("/api/pda/check") @Slf4j public class PdaCheckController { @@ -31,56 +28,56 @@ public class PdaCheckController { @PostMapping("/checkQuery") @Log("盘点单查询") - @ApiOperation("盘点单查询") + public ResponseEntity checkQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.checkQuery(whereJson), HttpStatus.OK); } @PostMapping("/checkQueryDtl") @Log("盘点单明细查询") - @ApiOperation("盘点单明细查询") + public ResponseEntity checkQueryDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.checkQueryDtl(whereJson), HttpStatus.OK); } @PostMapping("/checkQueryDetails") @Log("盘点单明细详情") - @ApiOperation("盘点单明细详情") + public ResponseEntity checkQueryDetails(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.checkQueryDetails(whereJson), HttpStatus.OK); } @PostMapping("/saveCheck") @Log("保存") - @ApiOperation("保存") + public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.saveCheck(whereJson), HttpStatus.OK); } @PostMapping("/confirmCheck") @Log("确认") - @ApiOperation("确认") + public ResponseEntity confirmCheck(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.confirmCheck(whereJson), HttpStatus.OK); } @PostMapping("/exception") @Log("异常") - @ApiOperation("异常") + public ResponseEntity exception(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.exception(whereJson), HttpStatus.OK); } @PostMapping("/normal") @Log("正常") - @ApiOperation("正常") + public ResponseEntity normal(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCheckService.normal(whereJson), HttpStatus.OK); } @PostMapping("/getStor") @Log("获取人员对应仓库下拉框") - @ApiOperation("获取人员对应仓库下拉框") + public ResponseEntity getStor() { return new ResponseEntity<>(pdaCheckService.getStor(), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java index 77417391f..29372ec9f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java @@ -1,11 +1,8 @@ - package org.nl.wms.pda.st.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.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "打印信息") + @RequestMapping("/api/pda/print") @Slf4j public class PrintController { @@ -32,21 +29,21 @@ public class PrintController { @PostMapping("/customerInfo") @Log("木箱明细查询") - @ApiOperation("木箱明细查询") + public ResponseEntity customerInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(printService.customerInfo(whereJson), HttpStatus.OK); } @PostMapping("/customerPrint") @Log("打印") - @ApiOperation("打印") + public ResponseEntity customerPrint(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(printService.customerPrint(whereJson), HttpStatus.OK); } @PostMapping("/printType") @Log("打印机下拉框") - @ApiOperation("打印机下拉框") + @SaIgnore public ResponseEntity printType(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(printService.printType(whereJson), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductInstorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductInstorController.java index e36b6ffb9..4e061477d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductInstorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductInstorController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "成品入库") + @RequestMapping("/api/pda/st") @Slf4j public class ProductInstorController { @@ -31,35 +28,35 @@ public class ProductInstorController { @PostMapping("/boxQuery") @Log("查询子卷包装关系") - @ApiOperation("查询子卷包装关系") + public ResponseEntity boxQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productInstorService.boxQuery(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("手持生产入库确认") - @ApiOperation("手持生产入库确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productInstorService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/mendCode") @Log("补码") - @ApiOperation("补码") + public ResponseEntity mendCode(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productInstorService.mendCode(whereJson), HttpStatus.OK); } @PostMapping("/bale") @Log("捆扎") - @ApiOperation("捆扎") + public ResponseEntity bale(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productInstorService.bale(whereJson), HttpStatus.OK); } @PostMapping("/abnormalOut") @Log("异常出口点位解锁") - @ApiOperation("异常出口点位解锁") + public ResponseEntity abnormalOut(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productInstorService.abnormalOut(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductionOutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductionOutController.java index db4fe2334..a23e75865 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductionOutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/ProductionOutController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.st.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "生产区发货") + @RequestMapping("/api/pda/st") @Slf4j public class ProductionOutController { @@ -31,28 +28,28 @@ public class ProductionOutController { @PostMapping("/ivtQuery") @Log("单据初始化查询") - @ApiOperation("单据初始化查询") + public ResponseEntity ivtQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productionOutService.ivtQuery(whereJson), HttpStatus.OK); } @PostMapping("/ivtDtlQuery") @Log("查询点位木箱") - @ApiOperation("查询点位木箱") + public ResponseEntity ivtDtlQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productionOutService.ivtDtlQuery(whereJson), HttpStatus.OK); } @PostMapping("/ivtbBoxDtlQuery") @Log("木箱明细") - @ApiOperation("木箱明细") + public ResponseEntity ivtbBoxDtlQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productionOutService.ivtbBoxDtlQuery(whereJson), HttpStatus.OK); } @PostMapping("/outConfirm") @Log("出库确认") - @ApiOperation("出库确认") + public ResponseEntity outConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(productionOutService.outConfirm(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java index be419d428..e440ba608 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java @@ -1,11 +1,8 @@ - package org.nl.wms.pda.st.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.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "虚拟区发货") + @RequestMapping("/api/pda/virtual") @Slf4j public class VirtualOutController { @@ -32,35 +29,35 @@ public class VirtualOutController { @PostMapping("/billQuery") @Log("出库初始化查询") - @ApiOperation("出库初始化查询") + public ResponseEntity ivtQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(virtualOutService.ivtQuery(whereJson), HttpStatus.OK); } @PostMapping("/billType") @Log("获取单据类型") - @ApiOperation("获取单据类型") + public ResponseEntity billType(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(virtualOutService.billType(whereJson), HttpStatus.OK); } @PostMapping("/ivtQuery") @Log("分配明细查询") - @ApiOperation("分配明细查询") + public ResponseEntity ivtDisQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(virtualOutService.ivtDisQuery(whereJson), HttpStatus.OK); } @PostMapping("/outConfirm") @Log("出库确认") - @ApiOperation("出库确认") + public ResponseEntity outConfirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(virtualOutService.outConfirm(whereJson), HttpStatus.OK); } @PostMapping("/printType") @Log("打印机下拉框") - @ApiOperation("打印机下拉框") + @SaIgnore public ResponseEntity printType(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(virtualOutService.printType(whereJson), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolInService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolInService.java index 7297ec176..6e9d47264 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolInService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolInService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolOutService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolOutService.java index 64d1729d1..f44f3e656 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolOutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/CoolOutService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java index ee2b341a7..34c2ee461 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PdaCheckService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java index 1c4e2325d..79d34451c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductInstorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductInstorService.java index df41c0859..e36c10025 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductInstorService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductInstorService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductionOutService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductionOutService.java index c9a0bf1cf..680584777 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductionOutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/ProductionOutService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/VirtualOutService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/VirtualOutService.java index a8008ee7e..c1aac31e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/VirtualOutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/VirtualOutService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java index bcac4f54f..66c40f0ac 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java index 7bdb3cd1b..ab46bc11d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java index dbe449a06..2191ce524 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index cedf1ded5..a2235107e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index 17f1f53b0..9c9d8d57b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java index 54306cd0e..a8ae49622 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java index e7d0de9be..fbbbda4c5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.st.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/rest/PdaTaskController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/rest/PdaTaskController.java index bc4a99365..196c48ee1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/rest/PdaTaskController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/rest/PdaTaskController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pda.task.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -22,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/pda/task") @Slf4j public class PdaTaskController { @@ -31,28 +28,28 @@ public class PdaTaskController { @PostMapping("/taskQuery") @Log("任务查询") - @ApiOperation("任务查询") + public ResponseEntity taskQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaTaskService.taskQuery(whereJson), HttpStatus.OK); } @PostMapping("/againLssued") @Log("重新下发") - @ApiOperation("重新下发") + public ResponseEntity againLssued(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaTaskService.againLssued(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制完成") - @ApiOperation("强制完成") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaTaskService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/rgvStatusQuery") @Log("rgv状态查询") - @ApiOperation("rgv状态查询") + public ResponseEntity rgvStatusQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaTaskService.rgvStatusQuery(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java index 09e261234..6311be803 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/PdaTaskService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.task.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java index 8b5fd7db9..8487fc691 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/service/impl/PdaTaskServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pda.task.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java index b7302c8a5..3ca1dfa94 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/rest/SubpackagerelationController.java @@ -1,9 +1,6 @@ - package org.nl.wms.pdm.bi.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "子卷包装关系管理") + @RequestMapping("/api/subpackagerelation") @Slf4j public class SubpackagerelationController { @@ -34,7 +31,7 @@ public class SubpackagerelationController { @GetMapping @Log("查询子卷包装关系") - @ApiOperation("查询子卷包装关系") + //@SaCheckPermission("@el.check('subpackagerelation:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(subpackagerelationService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +39,7 @@ public class SubpackagerelationController { @PostMapping @Log("新增子卷包装关系") - @ApiOperation("新增子卷包装关系") + //@SaCheckPermission("@el.check('subpackagerelation:add')") public ResponseEntity create(@Validated @RequestBody SubpackagerelationDto dto) { subpackagerelationService.create(dto); @@ -51,7 +48,7 @@ public class SubpackagerelationController { @PutMapping @Log("修改子卷包装关系") - @ApiOperation("修改子卷包装关系") + //@SaCheckPermission("@el.check('subpackagerelation:edit')") public ResponseEntity update(@Validated @RequestBody SubpackagerelationDto dto) { subpackagerelationService.update(dto); @@ -59,7 +56,7 @@ public class SubpackagerelationController { } @Log("删除子卷包装关系") - @ApiOperation("删除子卷包装关系") + //@SaCheckPermission("@el.check('subpackagerelation:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +65,7 @@ public class SubpackagerelationController { } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { subpackagerelationService.download(map, response); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/SubpackagerelationService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/SubpackagerelationService.java index 2113959df..6b5a0415c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/SubpackagerelationService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/SubpackagerelationService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.bi.service; import org.nl.wms.pdm.bi.service.dto.SubpackagerelationDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java index 5b6b83b1e..1ad4e7fa0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.bi.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java index d1d26c5c9..c71c06d2c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pdm.ivt.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "冷却区库存管理") + @RequestMapping("/api/stIvtCoolpointivt") @Slf4j public class CoolPointIvtController { @@ -33,7 +30,7 @@ public class CoolPointIvtController { @GetMapping @Log("查询冷却区库存") - @ApiOperation("查询冷却区库存") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(coolpointivtService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class CoolPointIvtController { @PostMapping @Log("新增冷却区库存") - @ApiOperation("新增冷却区库存") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:add')") public ResponseEntity create(@Validated @RequestBody CoolPointIvtDto dto) { coolpointivtService.create(dto); @@ -50,7 +47,7 @@ public class CoolPointIvtController { @PutMapping @Log("修改冷却区库存") - @ApiOperation("修改冷却区库存") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:edit')") public ResponseEntity update(@Validated @RequestBody CoolPointIvtDto dto) { coolpointivtService.update(dto); @@ -58,7 +55,7 @@ public class CoolPointIvtController { } @Log("删除冷却区库存") - @ApiOperation("删除冷却区库存") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +65,7 @@ public class CoolPointIvtController { @GetMapping("/coolRegionIOQueryAll") @Log("冷却区出入表") - @ApiOperation("冷却区出入表") + //@SaCheckPermission("@el.check('stIvtCoolpointivt:list')") public ResponseEntity coolRegionIOQueryAll(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(coolpointivtService.coolRegionIOQueryAll(whereJson, page), HttpStatus.OK); @@ -76,7 +73,7 @@ public class CoolPointIvtController { @PostMapping("/uploadMes") @Log("手动回传MES") - @ApiOperation("手动回传MES") + public ResponseEntity uploadMes(@RequestBody JSONObject form) { coolpointivtService.uploadMes(form); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CutPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CutPointIvtController.java index 7a03e32c4..d9c8d8951 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CutPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CutPointIvtController.java @@ -1,9 +1,6 @@ - package org.nl.wms.pdm.ivt.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "分切区点库存管理") + @RequestMapping("/api/cutpointivt") @Slf4j public class CutPointIvtController { @@ -32,7 +29,7 @@ public class CutPointIvtController { @GetMapping @Log("查询分切区点库存") - @ApiOperation("查询分切区点库存") + //@SaCheckPermission("@el.check('cutpointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(cutpointivtService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class CutPointIvtController { @PostMapping @Log("新增分切区点库存") - @ApiOperation("新增分切区点库存") + //@SaCheckPermission("@el.check('cutpointivt:add')") public ResponseEntity create(@Validated @RequestBody CutPointIvtDto dto) { cutpointivtService.create(dto); @@ -49,7 +46,7 @@ public class CutPointIvtController { @PutMapping @Log("修改分切区点库存") - @ApiOperation("修改分切区点库存") + //@SaCheckPermission("@el.check('cutpointivt:edit')") public ResponseEntity update(@Validated @RequestBody CutPointIvtDto dto) { cutpointivtService.update(dto); @@ -57,7 +54,7 @@ public class CutPointIvtController { } @Log("删除分切区点库存") - @ApiOperation("删除分切区点库存") + //@SaCheckPermission("@el.check('cutpointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/DeliveryPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/DeliveryPointIvtController.java index 262047cd8..aea178a94 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/DeliveryPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/DeliveryPointIvtController.java @@ -1,9 +1,6 @@ - package org.nl.wms.pdm.ivt.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "分切输送线管理") + @RequestMapping("/api/deliverypointivt") @Slf4j public class DeliveryPointIvtController { @@ -32,7 +29,7 @@ public class DeliveryPointIvtController { @GetMapping @Log("查询分切输送线") - @ApiOperation("查询分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deliverypointivtService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class DeliveryPointIvtController { @PostMapping @Log("新增分切输送线") - @ApiOperation("新增分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:add')") public ResponseEntity create(@Validated @RequestBody DeliveryPointIvtDto dto) { deliverypointivtService.create(dto); @@ -49,7 +46,7 @@ public class DeliveryPointIvtController { @PutMapping @Log("修改分切输送线") - @ApiOperation("修改分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:edit')") public ResponseEntity update(@Validated @RequestBody DeliveryPointIvtDto dto) { deliverypointivtService.update(dto); @@ -57,7 +54,7 @@ public class DeliveryPointIvtController { } @Log("删除分切输送线") - @ApiOperation("删除分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java index 4b069d1c7..b598d5d03 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pdm.ivt.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "烘烤区点位库存管理") + @RequestMapping("/api/hotpointivt") @Slf4j public class HotPointIvtController { @@ -33,7 +30,7 @@ public class HotPointIvtController { @GetMapping @Log("查询烘烤区点位库存") - @ApiOperation("查询烘烤区点位库存") + //@SaCheckPermission("@el.check('hotpointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(hotpointivtService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class HotPointIvtController { @PostMapping @Log("新增烘烤区点位库存") - @ApiOperation("新增烘烤区点位库存") + //@SaCheckPermission("@el.check('hotpointivt:add')") public ResponseEntity create(@Validated @RequestBody HotPointIvtDto dto) { hotpointivtService.create(dto); @@ -50,7 +47,7 @@ public class HotPointIvtController { @PutMapping @Log("修改烘烤区点位库存") - @ApiOperation("修改烘烤区点位库存") + //@SaCheckPermission("@el.check('hotpointivt:edit')") public ResponseEntity update(@Validated @RequestBody HotPointIvtDto dto) { hotpointivtService.update(dto); @@ -58,7 +55,7 @@ public class HotPointIvtController { } @Log("删除烘烤区点位库存") - @ApiOperation("删除烘烤区点位库存") + //@SaCheckPermission("@el.check('hotpointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,14 +65,14 @@ public class HotPointIvtController { @GetMapping("/taskDtlQuery") @Log("查询烘烤任务明细") - @ApiOperation("查询烘烤任务明细") + public ResponseEntity taskDtlQuery(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(hotpointivtService.taskDtlQuery(whereJson, page), HttpStatus.OK); } @PostMapping("/uploadMes") @Log("手动回传MES") - @ApiOperation("手动回传MES") + public ResponseEntity uploadMes(@RequestBody JSONObject form) { hotpointivtService.uploadMes(form); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/PackagePointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/PackagePointIvtController.java index ee3998217..37af881a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/PackagePointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/PackagePointIvtController.java @@ -1,14 +1,10 @@ - package org.nl.wms.pdm.ivt.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; import org.nl.wms.pdm.ivt.service.PackagePointIvtService; -import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto; import org.nl.wms.pdm.ivt.service.dto.PackagePointIvtDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -19,12 +15,12 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; /** -* @Auther:Zhouz -* @Date:2023/12/20 + * @Auther:Zhouz + * @Date:2023/12/20 */ @RestController @RequiredArgsConstructor -@Api(tags = "内包间管理") + @RequestMapping("/api/packagepointivt") @Slf4j public class PackagePointIvtController { @@ -33,7 +29,7 @@ public class PackagePointIvtController { @GetMapping @Log("查询内包间点位") - @ApiOperation("查询内包间点位") + //@SaCheckPermission("@el.check('deliverypointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(packagePointIvtService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +37,7 @@ public class PackagePointIvtController { @PostMapping @Log("新增分切输送线") - @ApiOperation("新增分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:add')") public ResponseEntity create(@Validated @RequestBody PackagePointIvtDto dto) { packagePointIvtService.create(dto); @@ -50,7 +46,7 @@ public class PackagePointIvtController { @PutMapping @Log("修改分切输送线") - @ApiOperation("修改分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:edit')") public ResponseEntity update(@Validated @RequestBody PackagePointIvtDto dto) { packagePointIvtService.update(dto); @@ -58,7 +54,7 @@ public class PackagePointIvtController { } @Log("删除分切输送线") - @ApiOperation("删除分切输送线") + //@SaCheckPermission("@el.check('deliverypointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/SbPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/SbPointIvtController.java index 387d65771..6d6f6e654 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/SbPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/SbPointIvtController.java @@ -1,9 +1,6 @@ - package org.nl.wms.pdm.ivt.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "生箔点位库存管理") + @RequestMapping("/api/sbpointivt") @Slf4j public class SbPointIvtController { @@ -32,7 +29,7 @@ public class SbPointIvtController { @GetMapping @Log("查询生箔点位库存") - @ApiOperation("查询生箔点位库存") + //@SaCheckPermission("@el.check('sbpointivt:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(sbpointivtService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class SbPointIvtController { @PostMapping @Log("新增生箔点位库存") - @ApiOperation("新增生箔点位库存") + //@SaCheckPermission("@el.check('sbpointivt:add')") public ResponseEntity create(@Validated @RequestBody SbPointIvtDto dto) { sbpointivtService.create(dto); @@ -49,7 +46,7 @@ public class SbPointIvtController { @PutMapping @Log("修改生箔点位库存") - @ApiOperation("修改生箔点位库存") + //@SaCheckPermission("@el.check('sbpointivt:edit')") public ResponseEntity update(@Validated @RequestBody SbPointIvtDto dto) { sbpointivtService.update(dto); @@ -57,7 +54,7 @@ public class SbPointIvtController { } @Log("删除生箔点位库存") - @ApiOperation("删除生箔点位库存") + //@SaCheckPermission("@el.check('sbpointivt:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java index 282898173..a82690b39 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CutPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CutPointIvtService.java index 329128eba..5e967b2b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CutPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CutPointIvtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service; import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/DeliveryPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/DeliveryPointIvtService.java index 6e1e3f514..3886cdf02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/DeliveryPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/DeliveryPointIvtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service; import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java index e76ac5157..9abfa2f79 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/PackagePointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/PackagePointIvtService.java index a83877f0c..e2d9ad127 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/PackagePointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/PackagePointIvtService.java @@ -1,7 +1,5 @@ - package org.nl.wms.pdm.ivt.service; -import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto; import org.nl.wms.pdm.ivt.service.dto.PackagePointIvtDto; import org.springframework.data.domain.Pageable; @@ -9,9 +7,9 @@ import java.util.List; import java.util.Map; /** -* @Auther:Zhouz -* @Date:2023/12/20 -* @Description:内包间接口服务 + * @Auther:Zhouz + * @Date:2023/12/20 + * @Description:内包间接口服务 */ public interface PackagePointIvtService { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/SbPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/SbPointIvtService.java index 6b3fdd1d4..e07676b20 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/SbPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/SbPointIvtService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service; import org.nl.wms.pdm.ivt.service.dto.SbPointIvtDto; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 564f52d7f..7966bf360 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java index f73d19257..526b58fd9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java index 772399407..04d1d1b4a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 4f8e8b8ef..c532a9115 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java index 8ff24d622..7fafae9da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; @@ -17,7 +16,6 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pdm.ivt.service.PackagePointIvtService; -import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto; import org.nl.wms.pdm.ivt.service.dto.PackagePointIvtDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -27,9 +25,9 @@ import java.util.List; import java.util.Map; /** -* @Auther:Zhouz -* @Date:2023/12/20 -* @Description:内包间接口实现类 + * @Auther:Zhouz + * @Date:2023/12/20 + * @Description:内包间接口实现类 */ @Service @RequiredArgsConstructor diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java index 7c82b4c00..edc370da3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.ivt.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java index 5d5712129..257c1c18f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pdm.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "生箔工序工单管理") + @RequestMapping("/api/rawfoilworkorder") @Slf4j public class RawfoilworkorderController { @@ -33,7 +30,7 @@ public class RawfoilworkorderController { @GetMapping @Log("查询生箔工序工单") - @ApiOperation("查询生箔工序工单") + //@SaCheckPermission("@el.check('rawfoilworkorder:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(rawfoilworkorderService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class RawfoilworkorderController { @PostMapping @Log("新增生箔工序工单") - @ApiOperation("新增生箔工序工单") + //@SaCheckPermission("@el.check('rawfoilworkorder:add')") public ResponseEntity create(@Validated @RequestBody RawfoilworkorderDto dto) { rawfoilworkorderService.create(dto); @@ -50,7 +47,7 @@ public class RawfoilworkorderController { @PutMapping @Log("修改生箔工序工单") - @ApiOperation("修改生箔工序工单") + //@SaCheckPermission("@el.check('rawfoilworkorder:edit')") public ResponseEntity update(@Validated @RequestBody RawfoilworkorderDto dto) { rawfoilworkorderService.update(dto); @@ -58,7 +55,7 @@ public class RawfoilworkorderController { } @Log("删除生箔工序工单") - @ApiOperation("删除生箔工序工单") + //@SaCheckPermission("@el.check('rawfoilworkorder:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class RawfoilworkorderController { } @Log("强制确认") - @ApiOperation("强制确认") + @PostMapping("/compelEnd") public ResponseEntity compelEnd(@RequestBody JSONObject whereJson) { rawfoilworkorderService.compelEnd(whereJson); @@ -75,7 +72,7 @@ public class RawfoilworkorderController { } @Log("称重") - @ApiOperation("称重") + @PostMapping("/confirm") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { rawfoilworkorderService.confirm(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java index ddc8f2391..68b787224 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java @@ -1,10 +1,7 @@ - package org.nl.wms.pdm.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "分切计划管理") + @RequestMapping("/api/slittingproductionplan") @Slf4j public class SlittingproductionplanController { @@ -33,7 +30,7 @@ public class SlittingproductionplanController { @GetMapping @Log("查询分切计划") - @ApiOperation("查询分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(slittingproductionplanService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class SlittingproductionplanController { @PostMapping @Log("新增分切计划") - @ApiOperation("新增分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:add')") public ResponseEntity create(@Validated @RequestBody SlittingproductionplanDto dto) { slittingproductionplanService.create(dto); @@ -50,7 +47,7 @@ public class SlittingproductionplanController { @PutMapping @Log("修改分切计划") - @ApiOperation("修改分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:edit')") public ResponseEntity update(@Validated @RequestBody SlittingproductionplanDto dto) { slittingproductionplanService.update(dto); @@ -58,7 +55,7 @@ public class SlittingproductionplanController { } @Log("删除分切计划") - @ApiOperation("删除分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class SlittingproductionplanController { } @Log("上料完成") - @ApiOperation("上料完成") + @PostMapping("/upMaterFinish") public ResponseEntity upMaterFinish(@RequestBody JSONObject whereJson) { slittingproductionplanService.upMaterFinish(whereJson); @@ -75,7 +72,7 @@ public class SlittingproductionplanController { } @Log("套管完成") - @ApiOperation("套管完成") + @PostMapping("/caseFinish") public ResponseEntity caseFinish(@RequestBody JSONObject whereJson) { slittingproductionplanService.caseFinish(whereJson); @@ -83,7 +80,7 @@ public class SlittingproductionplanController { } @Log("配送完成") - @ApiOperation("配送完成") + @PostMapping("/sendFinish") public ResponseEntity sendFinish(@RequestBody JSONObject whereJson) { slittingproductionplanService.sendFinish(whereJson); @@ -91,7 +88,7 @@ public class SlittingproductionplanController { } @Log("入站完成") - @ApiOperation("入站完成") + @PostMapping("/inFinish") public ResponseEntity inFinish(@RequestBody JSONObject whereJson) { slittingproductionplanService.inFinish(whereJson); @@ -99,7 +96,7 @@ public class SlittingproductionplanController { } @Log("强制完成") - @ApiOperation("强制完成") + @PostMapping("/compelFinish") public ResponseEntity compelFinish(@RequestBody JSONObject whereJson) { slittingproductionplanService.compelFinish(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java index 6910bad0b..e9fe07af5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java index 46e77e6df..229c355f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index c0aeb3960..7801b71ae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java index 0247ef324..c9b3e7133 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.pdm.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 2079621b3..33786b3dc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch; import cn.hutool.core.util.StrUtil; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java index 77fc67db9..dc6e1c2c4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java @@ -35,7 +35,7 @@ public class AutoCallEmptyVehicle { for (URLEnum url : URLEnum.values()) { String product_area = url.getProduct_area(); JSONObject nbj_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("product_area = '" + product_area + "' AND point_type = '9'").uniqueResult(0); - if (ObjectUtil.isEmpty(nbj_jo)){ + if (ObjectUtil.isEmpty(nbj_jo)) { continue; } if (nbj_jo.getString("is_used").equals("1")) { @@ -68,7 +68,7 @@ public class AutoCallEmptyVehicle { if (plan_rows.size() >= 2) { donw_num += 2; - } else if (plan_rows.size() == 1){ + } else if (plan_rows.size() == 1) { donw_num += 1; } } @@ -240,7 +240,7 @@ public class AutoCallEmptyVehicle { JSONObject row = rows.getJSONObject(i); HashMap map = new HashMap(); map.put("is_paper_ok", "1"); - WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(map,"workorder_id = '"+row.getString("workorder_id")+"'"); + WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(map, "workorder_id = '" + row.getString("workorder_id") + "'"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java index 80edd0e8e..31296edf8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java @@ -43,7 +43,7 @@ public class AutoQueryProudDayData { } } else { JSONObject jo = new JSONObject(); - jo.put("User",""); + jo.put("User", ""); UserList.add(jo); } param.put("UserList", UserList); @@ -61,7 +61,7 @@ public class AutoQueryProudDayData { // 查询共多少个仓库 String in_stor_code = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("STOR_CODE_FEISHU").getValue(); - JSONArray storArr = storTab.query("is_used = '1' and stor_code in"+in_stor_code).getResultJSONArray(0); + JSONArray storArr = storTab.query("is_used = '1' and stor_code in" + in_stor_code).getResultJSONArray(0); // 客户 String custB = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("CUST_B").getValue(); @@ -69,7 +69,7 @@ public class AutoQueryProudDayData { String custBandC = custB + "," + custC; JSONObject result = new JSONObject(); // 全部数据 - result.put("Title", DateUtil.today()+"成品数据(单位:T)"); + result.put("Title", DateUtil.today() + "成品数据(单位:T)"); /* * 查询各仓库库存 @@ -98,25 +98,25 @@ public class AutoQueryProudDayData { List collect = allIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("TotalInventory", collect.isEmpty() ? "0.00" : NumberUtil.round(collect.get(0).getString("num"), 2)+""); + json.put("TotalInventory", collect.isEmpty() ? "0.00" : NumberUtil.round(collect.get(0).getString("num"), 2) + ""); // 超期库存 List collect2 = sidIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("OverdueInventory", collect2.isEmpty() ? "0.00" : NumberUtil.round(collect2.get(0).getString("num"),2)+""); + json.put("OverdueInventory", collect2.isEmpty() ? "0.00" : NumberUtil.round(collect2.get(0).getString("num"), 2) + ""); // 临期库存 List collect3 = faceIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("InterimInventory", collect3.isEmpty() ? "0.00" : NumberUtil.round(collect3.get(0).getString("num"),2)+""); + json.put("InterimInventory", collect3.isEmpty() ? "0.00" : NumberUtil.round(collect3.get(0).getString("num"), 2) + ""); // 正常库存 List collect4 = regIvtList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("NormalStockAge", collect4.isEmpty() ? "0.00" : NumberUtil.round(collect4.get(0).getString("num"),2)+""); + json.put("NormalStockAge", collect4.isEmpty() ? "0.00" : NumberUtil.round(collect4.get(0).getString("num"), 2) + ""); Arrayobject1.add(json); } @@ -125,12 +125,12 @@ public class AutoQueryProudDayData { JSONObject allIvt = new JSONObject(); allIvt.put("local", "汇总"); ; - allIvt.put("TotalInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("TotalInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); - allIvt.put("OverdueInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("OverdueInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); - allIvt.put("InterimInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("InterimInventory")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); - allIvt.put("NormalStockAge", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("NormalStockAge")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + allIvt.put("TotalInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("TotalInventory")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + allIvt.put("OverdueInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("OverdueInventory")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + allIvt.put("InterimInventory", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("InterimInventory")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + allIvt.put("NormalStockAge", NumberUtil.round(Arrayobject1.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("NormalStockAge")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); Arrayobject1.add(allIvt); - result.put("Arrayobject1",Arrayobject1); + result.put("Arrayobject1", Arrayobject1); /* * 各客户库存 ： @@ -150,7 +150,7 @@ public class AutoQueryProudDayData { custHand.put("Customer2", "C库存"); custHand.put("Customer3", "Other库存(除BC)"); Customernventory.add(custHand); - result.put("Customernventory",Customernventory); + result.put("Customernventory", Customernventory); // 2.数据 JSONArray Arrayobject2 = new JSONArray(); @@ -171,17 +171,17 @@ public class AutoQueryProudDayData { // B库存集合 List custIvtBList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "5") - .addParam("customer_name", "('"+collectB1+"')") + .addParam("customer_name", "('" + collectB1 + "')") .process().getResultJSONArray(0).toJavaList(JSONObject.class); // C库存集合 List custIvtCList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "5") - .addParam("customer_name", "('"+collectC1+"')") + .addParam("customer_name", "('" + collectC1 + "')") .process().getResultJSONArray(0).toJavaList(JSONObject.class); // 其他库存集合 List custIvtOtherList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "6") - .addParam("customer_name", "('"+collectAll+"')") + .addParam("customer_name", "('" + collectAll + "')") .process().getResultJSONArray(0).toJavaList(JSONObject.class); for (int i = 0; i < storArr.size(); i++) { @@ -194,19 +194,19 @@ public class AutoQueryProudDayData { List collectB = custIvtBList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory1", collectB.isEmpty() ? "0.00" : NumberUtil.round(collectB.get(0).getString("num"), 2)+""); + json.put("Customernventory1", collectB.isEmpty() ? "0.00" : NumberUtil.round(collectB.get(0).getString("num"), 2) + ""); // C库存 List collectC = custIvtCList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory2", collectC.isEmpty() ? "0.00" : NumberUtil.round(collectC.get(0).getString("num"), 2)+""); + json.put("Customernventory2", collectC.isEmpty() ? "0.00" : NumberUtil.round(collectC.get(0).getString("num"), 2) + ""); // 其他库存 List collectOthen = custIvtOtherList.stream() .filter(row -> row.getString("stor_id").equals(item.getString("stor_id"))) .collect(Collectors.toList()); - json.put("Customernventory3", collectOthen.isEmpty() ? "0.00" : NumberUtil.round(collectOthen.get(0).getString("num"), 2)+""); + json.put("Customernventory3", collectOthen.isEmpty() ? "0.00" : NumberUtil.round(collectOthen.get(0).getString("num"), 2) + ""); Arrayobject2.add(json); } @@ -215,9 +215,9 @@ public class AutoQueryProudDayData { JSONObject allCustIvt = new JSONObject(); allCustIvt.put("Local", "汇总"); - allCustIvt.put("Customernventory1", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory1")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); - allCustIvt.put("Customernventory2", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory2")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); - allCustIvt.put("Customernventory3", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory3")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + allCustIvt.put("Customernventory1", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory1")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + allCustIvt.put("Customernventory2", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory2")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + allCustIvt.put("Customernventory3", NumberUtil.round(Arrayobject2.stream().map(row -> JSONObject.parseObject(JSON.toJSONString(row)).getDoubleValue("Customernventory3")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); Arrayobject2.add(allCustIvt); result.put("Arrayobject2", Arrayobject2); @@ -312,11 +312,11 @@ public class AutoQueryProudDayData { Arrayobject4.add(monthdayallot); // ---- 上月出库量 ---- - JSONObject upMonthdayOut= ivtChange(custBandC, custB, custC, upMonthOutList); + JSONObject upMonthdayOut = ivtChange(custBandC, custB, custC, upMonthOutList); upMonthdayOut.put("Title", "上月出"); Arrayobject4.add(upMonthdayOut); - result.put("Arrayobject4",Arrayobject4); + result.put("Arrayobject4", Arrayobject4); /* * 各区域库存变化 @@ -499,11 +499,11 @@ public class AutoQueryProudDayData { Arrayobject6.add(CorpB); // ---- C公司 ---- - JSONObject CorpC = upMonthIvt(jsonIvtC,monthInC); + JSONObject CorpC = upMonthIvt(jsonIvtC, monthInC); CorpC.put("Customer1", "C库存"); Arrayobject6.add(CorpC); - result.put("Arrayobject6",Arrayobject6); + result.put("Arrayobject6", Arrayobject6); } else { JSONArray Arrayobject6 = new JSONArray(); @@ -519,7 +519,7 @@ public class AutoQueryProudDayData { CorpC.put("Customerqty1", "X"); Arrayobject6.add(CorpC); - result.put("Arrayobject6",Arrayobject6); + result.put("Arrayobject6", Arrayobject6); } result.put("EndDate", getEndDate()); return result; @@ -527,6 +527,7 @@ public class AutoQueryProudDayData { /** * 当月区域公共方法 + * * @param param 、 * @param title 、 * @return JSONObject @@ -540,12 +541,12 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0.00"); - result.put("Areaqty2","0.00"); - result.put("Areaqty3","0.00"); - result.put("Areaqty4","0.00"); - result.put("Areaqty5","0.00"); - result.put("Areaqty6","0.00"); + result.put("Areaqty1", "0.00"); + result.put("Areaqty2", "0.00"); + result.put("Areaqty3", "0.00"); + result.put("Areaqty4", "0.00"); + result.put("Areaqty5", "0.00"); + result.put("Areaqty6", "0.00"); } for (String region_code : paramMap.keySet()) { @@ -554,34 +555,46 @@ public class AutoQueryProudDayData { String num = NumberUtil.round(list.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.0).toString(), 2) + ""; switch (region_code) { - case "A1": result.put("Areaqty1", num); break; - case "A2": result.put("Areaqty2", num); break; - case "A3": result.put("Areaqty3", num); break; - case "A4": result.put("Areaqty4", num); break; - case "B1": result.put("Areaqty5", num); break; - case "B2": result.put("Areaqty6", num); break; + case "A1": + result.put("Areaqty1", num); + break; + case "A2": + result.put("Areaqty2", num); + break; + case "A3": + result.put("Areaqty3", num); + break; + case "A4": + result.put("Areaqty4", num); + break; + case "B1": + result.put("Areaqty5", num); + break; + case "B2": + result.put("Areaqty6", num); + break; default: break; } } if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { - result.put("Areaqty1","0.00"); + result.put("Areaqty1", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { - result.put("Areaqty2","0.00"); + result.put("Areaqty2", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { - result.put("Areaqty3","0.00"); + result.put("Areaqty3", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { - result.put("Areaqty4","0.00"); + result.put("Areaqty4", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { - result.put("Areaqty5","0.00"); + result.put("Areaqty5", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { - result.put("Areaqty6","0.00"); + result.put("Areaqty6", "0.00"); } return result; @@ -589,8 +602,9 @@ public class AutoQueryProudDayData { /** * 当月区域、客户公共方法 - * @param param 、 - * @param title 、 + * + * @param param 、 + * @param title 、 * @param customer 客户 、 * @return JSONObject */ @@ -603,12 +617,12 @@ public class AutoQueryProudDayData { .collect(Collectors.groupingBy(row -> row.getString("region_code"))); if (paramMap.isEmpty()) { - result.put("Areaqty1","0.00"); - result.put("Areaqty2","0.00"); - result.put("Areaqty3","0.00"); - result.put("Areaqty4","0.00"); - result.put("Areaqty5","0.00"); - result.put("Areaqty6","0.00"); + result.put("Areaqty1", "0.00"); + result.put("Areaqty2", "0.00"); + result.put("Areaqty3", "0.00"); + result.put("Areaqty4", "0.00"); + result.put("Areaqty5", "0.00"); + result.put("Areaqty6", "0.00"); } for (String region_code : paramMap.keySet()) { @@ -622,31 +636,43 @@ public class AutoQueryProudDayData { switch (region_code) { - case "A1": result.put("Areaqty1", num); break; - case "A2": result.put("Areaqty2", num); break; - case "A3": result.put("Areaqty3", num); break; - case "A4": result.put("Areaqty4", num); break; - case "B1": result.put("Areaqty5", num); break; - case "B2": result.put("Areaqty6", num); break; + case "A1": + result.put("Areaqty1", num); + break; + case "A2": + result.put("Areaqty2", num); + break; + case "A3": + result.put("Areaqty3", num); + break; + case "A4": + result.put("Areaqty4", num); + break; + case "B1": + result.put("Areaqty5", num); + break; + case "B2": + result.put("Areaqty6", num); + break; default: break; } } if (ObjectUtil.isEmpty(result.getString("Areaqty1"))) { - result.put("Areaqty1","0.00"); + result.put("Areaqty1", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty2"))) { - result.put("Areaqty2","0.00"); + result.put("Areaqty2", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty3"))) { - result.put("Areaqty3","0.00"); + result.put("Areaqty3", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty4"))) { - result.put("Areaqty4","0.00"); + result.put("Areaqty4", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty5"))) { - result.put("Areaqty5","0.00"); + result.put("Areaqty5", "0.00"); } if (ObjectUtil.isEmpty(result.getString("Areaqty6"))) { result.put("Areaqty6", "0.00"); @@ -657,10 +683,11 @@ public class AutoQueryProudDayData { /** * 库存变化公共方法 + * * @param custBandC b和c客户 - * @param custB b客户 - * @param custC c客户 - * @param dataList 、 + * @param custB b客户 + * @param custC c客户 + * @param dataList 、 * @return 、 */ public JSONObject ivtChange(String custBandC, String custB, String custC, List dataList) { @@ -671,46 +698,45 @@ public class AutoQueryProudDayData { .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> !custBandC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州二期仓(除BC) List collect2 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.BC01.getId())) .filter(row -> !custBandC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty2", NumberUtil.round(collect2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + result.put("Customerqty2", NumberUtil.round(collect2.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 东莞仓 List collect3 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.WK01.getId())) .collect(Collectors.toList()); - result.put("Customerqty3", NumberUtil.round(collect3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + result.put("Customerqty3", NumberUtil.round(collect3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州一期仓(B) List collect4 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> custB.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州一期仓(C) List collect5 = dataList.stream() .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) .filter(row -> custC.contains(row.getString("customer_name"))) .collect(Collectors.toList()); - result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2)+""); + result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); return result; } /** - * * @param jsonIvtB 实施库存 * @param monthInB 当月调拨入库量 * @return / */ - public JSONObject upMonthIvt(JSONObject jsonIvtB,JSONObject monthInB) { + public JSONObject upMonthIvt(JSONObject jsonIvtB, JSONObject monthInB) { JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index e38349600..b47fbbbd5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -1,11 +1,8 @@ - package org.nl.wms.sch.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.modules.logging.annotation.Log; @@ -27,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "点位管理") + @RequestMapping("/api/point") @Slf4j public class PointController { @@ -36,7 +33,7 @@ public class PointController { @GetMapping @Log("查询点位") - @ApiOperation("查询点位") + //@SaCheckPermission("point:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(pointService.queryAll(whereJson, page), HttpStatus.OK); @@ -44,7 +41,7 @@ public class PointController { @PostMapping @Log("新增点位") - @ApiOperation("新增点位") + //@SaCheckPermission("point:add") public ResponseEntity create(@Validated @RequestBody PointDto dto) { pointService.create(dto); @@ -53,7 +50,7 @@ public class PointController { @PutMapping @Log("修改点位") - @ApiOperation("修改点位") + //@SaCheckPermission("point:edit") public ResponseEntity update(@Validated @RequestBody PointDto dto) { pointService.update(dto); @@ -61,7 +58,7 @@ public class PointController { } @Log("删除点位") - @ApiOperation("删除点位") + //@SaCheckPermission("point:del") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -70,7 +67,7 @@ public class PointController { } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { pointService.download(map, response); @@ -78,7 +75,7 @@ public class PointController { @PutMapping("/changeActive") @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") + //@SaCheckPermission("store:edit") public ResponseEntity update(@RequestBody JSONObject json) { pointService.changeActive(json); @@ -87,7 +84,7 @@ public class PointController { @PutMapping("/changeActives") @Log("批量修改点位启用状态") - @ApiOperation("批量修改点位启用状态") + //@SaCheckPermission("store:edit") public ResponseEntity update2(@RequestBody JSONArray rows) { for (int i = 0; i < rows.size(); i++) { @@ -99,7 +96,7 @@ public class PointController { @PostMapping("/getPoint") @Log("查询点位下拉框") - @ApiOperation("查询点位下拉框") + //@SaCheckPermission("materialtype:list") public ResponseEntity queryPoint(@RequestBody Map whereJson) { return new ResponseEntity<>(pointService.getPoint(whereJson), HttpStatus.OK); @@ -107,7 +104,7 @@ public class PointController { @GetMapping("/selectPoint") @Log("查询点位管理") - @ApiOperation("查询点位管理") + //@SaCheckPermission("Point:list") public ResponseEntity selectPoint(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(pointService.selectPoint(whereJson, page), HttpStatus.OK); @@ -115,14 +112,14 @@ public class PointController { @GetMapping("/getRegion") @Log("获取区域") - @ApiOperation("获取区域") + public ResponseEntity getRegion() { return new ResponseEntity<>(pointService.getRegion(), HttpStatus.OK); } @Log("启动与禁用") @PostMapping("/changeUsed") - @ApiOperation("启动与禁用") + public ResponseEntity changeUsedOn(@RequestBody JSONObject jsonObject) { pointService.changeUsed(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -130,7 +127,7 @@ public class PointController { @Log("锁定与解锁") @PostMapping("/changeLock") - @ApiOperation("锁定与解锁") + public ResponseEntity changeLock(@RequestBody JSONObject jsonObject) { pointService.changeLock(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -138,7 +135,7 @@ public class PointController { @Log("仓位同步") @PostMapping("/sync") - @ApiOperation("仓位同步") + public ResponseEntity sync() { pointService.sync(); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java index fcbf39056..319925bc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/RegionController.java @@ -1,9 +1,6 @@ - package org.nl.wms.sch.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -23,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "区域管理管理") + @RequestMapping("/api/region") @Slf4j public class RegionController { @@ -32,7 +29,7 @@ public class RegionController { @GetMapping @Log("查询区域管理") - @ApiOperation("查询区域管理") + //@SaCheckPermission("region:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(regionService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class RegionController { @PostMapping @Log("新增区域管理") - @ApiOperation("新增区域管理") + //@SaCheckPermission("region:add") public ResponseEntity create(@Validated @RequestBody RegionDto dto) { regionService.create(dto); @@ -49,7 +46,7 @@ public class RegionController { @PutMapping @Log("修改区域管理") - @ApiOperation("修改区域管理") + //@SaCheckPermission("region:edit") public ResponseEntity update(@Validated @RequestBody RegionDto dto) { regionService.update(dto); @@ -57,7 +54,7 @@ public class RegionController { } @Log("删除区域管理") - @ApiOperation("删除区域管理") + //@SaCheckPermission("region:del") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class RegionController { @PostMapping("/getPointStatusSelectById") @Log("获取点位状态下拉框") - @ApiOperation("获取点位状态下拉框") + //@SaCheckPermission("region:add") public ResponseEntity getPointStatusSelectById(@RequestBody Long region_id) { return new ResponseEntity<>(regionService.getPointStatusSelectById(region_id), HttpStatus.CREATED); @@ -75,7 +72,7 @@ public class RegionController { @PostMapping("/getPointTypeSelectById") @Log("获取点位类型下拉框") - @ApiOperation("获取点位类型下拉框") + //@SaCheckPermission("region:add") public ResponseEntity getPointTypeSelectById(@RequestBody Long region_id) { return new ResponseEntity<>(regionService.getPointTypeSelectById(region_id), HttpStatus.CREATED); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java index 4f9ecc846..4ba05e980 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java @@ -1,11 +1,8 @@ - package org.nl.wms.sch.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.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/task") @Slf4j public class TaskController { @@ -34,7 +31,7 @@ public class TaskController { @GetMapping @Log("查询任务") - @ApiOperation("查询任务") + //@SaCheckPermission("task:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK); @@ -42,7 +39,7 @@ public class TaskController { @GetMapping("/taskStatus") @Log("获取任务状态列表") - @ApiOperation("获取任务状态列表") + public ResponseEntity getTaskStatus() { TaskStatusEnum[] values = TaskStatusEnum.values(); JSONArray arr = new JSONArray(); @@ -62,7 +59,7 @@ public class TaskController { @GetMapping("/finishType") @Log("获取任务类型列表") - @ApiOperation("获取任务类型列表") + public ResponseEntity getFinishType() { FinishTypeEnum[] values = FinishTypeEnum.values(); JSONArray arr = new JSONArray(); @@ -77,7 +74,7 @@ public class TaskController { @PutMapping("/operation") @Log("任务操作") - @ApiOperation("任务操作") + //@SaCheckPermission("task:edit") public ResponseEntity update(@RequestBody Map map) { taskService.operation(map); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index aef5cf3d3..a0499523c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java index d6c3b1c43..1da65aa83 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/RegionService.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch.service; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java index 222cbc787..593800237 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/TaskService.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch.service; import org.springframework.data.domain.Pageable; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index bf537d911..d0c01dd67 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 84b442663..34dca3e67 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.sch.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 85f66441c..8f04dc9c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -186,7 +186,7 @@ public class CutConveyorTask extends AbstractAcsTask { //判断内包间是否启用 JSONObject package_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '9' AND product_area = '" + jsonTask.getString("product_area") + "'").uniqueResult(0); - if (package_jo.getString("is_used").equals("1")){ + if (package_jo.getString("is_used").equals("1")) { //判断载具上是否存在气涨轴 String vehicle_code = jsonTask.getString("vehicle_code"); if (StrUtil.isNotEmpty(vehicle_code)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java index 3891631ea..218ee81a7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java @@ -15,7 +15,6 @@ import org.nl.wms.pda.mps.service.ShippingService; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.TaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index 68f4fff7d..e08f1173d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -118,16 +118,16 @@ public class PaperTubeTask extends AbstractAcsTask { String have_qzz = cbz_jo.getString("have_qzz"); //判断当前RGV上是否存在未拔轴的成品卷 JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0); - if ( "0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz"))){ + if ("0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz"))) { PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); //todo:创建桁架任务搬运一个符合的气涨轴 JSONObject jo = new JSONObject(); jo.put("task_type", "010602"); String public_area = ""; - if (product_area.equals("A1") || product_area.equals("A2")){ + if (product_area.equals("A1") || product_area.equals("A2")) { public_area = "A1"; } - if (product_area.equals("A3") || product_area.equals("A4")){ + if (product_area.equals("A3") || product_area.equals("A4")) { public_area = "A3"; } JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + public_area + "'").uniqueResult(0); @@ -195,9 +195,9 @@ public class PaperTubeTask extends AbstractAcsTask { json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); String task_status = form.getString("task_status"); - if (StrUtil.isNotEmpty(task_status)){ + if (StrUtil.isNotEmpty(task_status)) { json.put("task_status", task_status); - }else { + } else { json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java index 0b021b7d6..6d8fc0933 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InchargeController.java @@ -1,10 +1,7 @@ - package org.nl.wms.st.inbill.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "入库冲销") + @RequestMapping("/api/incharge") @Slf4j public class InchargeController { @@ -33,7 +30,7 @@ public class InchargeController { @GetMapping @Log("查询入库冲销") - @ApiOperation("查询入库冲销") + //@PreAuthorize("@el.check('emptyvehiclerecord:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(inchargeService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class InchargeController { @PostMapping @Log("新增入库冲销") - @ApiOperation("新增入库冲销") + //@PreAuthorize("@el.check('emptyvehiclerecord:add')") public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { inchargeService.create(dto); @@ -50,7 +47,7 @@ public class InchargeController { @PutMapping @Log("修改入库冲销") - @ApiOperation("修改入库冲销") + //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { inchargeService.update(dto); @@ -58,7 +55,7 @@ public class InchargeController { } @Log("删除入库冲销") - @ApiOperation("删除入库冲销") + //@PreAuthorize("@el.check('emptyvehiclerecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +65,7 @@ public class InchargeController { @PostMapping("/charge") @Log("冲销") - @ApiOperation("冲销") + public ResponseEntity charge(@RequestBody JSONObject whereJson) { inchargeService.charge(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java index 0d67ac48e..ba5ce9e47 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java @@ -1,9 +1,6 @@ - package org.nl.wms.st.inbill.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -21,7 +18,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "出库冲销") + @RequestMapping("/api/outcharge") @Slf4j public class OutChargeController { @@ -30,7 +27,7 @@ public class OutChargeController { @GetMapping @Log("出库单查询") - @ApiOperation("出库单查询") + //@PreAuthorize("@el.check('regionio:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(outChargeService.queryAll(whereJson, page), HttpStatus.OK); @@ -38,7 +35,7 @@ public class OutChargeController { @PostMapping("/charge") @Log("冲销") - @ApiOperation("冲销") + //@PreAuthorize("@el.check('regionio:add')") public ResponseEntity charge(@RequestBody Map whereJson) { outChargeService.charge(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java index 86e359054..4a74d0fbb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java @@ -2,8 +2,6 @@ package org.nl.wms.st.inbill.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.modules.logging.annotation.Log; @@ -18,7 +16,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "PC端入库") + @RequestMapping("/api/in/rawAssist") @Slf4j public class RawAssistIStorController { @@ -28,14 +26,14 @@ public class RawAssistIStorController { @GetMapping @Log("查询入库单据") - @ApiOperation("查询入库单据") + //@PreAuthorize("@el.check('checkoutbill:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(rawAssistIStorService.pageQuery(whereJson, page), HttpStatus.OK); } @Log("删除出入库单") - @ApiOperation("删除出入库单") + //@PreAuthorize("@el.check('sectattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -45,7 +43,7 @@ public class RawAssistIStorController { @GetMapping("/getBillDtl") @Log("查询入库单来源") - @ApiOperation("查询入库单来源") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getBillDtl(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(rawAssistIStorService.getBillDtl(whereJson, page), HttpStatus.OK); @@ -53,7 +51,7 @@ public class RawAssistIStorController { @PostMapping() @Log("新增入库单") - @ApiOperation("新增入库单") + //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity insertDtl(@RequestBody Map whereJson) { rawAssistIStorService.insertDtl(whereJson); @@ -62,7 +60,7 @@ public class RawAssistIStorController { @PutMapping @Log("修改入库单") - @ApiOperation("修改入库单") + //@PreAuthorize("@el.check('sectattr:edit')") public ResponseEntity update(@RequestBody Map whereJson) { rawAssistIStorService.update(whereJson); @@ -71,7 +69,7 @@ public class RawAssistIStorController { @GetMapping("/getIODtl") @Log("查询出入库单明细") - @ApiOperation("查询出入库单明细") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getIODtl(@RequestParam Map whereJson) { return new ResponseEntity<>(rawAssistIStorService.getIODtl(whereJson), HttpStatus.OK); @@ -79,7 +77,7 @@ public class RawAssistIStorController { @PostMapping("/commit") @Log("出入单提交") - @ApiOperation("出入单提交") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity commit(@RequestBody Map whereJson) { rawAssistIStorService.commit(whereJson); @@ -88,7 +86,7 @@ public class RawAssistIStorController { @PostMapping("/getDisDtl") @Log("查询入库分配载具明细") - @ApiOperation("查询入库分配载具明细") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getDisDtl(@RequestBody Map whereJson) { return new ResponseEntity<>(rawAssistIStorService.getDisDtl(whereJson), HttpStatus.OK); @@ -96,7 +94,7 @@ public class RawAssistIStorController { @PostMapping("/divStruct") @Log("分配货位") - @ApiOperation("分配货位") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity divStruct(@RequestBody Map whereJson) { rawAssistIStorService.divStruct(whereJson); @@ -105,7 +103,7 @@ public class RawAssistIStorController { @PostMapping("/allDivStruct") @Log("全部分配货位") - @ApiOperation("全部分配货位") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity allDivStruct(@RequestBody JSONObject whereJson) { rawAssistIStorService.allDivStruct(whereJson); @@ -114,7 +112,7 @@ public class RawAssistIStorController { @PostMapping("/unDivStruct") @Log("取消分配货位") - @ApiOperation("取消分配货位") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity unDivStruct(@RequestBody Map whereJson) { rawAssistIStorService.unDivStruct(whereJson); @@ -123,7 +121,7 @@ public class RawAssistIStorController { @PostMapping("/divPoint") @Log("设置起点") - @ApiOperation("设置起点") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity divPoint(@RequestBody Map whereJson) { rawAssistIStorService.divPoint(whereJson); @@ -132,7 +130,7 @@ public class RawAssistIStorController { @PostMapping("/queryTask") @Log("查询任务") - @ApiOperation("查询任务") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryTask(@RequestBody Map whereJson) { return new ResponseEntity<>(rawAssistIStorService.queryTask(whereJson), HttpStatus.OK); @@ -140,7 +138,7 @@ public class RawAssistIStorController { @PostMapping("/delDis") @Log("删除分配") - @ApiOperation("删除分配") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity delDis(@RequestBody JSONObject whereJson) { rawAssistIStorService.delDis(whereJson); @@ -149,7 +147,7 @@ public class RawAssistIStorController { @PostMapping("/queryBoxMater") @Log("查询箱内子卷") - @ApiOperation("查询箱内子卷") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryBoxMater(@RequestBody JSONArray whereJson) { @@ -158,7 +156,7 @@ public class RawAssistIStorController { @PostMapping("/updateTask") @Log("变更任务") - @ApiOperation("变更任务") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity updateTask(@RequestBody Map whereJson) { rawAssistIStorService.updateTask(whereJson); @@ -167,7 +165,7 @@ public class RawAssistIStorController { @PostMapping("/delTask") @Log("删除任务") - @ApiOperation("删除任务") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity delTask(@RequestBody Map whereJson) { rawAssistIStorService.delTask(whereJson); @@ -176,7 +174,7 @@ public class RawAssistIStorController { @PostMapping("/reIssueTask") @Log("下发") - @ApiOperation("下发") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity reIssueTask(@RequestBody Map whereJson) { rawAssistIStorService.reIssueTask(whereJson); @@ -185,7 +183,7 @@ public class RawAssistIStorController { @PostMapping("/confirmTask") @Log("完成任务") - @ApiOperation("完成任务") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity confirmTask(@RequestBody Map whereJson) { rawAssistIStorService.confirmTask(whereJson); @@ -194,7 +192,7 @@ public class RawAssistIStorController { @PostMapping("/cancelTask") @Log("取消完成任务") - @ApiOperation("取消完成任务") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity cancelTask(@RequestBody Map whereJson) { rawAssistIStorService.cancelTask(whereJson); @@ -203,7 +201,7 @@ public class RawAssistIStorController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity confirm(@RequestBody Map whereJson) { rawAssistIStorService.confirm(whereJson); @@ -212,7 +210,7 @@ public class RawAssistIStorController { @PostMapping("/backConfirm") @Log("完成入库负单") - @ApiOperation("完成入库负单") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity backConfirm(@RequestBody Map whereJson) { rawAssistIStorService.backConfirm(whereJson); @@ -221,7 +219,7 @@ public class RawAssistIStorController { @PostMapping("/autoDis") @Log("自动分配") - @ApiOperation("自动分配") + //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity autoDis(@RequestBody JSONObject whereJson) { rawAssistIStorService.autoDis(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java index 3bbafd972..20f1c8e0e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java @@ -16,7 +16,7 @@ public interface CheckOutBillService { * @param page 分页参数 * @return Map */ - Map pageQuery(Map whereJson, Pageable page,String[] stor_id, String[] bill_status, String[] bill_type); + Map pageQuery(Map whereJson, Pageable page, String[] stor_id, String[] bill_status, String[] bill_type); /** * 查询数据分页 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java index 56b288cb8..75f41d36c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/InchargeService.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.inbill.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/OutChargeService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/OutChargeService.java index 9c6cebb4a..fa9e1868f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/OutChargeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/OutChargeService.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.inbill.service; import org.springframework.data.domain.Pageable; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java index a1ff28a5e..afd2cab1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.inbill.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index 390c63f04..cbe6cd859 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.inbill.service.impl; @@ -91,10 +90,10 @@ public class OutChargeServiceImpl implements OutChargeService { map.put("in_stor_id", in_stor_id); } if (ObjectUtil.isNotEmpty(begin_time)) { - map.put("begin_time",begin_time); + map.put("begin_time", begin_time); } if (ObjectUtil.isNotEmpty(end_time)) { - map.put("end_time",end_time); + map.put("end_time", end_time); } JSONObject json = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.iostorinv_id DESC"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ChangeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ChangeController.java index b2594a252..f7177c3e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ChangeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ChangeController.java @@ -1,8 +1,6 @@ package org.nl.wms.st.instor.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "库存变更") + @RequestMapping("/api/change") @Slf4j public class ChangeController { @@ -24,20 +22,20 @@ public class ChangeController { @GetMapping @Log("查询库存变更单") - @ApiOperation("查询库存变更单") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(changeService.pageQuery(whereJson, page), HttpStatus.OK); } @GetMapping("/getOutBillDtl") @Log("查询移库单") - @ApiOperation("查询移库单") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(changeService.getOutBillDtl(whereJson), HttpStatus.OK); } @Log("删除移库单") - @ApiOperation("删除移库单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { changeService.deleteAll(ids); @@ -46,7 +44,7 @@ public class ChangeController { @PutMapping @Log("修改移库单") - @ApiOperation("修改移库单") + public ResponseEntity update(@RequestBody Map whereJson) { changeService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -54,7 +52,7 @@ public class ChangeController { @PostMapping() @Log("新增移库单") - @ApiOperation("新增移库单") + public ResponseEntity insertDtl(@RequestBody Map whereJson) { changeService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -62,14 +60,14 @@ public class ChangeController { @GetMapping("/getStructIvt") @Log("查询可分配库存") - @ApiOperation("查询可分配库存") + public ResponseEntity getStructIvt(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(changeService.getStructIvt(whereJson, page), HttpStatus.OK); } @PostMapping("/confirm") @Log("移库单强制确认") - @ApiOperation("移库单强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { changeService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java index 9f3143208..eb4c27ea5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java @@ -1,8 +1,6 @@ package org.nl.wms.st.instor.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -18,7 +16,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "盘点") + @RequestMapping("/api/check") @Slf4j public class CheckController { @@ -26,48 +24,48 @@ public class CheckController { @GetMapping @Log("查询盘点单") - @ApiOperation("查询盘点单") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkService.pageQuery(whereJson, page), HttpStatus.OK); } @GetMapping("/getDtlView") @Log("查询盘点单明细详情") - @ApiOperation("查询盘点单明细详情") + public ResponseEntity getDtlView(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkService.getDtlView(whereJson, page), HttpStatus.OK); } @GetMapping("/getExceptionDispose") @Log("查询盘点单明细异常") - @ApiOperation("查询盘点单明细异常") + public ResponseEntity getExceptionDispose(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkService.getExceptionDispose(whereJson, page), HttpStatus.OK); } @GetMapping("/getOutBillDtl") @Log("查询移库单") - @ApiOperation("查询移库单") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(checkService.getOutBillDtl(whereJson), HttpStatus.OK); } @GetMapping("/getOutBillDtl2") @Log("查询盘点单明细2") - @ApiOperation("查询盘点单明细2") + public ResponseEntity getOutBillDtl2(@RequestParam Map whereJson) { return new ResponseEntity<>(checkService.getOutBillDtl2(whereJson), HttpStatus.OK); } @GetMapping("/getOutBillDis") @Log("查询移库单") - @ApiOperation("查询移库单") + public ResponseEntity getOutBillDis(@RequestParam Map whereJson) { return new ResponseEntity<>(checkService.getOutBillDis(whereJson), HttpStatus.OK); } @Log("删除移库单") - @ApiOperation("删除移库单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { checkService.deleteAll(ids); @@ -76,7 +74,7 @@ public class CheckController { @PutMapping @Log("修改盘点单") - @ApiOperation("修改盘点单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { checkService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -84,7 +82,7 @@ public class CheckController { @PostMapping() @Log("新增盘点单") - @ApiOperation("新增盘点单") + public ResponseEntity insertDtl(@RequestBody JSONObject whereJson) { checkService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -92,7 +90,7 @@ public class CheckController { @PostMapping("/allInsert") @Log("新增全部在库木箱") - @ApiOperation("新增全部在库木箱") + public ResponseEntity allInsert(@RequestBody JSONObject whereJson) { checkService.allInsert(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -100,14 +98,14 @@ public class CheckController { @GetMapping("/getStructIvt") @Log("查询可盘点库存") - @ApiOperation("查询可盘点库存") + public ResponseEntity getStructIvt(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkService.getStructIvt(whereJson, page), HttpStatus.OK); } @PostMapping("/confirm") @Log("盘点确定") - @ApiOperation("盘点确定") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { checkService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -115,14 +113,14 @@ public class CheckController { @GetMapping("/getInvTypes") @Log("查询单据字段") - @ApiOperation("查询单据字段") + public ResponseEntity getInvTypes() { return new ResponseEntity<>(checkService.getInvTypes(), HttpStatus.OK); } @PostMapping("/handdown") @Log("移库单手动下发") - @ApiOperation("移库单手动下发") + public ResponseEntity handdown(@RequestBody JSONObject whereJson) { checkService.handdown(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -130,7 +128,7 @@ public class CheckController { @PostMapping("/saveCheck") @Log("盘点保存") - @ApiOperation("盘点保存") + public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { checkService.saveCheck(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -138,7 +136,7 @@ public class CheckController { @PostMapping("/process0") @Log("财务为准") - @ApiOperation("财务为准") + public ResponseEntity process0(@RequestBody JSONObject whereJson) { checkService.process0(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -146,13 +144,13 @@ public class CheckController { @PostMapping("/process1") @Log("实物为准") - @ApiOperation("实物为准") + public ResponseEntity process1(@RequestBody JSONObject whereJson) { checkService.process1(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { checkService.download(checkService.getOutBillDtl(whereJson), response); @@ -160,7 +158,7 @@ public class CheckController { @PostMapping("/disposeConfirm") @Log("处理确认") - @ApiOperation("处理确认") + public ResponseEntity disposeConfirm(@RequestBody JSONObject whereJson) { checkService.disposeConfirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -168,7 +166,7 @@ public class CheckController { @PostMapping("/confirmBtn") @Log("强制确认") - @ApiOperation("强制确认") + public ResponseEntity confirmBtn(@RequestBody JSONObject whereJson) { checkService.confirmBtn(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -176,7 +174,7 @@ public class CheckController { @PostMapping("/repairSubmit") @Log("补录明细") - @ApiOperation("补录明细") + public ResponseEntity repairSubmit(@RequestBody JSONObject whereJson) { checkService.repairSubmit(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/HandMoveStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/HandMoveStorController.java index 4f2a875be..d429d4bd8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/HandMoveStorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/HandMoveStorController.java @@ -2,8 +2,6 @@ package org.nl.wms.st.instor.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.modules.logging.annotation.Log; @@ -17,7 +15,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "检验出库") + @RequestMapping("/api/handmovestor") @Slf4j public class HandMoveStorController { @@ -25,20 +23,20 @@ public class HandMoveStorController { @GetMapping @Log("查询手工移库单") - @ApiOperation("查询手工移库单") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(handMoveStorService.pageQuery(whereJson, page), HttpStatus.OK); } @GetMapping("/getOutBillDtl") @Log("查询移库单") - @ApiOperation("查询移库单") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(handMoveStorService.getOutBillDtl(whereJson), HttpStatus.OK); } @Log("删除移库单") - @ApiOperation("删除移库单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { handMoveStorService.deleteAll(ids); @@ -47,7 +45,7 @@ public class HandMoveStorController { @PutMapping @Log("修改移库单") - @ApiOperation("修改移库单") + public ResponseEntity update(@RequestBody Map whereJson) { handMoveStorService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -55,7 +53,7 @@ public class HandMoveStorController { @PostMapping() @Log("新增移库单") - @ApiOperation("新增移库单") + public ResponseEntity insertDtl(@RequestBody Map whereJson) { handMoveStorService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -63,21 +61,21 @@ public class HandMoveStorController { @GetMapping("/getStructIvt") @Log("查询可分配库存") - @ApiOperation("查询可分配库存") + public ResponseEntity getStructIvt(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(handMoveStorService.getStructIvt(whereJson, page), HttpStatus.OK); } @PostMapping("/getBoxIvt") @Log("查询箱内库存") - @ApiOperation("查询箱内库存") + public ResponseEntity getBoxIvt(@RequestBody JSONArray whereJson) { return new ResponseEntity<>(handMoveStorService.getBoxIvt(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("移库单强制确认") - @ApiOperation("移库单强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { handMoveStorService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -85,14 +83,14 @@ public class HandMoveStorController { @GetMapping("/getInvTypes") @Log("查询单据字段") - @ApiOperation("查询单据字段") + public ResponseEntity getInvTypes() { return new ResponseEntity<>(handMoveStorService.getInvTypes(), HttpStatus.OK); } @PostMapping("/handdown") @Log("移库单手动下发") - @ApiOperation("移库单手动下发") + public ResponseEntity handdown(@RequestBody JSONObject whereJson) { handMoveStorService.handdown(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -100,7 +98,7 @@ public class HandMoveStorController { @PostMapping("/checkReturn") @Log("盘点回库") - @ApiOperation("盘点回库") + public ResponseEntity checkReturn() { handMoveStorService.checkReturn(); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java index d34f700c2..130c00959 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/ProductScrapController.java @@ -1,8 +1,6 @@ package org.nl.wms.st.instor.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "成品报废审核") + @RequestMapping("/api/productscrap") @Slf4j public class ProductScrapController { @@ -24,20 +22,20 @@ public class ProductScrapController { @GetMapping @Log("查询成品报废审核单") - @ApiOperation("查询成品报废审核单") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(productScrapService.pageQuery(whereJson, page), HttpStatus.OK); } @GetMapping("/getOutBillDtl") @Log("查询明细") - @ApiOperation("查询明细") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(productScrapService.getOutBillDtl(whereJson), HttpStatus.OK); } @Log("删除") - @ApiOperation("删除") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { productScrapService.deleteAll(ids); @@ -46,7 +44,7 @@ public class ProductScrapController { @PutMapping @Log("修改") - @ApiOperation("修改") + public ResponseEntity update(@RequestBody JSONObject whereJson) { productScrapService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -54,7 +52,7 @@ public class ProductScrapController { @PostMapping() @Log("新增") - @ApiOperation("新增") + public ResponseEntity insertDtl(@RequestBody JSONObject whereJson) { productScrapService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -62,7 +60,7 @@ public class ProductScrapController { @PostMapping("/auditPass") @Log("审核通过") - @ApiOperation("审核通过") + public ResponseEntity auditPass(@RequestBody JSONObject whereJson) { productScrapService.auditPass(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -70,7 +68,7 @@ public class ProductScrapController { @PostMapping("/auditOut") @Log("不通过") - @ApiOperation("不通过") + public ResponseEntity auditOut(@RequestBody JSONObject whereJson) { productScrapService.auditOut(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -78,7 +76,7 @@ public class ProductScrapController { @PostMapping("/onSubmit") @Log("提交") - @ApiOperation("提交") + public ResponseEntity onSubmit(@RequestBody JSONObject whereJson) { productScrapService.onSubmit(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/RecutPlanController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/RecutPlanController.java index f647b926b..5c87a0f19 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/RecutPlanController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/RecutPlanController.java @@ -1,8 +1,6 @@ package org.nl.wms.st.instor.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -16,7 +14,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "改切计划管理") + @RequestMapping("/api/recutplan") @Slf4j public class RecutPlanController { @@ -24,20 +22,20 @@ public class RecutPlanController { @GetMapping @Log("查询改切计划") - @ApiOperation("查询改切计划") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(recutPlanService.pageQuery(whereJson, page), HttpStatus.OK); } @GetMapping("/getOutBillDtl") @Log("查询明细") - @ApiOperation("查询明细") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(recutPlanService.getOutBillDtl(whereJson), HttpStatus.OK); } @Log("删除") - @ApiOperation("删除") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { recutPlanService.deleteAll(ids); @@ -46,7 +44,7 @@ public class RecutPlanController { @PutMapping @Log("修改") - @ApiOperation("修改") + public ResponseEntity update(@RequestBody JSONObject whereJson) { recutPlanService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -54,7 +52,7 @@ public class RecutPlanController { @PostMapping() @Log("新增") - @ApiOperation("新增") + public ResponseEntity insertDtl(@RequestBody JSONObject whereJson) { recutPlanService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -62,7 +60,7 @@ public class RecutPlanController { @PostMapping("/createBill") @Log("创建出库单") - @ApiOperation("创建出库单") + public ResponseEntity createBill(@RequestBody JSONObject whereJson) { recutPlanService.createBill(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -70,7 +68,7 @@ public class RecutPlanController { @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + public ResponseEntity auditOut(@RequestBody JSONObject whereJson) { recutPlanService.auditOut(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index 5b2a0173d..047ebe51e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -64,7 +64,7 @@ public class CheckServiceImpl implements CheckService { JSONObject jo = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "check_code desc"); JSONArray content = jo.getJSONArray("content"); - if (content.isEmpty()){ + if (content.isEmpty()) { return jo; } // 拼接主表id diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index 79c8ab6da..800368551 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -1,8 +1,6 @@ package org.nl.wms.st.outbill.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -18,7 +16,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "检验出库") + @RequestMapping("/api/checkoutbill") @Slf4j public class CheckOutBillController { @@ -26,15 +24,15 @@ public class CheckOutBillController { @GetMapping @Log("查询出库单") - @ApiOperation("查询出库单") + //@PreAuthorize("@el.check('checkoutbill:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page, String[] stor_id, String[] bill_status, String[] bill_type) { - return new ResponseEntity<>(checkOutBillService.pageQuery(whereJson, page,stor_id , bill_status, bill_type), HttpStatus.OK); + return new ResponseEntity<>(checkOutBillService.pageQuery(whereJson, page, stor_id, bill_status, bill_type), HttpStatus.OK); } @GetMapping("/addDtl") @Log("查询库存") - @ApiOperation("查询库存") + //@PreAuthorize("@el.check('checkoutbill:list')") public ResponseEntity queryAddDtl(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkOutBillService.queryAddDtl(whereJson, page), HttpStatus.OK); @@ -42,7 +40,7 @@ public class CheckOutBillController { @GetMapping("/queryDtl") @Log("查询库存") - @ApiOperation("查询库存") + //@PreAuthorize("@el.check('checkoutbill:list')") public ResponseEntity queryDtl(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(checkOutBillService.queryDtl(whereJson, page), HttpStatus.OK); @@ -50,13 +48,13 @@ public class CheckOutBillController { @GetMapping("/getOutBillDtl") @Log("查询明细") - @ApiOperation("查询明细") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillDtl(whereJson), HttpStatus.OK); } @Log("删除出库单") - @ApiOperation("删除出库单") + //@PreAuthorize("@el.check('checkoutbill:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -66,7 +64,7 @@ public class CheckOutBillController { @PutMapping @Log("修改出库单") - @ApiOperation("修改出库单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { checkOutBillService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -74,7 +72,7 @@ public class CheckOutBillController { @PostMapping() @Log("新增出库单") - @ApiOperation("新增出库单") + public ResponseEntity insertDtl(@RequestBody JSONObject whereJson) { checkOutBillService.insertDtl(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -82,7 +80,7 @@ public class CheckOutBillController { @PostMapping("/allDiv") @Log("出库单全部分配") - @ApiOperation("出库单全部分配") + public ResponseEntity allDiv(@RequestBody JSONObject whereJson) { checkOutBillService.allDiv(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -90,7 +88,7 @@ public class CheckOutBillController { @PostMapping("/allDivOne") @Log("出库单全部分2配") - @ApiOperation("出库单全部分配2") + public ResponseEntity allDivOne(@RequestBody JSONObject whereJson) { checkOutBillService.allDivOne(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -98,7 +96,7 @@ public class CheckOutBillController { @PostMapping("/allCancel") @Log("出库单全部取消") - @ApiOperation("出库单全部取消") + public ResponseEntity allCancel(@RequestBody JSONObject whereJson) { checkOutBillService.allCancel(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -106,7 +104,7 @@ public class CheckOutBillController { @PostMapping("/cancelTask") @Log("删除任务") - @ApiOperation("删除任务") + public ResponseEntity cancelTask(@RequestBody JSONObject whereJson) { checkOutBillService.cancelTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -114,7 +112,7 @@ public class CheckOutBillController { @PostMapping("/oneCancel") @Log("出库单全部取消") - @ApiOperation("出库单全部取消") + public ResponseEntity oneCancel(@RequestBody JSONObject whereJson) { checkOutBillService.oneCancel(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -122,28 +120,28 @@ public class CheckOutBillController { @GetMapping("/getOutBillDis") @Log("查询已出库单分配") - @ApiOperation("查询出库单分配") + public ResponseEntity getOutBillDis(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillDis(whereJson), HttpStatus.OK); } @GetMapping("/getOutBillDis2") @Log("查询未出库单分配") - @ApiOperation("查询出库单分配") + public ResponseEntity getOutBillDis2(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillDis2(whereJson), HttpStatus.OK); } @GetMapping("/getOutBillDisDtl") @Log("查询出库单分配") - @ApiOperation("查询出库单分配") + public ResponseEntity getOutBillDisDtl(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillDisDtl(whereJson), HttpStatus.OK); } @PostMapping("/setPoint") @Log("设置检验站点") - @ApiOperation("设置检验站点") + public ResponseEntity setPoint(@RequestBody JSONObject whereJson) { checkOutBillService.setPoint(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -151,7 +149,7 @@ public class CheckOutBillController { @PostMapping("/oneSetPoint") @Log("设置一个站点") - @ApiOperation("设置检验站点") + public ResponseEntity oneSetPoint(@RequestBody JSONObject whereJson) { checkOutBillService.oneSetPoint(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -159,7 +157,7 @@ public class CheckOutBillController { @PostMapping("/oneSetPoint2") @Log("设置一个站点") - @ApiOperation("设置检验站点") + public ResponseEntity oneSetPoint2(@RequestBody JSONObject whereJson) { checkOutBillService.oneSetPoint2(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -167,7 +165,7 @@ public class CheckOutBillController { @PostMapping("/allSetPoint") @Log("一键设置") - @ApiOperation("一键设置") + public ResponseEntity allSetPoint(@RequestBody JSONObject whereJson) { checkOutBillService.allSetPoint(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -175,28 +173,28 @@ public class CheckOutBillController { @GetMapping("/getOutBillTask") @Log("查询出库单分配任务") - @ApiOperation("查询出库单分配任务") + public ResponseEntity getOutBillTask(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK); } @PostMapping("/getOutBillTask2") @Log("详情查询出库单分配任务2") - @ApiOperation("详情查询出库单分配任务2") + public ResponseEntity getOutBillTask2(@RequestBody Map whereJson) { return new ResponseEntity<>(checkOutBillService.getOutBillTask2(whereJson), HttpStatus.OK); } @GetMapping("/getStructIvt") @Log("查询可分配库存") - @ApiOperation("查询可分配库存") + public ResponseEntity getStructIvt(@RequestParam Map whereJson) { return new ResponseEntity<>(checkOutBillService.getStructIvt(whereJson), HttpStatus.OK); } @PostMapping("/manualDiv") @Log("出库单手动分配") - @ApiOperation("出库单手动分配") + public ResponseEntity manualDiv(@RequestBody JSONObject whereJson) { checkOutBillService.manualDiv(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -204,7 +202,7 @@ public class CheckOutBillController { @PostMapping("/confirm") @Log("出库单强制确认") - @ApiOperation("出库单强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { checkOutBillService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -212,7 +210,7 @@ public class CheckOutBillController { @PostMapping("/issueTask") @Log("出库任务下发") - @ApiOperation("出库任务下发") + public ResponseEntity issueTask(@RequestBody JSONObject whereJson) { checkOutBillService.issueTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -220,7 +218,7 @@ public class CheckOutBillController { @PostMapping("/finishTask") @Log("出库任务手动完成") - @ApiOperation("出库任务手动完成") + public ResponseEntity finishTask(@RequestBody JSONObject whereJson) { checkOutBillService.finishTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -228,7 +226,7 @@ public class CheckOutBillController { @PostMapping("/cancleTaskfinish") @Log("出库任务手动取消完成") - @ApiOperation("出库任务手动取消完成") + public ResponseEntity cancleTaskfinish(@RequestBody JSONObject whereJson) { checkOutBillService.cancleTaskfinish(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -236,28 +234,28 @@ public class CheckOutBillController { @GetMapping("/getInvTypes") @Log("查询单据字段") - @ApiOperation("查询单据字段") + public ResponseEntity getInvTypes() { return new ResponseEntity<>(checkOutBillService.getInvTypes(), HttpStatus.OK); } @PostMapping("/paramByCodeType") @Log("查询出库单物料是否限制参数") - @ApiOperation("查询出库单物料是否限制参数") + public ResponseEntity paramByCodeType(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkOutBillService.getParamByCodeType(whereJson), HttpStatus.OK); } @PostMapping("/schAreaType") @Log("查询点位区域类型") - @ApiOperation("查询点位区域类型") + public ResponseEntity schAreaType(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkOutBillService.schAreaType(whereJson), HttpStatus.OK); } @PostMapping("/backConfirm") @Log("出库单强制确认") - @ApiOperation("出库单强制确认") + public ResponseEntity backConfirm(@RequestBody JSONObject whereJson) { checkOutBillService.backConfirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -265,21 +263,21 @@ public class CheckOutBillController { @GetMapping("/getType") @Log("获取全部出入库业务类型") - @ApiOperation("获取全部出入库业务类型") + public ResponseEntity getType() { return new ResponseEntity<>(checkOutBillService.getType(), HttpStatus.OK); } @PostMapping("/moneySubmit") @Log("发货信息保存") - @ApiOperation("发货信息保存") + public ResponseEntity moneySubmit(@RequestBody JSONObject whereJson) { checkOutBillService.moneySubmit(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @Log("下载发货单Excel") - @ApiOperation("下载发货单Excel") + @GetMapping(value = "/downloadExcel") public ResponseEntity downloadExcel(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { checkOutBillService.downloadExcel(response, whereJson); @@ -288,30 +286,30 @@ public class CheckOutBillController { @PostMapping("/getDisNum") @Log("获取分配明细条数") - @ApiOperation("获取分配明细条数") + public ResponseEntity getDisNum(@RequestBody Map whereJson) { return new ResponseEntity<>(checkOutBillService.getDisNum(whereJson), HttpStatus.OK); } @PostMapping("/queryBox") @Log("新增物料库存条件过滤") - @ApiOperation("新增物料库存条件过滤") + public ResponseEntity queryBox(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkOutBillService.queryBox(whereJson), HttpStatus.OK); } @PostMapping("/outReturn") @Log("销售出库回传mes") - @ApiOperation("销售出库回传mes") + public ResponseEntity outReturn(@RequestBody JSONObject whereJson) { checkOutBillService.outReturn(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") - public void download(@RequestParam Map map, HttpServletResponse response,String[] stor_id, String[] bill_status, String[] bill_type) throws IOException { + public void download(@RequestParam Map map, HttpServletResponse response, String[] stor_id, String[] bill_status, String[] bill_type) throws IOException { checkOutBillService.download(map, response, stor_id, bill_status, bill_type); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/RegionioOutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/RegionioOutController.java index 844ff4cb5..5c2a8f4ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/RegionioOutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/RegionioOutController.java @@ -1,10 +1,7 @@ - package org.nl.wms.st.outbill.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "区域出库管理") + @RequestMapping("/api/regionioOut") @Slf4j public class RegionioOutController { @@ -33,7 +30,7 @@ public class RegionioOutController { @GetMapping @Log("查询区域出库") - @ApiOperation("查询区域出库") + //@PreAuthorize("@el.check('regionio:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(regionioOutService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class RegionioOutController { @PostMapping @Log("新增区域出库") - @ApiOperation("新增区域出库") + //@PreAuthorize("@el.check('regionio:add')") public ResponseEntity create(@Validated @RequestBody RegionioDto dto) { regionioOutService.create(dto); @@ -50,7 +47,7 @@ public class RegionioOutController { @PutMapping @Log("修改区域入库") - @ApiOperation("修改区域入库") + //@PreAuthorize("@el.check('regionio:edit')") public ResponseEntity update(@Validated @RequestBody RegionioDto dto) { regionioOutService.update(dto); @@ -58,7 +55,7 @@ public class RegionioOutController { } @Log("删除区域出库") - @ApiOperation("删除区域出库") + //@PreAuthorize("@el.check('regionio:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class RegionioOutController { } @Log("生成任务") - @ApiOperation("生成任务") + @PostMapping("/createTask") public ResponseEntity createTask(@RequestBody JSONObject jsonObject) { regionioOutService.createTask(jsonObject); @@ -76,7 +73,7 @@ public class RegionioOutController { @GetMapping("/getMaterial") @Log("选择物料") - @ApiOperation("选择物料") + public ResponseEntity getMaterial(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(regionioOutService.getMaterial(whereJson, page), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/RegionioOutService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/RegionioOutService.java index 3c265a27e..5dbae56f5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/RegionioOutService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/RegionioOutService.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.outbill.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 5d184a3ba..04edd3e69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -833,9 +833,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mp.put("实际毛重", box_weight); mp.put("车号", jsonObject.getString("order_number")); mp.put("箱数", jsonObject.getString("box_count")); - if (StrUtil.equals(jsonObject.getString("bill_type"), "1004")){ + if (StrUtil.equals(jsonObject.getString("bill_type"), "1004")) { mp.put("收货地址", jsonObject.getString("out_stor_name")); - }else { + } else { mp.put("收货地址", jsonObject.getString("receiptaddress")); } mp.put("单据状态", jsonObject.getString("bill_status")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java index 967b9a6aa..e6fa19aff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/RegionioOutServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.outbill.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java index 4616ffa2c..d063c765d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/rest/InAndOutReturnlController.java @@ -2,8 +2,6 @@ package org.nl.wms.st.returns.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.modules.logging.annotation.Log; @@ -21,7 +19,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "出入库回传") + @RequestMapping("/api/inandoutreturn") @Slf4j public class InAndOutReturnlController { @@ -29,7 +27,7 @@ public class InAndOutReturnlController { @GetMapping @Log("查询出库单") - @ApiOperation("查询出库单") + //@PreAuthorize("@el.check('checkoutbill:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(inAndOutReturnService.pageQuery(whereJson, page), HttpStatus.OK); @@ -37,7 +35,7 @@ public class InAndOutReturnlController { @PostMapping("/upload") @Log("回传") - @ApiOperation("回传") + public ResponseEntity upload(@RequestBody JSONObject whereJson) { inAndOutReturnService.upload(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -45,7 +43,7 @@ public class InAndOutReturnlController { @PostMapping("/uploadMES") @Log("回传MES") - @ApiOperation("回传MES") + public ResponseEntity uploadMES(@RequestBody JSONObject whereJson) { inAndOutReturnService.uploadMES(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -53,7 +51,7 @@ public class InAndOutReturnlController { @PostMapping("/uploadSAP") @Log("回传SAP") - @ApiOperation("回传SAP") + public ResponseEntity uploadSAP(@RequestBody JSONObject whereJson) { inAndOutReturnService.uploadSAP(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -61,13 +59,13 @@ public class InAndOutReturnlController { @PostMapping("/disupload") @Log("不回传") - @ApiOperation("不回传") + public ResponseEntity disupload(@RequestBody JSONObject whereJson) { inAndOutReturnService.disupload(whereJson); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { JSONArray outBillDis = SpringContextHolder.getBean(CheckOutBillServiceImpl.class).getOutBillDis(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index f01e09263..74d34ba30 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -362,7 +362,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonObject1.put("NetWeight", jsonObject.getString("plan_qty")); details.add(jsonObject1); } - jsonDtl.put("Details",details); + jsonDtl.put("Details", details); item.add(jsonDtl); } param.put("item", item); @@ -1555,7 +1555,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonObject1.put("NetWeight", jsonObject.getString("plan_qty")); details.add(jsonObject1); } - jsonDtl.put("Details",details); + jsonDtl.put("Details", details); item.add(jsonDtl); } param.put("item", item); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java index ff0fce01c..b709b6edc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/InEmptyvehiclerecordController.java @@ -1,10 +1,7 @@ - package org.nl.wms.st.vehiclebill.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "空载具入库管理") + @RequestMapping("/api/inemptyvehicle") @Slf4j public class InEmptyvehiclerecordController { @@ -33,7 +30,7 @@ public class InEmptyvehiclerecordController { @GetMapping @Log("查询空载具入库") - @ApiOperation("查询空载具入库") + //@PreAuthorize("@el.check('emptyvehiclerecord:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(inEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class InEmptyvehiclerecordController { @PostMapping @Log("新增空载具入库") - @ApiOperation("新增空载具入库") + //@PreAuthorize("@el.check('emptyvehiclerecord:add')") public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { inEmptyvehiclerecordService.create(dto); @@ -50,7 +47,7 @@ public class InEmptyvehiclerecordController { @PutMapping @Log("修改空载具入库") - @ApiOperation("修改空载具入库") + //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { inEmptyvehiclerecordService.update(dto); @@ -58,7 +55,7 @@ public class InEmptyvehiclerecordController { } @Log("删除空载具入库") - @ApiOperation("删除空载具入库") + //@PreAuthorize("@el.check('emptyvehiclerecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class InEmptyvehiclerecordController { } @Log("生成任务") - @ApiOperation("生成任务") + @PostMapping("/createTask") public ResponseEntity createTask(@RequestBody JSONObject whereJson) { inEmptyvehiclerecordService.createTask(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java index 96b9c1b05..961755f7b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/rest/OutEmptyvehiclerecordController.java @@ -1,10 +1,7 @@ - package org.nl.wms.st.vehiclebill.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "空载具出库管理") + @RequestMapping("/api/outemptyvehicle") @Slf4j public class OutEmptyvehiclerecordController { @@ -33,7 +30,7 @@ public class OutEmptyvehiclerecordController { @GetMapping @Log("查询空载具出库") - @ApiOperation("查询空载具出库") + //@PreAuthorize("@el.check('emptyvehiclerecord:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(outEmptyvehiclerecordService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class OutEmptyvehiclerecordController { @PostMapping @Log("新增空载具出库") - @ApiOperation("新增空载具出库") + //@PreAuthorize("@el.check('emptyvehiclerecord:add')") public ResponseEntity create(@Validated @RequestBody EmptyvehiclerecordDto dto) { outEmptyvehiclerecordService.create(dto); @@ -50,7 +47,7 @@ public class OutEmptyvehiclerecordController { @PutMapping @Log("修改空载具出库") - @ApiOperation("修改空载具出库") + //@PreAuthorize("@el.check('emptyvehiclerecord:edit')") public ResponseEntity update(@Validated @RequestBody EmptyvehiclerecordDto dto) { outEmptyvehiclerecordService.update(dto); @@ -58,7 +55,7 @@ public class OutEmptyvehiclerecordController { } @Log("删除空载具出库") - @ApiOperation("删除空载具出库") + //@PreAuthorize("@el.check('emptyvehiclerecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -67,7 +64,7 @@ public class OutEmptyvehiclerecordController { } @Log("生成任务") - @ApiOperation("生成任务") + @PostMapping("/createTask") public ResponseEntity createTask(@RequestBody JSONObject whereJson) { outEmptyvehiclerecordService.createTask(whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java index fc1bc34cb..79cd1a23c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/InEmptyvehiclerecordService.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.vehiclebill.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java index d1365c82a..d6f631f4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/OutEmptyvehiclerecordService.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.vehiclebill.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java index f3909345d..5f66b1b5c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/InEmptyvehiclerecordServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.vehiclebill.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java index 706bda002..f6ea75bc5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vehiclebill/service/impl/OutEmptyvehiclerecordServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.st.vehiclebill.service.impl; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java index c6a8dc709..4ad9bd0a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java @@ -1,10 +1,7 @@ - package org.nl.wms.stat.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "成品入库查询") + @RequestMapping("/api/in/InQuery") @Slf4j public class InBillQueryController { @@ -34,21 +31,21 @@ public class InBillQueryController { @GetMapping @Log("查询") - @ApiOperation("查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page, String[] product_area) { return new ResponseEntity<>(inBillQueryService.queryAll(whereJson, page, product_area), HttpStatus.OK); } @GetMapping(value = "/query2") @Log("查询") - @ApiOperation("查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page, String[] product_area) { return new ResponseEntity<>(inBillQueryService.queryAll2(whereJson, page, product_area), HttpStatus.OK); } @PostMapping @Log("新增") - @ApiOperation("新增") + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { inBillQueryService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,14 +53,14 @@ public class InBillQueryController { @PutMapping @Log("修改") - @ApiOperation("修改") + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { inBillQueryService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除") - @ApiOperation("删除") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { inBillQueryService.deleteAll(ids); @@ -71,14 +68,14 @@ public class InBillQueryController { } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException { inBillQueryService.download(map, response, product_area); } @Log("导出数据2") - @ApiOperation("导出数据2") + @GetMapping(value = "/download2") public void download2(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException { inBillQueryService.download2(map, response, product_area); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java index e06fdd5d6..b7434b52d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java @@ -1,9 +1,6 @@ - package org.nl.wms.stat.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -24,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "收发存查询管理") + @RequestMapping("/api/iostordaily") @Slf4j public class IostordailyController { @@ -33,7 +30,7 @@ public class IostordailyController { @GetMapping @Log("查询收发存查询") - @ApiOperation("查询收发存查询") + //@PreAuthorize("@el.check('iostordaily:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(iostordailyService.queryAll(whereJson, page), HttpStatus.OK); @@ -41,7 +38,7 @@ public class IostordailyController { @GetMapping("/getStor") @Log("查询仓库") - @ApiOperation("查询仓库") + public ResponseEntity getStor() { return new ResponseEntity<>(iostordailyService.getStor(), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java index 9d47eed1c..d9a198766 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/OutBillQueryController.java @@ -1,10 +1,7 @@ - package org.nl.wms.stat.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "成品出库查询") + @RequestMapping("/api/out/OutQuery") @Slf4j public class OutBillQueryController { @@ -34,21 +31,21 @@ public class OutBillQueryController { @GetMapping @Log("查询") - @ApiOperation("查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page, String[] bill_types) { return new ResponseEntity<>(outBillQueryService.queryAll(whereJson, page, bill_types), HttpStatus.OK); } @GetMapping(value = "/query2") @Log("新查询") - @ApiOperation("新查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page, String[] bill_types) { return new ResponseEntity<>(outBillQueryService.queryAll2(whereJson, page, bill_types), HttpStatus.OK); } @PostMapping @Log("新增") - @ApiOperation("新增") + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { outBillQueryService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,14 +53,14 @@ public class OutBillQueryController { @PutMapping @Log("修改") - @ApiOperation("修改") + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { outBillQueryService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除") - @ApiOperation("删除") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { outBillQueryService.deleteAll(ids); @@ -71,14 +68,14 @@ public class OutBillQueryController { } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response, String[] bill_types) throws IOException { outBillQueryService.download(map, response, bill_types); } @Log("导出数据2") - @ApiOperation("导出数据2") + @GetMapping(value = "/download2") public void download2(@RequestParam Map map, HttpServletResponse response, String[] bill_types) throws IOException { outBillQueryService.download2(map, response, bill_types); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/PastIvtQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/PastIvtQueryController.java index 7df608d47..66d5d8f05 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/PastIvtQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/PastIvtQueryController.java @@ -1,10 +1,7 @@ - package org.nl.wms.stat.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; @@ -25,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "临期库存查询") + @RequestMapping("/api/pastivt") @Slf4j public class PastIvtQueryController { @@ -34,14 +31,14 @@ public class PastIvtQueryController { @GetMapping @Log("查询") - @ApiOperation("查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(pastIvtQueryService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增") - @ApiOperation("新增") + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { pastIvtQueryService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,14 +46,14 @@ public class PastIvtQueryController { @PutMapping @Log("修改") - @ApiOperation("修改") + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { pastIvtQueryService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除") - @ApiOperation("删除") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { pastIvtQueryService.deleteAll(ids); @@ -64,7 +61,7 @@ public class PastIvtQueryController { } @Log("导出数据") - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { pastIvtQueryService.download(map, response); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java index b9b7706c4..cf8b69a6d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java @@ -1,4 +1,3 @@ - package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java index 9d6b5075c..664258f3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/OutBillQueryService.java @@ -1,4 +1,3 @@ - package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java index 6ec21f023..c342cba61 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/PastIvtQueryService.java @@ -1,4 +1,3 @@ - package org.nl.wms.stat.service; import com.alibaba.fastjson.JSONObject; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java index 08eb9be3b..2962d3ad8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java @@ -1,4 +1,3 @@ - package org.nl.wms.stat.service.impl; import com.alibaba.fastjson.JSONArray; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java index 32f76cf80..15369b716 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java @@ -1,4 +1,3 @@ - package org.nl.wms.stat.service.impl; diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index ceb2e3d9e..bca4b8014 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -100,6 +100,7 @@ https://juejin.cn/post/6844903775631572999 + diff --git a/lms/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/lms/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl index 53f849f0b..ec934f094 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -10,7 +10,7 @@ import org.springframework.http.ResponseEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Map; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; **/ @RestController @RequiredArgsConstructor -@Api(tags = "${apiAlias}管理") + @RequestMapping("/api/${changeClassName}") @Slf4j public class ${className}Controller { @@ -29,7 +29,7 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - @ApiOperation("查询${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(${changeClassName}Service.queryAll(whereJson,page),HttpStatus.OK); @@ -37,7 +37,7 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - @ApiOperation("新增${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.create(dto); @@ -46,7 +46,7 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - @ApiOperation("修改${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.update(dto); @@ -54,7 +54,7 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - @ApiOperation("删除${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody ${pkColumnType}[] ids) { diff --git a/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl b/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl index 347e72914..c164f6f53 100644 --- a/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl +++ b/lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl @@ -2,7 +2,7 @@ package ${package}.domain; import lombok.Data; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; + import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; <#if isNotNullColumns??> @@ -55,9 +55,9 @@ public class ${className} implements Serializable { <#if column.remark != ''> - @ApiModelProperty(value = "${column.remark}") + <#else> - @ApiModelProperty(value = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName};