diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index 51be1f6a..aec8c46c 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -17,13 +17,13 @@ UTF-8 1.8 1.16 - 2.9.2 1.1.22 1.2.0.Final 1.31.0 5.7.14 0.11.1 1.2.83 + 8.2.0 1.9 @@ -100,23 +100,23 @@ - - org.springframework.boot - spring-boot-starter-data-elasticsearch - 2.7.5 - - - - + + + + + + + + - - - com.internetitem - logback-elasticsearch-appender - 1.6 - + + + + + + @@ -180,7 +180,40 @@ ${sa-token.version} + + + org.apache.lucene + lucene-core + ${lucene.version} + + + org.apache.lucene + lucene-highlighter + ${lucene.version} + + + org.apache.lucene + lucene-analyzers-common + ${lucene.version} + + + com.github.magese + ik-analyzer + ${lucene.version} + + + + org.apache.lucene + lucene-analyzers-smartcn + ${lucene.version} + + + + org.apache.lucene + lucene-queryparser + ${lucene.version} + org.springframework.boot @@ -199,38 +232,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 @@ -357,7 +358,11 @@ jetcache-starter-redis 2.5.14 - + + com.google.guava + guava + 29.0-jre + com.oracle.database.jdbc ojdbc5 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java index d227b0a4..807d4d0f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.Cache; 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.CommandLineRunner; @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) + @SpringBootApplication(exclude = { org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/Property.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/Property.java new file mode 100644 index 00000000..5bfb46a6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/Property.java @@ -0,0 +1,44 @@ +package org.nl.common.domain; + +/* + * @author ZZQ + * @Date 2023/12/26 15:30 + */ +public class Property { + private String name; + private String value; + private boolean allowEmpty; + + public Property() { + } + + public Property(String name, String value, boolean allowEmpty) { + this.name = name; + this.value = value; + this.allowEmpty = allowEmpty; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public boolean isAllowEmpty() { + return allowEmpty; + } + + public void setAllowEmpty(boolean allowEmpty) { + this.allowEmpty = allowEmpty; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LogMessageConstant.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LogMessageConstant.java new file mode 100644 index 00000000..89d06213 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LogMessageConstant.java @@ -0,0 +1,46 @@ +package org.nl.common.lucene; + +/** + * @Author: lyd + * @Description: 定义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/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java new file mode 100644 index 00000000..4c059fa6 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java @@ -0,0 +1,87 @@ +package org.nl.common.lucene; +/** + * @author ldjun + * @version 1.0 + * @date 2023年08月24日 13:00 + * @desc desc + */ + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.AppenderBase; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.document.*; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FSDirectory; +import org.nl.common.domain.Property; +import org.nl.common.utils.YmlConfigFileUtil; +import org.wltea.analyzer.lucene.IKAnalyzer; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.List; +import java.util.Properties; + +public class LuceneAppender extends AppenderBase { + public LuceneProperties properties; + public static Directory index; + private List encoders; + public static IndexWriter indexWriter; + + + + @Override + public void start() { + super.start(); + try { + // 读取配置文件 + Properties properties = YmlConfigFileUtil.readConfig("config/application.yml"); + + // 获取配置值 + String luceneDir = properties.getProperty("lucene.index.path"); + index = FSDirectory.open(Paths.get(luceneDir)); + // 初始化 Lucene 索引 + Analyzer analyzer = new IKAnalyzer(); + IndexWriterConfig config = new IndexWriterConfig(analyzer); + indexWriter = new IndexWriter(index, config); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + @Override + protected void append(ILoggingEvent event) { + Document doc = new Document(); + for (Property property : this.properties.getProperties()) { + LucenePropertyAndEncoder encoder = new LucenePropertyAndEncoder(property, this.context); + doc.add(new StringField(property.getName(), encoder.encode(event), Field.Store.YES)); + } + doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, event.getFormattedMessage(), 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); + indexWriter.commit(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void stop() { + super.stop(); + try { + indexWriter.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void setProperties(LuceneProperties properties) { + this.properties = properties; + + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneProperties.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneProperties.java new file mode 100644 index 00000000..60cbadd7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneProperties.java @@ -0,0 +1,26 @@ +package org.nl.common.lucene; + + + +import org.nl.common.domain.Property; + +import java.util.ArrayList; +import java.util.List; + +public class LuceneProperties { + + private List properties; + + public LuceneProperties() { + this.properties = new ArrayList(); + } + + public List getProperties() { + return properties; + } + + public void addProperty(Property property) { + properties.add(property); + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LucenePropertyAndEncoder.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LucenePropertyAndEncoder.java new file mode 100644 index 00000000..60baeea8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LucenePropertyAndEncoder.java @@ -0,0 +1,39 @@ +package org.nl.common.lucene; + +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.pattern.PatternLayoutBase; +import org.nl.common.domain.Property; + +/* + * @author ZZQ + * @Date 2023/12/22 18:11 + */ +public class LucenePropertyAndEncoder { + + private Property property; + + private PatternLayoutBase layout = new PatternLayout(); + + public LucenePropertyAndEncoder(Property property, Context context) { + this.property = property; + this.layout.setContext(context); + this.layout.setPattern(String.valueOf(property.getValue())); + this.layout.setPostCompileProcessor(null); + this.layout.start(); + } + + public String encode(ILoggingEvent event) { + return layout.doLayout(event); + } + + public String getName() { + return property.getName(); + } + + public boolean allowEmpty() { + return property.isAllowEmpty(); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AsyncHttpRequest.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AsyncHttpRequest.java index 7de5debe..d0b9348d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AsyncHttpRequest.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AsyncHttpRequest.java @@ -1,65 +1,65 @@ -package org.nl.common.utils; - -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.concurrent.FutureCallback; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; -import org.apache.http.impl.nio.client.HttpAsyncClients; -import org.nl.modules.wql.util.SpringContextHolder; -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Component; - -import java.util.concurrent.Future; - -/* - * HTtp异步调用 - */ -public class AsyncHttpRequest { - - private StringEntity entity; - public HttpRequestBase httpbase; - private String url; - - public AsyncHttpRequest(String url) { - this.url=url; - } - - public static AsyncHttpRequest post(String url,String body){ - return new AsyncHttpRequest(url).body(body); - }; - - public static AsyncHttpRequest get(String url){ - return new AsyncHttpRequest(url).getEntity(); - }; - private AsyncHttpRequest getEntity(){ - HttpGet httpGet = new HttpGet(this.url); - this.httpbase = httpGet; - return this; - }; - private AsyncHttpRequest body(String body){ - this.entity = new StringEntity(body, "UTF-8"); - this.entity.setContentType("application/json"); - HttpPost httpPost = new HttpPost(this.url); - httpPost.setEntity(entity); - this.httpbase = httpPost; - return this; - }; - public Future execute(FutureCallback callback){ - CloseableHttpAsyncClient client = SpringContextHolder.getBean(CloseableHttpAsyncClient.class); - Future execute = client.execute(httpbase, callback); - return execute; - }; -} -@Component -class HttpAsyncClientInit{ - - @Bean - public CloseableHttpAsyncClient closeableHttpAsyncClient(){ - CloseableHttpAsyncClient aDefault = HttpAsyncClients.createDefault(); - aDefault.start(); - return aDefault; - } -} +//package org.nl.common.utils; +// +//import org.apache.http.HttpResponse; +//import org.apache.http.client.methods.HttpGet; +//import org.apache.http.client.methods.HttpPost; +//import org.apache.http.client.methods.HttpRequestBase; +//import org.apache.http.concurrent.FutureCallback; +//import org.apache.http.entity.StringEntity; +//import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; +//import org.apache.http.impl.nio.client.HttpAsyncClients; +//import org.nl.modules.wql.util.SpringContextHolder; +//import org.springframework.context.annotation.Bean; +//import org.springframework.stereotype.Component; +// +//import java.util.concurrent.Future; +// +///* +// * HTtp异步调用 +// */ +//public class AsyncHttpRequest { +// +// private StringEntity entity; +// public HttpRequestBase httpbase; +// private String url; +// +// public AsyncHttpRequest(String url) { +// this.url=url; +// } +// +// public static AsyncHttpRequest post(String url,String body){ +// return new AsyncHttpRequest(url).body(body); +// }; +// +// public static AsyncHttpRequest get(String url){ +// return new AsyncHttpRequest(url).getEntity(); +// }; +// private AsyncHttpRequest getEntity(){ +// HttpGet httpGet = new HttpGet(this.url); +// this.httpbase = httpGet; +// return this; +// }; +// private AsyncHttpRequest body(String body){ +// this.entity = new StringEntity(body, "UTF-8"); +// this.entity.setContentType("application/json"); +// HttpPost httpPost = new HttpPost(this.url); +// httpPost.setEntity(entity); +// this.httpbase = httpPost; +// return this; +// }; +// public Future execute(FutureCallback callback){ +// CloseableHttpAsyncClient client = SpringContextHolder.getBean(CloseableHttpAsyncClient.class); +// Future execute = client.execute(httpbase, callback); +// return execute; +// }; +//} +//@Component +//class HttpAsyncClientInit{ +// +// @Bean +// public CloseableHttpAsyncClient closeableHttpAsyncClient(){ +// CloseableHttpAsyncClient aDefault = HttpAsyncClients.createDefault(); +// aDefault.start(); +// return aDefault; +// } +//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java new file mode 100644 index 00000000..1c351b5b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java @@ -0,0 +1,28 @@ +package org.nl.common.utils; + +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; + +import java.util.Properties; + +/** + * @Author: lyd + * @Description: 配置文件获取方法 + * @Date: 2023/12/6 + */ +public class YmlConfigFileUtil { + public static Properties readConfig(String configFile) { + // 创建 Resource 对象 + Resource resource = new ClassPathResource(configFile); + + // 创建 YamlPropertiesFactoryBean + YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean(); + yamlPropertiesFactoryBean.setResources(resource); + + // 获取 Properties 对象 + Properties properties = yamlPropertiesFactoryBean.getObject(); + + return properties; + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java index aca085f8..9fc22aec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java @@ -1,119 +1,119 @@ -package org.nl.config; - -import cn.hutool.core.util.IdUtil; -import cn.hutool.poi.excel.BigExcelWriter; -import cn.hutool.poi.excel.ExcelUtil; -import com.alibaba.druid.util.StringUtils; -import io.swagger.annotations.Api; -import org.apache.poi.xssf.streaming.SXSSFSheet; -import org.nl.common.anno.Log; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.SmartLifecycle; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.method.HandlerMethod; -import springfox.documentation.RequestHandler; -import springfox.documentation.spi.service.RequestHandlerProvider; -import springfox.documentation.spring.web.WebMvcRequestHandler; - -import java.io.File; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.function.Predicate; - -/* - * @author ZZQ - * @Date 2023/10/17 14:51 - * 接口文档工具 - */ -//@Component -public class ApiDocScan implements SmartLifecycle { - private final List handlerProviders; - - @Autowired - public ApiDocScan(List handlerProviders) { - this.handlerProviders = handlerProviders; - } - - @Override - public void start() { - RequestHandlerProvider requestHandlerProvider = handlerProviders.get(0); - List requestHandlers = requestHandlerProvider.requestHandlers(); - List urlMapping = new ArrayList<>(); - ite: - for (RequestHandler handler : requestHandlers) { - if (handler instanceof WebMvcRequestHandler){ - WebMvcRequestHandler requestHandler = (WebMvcRequestHandler) handler; - HandlerMethod handlerMethod = requestHandler.getHandlerMethod(); - Method method = handlerMethod.getMethod(); - Annotation[] annotations = method.getDeclaredAnnotations(); - Map map = null; - for (Annotation annotation : annotations) { - if (annotation instanceof Log || annotation instanceof io.swagger.annotations.ApiOperation){ - map = new HashMap(); - Class aClass = annotation.getClass(); - try { - Method value1 = ((Class) aClass.getGenericInterfaces()[0]).getDeclaredMethod("value"); - value1.setAccessible(true); - Object invoke = value1.invoke(annotation); - map.put("接口名称",invoke); - break ; - }catch (Exception ex){ - System.out.println(ex.getMessage()); - continue ite; - } - } - } - if (map==null){ - continue ; - } - Class[] parameterTypes = method.getParameterTypes(); - String[] params = new String[parameterTypes.length]; - for (int i = 0; i < parameterTypes.length; i++) { - params[i] = parameterTypes[i].getName().substring(parameterTypes[i].getName().lastIndexOf('.')+1);; - } - map.put("请求参数",Arrays.toString(params)); - Set patterns = requestHandler.getRequestMapping().getPatternsCondition().getPatterns(); - Set methods = requestHandler.getRequestMapping().getMethodsCondition().getMethods(); - map.put("请求接口",patterns.toString()); - map.put("请求类型",methods.toString()); - map.put("后端代码入口",handlerMethod.getBean()); - Api api = handlerMethod.getBeanType().getDeclaredAnnotation(Api.class); - String interfaceType = ""; - if (api!=null){ - interfaceType = api.tags()[0]; - } - map.put("接口类型",interfaceType ); - urlMapping.add(map); - } - } - ApiDocScan.writeInterfaceFile(urlMapping); - } - - public static void writeInterfaceFile(List list ) { - try { - String tempPath = System.getProperty("user.dir") + File.separator + IdUtil.fastSimpleUUID() + ".xlsx"; - File file = new File(tempPath); - BigExcelWriter writer = ExcelUtil.getBigWriter(file); - writer.write(list, true); - SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); - sheet.trackAllColumnsForAutoSizing(); - //列宽自适应 - writer.autoSizeColumnAll(); - writer.close(); - System.out.println("输出完成，文件地址："+tempPath); - }catch (Exception ex){ - System.out.println(ex.getMessage()); - } - } - @Override - public void stop() { - - } - @Override - public boolean isRunning() { - return false; - } -} +//package org.nl.config; +// +//import cn.hutool.core.util.IdUtil; +//import cn.hutool.poi.excel.BigExcelWriter; +//import cn.hutool.poi.excel.ExcelUtil; +//import com.alibaba.druid.util.StringUtils; +// +//import org.apache.poi.xssf.streaming.SXSSFSheet; +//import org.nl.common.anno.Log; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.SmartLifecycle; +//import org.springframework.stereotype.Component; +//import org.springframework.web.bind.annotation.RequestMethod; +//import org.springframework.web.method.HandlerMethod; +// +// +// +// +//import java.io.File; +//import java.lang.annotation.Annotation; +//import java.lang.reflect.Method; +//import java.util.*; +//import java.util.concurrent.CopyOnWriteArrayList; +//import java.util.function.Predicate; +// +///* +// * @author ZZQ +// * @Date 2023/10/17 14:51 +// * 接口文档工具 +// */ +////@Component +//public class ApiDocScan implements SmartLifecycle { +// private final List handlerProviders; +// +// @Autowired +// public ApiDocScan(List handlerProviders) { +// this.handlerProviders = handlerProviders; +// } +// +// @Override +// public void start() { +// RequestHandlerProvider requestHandlerProvider = handlerProviders.get(0); +// List requestHandlers = requestHandlerProvider.requestHandlers(); +// List urlMapping = new ArrayList<>(); +// ite: +// for (RequestHandler handler : requestHandlers) { +// if (handler instanceof WebMvcRequestHandler){ +// WebMvcRequestHandler requestHandler = (WebMvcRequestHandler) handler; +// HandlerMethod handlerMethod = requestHandler.getHandlerMethod(); +// Method method = handlerMethod.getMethod(); +// Annotation[] annotations = method.getDeclaredAnnotations(); +// Map map = null; +// for (Annotation annotation : annotations) { +// if (annotation instanceof Log || annotation instanceof io.swagger.annotations.ApiOperation){ +// map = new HashMap(); +// Class aClass = annotation.getClass(); +// try { +// Method value1 = ((Class) aClass.getGenericInterfaces()[0]).getDeclaredMethod("value"); +// value1.setAccessible(true); +// Object invoke = value1.invoke(annotation); +// map.put("接口名称",invoke); +// break ; +// }catch (Exception ex){ +// System.out.println(ex.getMessage()); +// continue ite; +// } +// } +// } +// if (map==null){ +// continue ; +// } +// Class[] parameterTypes = method.getParameterTypes(); +// String[] params = new String[parameterTypes.length]; +// for (int i = 0; i < parameterTypes.length; i++) { +// params[i] = parameterTypes[i].getName().substring(parameterTypes[i].getName().lastIndexOf('.')+1);; +// } +// map.put("请求参数",Arrays.toString(params)); +// Set patterns = requestHandler.getRequestMapping().getPatternsCondition().getPatterns(); +// Set methods = requestHandler.getRequestMapping().getMethodsCondition().getMethods(); +// map.put("请求接口",patterns.toString()); +// map.put("请求类型",methods.toString()); +// map.put("后端代码入口",handlerMethod.getBean()); +// Api api = handlerMethod.getBeanType().getDeclaredAnnotation(Api.class); +// String interfaceType = ""; +// if (api!=null){ +// interfaceType = api.tags()[0]; +// } +// map.put("接口类型",interfaceType ); +// urlMapping.add(map); +// } +// } +// ApiDocScan.writeInterfaceFile(urlMapping); +// } +// +// public static void writeInterfaceFile(List list ) { +// try { +// String tempPath = System.getProperty("user.dir") + File.separator + IdUtil.fastSimpleUUID() + ".xlsx"; +// File file = new File(tempPath); +// BigExcelWriter writer = ExcelUtil.getBigWriter(file); +// writer.write(list, true); +// SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); +// sheet.trackAllColumnsForAutoSizing(); +// //列宽自适应 +// writer.autoSizeColumnAll(); +// writer.close(); +// System.out.println("输出完成，文件地址："+tempPath); +// }catch (Exception ex){ +// System.out.println(ex.getMessage()); +// } +// } +// @Override +// public void stop() { +// +// } +// @Override +// public boolean isRunning() { +// return false; +// } +//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java index b7da6746..f0415214 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java @@ -33,7 +33,7 @@ public class ConventConfig implements SmartLifecycle { AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_SEND_FULL, SpringContextHolder.getBean(PlotterSendMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_CALL_EMP, SpringContextHolder.getBean(PlotterCallEmptyTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_CALL_FULL, SpringContextHolder.getBean(WrapCallMaterialTask.class)); - AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_SEND_EMP, SpringContextHolder.getBean(WrapSendEmptyTask.class)); +// AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_SEND_EMP, SpringContextHolder.getBean(WrapSendEmptyTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_FULL, SpringContextHolder.getBean(WashSendMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_EMP, SpringContextHolder.getBean(WashCallEmptyTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_FULL_ERROR, SpringContextHolder.getBean(WashSendMaterialQZTask.class)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 8b416013..a814e82f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -49,7 +49,6 @@ public class CodeGenerator { gc.setOutputDir(projectPath + "/src/main/java/"); gc.setAuthor("generator"); gc.setOpen(false); -// gc.setSwagger2(true); gc.setEntityName("%s"); gc.setServiceName("I%sService"); gc.setServiceImplName("%sServiceImpl"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java index 582cb1a2..9d4d0c65 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/base/BaseEntity.java @@ -15,7 +15,7 @@ */ package org.nl.modules.common.base; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; @@ -43,22 +43,22 @@ public class BaseEntity implements Serializable { @CreatedBy @Column(name = "create_by", updatable = false) - @ApiModelProperty(value = "创建人", hidden = true) + private String createBy; @LastModifiedBy @Column(name = "update_by") - @ApiModelProperty(value = "更新人", hidden = true) + private String updatedBy; @CreationTimestamp @Column(name = "create_time", updatable = false) - @ApiModelProperty(value = "创建时间", hidden = true) + private Timestamp createTime; @UpdateTimestamp @Column(name = "update_time") - @ApiModelProperty(value = "更新时间", hidden = true) + private Timestamp updateTime; /* 分组校验 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java deleted file mode 100644 index d8af8f30..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java +++ /dev/null @@ -1,164 +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 com.google.common.base.Predicates; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import java.util.Date; - -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(Predicates.isNull()) - .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/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java index abbb456f..e5a042f9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/CacheKey.java @@ -18,7 +18,7 @@ package org.nl.modules.common.utils; /** * @author: liaojinlong * @date: 2020/6/11 15:49 - * @apiNote: 关于缓存的Key集合 + * */ public interface CacheKey { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java index aac99749..b345b2de 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java @@ -15,8 +15,8 @@ */ package org.nl.modules.common.utils; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import org.apache.commons.compress.utils.Lists; +import org.apache.commons.compress.utils.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java index cc23dd56..13f54770 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/ColumnInfo.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -38,47 +38,47 @@ public class ColumnInfo implements Serializable { @Id @Column(name = "column_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "数据库字段名称") + private String columnName; - @ApiModelProperty(value = "数据库字段类型") + private String columnType; - @ApiModelProperty(value = "数据库字段键类型") + private String keyType; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean notNull; - @ApiModelProperty(value = "是否在列表显示") + private Boolean listShow; - @ApiModelProperty(value = "是否表单显示") + private Boolean formShow; - @ApiModelProperty(value = "表单类型") + private String formType; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String queryType; - @ApiModelProperty(value = "字典名称") + private String dictName; - @ApiModelProperty(value = "日期注解") + private String dateAnnotation; public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java index 454b1e93..ca91df3b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/domain/GenConfig.java @@ -15,7 +15,7 @@ */ package org.nl.modules.generator.domain; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -42,38 +42,38 @@ public class GenConfig implements Serializable { @Id @Column(name = "config_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @NotBlank - @ApiModelProperty(value = "表名") + private String tableName; - @ApiModelProperty(value = "接口名称") + private String apiAlias; @NotBlank - @ApiModelProperty(value = "包路径") + private String pack; @NotBlank - @ApiModelProperty(value = "模块名") + private String moduleName; @NotBlank - @ApiModelProperty(value = "前端文件路径") + private String path; - @ApiModelProperty(value = "前端文件路径") + private String apiPath; - @ApiModelProperty(value = "作者") + private String author; - @ApiModelProperty(value = "表前缀") + private String prefix; - @ApiModelProperty(value = "是否覆盖") + private Boolean cover = false; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java index 974ea0cb..962169b4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java @@ -15,8 +15,8 @@ */ package org.nl.modules.generator.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.generator.domain.GenConfig; import org.nl.modules.generator.service.GenConfigService; @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/api/genConfig") -@Api(tags = "系统：代码生成器配置管理") + public class GenConfigController { private final GenConfigService genConfigService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java index d69f8d27..cd153710 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java @@ -16,8 +16,8 @@ package org.nl.modules.generator.rest; 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.PageUtil; @@ -40,7 +40,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") + public class GeneratorController { private final GeneratorService generatorService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 67085b57..f5a9c960 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -106,7 +106,7 @@ public class LogAspect { log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url,errorMsg,params, errorStack.append("】").toString()); Log log = new Log("ERROR", System.currentTimeMillis() - comming); log.setExceptionDetail(ThrowableUtil.getStackTrace(ex).getBytes()); - logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); + logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, (ProceedingJoinPoint) joinPoint, log); throw ex; }finally { log.info("[--response--][请求接口:{} 执行结束][耗时:{}s]",url,(System.currentTimeMillis() - comming)/1000); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/repository/EsLogRepository.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/repository/EsLogRepository.java index 9d1b55fb..a45ebf55 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/repository/EsLogRepository.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/repository/EsLogRepository.java @@ -1,14 +1,14 @@ -package org.nl.modules.logging.repository; - -import org.nl.modules.logging.service.dto.LogRepositoryDTO; -import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; -import org.springframework.stereotype.Repository; - -/* - * @author ZZQ - * @Date 2023/2/8 4:11 下午 - */ -@Repository -public interface EsLogRepository extends ElasticsearchRepository { - -} +//package org.nl.modules.logging.repository; +// +//import org.nl.modules.logging.service.dto.LogRepositoryDTO; +//import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +//import org.springframework.stereotype.Repository; +// +///* +// * @author ZZQ +// * @Date 2023/2/8 4:11 下午 +// */ +//@Repository +//public interface EsLogRepository extends ElasticsearchRepository { +// +//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java index a96ca224..baf2e3ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java @@ -1,7 +1,7 @@ package org.nl.modules.logging.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; @@ -23,7 +23,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor @RequestMapping("/api/interfaceLog") -@Api(tags = "系统：接口日志管理") + public class InterfaceLogController { private final InterfaceLogService interfaceLogService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java index 9fc889a8..8469c0b4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java @@ -1,89 +1,89 @@ -/* - * 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.logging.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import org.nl.common.utils.SecurityUtils; - -import org.nl.modules.logging.service.LogService; -import org.nl.modules.logging.service.dto.LogQueryCriteria; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -/** - * @author Zheng Jie - * @date 2018-11-24 - */ -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") -public class LogController { - - private final LogService logService; - @GetMapping - //("日志查询") - //@SaCheckPermission("@el.check()") - public ResponseEntity query(LogQueryCriteria criteria, Pageable pageable){ - criteria.setLogType("INFO"); - return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); - } - - @GetMapping(value = "/user") - // //("用户日志查询") - public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable){ - criteria.setLogType("INFO"); - criteria.setBlurry(SecurityUtils.getCurrentUsername()); - return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK); - } - - @GetMapping(value = "/error") - //("错误日志查询") - // @SaCheckPermission("@el.check()") - public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable){ - criteria.setLogType("ERROR"); - return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); - } - - @GetMapping(value = "/error/{id}") - //("日志异常详情查询") - // @SaCheckPermission("@el.check()") - public ResponseEntity queryErrorLogs(@PathVariable Long id){ - return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); - } - @DeleteMapping(value = "/del/error") - @Log("删除所有ERROR日志") - //("删除所有ERROR日志") - // @SaCheckPermission("@el.check()") - public ResponseEntity delAllErrorLog(){ - logService.delAllByError(); - return new ResponseEntity<>(HttpStatus.OK); - } - - @DeleteMapping(value = "/del/info") - @Log("删除所有INFO日志") - //("删除所有INFO日志") - // @SaCheckPermission("@el.check()") - public ResponseEntity delAllInfoLog(){ - logService.delAllByInfo(); - return new ResponseEntity<>(HttpStatus.OK); - } -} +///* +// * 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.logging.rest; +// +// +// +// import lombok.RequiredArgsConstructor; +//import org.nl.common.anno.Log; +//import org.nl.common.utils.SecurityUtils; +// +//import org.nl.modules.logging.service.LogService; +//import org.nl.modules.logging.service.dto.LogQueryCriteria; +//import org.springframework.data.domain.Pageable; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.ResponseEntity; +//import org.springframework.web.bind.annotation.*; +// +///** +// * @author Zheng Jie +// * @date 2018-11-24 +// */ +//@RestController +//@RequiredArgsConstructor +//@RequestMapping("/api/logs") +// +//public class LogController { +// +// private final LogService logService; +// @GetMapping +// //("日志查询") +// //@SaCheckPermission("@el.check()") +// public ResponseEntity query(LogQueryCriteria criteria, Pageable pageable){ +// criteria.setLogType("INFO"); +// return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); +// } +// +// @GetMapping(value = "/user") +// // //("用户日志查询") +// public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable){ +// criteria.setLogType("INFO"); +// criteria.setBlurry(SecurityUtils.getCurrentUsername()); +// return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK); +// } +// +// @GetMapping(value = "/error") +// //("错误日志查询") +// // @SaCheckPermission("@el.check()") +// public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable){ +// criteria.setLogType("ERROR"); +// return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK); +// } +// +// @GetMapping(value = "/error/{id}") +// //("日志异常详情查询") +// // @SaCheckPermission("@el.check()") +// public ResponseEntity queryErrorLogs(@PathVariable Long id){ +// return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); +// } +// @DeleteMapping(value = "/del/error") +// @Log("删除所有ERROR日志") +// //("删除所有ERROR日志") +// // @SaCheckPermission("@el.check()") +// public ResponseEntity delAllErrorLog(){ +// logService.delAllByError(); +// return new ResponseEntity<>(HttpStatus.OK); +// } +// +// @DeleteMapping(value = "/del/info") +// @Log("删除所有INFO日志") +// //("删除所有INFO日志") +// // @SaCheckPermission("@el.check()") +// public ResponseEntity delAllInfoLog(){ +// logService.delAllByInfo(); +// return new ResponseEntity<>(HttpStatus.OK); +// } +//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LuceneLogController.java similarity index 61% rename from mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LuceneLogController.java index 800febdf..1e4bbb54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LuceneLogController.java @@ -1,11 +1,8 @@ package org.nl.modules.logging.rest; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import org.nl.common.domain.query.PageQuery; -import org.nl.modules.logging.service.EsLogService; +import org.nl.modules.logging.service.LuceneLogService; import org.nl.modules.logging.service.dto.LogQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -18,27 +15,28 @@ import org.springframework.web.bind.annotation.*; */ @RestController -@RequiredArgsConstructor @RequestMapping("/api/esLog") -public class EsLogController { - private final EsLogService esLogService; +public class LuceneLogController { + + @Autowired + private LuceneLogService luceneLogService; @GetMapping("/labels/{type}") //("获取标签") public ResponseEntity labelsValues(@PathVariable String type) { - return new ResponseEntity<>(esLogService.getLabelsValues(type), HttpStatus.OK); + return new ResponseEntity<>(luceneLogService.getLabelsValues(type), HttpStatus.OK); } @PostMapping("/query") //("日志查询") public ResponseEntity queryAll(@RequestBody LogQuery query) { - return new ResponseEntity<>(esLogService.query(query), HttpStatus.OK); + return new ResponseEntity<>(luceneLogService.query(query), HttpStatus.OK); } @DeleteMapping("/clearLogs") //("清空日志") public ResponseEntity clearLogs(@RequestBody LogQuery query) { - esLogService.clearLogs(query); + luceneLogService.clearLogs(query); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/EsLogService.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/LuceneLogService.java similarity index 83% rename from mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/EsLogService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/LuceneLogService.java index 0df5f374..7c82b4bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/EsLogService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/LuceneLogService.java @@ -1,6 +1,7 @@ package org.nl.modules.logging.service; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.service.dto.LogQuery; @@ -11,7 +12,7 @@ import org.nl.modules.logging.service.dto.LogQuery; * @date 2023年02月07日 14:34 * @desc desc */ -public interface EsLogService { +public interface LuceneLogService { /** * 清空日志 @@ -28,5 +29,5 @@ public interface EsLogService { * @param logQuery * @return */ - Page query(LogQuery logQuery); + JSONObject query(LogQuery logQuery); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java index 997fc747..1df9ef10 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java @@ -21,6 +21,7 @@ public class LogQuery { * 追踪id */ private String traceId; + private String requestMethod; /** * 日志内容模糊匹配 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java index 84eda763..1d12a3b0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java @@ -4,13 +4,12 @@ import lombok.Data; import java.util.Date; import org.springframework.data.annotation.Id; -import org.springframework.data.elasticsearch.annotations.Document; /* * @author ZZQ * @Date 2023/2/8 4:06 下午 */ -@Document(indexName = "#{@ESConfig.index}", type = "mes_log") +//@Document(indexName = "#{@ESConfig.index}", type = "mes_log") @Data public class LogRepositoryDTO { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java deleted file mode 100644 index a6f340b8..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package org.nl.modules.logging.service.impl; - -import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.script.Script; -import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.aggregations.Aggregations; -import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.nl.common.enums.LevelEnum; -import org.nl.modules.logging.repository.EsLogRepository; -import org.nl.modules.logging.service.EsLogService; -import org.nl.modules.logging.service.dto.LogQuery; -import org.nl.modules.logging.service.dto.LogRepositoryDTO; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; -import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl; -import org.springframework.data.elasticsearch.core.query.DeleteQuery; -import org.springframework.data.elasticsearch.core.query.FetchSourceFilter; -import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.Date; -import java.util.List; - -/** - * @author ldjun - * @version 1.0 - * @date 2023年02月07日 14:35 - * @desc desc - */ -@Service -@RequiredArgsConstructor -public class EsLogServiceImpl implements EsLogService { - - private final EsLogRepository esLogRepository; - - private final ElasticsearchRestTemplate elasticsearchRestTemplate; - - @Override - public Page query(LogQuery logQuery){ - Page page = new Page<>(); - if (logQuery != null){ - BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod - extractedParam(logQuery, query); - Iterable all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending())); - page.setRecords(((AggregatedPageImpl) all).getContent()); - page.setTotal(((AggregatedPageImpl) all).getTotalElements()); - page.setPages(logQuery.getPage()); - page.setSize(logQuery.getSize()); - } - return page; - } - - - private void extractedParam(LogQuery logQuery, BoolQueryBuilder query) { - if (StringUtils.isNotBlank(logQuery.getLogLevel())){ - query.must().add(QueryBuilders.matchQuery("logLevel", LevelEnum.checkLevel(logQuery.getLogLevel()))); - } - if (StringUtils.isNotBlank(logQuery.getSystem())){ - query.must().add(QueryBuilders.matchQuery("system", logQuery.getSystem())); - } - if (logQuery.getIsRequest()){ - query.must().add(QueryBuilders.existsQuery("requestMethod")); - } - if (logQuery.getFilterSql()){ - query.mustNot().add(QueryBuilders.wildcardQuery("logger","org.nl.modules.wql.core.engine.*")); - } - query.mustNot().add(QueryBuilders.matchPhraseQuery("logger","org.elasticsearch.client.RestClient")); - if (StringUtils.isNotBlank(logQuery.getTraceId())){ - query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId())); - } - if (StringUtils.isNotBlank(logQuery.getMessage())){ - query.must().add(QueryBuilders.matchPhraseQuery("message", logQuery.getMessage())); - } - if (logQuery.getEndTime()!=null ){ - String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L"; - query.must().add(QueryBuilders.scriptQuery(new Script(script))); - } - if (logQuery.getStartTime()!=null){ - String script = "doc['@timestamp'].value.millis > " + logQuery.getStartTime().getTime() + "L"; - query.must().add(QueryBuilders.scriptQuery(new Script(script))); - } - } - - @Override - public void clearLogs(LogQuery logQuery) { - String system = logQuery.getSystem(); - BoolQueryBuilder query = QueryBuilders.boolQuery(); - if (!StringUtils.isBlank(system)){ - query.must().add(QueryBuilders.matchQuery("system", system)); - } - long time = DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, -10).getTime(); - String script = "doc['@timestamp'].value.millis < " + time + "L"; - query.must().add(QueryBuilders.scriptQuery(new Script(script))); - DeleteQuery deleteQuery = new DeleteQuery(); - deleteQuery.setQuery(query); - elasticsearchRestTemplate.delete(deleteQuery,new LogRepositoryDTO().getClass()); - } - - - @Override - public JSONArray getLabelsValues(String type) { - JSONArray result = new JSONArray(); - FetchSourceFilter fetchSourceFilter = new FetchSourceFilter(new String[]{type}, null); - NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder(); - queryBuilder.withCollapseField(type+".keyword"); - queryBuilder.withSourceFilter(fetchSourceFilter); - queryBuilder.addAggregation(AggregationBuilders.terms(type).field(type+".keyword").size(100)); - Aggregations agg = elasticsearchRestTemplate.query(queryBuilder.build(), SearchResponse::getAggregations); - Terms terms = agg.get(type); - List buckets = terms.getBuckets(); - if (!CollectionUtils.isEmpty(buckets)){ - buckets.stream().map(Terms.Bucket::getKeyAsString).forEach(v-> { - JSONObject item = new JSONObject(); - item.put("label", v); - item.put("value", v); - result.add(item); - }); - } - return result; - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java new file mode 100644 index 00000000..680758df --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java @@ -0,0 +1,163 @@ +package org.nl.modules.logging.service.impl; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.db.PageResult; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.Terms; +import org.apache.lucene.queryparser.classic.QueryParser; +import org.apache.lucene.search.*; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.util.BytesRef; +import org.nl.common.lucene.LogMessageConstant; +import org.nl.common.lucene.LuceneAppender; +import org.nl.modules.logging.service.LuceneLogService; +import org.nl.modules.logging.service.dto.LogQuery; +import org.nl.modules.logging.service.dto.LogRepositoryDTO; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.wltea.analyzer.lucene.IKAnalyzer; + +import java.nio.file.Paths; +import java.util.*; + +@Service +public class LuceneLogServiceImpl implements LuceneLogService { + + static String[] INFO_LEVEL = new String[]{"DEBUG","INFO","WARN","ERROR"}; + + @Value("${lucene.index.path}") + private String indexUrl; + + @Override + public void clearLogs(LogQuery query) { + + } + + @Override + public JSONArray getLabelsValues(String type) { + + JSONArray result = new JSONArray(); + for (String v : INFO_LEVEL) { + JSONObject item = new JSONObject(); + item.put("label", v); + item.put("value", v); + result.add(item); + } + return result; + } + + + @Override + public JSONObject query(LogQuery logQuery) { + JSONObject res = new JSONObject(); + PageResult page = new PageResult(); + page.setPage(logQuery.getPage()); + page.setPageSize(logQuery.getSize()); + try { + FSDirectory directory = FSDirectory.open(Paths.get(indexUrl)); + DirectoryReader open = DirectoryReader.open(directory); + IndexSearcher searcher = new IndexSearcher(open); + //标准分词器，会自动去掉空格啊，is a the等单词 + Analyzer analyzer = new IKAnalyzer(true); + + // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数： + // 每页条数 + int pageSize = logQuery.getSize(); + int pageNum = logQuery.getPage()-1; + // 当前页的起始条数 + // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序 + Sort sort = new Sort(new SortField("time", SortField.Type.LONG,true)); + + TopDocs docs = null; + BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); + //时间范围查询 + Date startDate = logQuery.getStartTime(); + Date endDate = logQuery.getEndTime(); + + Calendar calendar=Calendar.getInstance(); + calendar.set(1970, 0, 1); + if (startDate == null){ 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); + // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses + 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())){ + TermQuery termQuery = new TermQuery(new Term("logLevel", logQuery.getLogLevel())); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + if (ObjectUtil.isNotEmpty(logQuery.getSystem())) { + TermQuery termQuery = new TermQuery(new Term("system", logQuery.getSystem())); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + if (ObjectUtil.isNotEmpty(logQuery.getRequestMethod())) { + TermQuery termQuery = new TermQuery(new Term("requestMethod", logQuery.getRequestMethod())); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + + if (Boolean.TRUE.equals(logQuery.getIsRequest())) { + Term traceid = new Term("traceId"); + TermQuery termQuery = new TermQuery(traceid); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST_NOT); + } + if (ObjectUtil.isNotEmpty(logQuery.getMessage())){ + //查询解析器 + QueryParser queryParser = new QueryParser("message", analyzer); + Query query = queryParser.parse(logQuery.getMessage()); + booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); + } + List list = new ArrayList<>(); + + TopFieldCollector collector = TopFieldCollector.create(sort, 100000, 0); + searcher.search(booleanQueryBuilder.build(), collector); + TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize); + docs = searcher.search(booleanQueryBuilder.build(),1); + + ScoreDoc[] scoreDocs = topDocs.scoreDocs; + for (ScoreDoc scoreDoc : scoreDocs) { + Document doc = open.document(scoreDoc.doc); + LogRepositoryDTO dto = new LogRepositoryDTO(); + dto.setSystem(doc.get("system")); + dto.setTraceId(doc.get("traceId")); + dto.setLogger(doc.get("logger")); + dto.setLogLevel(doc.get("logLevel")); + dto.setMessage(doc.get("message")); + dto.setRequestIp(doc.get("requestIp")); + dto.setRequestMethod(doc.get("requestMethod")); + dto.setRequestTime(doc.get("requestTime")); + dto.setThread(doc.get("thread")); + list.add(dto); + } + open.close(); + directory.close(); + page.addAll(list); + page.setTotal(scoreDocs.length); + res.put("total",docs.totalHits.value); + }catch (Exception ex){ + ex.printStackTrace(); + } + res.put("page",page); + return res; + + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java index 296826a0..ec3536d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java @@ -1,7 +1,7 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stage") @Slf4j public class StageController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java index 7579e379..fe829d1e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java @@ -1,7 +1,7 @@ package org.nl.modules.logicflow.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java index 141c6fc8..ac9f1d66 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/config/ConfigBeanConfiguration.java @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @apiNote 配置文件转换Pojo类的 统一配置 类 + * * @author: liaojinlong * @date: 2020/6/10 19:04 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java index c499a654..71ba9cac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java @@ -7,8 +7,8 @@ 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,7 +41,7 @@ import java.util.Map; @RestController @RequestMapping("/mobile/auth") @RequiredArgsConstructor -@Api(tags = "手持：系统授权接口") + public class MobileAuthorizationController{ private final RedisUtils redisUtils; private final ISysUserService userService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java index 1721952d..e3a8cb96 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java @@ -1,7 +1,7 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/grid") @Slf4j public class GridController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java index 1f4ea168..16993d91 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java @@ -1,8 +1,8 @@ package org.nl.modules.system.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格字段管理") + @RequestMapping("/api/gridField") @Slf4j public class GridFieldController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java index f1a770fb..f4db869d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java @@ -1,7 +1,7 @@ package org.nl.modules.system.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/redis") @Slf4j public class RedisController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java index a89ccbde..2bbf23ec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisKeyDefineRespVO.java @@ -1,7 +1,7 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,26 +16,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/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java index 2428bb06..bc90db31 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/vo/RedisMonitorRespVO.java @@ -1,7 +1,7 @@ package org.nl.modules.system.service.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,33 +16,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/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java index b9e535ec..5c2c57a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/domain/LocalStorage.java @@ -17,7 +17,7 @@ package org.nl.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -39,26 +39,26 @@ public class LocalStorage extends BaseEntity implements Serializable { @Id @Column(name = "storage_id") - @ApiModelProperty(value = "ID", hidden = true) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ApiModelProperty(value = "真实文件名") + private String realName; - @ApiModelProperty(value = "文件名") + private String name; - @ApiModelProperty(value = "后缀") + private String suffix; - @ApiModelProperty(value = "路径") + private String path; - @ApiModelProperty(value = "类型") + private String type; - @ApiModelProperty(value = "大小") + private String size; public LocalStorage(String realName,String name, String suffix, String path, String type, String size) { @@ -73,4 +73,4 @@ public class LocalStorage extends BaseEntity implements Serializable { public void copy(LocalStorage source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index f845047b..88846401 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -17,8 +17,8 @@ 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.common.anno.Log; import org.nl.modules.common.exception.BadRequestException; @@ -43,7 +43,7 @@ import java.io.IOException; */ @RestController @RequiredArgsConstructor -@Api(tags = "工具：本地存储管理") + @RequestMapping("/api/localStorage") public class LocalStorageController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java index 2906e080..dd868e7b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java @@ -33,7 +33,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.spring.web.json.Json; + import java.util.*; import java.util.function.Function; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/workingGoods/controller/WorkingGoodController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/workingGoods/controller/WorkingGoodController.java index 40c48892..3fbc174e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/workingGoods/controller/WorkingGoodController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/workingGoods/controller/WorkingGoodController.java @@ -8,8 +8,8 @@ package org.nl.wms.analysis_manage.workingGoods.controller; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java index 255d57dc..c24bf8ce 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -33,7 +33,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "人员设备维护管理") + @RequestMapping("/api/personcorrdevice") @Slf4j public class PersoncorrdeviceController{ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java index 4f6159fc..550e3f71 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.lubricate.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.apache.commons.lang3.StringUtils; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备润滑单管理") + @RequestMapping("/api/devicelubricatemst") @Slf4j public class DevicelubricatemstController { @@ -32,12 +32,12 @@ public class DevicelubricatemstController { private final DevicelubricatemstService devicelubricatemstService; @GetMapping - @ApiOperation("润滑单维护查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK); } @RequestMapping("/byuser") - @ApiOperation("润滑单维护查询") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { String currentNickName = SecurityUtils.getCurrentNickName(); @@ -48,40 +48,40 @@ public class DevicelubricatemstController { } @GetMapping("/query") - @ApiOperation("润滑单审核查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricatemstService.query2(whereJson, page), HttpStatus.OK); } @GetMapping("query3") - @ApiOperation("润滑单实施填报查询") + public ResponseEntity query3(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricatemstService.query3(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备润滑单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicelubricatemstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @GetMapping("/findByCode") - @ApiOperation("查询") + public ResponseEntity findByCode(@RequestParam Map whereJson) { String code = (String) whereJson.get("id"); return new ResponseEntity<>(devicelubricatemstService.findByCode(code), HttpStatus.OK); } @PutMapping - @ApiOperation("修改设备润滑单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicelubricatemstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备润滑单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicelubricatemstService.deleteAll(ids); @@ -89,41 +89,41 @@ public class DevicelubricatemstController { } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(TableDataInfo.build(devicelubricatemstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") - @ApiOperation("提交") + public ResponseEntity putIn(@RequestBody JSONObject whereJson) { devicelubricatemstService.putIn(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/startMaintain") - @ApiOperation("开始润滑") + public ResponseEntity startMaintain(@RequestBody JSONObject whereJson) { devicelubricatemstService.startMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/endMaintain") - @ApiOperation("结束润滑") + public ResponseEntity endMaintain(@RequestBody JSONObject whereJson) { devicelubricatemstService.endMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/auditMaintain") - @ApiOperation("审核") + public ResponseEntity auditMaintain(@RequestBody JSONObject whereJson) { devicelubricatemstService.auditMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/submitMain") - @ApiOperation("保存") + public ResponseEntity submitMain(@RequestBody JSONObject whereJson) { devicelubricatemstService.submitMain(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricateplanmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricateplanmstController.java index b10bc047..97d6df58 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricateplanmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricateplanmstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.lubricate.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.common.anno.Log; @@ -25,7 +25,6 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备润滑计划维护管理") @RequestMapping("/api/crudDevicelubricateplanmst") @Slf4j public class DevicelubricateplanmstController { @@ -33,38 +32,38 @@ public class DevicelubricateplanmstController { private final DevicelubricateplanmstService devicelubricateplanmstService; @GetMapping - @ApiOperation("查询设备润滑计划维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricateplanmstService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/queryDevice") - @ApiOperation("查询设备档案") + public ResponseEntity queryDevice(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricateplanmstService.queryDevice(whereJson, page), HttpStatus.OK); } @GetMapping("/queryDevice2") - @ApiOperation("查询设备档案2") + public ResponseEntity queryDevice2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricateplanmstService.queryDevice2(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备润滑计划维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicelubricateplanmstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备润滑计划维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicelubricateplanmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备润滑计划维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicelubricateplanmstService.deleteAll(ids); @@ -72,20 +71,20 @@ public class DevicelubricateplanmstController { } @PostMapping("/getDtl") - @ApiOperation("获取润滑明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(devicelubricateplanmstService.getDtl(whereJson),HttpStatus.OK); } @PutMapping("/changeActive") - @ApiOperation("修改启用状态") + public ResponseEntity changeActive(@RequestBody JSONObject json) { devicelubricateplanmstService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/copyAdd") - @ApiOperation("复制新增") + public ResponseEntity copyAdd(@RequestBody JSONObject whereJson) { devicelubricateplanmstService.copyAdd(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceLubriCateController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceLubriCateController.java index 4ad46588..1bd2bb5b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceLubriCateController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceLubriCateController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.pda.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.wms.device_manage.pda.service.PdaDeviceLubriCateService; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持润滑单管理") + @RequestMapping("/api/pda/device/lubricate") @Slf4j public class PdaDeviceLubriCateController { @@ -29,25 +29,25 @@ public class PdaDeviceLubriCateController { private final PdaDeviceLubriCateService pdaDeviceLubriCateService; @PostMapping("/getAllQuery") - @ApiOperation("设备润滑页面查询") + public ResponseEntity getAllQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceLubriCateService.getAllQuery(whereJson), HttpStatus.OK); } @PostMapping("/begin") - @ApiOperation("开始润滑") + public ResponseEntity begin(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceLubriCateService.begin(whereJson), HttpStatus.OK); } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceLubriCateService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") - @ApiOperation("结束润滑确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceLubriCateService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceManageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceManageController.java index 226afcce..6f292b89 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceManageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceManageController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.pda.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.wms.device_manage.pda.service.PdaDeviceManageService; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持设备管理") + @RequestMapping("/api/pda/device/manage") @Slf4j public class PdaDeviceManageController { @@ -29,19 +29,19 @@ public class PdaDeviceManageController { private final PdaDeviceManageService pdaDeviceManageService; @PostMapping("/getAllQuery") - @ApiOperation("设备作业页面查询") + public ResponseEntity getAllQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceManageService.getAllQuery(whereJson), HttpStatus.OK); } @PostMapping("/getDtl") - @ApiOperation("设备作业明细页面查询") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceManageService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") - @ApiOperation("审核") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceManageService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceRepairController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceRepairController.java index d134500a..8628b1d1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceRepairController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceRepairController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.pda.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.wms.device_manage.pda.service.PdaDeviceRepairService; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持维修单管理") + @RequestMapping("/api/pda/device/repair") @Slf4j public class PdaDeviceRepairController { @@ -29,25 +29,25 @@ public class PdaDeviceRepairController { private final PdaDeviceRepairService pdaDeviceRepairService; @PostMapping("/getAllQuery") - @ApiOperation("设备维修页面查询") + public ResponseEntity getAllQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceRepairService.getAllQuery(whereJson), HttpStatus.OK); } @PostMapping("/begin") - @ApiOperation("开始维修") + public ResponseEntity begin(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceRepairService.begin(whereJson), HttpStatus.OK); } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceRepairService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") - @ApiOperation("结束维修确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceRepairService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceSportCheckController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceSportCheckController.java index 853e8696..ed35434d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceSportCheckController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceSportCheckController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.pda.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.wms.device_manage.pda.service.PdaDeviceSportCheckService; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持点检单管理") + @RequestMapping("/api/pda/device/sportcheck") @Slf4j public class PdaDeviceSportCheckController { @@ -29,25 +29,25 @@ public class PdaDeviceSportCheckController { private final PdaDeviceSportCheckService pdaDeviceSportCheckService; @PostMapping("/getAllQuery") - @ApiOperation("设备点检页面查询") + public ResponseEntity getAllQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceSportCheckService.getAllQuery(whereJson), HttpStatus.OK); } @PostMapping("/begin") - @ApiOperation("开始点检") + public ResponseEntity begin(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceSportCheckService.begin(whereJson), HttpStatus.OK); } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceSportCheckService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") - @ApiOperation("结束点检确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceSportCheckService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceUpkeepController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceUpkeepController.java index 6f9d0c8f..d6fd66bd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceUpkeepController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/pda/rest/PdaDeviceUpkeepController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.pda.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.wms.device_manage.pda.service.PdaDeviceUpkeepService; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持保养单管理") + @RequestMapping("/api/pda/device/upkeep") @Slf4j public class PdaDeviceUpkeepController { @@ -29,25 +29,25 @@ public class PdaDeviceUpkeepController { private final PdaDeviceUpkeepService pdaDeviceUpkeepService; @PostMapping("/getAllQuery") - @ApiOperation("设备保养页面查询") + public ResponseEntity getAllQuery(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceUpkeepService.getAllQuery(whereJson), HttpStatus.OK); } @PostMapping("/begin") - @ApiOperation("开始保养") + public ResponseEntity begin(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceUpkeepService.begin(whereJson), HttpStatus.OK); } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceUpkeepService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") - @ApiOperation("结束保养确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaDeviceUpkeepService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java index cb2cf363..1364cb37 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java @@ -3,7 +3,7 @@ package org.nl.wms.device_manage.repair.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -28,7 +28,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "维修单维护管理") + @RequestMapping("/api/devicerepairmst") @Slf4j public class DevicerepairmstController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairplanmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairplanmstController.java index 7acc3d11..abc2fb55 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairplanmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairplanmstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.repair.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.common.anno.Log; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "维修计划维护管理") + @RequestMapping("/api/devicerepairplanmst") @Slf4j public class DevicerepairplanmstController { @@ -33,14 +33,14 @@ public class DevicerepairplanmstController { private final DevicerepairplanmstService devicerepairplanmstService; @GetMapping - @ApiOperation("查询维修计划维护") + //@PreAuthorize("@el.check('devicerepairplanmst:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairplanmstService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增维修计划维护") + //@PreAuthorize("@el.check('devicerepairplanmst:add')") public ResponseEntity create(@RequestBody JSONObject whereJson) { devicerepairplanmstService.create(whereJson); @@ -48,14 +48,14 @@ public class DevicerepairplanmstController { } @PutMapping - @ApiOperation("修改维修计划维护") + //@PreAuthorize("@el.check('devicerepairplanmst:edit')") public ResponseEntity update(@RequestBody JSONObject whereJson) { devicerepairplanmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除维修计划维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicerepairplanmstService.deleteAll(ids); @@ -63,20 +63,20 @@ public class DevicerepairplanmstController { } @PutMapping("/changeActive") - @ApiOperation("修改启用状态") + public ResponseEntity changeActive(@RequestBody JSONObject json) { devicerepairplanmstService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject json) { return new ResponseEntity<>(devicerepairplanmstService.getDtl(json),HttpStatus.OK); } @PostMapping("/copyAdd") - @ApiOperation("复制新增") + public ResponseEntity copyAdd(@RequestBody JSONObject whereJson) { devicerepairplanmstService.copyAdd(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java index b85a1571..203e0196 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairrequestController.java @@ -4,8 +4,8 @@ package org.nl.wms.device_manage.repair.rest; import cn.hutool.core.util.ObjectUtil; 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.utils.ImageCompress; @@ -33,7 +33,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备报修管理") + @RequestMapping("/api/devicerepairrequest") @Slf4j public class DevicerepairrequestController { @@ -43,20 +43,20 @@ public class DevicerepairrequestController { private final LocalStorageService localStorageService; @GetMapping - @ApiOperation("查询设备报修") + //@PreAuthorize("@el.check('devicerepairrequest:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairrequestService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/query2") - @ApiOperation("查询设备报修2") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairrequestService.query2(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备报修") + //@PreAuthorize("@el.check('devicerepairrequest:add')") public ResponseEntity create(@Validated @RequestBody DevicerepairrequestDto dto) { devicerepairrequestService.create(dto); @@ -64,14 +64,14 @@ public class DevicerepairrequestController { } @PutMapping - @ApiOperation("修改设备报修") + //@PreAuthorize("@el.check('devicerepairrequest:edit')") public ResponseEntity update(@Validated @RequestBody DevicerepairrequestDto dto) { devicerepairrequestService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备报修") + //@PreAuthorize("@el.check('devicerepairrequest:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -79,14 +79,14 @@ public class DevicerepairrequestController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("维修") + @PostMapping("/repair") public ResponseEntity repair(@RequestBody JSONObject whereJson) { devicerepairrequestService.repair(whereJson); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("不维修") + @PostMapping("/notRepair") public ResponseEntity notRepair(@RequestBody JSONObject whereJson) { devicerepairrequestService.notRepair(whereJson); @@ -94,13 +94,13 @@ public class DevicerepairrequestController { } @GetMapping("/localStorage") - @ApiOperation("查看图片") + public ResponseEntity localStorage(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairrequestService.localStorage(whereJson, page), HttpStatus.OK); } @PostMapping({"/pictures/{request_id}"}) - @ApiOperation("故障图上传") + public ResponseEntity upload(@RequestParam MultipartFile file, @PathVariable String request_id) { LocalStorage localStorage = this.localStorageService.create((String) null, file); Long compressSize = ImageCompress.imgCompress(localStorage.getPath(), 100L, 0.8); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java index 74118b35..24c34bc3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.sportcheck.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.apache.commons.lang3.StringUtils; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备点检单管理") + @RequestMapping("/api/devicesportcheckmst") @Slf4j public class DevicesportcheckmstController { @@ -32,13 +32,13 @@ public class DevicesportcheckmstController { private final DevicesportcheckmstService devicesportcheckmstService; @GetMapping - @ApiOperation("点检单维护查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK); } @RequestMapping("/byuser") - @ApiOperation("查询人员点检单") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { String currentNickName = SecurityUtils.getCurrentNickName(); @@ -49,40 +49,40 @@ public class DevicesportcheckmstController { } @GetMapping("/query") - @ApiOperation("点检单审核查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckmstService.query2(whereJson, page), HttpStatus.OK); } @GetMapping("query3") - @ApiOperation("点检单实施填报查询") + public ResponseEntity query3(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckmstService.query3(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备点检单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicesportcheckmstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @GetMapping("/findByCode") - @ApiOperation("查询") + public ResponseEntity findByCode(@RequestParam Map whereJson) { String code = (String) whereJson.get("id"); return new ResponseEntity<>(devicesportcheckmstService.findByCode(code), HttpStatus.OK); } @PutMapping - @ApiOperation("修改设备点检单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicesportcheckmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备点检单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicesportcheckmstService.deleteAll(ids); @@ -90,41 +90,41 @@ public class DevicesportcheckmstController { } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(TableDataInfo.build(devicesportcheckmstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") - @ApiOperation("提交") + public ResponseEntity putIn(@RequestBody JSONObject whereJson) { devicesportcheckmstService.putIn(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/startMaintain") - @ApiOperation("开始点检") + public ResponseEntity startMaintain(@RequestBody JSONObject whereJson) { devicesportcheckmstService.startMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/endMaintain") - @ApiOperation("结束点检") + public ResponseEntity endMaintain(@RequestBody JSONObject whereJson) { devicesportcheckmstService.endMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/auditMaintain") - @ApiOperation("审核") + public ResponseEntity auditMaintain(@RequestBody JSONObject whereJson) { devicesportcheckmstService.auditMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/submitMain") - @ApiOperation("保存") + public ResponseEntity submitMain(@RequestBody JSONObject whereJson) { devicesportcheckmstService.submitMain(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckplanmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckplanmstController.java index ac8be62b..d3d87070 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckplanmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckplanmstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.sportcheck.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.common.anno.Log; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备点检计划维护管理") + @RequestMapping("/api/devicesportcheckplanmst") @Slf4j public class DevicesportcheckplanmstController { @@ -33,38 +33,38 @@ public class DevicesportcheckplanmstController { private final DevicesportcheckplanmstService devicesportcheckplanmstService; @GetMapping - @ApiOperation("查询设备点检计划维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckplanmstService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/queryDevice") - @ApiOperation("查询设备档案") + public ResponseEntity queryDevice(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckplanmstService.queryDevice(whereJson, page), HttpStatus.OK); } @GetMapping("/queryDevice2") - @ApiOperation("查询设备档案2") + public ResponseEntity queryDevice2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicesportcheckplanmstService.queryDevice2(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备点检计划维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicesportcheckplanmstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备点检计划维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicesportcheckplanmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备点检计划维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicesportcheckplanmstService.deleteAll(ids); @@ -72,20 +72,20 @@ public class DevicesportcheckplanmstController { } @PostMapping("/getDtl") - @ApiOperation("获取点检明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(devicesportcheckplanmstService.getDtl(whereJson),HttpStatus.OK); } @PutMapping("/changeActive") - @ApiOperation("修改启用状态") + public ResponseEntity changeActive(@RequestBody JSONObject json) { devicesportcheckplanmstService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/copyAdd") - @ApiOperation("复制新增") + public ResponseEntity copyAdd(@RequestBody JSONObject whereJson) { devicesportcheckplanmstService.copyAdd(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicePairQueryController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicePairQueryController.java index eb7e4aef..c9762a64 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicePairQueryController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicePairQueryController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.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.wms.device_manage.stat.service.DevicePairQueryService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "维修记录") + @RequestMapping("/api/devicerepairquery") @Slf4j public class DevicePairQueryController { @@ -31,25 +31,25 @@ public class DevicePairQueryController { private final DevicePairQueryService devicePairQueryService; @GetMapping - @ApiOperation("维修记录查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicePairQueryService.queryAll(whereJson, page), HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { devicePairQueryService.download(whereJson, response); } @PostMapping("/getDeviceInfo") - @ApiOperation("获取数据") + public ResponseEntity getDeviceInfo(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(devicePairQueryService.getDeviceInfo(whereJson), HttpStatus.OK); } @PostMapping("/getIosMst") - @ApiOperation("获取备件出库单信息") + public ResponseEntity getIosMst(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(devicePairQueryService.getIosMst(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicefaultcaeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicefaultcaeController.java index 10e0647d..bb4958f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicefaultcaeController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/rest/DevicefaultcaeController.java @@ -2,8 +2,8 @@ package org.nl.wms.device_manage.stat.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.wms.device_manage.stat.service.DevicefaultcaeService; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备故障分析") + @RequestMapping("/api/devicefaultcae") @Slf4j public class DevicefaultcaeController { @@ -32,24 +32,24 @@ public class DevicefaultcaeController { private final DevicefaultcaeService devicefaultcaeService; @GetMapping - @ApiOperation("设备故障分析查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicefaultcaeService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/dtlQuery") - @ApiOperation("明细查询") + public ResponseEntity dtlQuery(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicefaultcaeService.dtlQuery(whereJson, page), HttpStatus.OK); } @PostMapping("/getFaultList") - @ApiOperation("获取故障下拉框") + public ResponseEntity getFaultList() { return new ResponseEntity<>(devicefaultcaeService.getFaultList(),HttpStatus.CREATED); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { devicefaultcaeService.download(whereJson, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java index 1f0e4626..0e627b97 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.upkeep.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.apache.commons.lang3.StringUtils; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备保养单管理") + @RequestMapping("/api/devicemaintenancemst") @Slf4j public class DevicemaintenancemstController { @@ -33,12 +33,12 @@ public class DevicemaintenancemstController { private final DevicemaintenancemstService devicemaintenancemstService; @GetMapping - @ApiOperation("保养单维护查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); } @RequestMapping("/byuser") - @ApiOperation("保养单维护查询") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { String currentNickName = SecurityUtils.getCurrentNickName(); @@ -49,40 +49,40 @@ public class DevicemaintenancemstController { } @GetMapping("/query") - @ApiOperation("保养单审核查询") + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.query2(whereJson, page), HttpStatus.OK); } @GetMapping("query3") - @ApiOperation("保养单实施填报查询") + public ResponseEntity query3(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备保养单") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicemaintenancemstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @GetMapping("/findByCode") - @ApiOperation("查询") + public ResponseEntity findByCode(@RequestParam Map whereJson) { String code = (String) whereJson.get("id"); return new ResponseEntity<>(devicemaintenancemstService.findByCode(code), HttpStatus.OK); } @PutMapping - @ApiOperation("修改设备保养单") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicemaintenancemstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备保养单") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicemaintenancemstService.deleteAll(ids); @@ -90,41 +90,41 @@ public class DevicemaintenancemstController { } @PostMapping("/getDtl") - @ApiOperation("获取明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(TableDataInfo.build(devicemaintenancemstService.getDtl(whereJson)),HttpStatus.OK); } @PostMapping("/putIn") - @ApiOperation("提交") + public ResponseEntity putIn(@RequestBody JSONObject whereJson) { devicemaintenancemstService.putIn(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/startMaintain") - @ApiOperation("开始保养") + public ResponseEntity startMaintain(@RequestBody JSONObject whereJson) { devicemaintenancemstService.startMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/endMaintain") - @ApiOperation("结束保养") + public ResponseEntity endMaintain(@RequestBody JSONObject whereJson) { devicemaintenancemstService.endMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/auditMaintain") - @ApiOperation("审核") + public ResponseEntity auditMaintain(@RequestBody JSONObject whereJson) { devicemaintenancemstService.auditMaintain(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/submitMain") - @ApiOperation("保存") + public ResponseEntity submitMain(@RequestBody JSONObject whereJson) { devicemaintenancemstService.submitMain(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java index 6d8ddfb3..97c0bfc9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenanceplanmstController.java @@ -3,8 +3,8 @@ package org.nl.wms.device_manage.upkeep.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.common.anno.Log; @@ -27,7 +27,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备保养计划维护管理") + @RequestMapping("/api/devicemaintenanceplanmst") @Slf4j public class DevicemaintenanceplanmstController { @@ -35,19 +35,19 @@ public class DevicemaintenanceplanmstController { private final DevicemaintenanceplanmstService devicemaintenanceplanmstService; @GetMapping - @ApiOperation("查询设备保养计划维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenanceplanmstService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/queryDevice") - @ApiOperation("查询设备档案") + public ResponseEntity queryDevice(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK); } @PostMapping("/queryDevice3") - @ApiOperation("查询设备档案2") + public ResponseEntity queryDevice3(@RequestBody JSONObject whereJson) { PageRequest pageRequest =PageRequest.of(whereJson.getInteger("page")-1, whereJson.getInteger("size")); Map stringObjectMap = devicemaintenanceplanmstService.queryDevice2(whereJson, pageRequest); @@ -55,26 +55,26 @@ public class DevicemaintenanceplanmstController { } @GetMapping("/queryDevice2") - @ApiOperation("查询设备档案2") + public ResponseEntity queryDevice2(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice2(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备保养计划维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicemaintenanceplanmstService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备保养计划维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicemaintenanceplanmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备保养计划维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicemaintenanceplanmstService.deleteAll(ids); @@ -82,20 +82,20 @@ public class DevicemaintenanceplanmstController { } @PostMapping("/getDtl") - @ApiOperation("获取保养明细") + public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(devicemaintenanceplanmstService.getDtl(whereJson),HttpStatus.OK); } @PutMapping("/changeActive") - @ApiOperation("修改启用状态") + public ResponseEntity changeActive(@RequestBody JSONObject json) { devicemaintenanceplanmstService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/copyAdd") - @ApiOperation("复制新增") + public ResponseEntity copyAdd(@RequestBody JSONObject whereJson) { devicemaintenanceplanmstService.copyAdd(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java index a4132620..cd2948b4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java @@ -4,7 +4,7 @@ package org.nl.wms.ext_manage.acs.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import org.apache.commons.lang3.StringUtils; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -25,7 +25,7 @@ import java.util.Map; * @date 2021-07-21 **/ @RestController -@Api(tags = "acs接收wms") + @RequestMapping("/api/acsToWms/task") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java index 83adb066..5b26550a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java @@ -4,8 +4,8 @@ package org.nl.wms.ext_manage.acs.rest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms发送acs") + @RequestMapping("/api/wmsToAcs/task") @Slf4j public class WmsToAcsController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index f2cde79f..1fb36884 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -294,6 +294,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ Map item = (Map)param.get(deviceCode); Object qty = item.get("qty"); Object weight = item.get("weight"); + Object nok_qty = item.get("nok_qty"); UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.set("deviceinstor_qty",qty); if (weight!=null){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java index 55c089cd..29520028 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java @@ -8,10 +8,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; +//import org.apache.http.HttpResponse; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.AcsUtil; -import org.nl.common.utils.AsyncHttpRequest; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; import org.nl.modules.wql.util.SpringContextHolder; @@ -189,7 +188,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ return; } String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); - Future execute = AsyncHttpRequest.post(acsUrl + api, arr.toString()).execute(null); +// Future execute = AsyncHttpRequest.post(acsUrl + api, arr.toString()).execute(null); log.info("异步下发ACS参数----------------------------------------+"+acsUrl+",---"+arr.toString()); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java index 90a4e361..80bd3abb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java @@ -1,8 +1,8 @@ package org.nl.wms.ext_manage.bigScreen.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.wms.ext_manage.bigScreen.service.AgvBigScreenService; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; **/ @RestController @RequiredArgsConstructor -@Api(tags = "AGV监控中心") + @RequestMapping("/api/agvBigScreen") @Slf4j @CrossOrigin diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java index c91fd276..01c9a2b8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java @@ -2,8 +2,8 @@ package org.nl.wms.ext_manage.bigScreen.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.wms.ext_manage.bigScreen.service.BigScreenService; @@ -20,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "监控大屏") + @RequestMapping("/api/bigScreenScreen") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java index f6b966f1..44c6e6a0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java @@ -3,8 +3,8 @@ package org.nl.wms.ext_manage.bigScreen.rest; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "大屏生产监控中心") + @RequestMapping("/api/bigscreen/product") @SaIgnore @Slf4j diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java index a3872d69..ed13cf06 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java @@ -1,8 +1,8 @@ package org.nl.wms.ext_manage.bigScreen.test.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; */ @RestController @RequiredArgsConstructor -@Api(tags = "虚拟大屏") + @RequestMapping("/api/bigTest") @Slf4j @CrossOrigin diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java index 377f2c65..aea2df25 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java @@ -4,8 +4,8 @@ package org.nl.wms.ext_manage.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.common.anno.Log; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @RequiredArgsConstructor -@Api(tags = "wms发送sap") + @RequestMapping("/api/sap/") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java index 8a1fff73..083b4810 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java @@ -4,8 +4,8 @@ package org.nl.wms.masterdata_manage.bfmaster.rest; import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -31,7 +31,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "物料管理") + @RequestMapping("/api/Materialbase") @Slf4j public class MaterialbaseController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SemirealrawmaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SemirealrawmaterialController.java index d75e646e..73d5cddb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SemirealrawmaterialController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SemirealrawmaterialController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.bfmaster.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -28,7 +28,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "半成品对应原材料管理") + @RequestMapping("/api/semirealrawmaterial") @Slf4j public class SemirealrawmaterialController { @@ -72,7 +72,7 @@ public class SemirealrawmaterialController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { semirealrawmaterialService.excelImport(file, request, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SupplierbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SupplierbaseController.java index a595a58c..f189942d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SupplierbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/SupplierbaseController.java @@ -2,8 +2,8 @@ package org.nl.wms.masterdata_manage.bfmaster.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "供应商管理") + @RequestMapping("/api/supplierbase") @Slf4j public class SupplierbaseController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java index bf731bdf..e36807e9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiLubriDeviceController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "润滑人与设备档案维护") + @RequestMapping("/api/embilubridevice") @Slf4j public class EmBiLubriDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java index 640b95df..565150c2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiRepairDeviceController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "维修人与设备档案维护") + @RequestMapping("/api/embirepairdevice") @Slf4j public class EmBiRepairDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java index 768bb4a5..6f1180a6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiSportDeviceController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "点检人与设备档案维护") + @RequestMapping("/api/embisportdevice") @Slf4j public class EmBiSportDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java index 95a3b0b4..e8a71ee4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/em/EmBiUpkeepDeviceController.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "保养人与设备档案维护") + @RequestMapping("/api/embiupkeepdevice") @Slf4j public class EmBiUpkeepDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/material/MdMeMaterialbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/material/MdMeMaterialbaseController.java index fca43788..938cd30c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/material/MdMeMaterialbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/material/MdMeMaterialbaseController.java @@ -1,6 +1,6 @@ package org.nl.wms.masterdata_manage.controller.material; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.utils.RedissonUtils; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -32,7 +32,7 @@ public class MdMeMaterialbaseController{ @PostMapping("/excelImport") @Log("物料基础信息导入") - @ApiOperation("物料基础信息导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java index c5c3425f..e31ed9c4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java @@ -2,7 +2,7 @@ package org.nl.wms.masterdata_manage.controller.vehicle; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java index 57cd0aa8..913c0c28 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java @@ -2,7 +2,7 @@ package org.nl.wms.masterdata_manage.controller.vehicle; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceLubricateitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceLubricateitemsController.java index cf420d85..c1417235 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceLubricateitemsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceLubricateitemsController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.em.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.common.anno.Log; @@ -26,7 +26,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备润滑项目维护管理") + @RequestMapping("/api/devicelubricateitems") @Slf4j public class DeviceLubricateitemsController { @@ -34,26 +34,26 @@ public class DeviceLubricateitemsController { private final DeviceLubricateitemsService deviceLubricateitemsService; @GetMapping - @ApiOperation("查询设备润滑项目维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceLubricateitemsService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备润滑项目维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { deviceLubricateitemsService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备润滑项目维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { deviceLubricateitemsService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备润滑项目维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { deviceLubricateitemsService.deleteAll(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceSportCheckitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceSportCheckitemsController.java index 27b3e36b..c65f3253 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceSportCheckitemsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DeviceSportCheckitemsController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.em.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.common.anno.Log; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备点检项目维护管理") + @RequestMapping("/api/devicesportcheckitems") @Slf4j public class DeviceSportCheckitemsController { @@ -33,26 +33,26 @@ public class DeviceSportCheckitemsController { private final DeviceSportCheckitemsService deviceSportCheckitemsService; @GetMapping - @ApiOperation("查询设备点检项目维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(deviceSportCheckitemsService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备点检项目维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { deviceSportCheckitemsService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备点检项目维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { deviceSportCheckitemsService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备点检项目维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { deviceSportCheckitemsService.deleteAll(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java index d2f26cee..05259917 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.em.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.common.utils.MapOf; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备故障分类维护管理") + @RequestMapping("/api/devicefaultclass") @Slf4j public class DevicefaultclassController { @@ -32,7 +32,7 @@ public class DevicefaultclassController { private final DevicefaultclassService devicefaultclassService; @GetMapping - @ApiOperation("查询设备故障分类维护") + //@PreAuthorize("@el.check('devicefaultclass:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicefaultclassService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +40,7 @@ public class DevicefaultclassController { @PostMapping("/dtl3") - @ApiOperation("查询设备故障分类维护") + //@PreAuthorize("@el.check('devicefaultclass:list')") public ResponseEntity querydtl3(@RequestParam Map whereJson, Pageable page) { Map stringObjectMap = devicefaultclassService.queryAll(whereJson, page); @@ -48,7 +48,7 @@ public class DevicefaultclassController { } @PostMapping - @ApiOperation("新增设备故障分类维护") + //@PreAuthorize("@el.check('devicefaultclass:add')") public ResponseEntity create(@RequestBody JSONObject whereJson) { devicefaultclassService.create(whereJson); @@ -56,13 +56,13 @@ public class DevicefaultclassController { } @PutMapping - @ApiOperation("修改设备故障分类维护") + //@PreAuthorize("@el.check('devicefaultclass:edit')") public ResponseEntity update(@RequestBody JSONObject whereJson) { devicefaultclassService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备故障分类维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicefaultclassService.deleteAll(ids); @@ -70,7 +70,7 @@ public class DevicefaultclassController { } @PostMapping("/excelImport") - @ApiOperation("故障分类导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { devicefaultclassService.excelImport(file,request); return new ResponseEntity<>(HttpStatus.CREATED); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java index a277ad3c..94916414 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicemaintenanceitemsController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.em.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.common.anno.Log; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备保养项目维护管理") + @RequestMapping("/api/devicemaintenanceitems") @Slf4j public class DevicemaintenanceitemsController { @@ -33,26 +33,26 @@ public class DevicemaintenanceitemsController { private final DevicemaintenanceitemsService devicemaintenanceitemsService; @GetMapping - @ApiOperation("查询设备保养项目维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenanceitemsService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备保养项目维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicemaintenanceitemsService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备保养项目维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicemaintenanceitemsService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备保养项目维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicemaintenanceitemsService.deleteAll(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java index 4041c833..eb7decfc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicerepairitemsController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.em.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.common.anno.Log; @@ -25,7 +25,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "设备维修项目维护管理") + @RequestMapping("/api/devicerepairitems") @Slf4j public class DevicerepairitemsController { @@ -33,26 +33,26 @@ public class DevicerepairitemsController { private final DevicerepairitemsService devicerepairitemsService; @GetMapping - @ApiOperation("查询设备维修项目维护") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairitemsService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping - @ApiOperation("新增设备维修项目维护") + public ResponseEntity create(@RequestBody JSONObject whereJson) { devicerepairitemsService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备维修项目维护") + public ResponseEntity update(@RequestBody JSONObject whereJson) { devicerepairitemsService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备维修项目维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicerepairitemsService.deleteAll(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/EquipmentfileController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/EquipmentfileController.java index ec52bedd..f2bb77c6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/EquipmentfileController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/EquipmentfileController.java @@ -4,8 +4,8 @@ package org.nl.wms.masterdata_manage.em.rest; import cn.hutool.core.util.ObjectUtil; 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.anno.Log; @@ -29,7 +29,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "设备档案管理") + @RequestMapping("/api/equipmentfile") @Slf4j public class EquipmentfileController { @@ -37,39 +37,39 @@ public class EquipmentfileController { private final EquipmentfileService equipmentfileService; private final LocalStorageService localStorageService; @GetMapping - @ApiOperation("查询设备") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(equipmentfileService.queryAll(whereJson,page),HttpStatus.OK); } - @ApiOperation("导出月计划模板") + @GetMapping(value = "/download") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { equipmentfileService.download(equipmentfileService.query(whereJson), response); } @PostMapping - @ApiOperation("新增设备档案") + public ResponseEntity create(@RequestBody JSONObject json){ equipmentfileService.create(json); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping - @ApiOperation("修改设备档案") + public ResponseEntity update(@RequestBody JSONObject whereJson){ equipmentfileService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备档案") + @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { equipmentfileService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("提交") + @PostMapping("/submit") public ResponseEntity submit(@RequestBody JSONObject whereJson) { equipmentfileService.submit(whereJson); @@ -77,54 +77,54 @@ public class EquipmentfileController { } @GetMapping("/queryivt1") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt1(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll1(whereJson),HttpStatus.OK); } @GetMapping("/queryivt2") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt2(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll2(whereJson),HttpStatus.OK); } @GetMapping("/queryivt3") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt3(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll3(whereJson),HttpStatus.OK); } @GetMapping("/queryivt4") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt4(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll4(whereJson),HttpStatus.OK); } @GetMapping("/queryivt5") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt5(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll5(whereJson),HttpStatus.OK); } @GetMapping("/queryivt6") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt6(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll6(whereJson),HttpStatus.OK); } @GetMapping("/queryivt7") - @ApiOperation("查询设备档案") + public ResponseEntity queryivt7(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryAll7(whereJson),HttpStatus.OK); } @GetMapping("/queryBomList") - @ApiOperation("查询设备档案") + public ResponseEntity queryBomList(@RequestParam Map whereJson){ return new ResponseEntity<>(equipmentfileService.queryBomList(whereJson),HttpStatus.OK); } @PostMapping({"/pictures/{inspection_id}"}) - @ApiOperation("质保书上传") + public ResponseEntity upload(@RequestParam MultipartFile file, @PathVariable String inspection_id) { LocalStorage localStorage = this.localStorageService.create((String) null, file); JSONObject mstObj = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + inspection_id + "'").uniqueResult(0); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java index 7d0043d2..5d9c208e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java @@ -6,8 +6,8 @@ import cn.dev33.satoken.annotation.SaIgnore; 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.apache.commons.lang3.StringUtils; @@ -36,7 +36,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "基础类别管理") + @RequestMapping("/api/Classstandard") @Slf4j @SaIgnore @@ -155,7 +155,7 @@ public class ClassstandardController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { MdPbClassstandardService.excelImport(file, request, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java index 9fe0e134..8a7a78a5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java @@ -4,8 +4,8 @@ package org.nl.wms.masterdata_manage.master.controller.customer; 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.common.TableDataInfo; @@ -33,7 +33,7 @@ import java.util.*; **/ @RestController @RequiredArgsConstructor -@Api(tags = "客户基础表管理") + @RequestMapping("/api/customerbase") @Slf4j public class MdCsCustomerbaseController { @@ -78,7 +78,7 @@ public class MdCsCustomerbaseController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { icustomerbaseService.excelImport(file, request, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java index 2753673e..c76bc9c2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java @@ -5,8 +5,8 @@ package org.nl.wms.masterdata_manage.master.controller.measureunit; 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 lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "计量单位管理") + @RequestMapping("/api/mdPbMeasureunit") @Slf4j public class MdPbMeasureunitController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/MdMeMaterialbase.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/MdMeMaterialbase.java index 8d0bb4f2..910b827e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/MdMeMaterialbase.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/MdMeMaterialbase.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -157,7 +157,7 @@ public class MdMeMaterialbase implements Serializable{ /** * 产品系列名称 */ - @ApiModelProperty(value = "/**产品系列名称*/") + private String product_series_name; /** * 每框数量 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java index 85f74d98..177e536c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; + import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java index 5f77f4ed..d6d9997b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.storage.controller.material; 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.anno.Log; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; **/ @RestController @RequiredArgsConstructor -@Api(tags = "安全库存管理") + @RequestMapping("/api/materialsafeivt") @Slf4j public class MaterialsafeivtController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java index 7bcbb210..d69f5643 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java @@ -3,8 +3,8 @@ package org.nl.wms.masterdata_manage.storage.controller.material; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -24,7 +24,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "物料存放设置管理") + @RequestMapping("/api/structrelamaterial") @Slf4j public class StructrelamaterialController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java index 9a27e470..9b2e8ce0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java @@ -4,8 +4,8 @@ package org.nl.wms.masterdata_manage.storage.controller.storage; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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 +30,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "库区管理") + @RequestMapping("/api/sectattr") @Slf4j public class SectattrController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java index eff45d10..342a9597 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -32,7 +32,7 @@ import java.util.List; **/ @RestController @RequiredArgsConstructor -@Api(tags = "仓库管理") + @RequestMapping("/api/stIvtBsrealstorattr") @Slf4j public class StorattrController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java index b5ee3a16..9d5eefdd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java @@ -4,8 +4,8 @@ package org.nl.wms.masterdata_manage.storage.controller.storage; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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 +27,7 @@ import java.util.Arrays; **/ @RestController @RequiredArgsConstructor -@Api(tags = "仓位管理") + @RequestMapping("/api/structattr") @Slf4j public class StructattrController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java index a182ab2a..0ed42831 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java @@ -3,7 +3,7 @@ package org.nl.wms.masterdata_manage.storage.controller.vehicle; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "仓位载具关联管理") + @RequestMapping("/api/structrelavehicletype") @Slf4j public class StructrelavehicletypeController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java index dd09973e..8bda5e06 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiOperation; + import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/DeviceDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/DeviceDto.java index 05cd0026..ebb6209e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/DeviceDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/dto/DeviceDto.java @@ -1,6 +1,6 @@ package org.nl.wms.mps_manage.other.service.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; /** @@ -15,42 +15,42 @@ public class DeviceDto{ /** * 设备编码 */ - @ApiModelProperty(value = "/**设备编码*/") + private String deviceCode; /** * 设备名称 */ - @ApiModelProperty(value = "/**设备名称*/") + private String deviceName; /** * 设备名称 */ - @ApiModelProperty(value = "/**设备名称*/") + private String device_status_name; /** * 工单编号 */ - @ApiModelProperty(value = "/**工单编号*/") + private String workorderCode; /** * 工单数 */ - @ApiModelProperty(value = "/**工单数*/") + private String job_count; /** * 设备状态 */ - @ApiModelProperty(value = "/**设备状态*/") + private String device_status; /** * 设备图标路径 */ - @ApiModelProperty(value = "/**设备图标路径*/") + private String device_icon; /** * 运行状态 */ - @ApiModelProperty(value = "/**运行状态*/") + private String is_run; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java index 0485b54a..c3ce71e0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -38,7 +38,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "生产订单") + @Slf4j @SaIgnore @RequestMapping("/api/mpsSaleOrder") @@ -93,7 +93,7 @@ public class MpsSaleOrderController{ @PostMapping("/excelImport") @Log("制造订单导入") - @ApiOperation("制造订单导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { RedissonUtils.lock(() -> iMpsSaleOrderService.excelImport(file, request), "制造订单导入", null); return new ResponseEntity<>(HttpStatus.OK); @@ -101,7 +101,7 @@ public class MpsSaleOrderController{ @PostMapping("/importWorkOrderFinish") @Log("归集到APS已排产的工单") - @ApiOperation("归集到APS已排产的工单") + public ResponseEntity importWorkOrderFinish(@RequestParam("file") MultipartFile file, HttpServletRequest request) { RedissonUtils.lock(() -> iMpsSaleOrderService.importWorkOrderFinish(file, request), "归集到APS已排产的工单", null); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java index 8c4b2350..efffb209 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java @@ -1,7 +1,7 @@ package org.nl.wms.mps_manage.saleorder.service.dao; import com.baomidou.mybatisplus.annotation.*; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.poi.hpsf.Decimal; @@ -27,102 +27,102 @@ public class MpsSaleOrder implements Serializable{ * 销售单标识 */ @TableId() - @ApiModelProperty(value = "/**销售单标识*/") + private String sale_id; /** * 销售单号 */ - @ApiModelProperty(value = "/**销售单号*/") + private String sale_code; /** * 明细序号 */ - @ApiModelProperty(value = "/**明细序号*/") + private Integer seq_no; /** * 销售单类型 */ - @ApiModelProperty(value = "/**销售单类型*/") + private String sale_type; /** * 物料标识 */ - @ApiModelProperty(value = "/**物料标识*/") + private String material_id; /** * 状态 */ - @ApiModelProperty(value = "/**状态*/") + private String status; /** * 销售数量 */ - @ApiModelProperty(value = "/**销售数量*/") + private BigDecimal sale_qty; /** * 生产顺序 */ - @ApiModelProperty(value = "/**生产顺序*/") + private Integer produce_seq; /** * 客户标识 */ - @ApiModelProperty(value = "/**客户标识*/") + private String cust_id; /** * 客户编码 */ - @ApiModelProperty(value = "/**客户编码*/") + private String cust_code; /** * 客户名称 */ - @ApiModelProperty(value = "/**客户名称*/") + private String cust_name; /** * 计量单位标识 */ - @ApiModelProperty(value = "/**计量单位标识*/") + private String qty_unit_id; /** * 数量计量单位名称 */ - @ApiModelProperty(value = "/**数量计量单位名称*/") + private String qty_unit_name; /** * 计划交期 */ - @ApiModelProperty(value = "/**计划交期*/") + private String plandeliver_date; /** * 创建人 */ - @ApiModelProperty(value = "/**创建人*/") + private String create_id; /** * 创建人姓名 */ - @ApiModelProperty(value = "/**创建人姓名*/") + private String create_name; /** * 创建时间 */ - @ApiModelProperty(value = "/**创建时间*/") + private Date create_time; /** * 提交人 */ - @ApiModelProperty(value = "/**提交人*/") + private String audit_id; /** * 提交时间 */ - @ApiModelProperty(value = "/**提交时间*/") + private String audit_time; /** * 提交人姓名 */ - @ApiModelProperty(value = "/**提交人姓名*/") + private String audit_name; /** * 修改人 @@ -139,141 +139,141 @@ public class MpsSaleOrder implements Serializable{ /** * 确认人 */ - @ApiModelProperty(value = "/**确认人*/") + private String confirm_id; /** * 确认人姓名 */ - @ApiModelProperty(value = "/**确认人姓名*/") + private String confirm_name; /** * 确认时间 */ - @ApiModelProperty(value = "/**确认时间*/") + private String confirm_time; /** * 生成方式 */ - @ApiModelProperty(value = "/**生成方式*/") + private String create_mode; /** * 是否删除 */ - @ApiModelProperty(value = "/**是否删除*/") + private Integer is_delete; /** * 备注 */ - @ApiModelProperty(value = "/**备注*/") + private String remark; /** * 车间标识 */ - @ApiModelProperty(value = "/**车间标识*/") + private String product_area; /** * 生产数量 */ - @ApiModelProperty(value = "/**生产数量*/") + private BigDecimal product_qty; /** * 预入库数量 */ - @ApiModelProperty(value = "/**预入库数量*/") + private BigDecimal instor_qty; /** * 发货数量 */ - @ApiModelProperty(value = "/**发货数量*/") + private BigDecimal sendout_qty; /** * 物料编码 */ - @ApiModelProperty(value = "/**物料编码*/") + private String material_code; /** * 物料规格 */ - @ApiModelProperty(value = "/**物料规格*/") + private String material_spec; /** * 订单合同号 */ - @ApiModelProperty(value = "/**订单合同号*/") + private String contract_code; /** * aps最早开始时间（下料时间) */ - @ApiModelProperty(value = "/**aps最早开始时间（下料时间)*/") + private Date early_start_time; /** * aps订单号 */ - @ApiModelProperty(value = "/**aps订单号 */") + private String aps_sale_code; /** * aps订单状态 */ - @ApiModelProperty(value = "/**aps订单状态 */") + private String aps_status; /** * aps变更标识 */ - @ApiModelProperty(value = "/**aps变更标识*/") + private String aps_update_flag; /** * aps变更时间 */ - @ApiModelProperty(value = "/**aps变更时间*/") + private Date aps_update_time; /** * aps订单类型 */ - @ApiModelProperty(value = "/**aps订单类型*/") + private String aps_sale_type; /** * 单重 */ - @ApiModelProperty(value = "/**单重*/") + private BigDecimal rate_qty; /** * 原材料信息 */ - @ApiModelProperty(value = "/**原材料信息*/") + private String rawmaterial_name; /** * 原材料库存 */ - @ApiModelProperty(value = "/**原材料库存*/") + private BigDecimal canuse_qty; /** * 产品系列名称 */ - @ApiModelProperty(value = "/**产品系列名称*/") + private String product_series_name; /** * 后段计划交期 */ - @ApiModelProperty(value = "/**后段计划交期*/") + private String behind_plandeliver_date; /** * 后段提交标记 */ - @ApiModelProperty(value = "/**后段提交标记*/") + private String behind_submit_flag; /** * 需生产数量 */ - @ApiModelProperty(value = "/**需生产数量*/") + private BigDecimal need_product_qty; /** * 刻字数量 */ - @ApiModelProperty(value = "/**刻字数量*/") + private BigDecimal lettering_qty; /** * 刻字数量 */ - @ApiModelProperty(value = "/**入库数量*/") + private BigDecimal in_storage_qty; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java index 7800cb4d..5cbc89eb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java @@ -3,8 +3,8 @@ package org.nl.wms.pda_manage.pda.controller; 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.apache.commons.lang3.StringUtils; @@ -33,7 +33,7 @@ import java.util.regex.Pattern; */ @RestController @RequiredArgsConstructor -@Api(tags = "海亮缓存线手持服务") + @RequestMapping("/api/cacheLineHand") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java index fbba2c85..e2e07297 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java @@ -1,13 +1,13 @@ package org.nl.wms.pda_manage.pda.controller; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -27,6 +27,7 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivt import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -37,7 +38,7 @@ import java.util.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "成品手持服务") + @RequestMapping("/api/pda/finishproduct") @Slf4j @SaIgnore @@ -75,7 +76,7 @@ public class PdaProductIosController { @PostMapping("/releasepoint") @Log("发货确认") public ResponseEntity out(@RequestBody JSONObject param) { - Assert.notEmpty(new Object[]{param, param.getString("option")}, "操作类型不能为空"); + Assert.notNull(param.getString("option"), "操作类型不能为空"); if (param.getString("option").equals("one")){ Assert.notNull(param.getString("point"),"发货区点位不能为空"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java index 22b91ffc..e93d04b4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; @@ -53,7 +53,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; @RestController -@Api(tags = "成品手持服务") + @RequestMapping("/api/pda/wash") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java index b306c710..ba2be7e8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.api.R; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -56,7 +56,7 @@ import java.util.*; import java.util.stream.Collectors; @RestController -@Api(tags = "一体机刻字服务") + @RequestMapping("/api/pda") @Slf4j @SaIgnore @@ -113,6 +113,7 @@ public class TmpKZController { } //鞋料 + @Log("卸料") @PostMapping("kzunload") @SaIgnore public ResponseEntity kzunload(@RequestBody JSONObject param) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java index b9b9837d..0348e25c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.JSONArray; 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 lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -76,13 +76,14 @@ public class TmpPackageController { } @PostMapping("sendMaterial") + @Log("包装机手动叫料") @SaIgnore @Transactional public ResponseEntity callVechile(@RequestBody JSONObject param){ Assert.notNull(new Object[]{param.getString("device_code"),param.getString("point_code")},"请求参数不能为空"); List list = taskService.list(new QueryWrapper() .eq("point_code3", param.getString("device_code")) - .in("task_status", TaskStatusEnum.ISSUE.getCode(), TaskStatusEnum.EXECUTING.getCode())); + .in("task_status", TaskStatusEnum.ISSUE.getCode(),TaskStatusEnum.START_AND_POINT.getCode(), TaskStatusEnum.EXECUTING.getCode())); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException("当前设备"+param.getString("device_code")+"存在正在执行的任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); } @@ -95,22 +96,16 @@ public class TmpPackageController { } moveTask.put("task_status",StatusEnum.TASK_FINISH.getCode()); taskService.save(moveTask.toJavaObject(SchBaseTask.class)); - taskService.update(new UpdateWrapper() - .set("task_status", TaskStatusEnum.CANCEL.getCode()) - .set("update_id", SecurityUtils.getCurrentUserId()) - .set("update_name","手工叫料") - .set("update_time",new Date()) - .eq("point_code3", param.getString("device_code")) - .eq("task_status",TaskStatusEnum.SURE_START_ERROR.getCode())); - basePointService.update(new UpdateWrapper().set("lock_type",StatusEnum.LOCK_OFF.getCode()) + basePointService.update(new UpdateWrapper() + .set("lock_type",StatusEnum.LOCK_OFF.getCode()) .set("point_status",StatusEnum.POINT_STATUS_EMPTY.getCode()) .set("material_id","").set("qty",0) .set("task_id","") - .set("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode()) .eq("point_code",param.getString("point_code"))); return new ResponseEntity<>(MapOf.of("message","操作成功","status", HttpStatus.OK.value()),HttpStatus.OK); } + @PostMapping("cachepoint") @SaIgnore public ResponseEntity kzpoint(@RequestBody JSONObject param) { @@ -163,4 +158,33 @@ public class TmpPackageController { .eq("point_code",points.get(0).getPoint_code())); return new ResponseEntity<>(MapOf.of("message","操作成功","status", HttpStatus.OK.value()),HttpStatus.OK); } + + @PostMapping("sendVechile2") + @Log("包装机手动送空筐") + @SaIgnore + public ResponseEntity kzresidue2(@RequestBody JSONObject param){ + Assert.notNull(new Object[]{param.getString("device_code"),param.getString("point_code")},"请求参数不能为空"); + List list = taskService.list(new QueryWrapper() + .eq("point_code1", param.getString("device_code")) + .in("task_status", TaskStatusEnum.ISSUE.getCode(),TaskStatusEnum.START_AND_POINT.getCode(), TaskStatusEnum.EXECUTING.getCode())); + if (!CollectionUtils.isEmpty(list)){ + throw new BadRequestException("当前设备"+param.getString("device_code")+"存在正在执行的任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(","))); + } + JSONObject moveTask =taskService.createMoveTask(param.getString("device_code"),param.getString("point_code") , AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20); + JSONArray data = new JSONArray(); + data.add(moveTask); + Map result = wmsToAcsService.issueTaskToAcs2(data); + if (StrUtil.equals((String)result.get("status"), "400")) { + throw new BadRequestException((String)result.get("message")); + } + moveTask.put("task_status",StatusEnum.TASK_FINISH.getCode()); + taskService.save(moveTask.toJavaObject(SchBaseTask.class)); + basePointService.update(new UpdateWrapper() + .set("lock_type",StatusEnum.LOCK_OFF.getCode()) + .set("point_status",StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode()) + .set("material_id","").set("qty",0) + .set("task_id",moveTask.getString("task_id")) + .eq("point_code",param.getString("point_code"))); + return new ResponseEntity<>(MapOf.of("message","操作成功","status", HttpStatus.OK.value()),HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/BomController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/BomController.java index 483a6049..6544fe4d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/BomController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/BomController.java @@ -1,7 +1,7 @@ package org.nl.wms.product_manage.bfpdm.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "BOM单管理管理") + @RequestMapping("/api/bom") @Slf4j public class BomController{ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceController.java index c34a0bbc..3044cc9b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceController.java @@ -2,7 +2,7 @@ package org.nl.wms.product_manage.bfpdm.rest; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -21,7 +21,7 @@ import java.util.Map; * @date 2023-03-15 **/ @RequiredArgsConstructor -@Api(tags = "生产设备管理") + @Slf4j public class DeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceitemController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceitemController.java index 053c59de..b1e5b446 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceitemController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/DeviceitemController.java @@ -2,7 +2,7 @@ package org.nl.wms.product_manage.bfpdm.rest; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -22,7 +22,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "生产设备扩展项管理") + @RequestMapping("/api/deviceitem") @Slf4j public class DeviceitemController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/FactoryCalendarController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/FactoryCalendarController.java index 4ff9ef91..6fb700bb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/FactoryCalendarController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/bfpdm/rest/FactoryCalendarController.java @@ -3,7 +3,7 @@ package org.nl.wms.product_manage.bfpdm.rest; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "工厂日历管理") + @RequestMapping("/api/calendar") @Slf4j public class FactoryCalendarController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java index dc17e2c3..0f1c553e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * @date 2023-03-15 **/ @RestController -@Api(tags = "生产设备管理") + @RequestMapping("/api/device") @Slf4j public class PdmBiDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java index 8b84a56c..ebf6fc29 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * @date 2023-03-15 **/ @RestController -@Api(tags = "生产设备管理") + @RequestMapping("/api/specialDevice") @Slf4j public class SpecialDeviceController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java index 84d588a0..abd2cd70 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java @@ -3,8 +3,8 @@ package org.nl.wms.product_manage.controller.processroute; 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; @@ -24,7 +24,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "工艺路线管理") + @RequestMapping("/api/processroute") @Slf4j public class ProcessrouteController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/produceshiftorder/MpsBdProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/produceshiftorder/MpsBdProduceshiftorderController.java index 15788881..de4ae27a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/produceshiftorder/MpsBdProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/produceshiftorder/MpsBdProduceshiftorderController.java @@ -1,7 +1,7 @@ package org.nl.wms.product_manage.controller.produceshiftorder; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.nl.wms.product_manage.service.produceshiftorder.IMpsBdProduceshiftorderService; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-08-22 */ @RestController -@Api(tags = "工单") + @RequestMapping("api/mpsBdProduceshiftorder") @Slf4j public class MpsBdProduceshiftorderController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java index 8e0d72b7..08f467aa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java @@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -36,7 +36,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "产品工艺路线管理") + @RequestMapping("/api/productprocessroute") @Slf4j public class ProductprocessrouteController { @@ -50,7 +50,7 @@ public class ProductprocessrouteController { @GetMapping @Log("查询产品工艺路线") - @ApiOperation("查询产品工艺路线") + public ResponseEntity query(@RequestParam Map whereJson, Pageable pageQuery){ Page page = PageHelper.startPage(pageQuery.getPageNumber() + 1, pageQuery.getPageSize()); List list = ipdmBiProductprocessrouteService.queryAll(whereJson); @@ -61,7 +61,7 @@ public class ProductprocessrouteController { @PostMapping @Log("新增产品工艺路线") - @ApiOperation("新增产品工艺路线") + public ResponseEntity create(@RequestBody Map whereJson){ ipdmBiProductprocessrouteService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -128,14 +128,14 @@ public class ProductprocessrouteController { } @Log("获取设备列表") - @ApiOperation("获取设备列表") + @PutMapping("/queryDevice") public ResponseEntity queryDevice(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(ipdmBiProductprocessrouteService.queryDevice(whereJson), HttpStatus.OK); } @Log("获取设备列表") - @ApiOperation("获取设备列表") + @PostMapping("/saveDevice") public ResponseEntity saveDevice(@RequestBody JSONObject row) { ipdmBiProductprocessrouteService.saveDevice(row); @@ -144,7 +144,7 @@ public class ProductprocessrouteController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { ipdmBiProductprocessrouteService.excelImport(file, request, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java index 334750eb..3bbc703f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; -import io.swagger.annotations.ApiOperation; + import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index 8340f4a3..8de9ae34 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -48,7 +48,7 @@ import java.util.stream.Collectors; */ @RestController @RequiredArgsConstructor -@Api(tags = "工单管理") + @RequestMapping("/api/produceWorkorder") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 82b343c4..ba636601 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -2,7 +2,7 @@ package org.nl.wms.product_manage.controller.workorder; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -31,7 +31,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "一体机工单管理") + @RequestMapping("/api/produceshiftorder") @SaIgnore @Slf4j diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java index f70fdc3d..1f52c76d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java @@ -3,7 +3,7 @@ package org.nl.wms.product_manage.controller.workprocedure; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -30,7 +30,7 @@ import java.util.List; */ @RestController @RequiredArgsConstructor -@Api(tags = "工序管理") + @RequestMapping("/api/workProcedure") @Slf4j public class PdmBiWorkprocedureController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java index 217429d7..3d1a114b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; -import io.swagger.annotations.ApiModelProperty; + import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java index 6c7cc16c..df89dba4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java @@ -2,7 +2,7 @@ package org.nl.wms.quality_manage.controller.inspection; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java index d3cba7fb..6dc55978 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java @@ -3,7 +3,7 @@ package org.nl.wms.quality_manage.controller.inspection; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionschemedtlproductstandardService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java index d532c98c..15fc308e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java @@ -4,7 +4,7 @@ package org.nl.wms.quality_manage.controller.inspection; 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.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionschemedtlService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java index fc67997f..22d03ced 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java @@ -4,7 +4,7 @@ package org.nl.wms.quality_manage.controller.report; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java index 5ab5e811..e588bbef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java @@ -1,7 +1,7 @@ package org.nl.wms.scheduler_manage.controller.cacheline; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -20,7 +20,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "缓存线位置管理") + @RequestMapping("/api/cachelinePosition") @Slf4j public class CachelinePositionController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java index 7b9aed11..571e7893 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java @@ -2,7 +2,7 @@ package org.nl.wms.scheduler_manage.controller.region; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -28,7 +28,7 @@ import java.util.Map; * @since 2023-04-27 */ @RestController -@Api(tags = "区域管理管理") + @RequestMapping("/api/region") @Slf4j public class SchBaseRegionController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java index 7a2bab35..93b25205 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; + import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -36,7 +36,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "任务管理") + @RequestMapping("/api/task") @Slf4j public class TaskController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java index 6326ced6..2d3e3b4c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java @@ -158,7 +158,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(historyivtService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/getHeader") - @ApiOperation("获取表头") + public ResponseEntity getHeader() { return new ResponseEntity<>(historyivtService.getHeader(), HttpStatus.OK); } @PostMapping("/autoWeb") - @ApiOperation("线性图") + public ResponseEntity autoWeb(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(historyivtService.autoWeb(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/PhyivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/PhyivtController.java index b061a258..a81defa8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/PhyivtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/PhyivtController.java @@ -2,8 +2,8 @@ package org.nl.wms.stata_manage.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.wms.stata_manage.service.PhyivtService; @@ -23,7 +23,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "收发存查询") + @RequestMapping("/api/phyivt") @Slf4j public class PhyivtController { @@ -31,7 +31,7 @@ public class PhyivtController { private final PhyivtService phyivtService; @GetMapping - @ApiOperation("库存查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(phyivtService.queryAll(whereJson, page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java index 8e8b2d6b..255de8d2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/RealTimeIvtController.java @@ -3,8 +3,8 @@ package org.nl.wms.stata_manage.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.wms.stata_manage.service.RealTimeIvtService; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "实时库存统计分析") + @RequestMapping("/api/realtimeivt") @Slf4j public class RealTimeIvtController { @@ -29,13 +29,13 @@ public class RealTimeIvtController { private final RealTimeIvtService realTimeIvtService; @GetMapping - @ApiOperation("库存查询") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(realTimeIvtService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping("/autoWeb") - @ApiOperation("饼图") + public ResponseEntity autoWeb(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(realTimeIvtService.autoWeb(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java index b7f64952..31d7fef6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.pda.controller; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.wms.storage_manage.pda.service.PdaStBcpCheckService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java index cda45b53..59915c4f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.pda.controller; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.wms.storage_manage.pda.service.PdaStBcpOutService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java index 64fea142..c4c87f02 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.pda.controller; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.wms.storage_manage.pda.service.PdaStBcpShutService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java index 1ac36804..5807043b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.productmanage.controller.check; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.check.IStIvtCheckmstCpService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java index c3e3fae9..e3cdc1d3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java @@ -4,8 +4,8 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor -@Api(tags = "成品入库") + @RequestMapping("/api/productIn") @Slf4j public class IStivtlostorivnCpInController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java index 65bc528c..a4cd79e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java @@ -2,8 +2,8 @@ package org.nl.wms.storage_manage.productmanage.controller.iostorInv; 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.common.anno.Log; @@ -20,7 +20,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor -@Api(tags = "成品出库") + @RequestMapping("/api/productOut") @Slf4j public class IStivtlostorivnCpOutController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java index 1d44cb3d..f9b1e482 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -35,7 +35,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "销售发货单") + @Slf4j @RequestMapping("/api/stIfDeliveryorderCp") public class StIfDeliveryorderCpController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java index adf803d4..f6f46e5a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.productmanage.controller.moreOrLess; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessmstCpService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java index e3d57cf3..31778738 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java @@ -1,6 +1,6 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java index 99bfa3ce..5d0206e8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java @@ -1,6 +1,6 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtflowCpService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java index 316a57dc..846dce0b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/check/StIvtCheckmstYlController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.rawmanage.controller.check; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckmstYlService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java index def479c7..37319c9b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java @@ -3,7 +3,7 @@ package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.ApiOperation; + import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java index 4a12217d..e7bd7c22 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.rawmanage.controller.iostorInv; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvOutYlService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java index 830ec18c..bf4e1fa0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.rawmanage.controller.moveOrLess; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessmstYlService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java index af79ea42..b28a7920 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.device_manage.ios.service.structIvt.dto.StructIvtEmQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java index 9d8f72ce..b7975e2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java @@ -1,7 +1,7 @@ package org.nl.wms.storage_manage.rawmanage.controller.structIvt; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.IvtFlowQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java index a07670e5..63d2fcbb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.semimanage.controller.check; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIoVstorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIoVstorinvBcpController.java index ff68bfa5..cbe26fca 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIoVstorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIoVstorinvBcpController.java @@ -5,7 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; 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 lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; * @since 2023-05-10 */ @RestController -@Api(tags = "半成品虚拟入库") + @RequestMapping("/api/in/semivproductIn") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java index b1692b9f..bc980184 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil; 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.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -45,7 +45,7 @@ import java.util.stream.Collectors; * @since 2023-05-10 */ @RestController -@Api(tags = "半成品入库") + @RequestMapping("/api/in/semiproductIn") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java index 9f317654..add6e995 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java @@ -4,8 +4,8 @@ package org.nl.wms.storage_manage.semimanage.controller.iostorInv; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -31,7 +31,7 @@ import java.util.Map; * @since 2023-05-10 */ @RestController -@Api(tags = "半成品出库") + @RequestMapping("/api/out/semiproduct") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java index 296a28d1..fdc28ccc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java @@ -2,7 +2,7 @@ package org.nl.wms.storage_manage.semimanage.controller.moveOrLess; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.dto.MoreOrlessQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java index 17023aaa..c1e614ae 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java @@ -3,7 +3,7 @@ package org.nl.wms.storage_manage.semimanage.controller.shutFrame; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java index a434e8a6..536017e0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiOperation; + import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.ListOf; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpInController.java index 9c205ff3..b3d937f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpInController.java @@ -5,7 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; 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 lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -35,7 +35,7 @@ import java.util.stream.Collectors; * @since 2023-05-10 */ @RestController -@Api(tags = "海柔半成品入库") + @RequestMapping("/api/in/semiproductHr") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java index ef44c770..7dbbfba1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/iostorInv/StIvtIostorinvHrBcpOutController.java @@ -3,7 +3,7 @@ package org.nl.wms.storage_manage.semimanagehr.controller.iostorInv; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; + import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -25,7 +25,7 @@ import java.util.Map; * @since 2023-05-10 */ @RestController -@Api(tags = "海柔半成品出库") + @RequestMapping("/api/out/semiproductHr") @Slf4j @SaIgnore diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java index d5fd5514..0a2c53da 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleController.java @@ -1,7 +1,7 @@ package org.nl.wms.system_manage.controller.coderule; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -27,7 +27,7 @@ import java.util.Set; * @since 2022-12-19 */ @RestController -@Api(tags = "系统：编码生成") + @RequiredArgsConstructor @RequestMapping("/api/genCode") public class SysCodeRuleController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java index ee8bc456..7e394457 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java @@ -1,8 +1,8 @@ package org.nl.wms.system_manage.controller.coderule; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * @author generator * @since 2022-12-20 */ -@Api(tags = "系统：编码详情管理") + @RestController @RequiredArgsConstructor @RequestMapping("/api/codeDetail") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java index 56307996..081f3199 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java @@ -18,8 +18,8 @@ package org.nl.wms.system_manage.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.anno.Log; import org.nl.common.TableDataInfo; @@ -45,7 +45,7 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统：部门管理") + @RequestMapping("/api/dept") public class DeptController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java index 26a5103e..b2a8fef2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java @@ -4,7 +4,7 @@ package org.nl.wms.system_manage.controller.dict; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.nl.common.anno.Log; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java index 70c5b2e1..5702fc57 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java @@ -1,8 +1,8 @@ package org.nl.wms.system_manage.controller.generator; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.PageUtil; import org.nl.wms.system_manage.service.generator.ICodeColumnConfigService; @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/codeColumnConfig") @RequiredArgsConstructor -@Api(tags = "系统：代码生成管理") + public class CodeColumnConfigController { private final ICodeGenConfigService genConfigService; private final ICodeColumnConfigService generatorService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java index fa9d5879..bdaafb12 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java @@ -2,8 +2,8 @@ package org.nl.wms.system_manage.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.wms.system_manage.service.generator.ICodeGenConfigService; import org.nl.wms.system_manage.service.generator.dao.CodeGenConfig; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/codeGenConfig") @RequiredArgsConstructor -@Api(tags = "系统：代码生成器配置管理") + @SaIgnore public class CodeGenConfigController { private final ICodeGenConfigService genConfigService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java index ab76bf15..e606a823 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java @@ -5,7 +5,7 @@ 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.anno.Log; import org.nl.common.TableDataInfo; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java index 76626148..83ff67c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java @@ -15,8 +15,8 @@ */ package org.nl.wms.system_manage.controller.monitor; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.wms.system_manage.service.monitor.MonitorService; import org.springframework.http.HttpStatus; @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统-服务监控管理") + @RequestMapping("/api/monitor") public class MonitorController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java index a2e48c98..ed86cf0a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java @@ -10,7 +10,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.*; + import java.util.Map; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; **/ @RestController @RequiredArgsConstructor -@Api(tags = "消息通知管理") + @RequestMapping("/api/notice") @Slf4j public class NoticeController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java index 3b8eb8d8..2bcf62d7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java @@ -1,8 +1,8 @@ package org.nl.wms.system_manage.controller.param; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -28,7 +28,7 @@ import java.util.Map; * @author generator * @since 2022-12-14 */ -@Api(tags = "系统参数管理") + @Slf4j @RestController @RequestMapping("/api/param") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java index 4cbbd380..dbc46639 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java @@ -2,8 +2,8 @@ package org.nl.wms.system_manage.controller.permission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,7 @@ import java.util.Set; @Slf4j @RestController @RequiredArgsConstructor -@Api(tags = "数据管理") + @RequestMapping("/api/dataPermission") public class SysDataPermissionController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java index 991d9495..90154f84 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java @@ -2,8 +2,8 @@ package org.nl.wms.system_manage.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -33,7 +33,7 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") + public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java index 477df660..9024dc3c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java @@ -2,7 +2,7 @@ package org.nl.wms.system_manage.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.anno.Log; import org.nl.common.TableDataInfo; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java index f37692ce..b9f30f83 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java @@ -21,8 +21,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; @@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("/auth") @RequiredArgsConstructor -@Api(tags = "系统：系统授权接口") + public class AuthorizationController { private final RedisUtils redisUtils; private final OnlineUserService onlineUserService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java index bcd46977..dcc0fdfc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java @@ -3,8 +3,8 @@ package org.nl.wms.system_manage.controller.secutiry; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; @@ -28,7 +28,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持登陆") + @RequestMapping("api/bigScreenScreen") @Slf4j public class HandLoginController { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java index a6731154..1fbc396a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java @@ -15,8 +15,8 @@ */ package org.nl.wms.system_manage.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.wms.system_manage.service.secutiry.impl.OnlineUserService; @@ -35,7 +35,7 @@ import java.util.Set; @RestController @RequiredArgsConstructor @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") + public class OnlineController { private final OnlineUserService onlineUserService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java index 74b9c14c..2b7509a7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java @@ -21,8 +21,8 @@ import com.alibaba.fastjson.JSON; 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.anno.Log; import org.nl.common.domain.query.PageQuery; @@ -47,7 +47,7 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") + @RestController @RequestMapping("/api/users") @RequiredArgsConstructor diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptVo.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptVo.java index 9333727a..83f58792 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptVo.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/dto/DeptVo.java @@ -16,7 +16,7 @@ package org.nl.wms.system_manage.service.dept.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.modules.common.base.BaseDTO; @@ -43,22 +43,22 @@ public class DeptVo implements Serializable { private String ext_id; - @ApiModelProperty(value = "排序") + private Integer dept_sort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer sub_count = 0; //前端显示 private Boolean hasChildren =Boolean.FALSE; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java index 93ecbffa..1737b395 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/menu/impl/SysMenuServiceImpl.java @@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.constant.DictConstantPool; import org.nl.common.domain.query.PageQuery; diff --git a/mes/hd/nladmin-system/src/main/resources/IKAnalyzer.cfg.xml b/mes/hd/nladmin-system/src/main/resources/IKAnalyzer.cfg.xml new file mode 100644 index 00000000..b2eb693d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/IKAnalyzer.cfg.xml @@ -0,0 +1,11 @@ + + + + IK Analyzer 扩展配置 + + ext.dic; + + + stopword.dic; + + \ No newline at end of file diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 895d2751..18e2e26b 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -2,22 +2,6 @@ server: port: 8011 #配置数据源 spring: - data: - elasticsearch: - repositories: - enabled: true - client: - reactive: - #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 - endpoints: 47.96.133.178:8200 #外网 -# endpoints: http://192.168.46.225:9200 #外网 - elasticsearch: - rest: - #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 - uris: 192.168.81.54:9200 #外网 -# uris: http://192.168.46.225:9200 #外网 -# username: elastic -# password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource @@ -129,9 +113,6 @@ jwt: generator: enabled: true -#是否开启 swagger-ui -swagger: - enabled: false # IP 本地解析 ip: diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 7be08b17..9567e1df 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -2,22 +2,6 @@ server: port: 8011 #配置数据源 spring: - data: - elasticsearch: - repositories: - enabled: true - client: - reactive: - #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # endpoints: 47.96.133.178:8200 #外网 - endpoints: http://127.0.0.1:9200 #外网 - elasticsearch: - rest: - #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # uris: 47.96.133.178:8200 #外网 - uris: http://127.0.0.1:9200 #外网 - # username: elastic - # password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource @@ -130,10 +114,6 @@ jwt: generator: enabled: true -#是否开启 swagger-ui -swagger: - enabled: true - # IP 本地解析 ip: local-parsing: true @@ -202,3 +182,6 @@ sa-token: es: index: mes_log schedulerFile: /Users/mima0000/Desktop/scheduler.xml +lucene: + index: + path: /Users/mima0000/Desktop/index diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index 9759eeae..06e5f7fa 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -2,22 +2,6 @@ server: port: 8011 #配置数据源 spring: - data: - elasticsearch: - repositories: - enabled: true - client: - reactive: - #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # endpoints: 47.96.133.178:8200 #外网 - endpoints: http://192.168.46.225:9200 #外网 - elasticsearch: - rest: - #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 - # uris: 47.96.133.178:8200 #外网 - uris: http://192.168.46.225:9200 #外网 - # username: elastic - # password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource @@ -128,9 +112,6 @@ jwt: generator: enabled: true -#是否开启 swagger-ui -swagger: - enabled: true # IP 本地解析 ip: @@ -200,3 +181,6 @@ sa-token: es: index: mes_log schedulerFile: C:\lms\scheduler.xml +lucene: + index: + path: E:\lms\lucene\index diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml index 1022c2f3..80b6720f 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml @@ -104,9 +104,7 @@ jwt: generator: enabled: true -#是否开启 swagger-ui -swagger: - enabled: true + # IP 本地解析 ip: diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index e09c42ea..52019ba2 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -49,9 +49,6 @@ security: - /auth/login - /auth/code - /auth/logout - # swagger - - /swagger-ui.html - - /swagger-resources/** - /webjars/** - /file/** - /webSocket/** @@ -60,7 +57,6 @@ security: - /**/*.html - /**/*.css - /**/*.js - # swagger 文档配置 - /favicon.ico - /*/api-docs - /*/api-docs/** @@ -86,3 +82,6 @@ mybatis-plus: id-type: INPUT banner: false feishu: https://open.feishu.cn/open-apis/bot/v2/hook/cfe495f7-9bcd-40bb-ab66-038de2131cac +lucene: + index: + path: /Users/mima0000/Desktop/index diff --git a/mes/hd/nladmin-system/src/main/resources/ext.dic b/mes/hd/nladmin-system/src/main/resources/ext.dic new file mode 100644 index 00000000..85a5d87f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/ext.dic @@ -0,0 +1,30 @@ +定时插入半成品实时库存失败的数据 +插入窑内失败的数据 +插入窑内失败的信息 +定时插入半成品实时库存失败的信息 +插入货架数据失败的数据 +插入货架数据失败的信息 +插入窑前失败的数据 +插入窑前失败的信息 +获取MES给的工单数据 +上报mes消耗泥料记录的数据 +上报mes消耗泥料记录失败 +压机产出-获取MES给的工单数据 +压机产出返给MES的数据 +反馈压机产出插入mes数据库失败 +半成品入库-获取MES给的工单数据 +半成品入库返给MES的数据 +半成品入库插入mes数据库失败 +半成品出库-获取MES给的工单数据 +半成品出库返给MES的数据 +半成品出库插入mes数据库失败 +压机产出-获取MES给的工单数据 +压机产出返给MES的数据 +反馈压机产出插入mes数据库失败 +插入压机检测失败 +包装数据 +更新成功：更新数据 +插入LMS数据库失败 +记录自动要料信息 +自动下发混碾 +下发混碾失败 diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index e046d72b..36106149 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -1,12 +1,4 @@ - nlAdmin @@ -15,30 +7,40 @@ https://juejin.cn/post/6844903775631572999 value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/> - \ - - - - - http://192.168.46.225:9200/_bulk - ${esIndex} - mes_log - es-logger - es-error-logger - 30000 - false - false - false - 104857600 - 3 - 30000 - 250 - false - false - 20000 - + + + true + + ${log.pattern} + + + + + + + + ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log + + 15 + + 100MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + 2 + 500 + + + system @@ -73,155 +75,77 @@ https://juejin.cn/post/6844903775631572999 %logger - -
- Content-Type - application/json -
- - - - - true - - ${log.pattern} - + + + 512 - - - - - - ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - 0 - 500 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - + - + - + - - - - - + - + - + - + - - - - - - - - \ - - \ - + diff --git a/mes/hd/nladmin-system/src/main/resources/stopword.dic b/mes/hd/nladmin-system/src/main/resources/stopword.dic new file mode 100644 index 00000000..beec81ae --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/stopword.dic @@ -0,0 +1,1242 @@ +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +such +that +the +their +then +there +these +they +this +to +was +will +with +, +? +、 +。 +“ +” +《 +》 +！ +， +： +； +？ +人民 +末##末 +啊 +阿 +哎 +哎呀 +哎哟 +唉 +俺 +俺们 +按 +按照 +吧 +吧哒 +把 +罢了 +被 +本 +本着 +比 +比方 +比如 +鄙人 +彼 +彼此 +边 +别 +别的 +别说 +并 +并且 +不比 +不成 +不单 +不但 +不独 +不管 +不光 +不过 +不仅 +不拘 +不论 +不怕 +不然 +不如 +不特 +不惟 +不问 +不只 +朝 +朝着 +趁 +趁着 +乘 +冲 +除 +除此之外 +除非 +除了 +此 +此间 +此外 +从 +从而 +打 +待 +但 +但是 +当 +当着 +到 +得 +的 +的话 +等 +等等 +地 +第 +叮咚 +对 +对于 +多 +多少 +而 +而况 +而且 +而是 +而外 +而言 +而已 +尔后 +反过来 +反过来说 +反之 +非但 +非徒 +否则 +嘎 +嘎登 +该 +赶 +个 +各 +各个 +各位 +各种 +各自 +给 +根据 +跟 +故 +故此 +固然 +关于 +管 +归 +果然 +果真 +过 +哈 +哈哈 +呵 +和 +何 +何处 +何况 +何时 +嘿 +哼 +哼唷 +呼哧 +乎 +哗 +还是 +还有 +换句话说 +换言之 +或 +或是 +或者 +极了 +及 +及其 +及至 +即 +即便 +即或 +即令 +即若 +即使 +几 +几时 +己 +既 +既然 +既是 +继而 +加之 +假如 +假若 +假使 +鉴于 +将 +较 +较之 +叫 +接着 +结果 +借 +紧接着 +进而 +尽 +尽管 +经 +经过 +就 +就是 +就是说 +据 +具体地说 +具体说来 +开始 +开外 +靠 +咳 +可 +可见 +可是 +可以 +况且 +啦 +来 +来着 +离 +例如 +哩 +连 +连同 +两者 +了 +临 +另 +另外 +另一方面 +论 +嘛 +吗 +慢说 +漫说 +冒 +么 +每 +每当 +们 +莫若 +某 +某个 +某些 +拿 +哪 +哪边 +哪儿 +哪个 +哪里 +哪年 +哪怕 +哪天 +哪些 +哪样 +那 +那边 +那儿 +那个 +那会儿 +那里 +那么 +那么些 +那么样 +那时 +那些 +那样 +乃 +乃至 +呢 +能 +你 +你们 +您 +宁 +宁可 +宁肯 +宁愿 +哦 +呕 +啪达 +旁人 +呸 +凭 +凭借 +其 +其次 +其二 +其他 +其它 +其一 +其余 +其中 +起 +起见 +岂但 +恰恰相反 +前后 +前者 +且 +然而 +然后 +然则 +让 +人家 +任 +任何 +任凭 +如 +如此 +如果 +如何 +如其 +如若 +如上所述 +若 +若非 +若是 +啥 +上下 +尚且 +设若 +设使 +甚而 +甚么 +甚至 +省得 +时候 +什么 +什么样 +使得 +是 +是的 +首先 +谁 +谁知 +顺 +顺着 +似的 +虽 +虽然 +虽说 +虽则 +随 +随着 +所 +所以 +他 +他们 +他人 +它 +它们 +她 +她们 +倘 +倘或 +倘然 +倘若 +倘使 +腾 +替 +通过 +同 +同时 +哇 +万一 +往 +望 +为 +为何 +为了 +为什么 +为着 +喂 +嗡嗡 +我 +我们 +呜 +呜呼 +乌乎 +无论 +无宁 +毋宁 +嘻 +吓 +相对而言 +像 +向 +向着 +嘘 +呀 +焉 +沿 +沿着 +要 +要不 +要不然 +要不是 +要么 +要是 +也 +也罢 +也好 +一 +一般 +一旦 +一方面 +一来 +一切 +一样 +一则 +依 +依照 +矣 +以 +以便 +以及 +以免 +以至 +以至于 +以致 +抑或 +因 +因此 +因而 +因为 +哟 +用 +由 +由此可见 +由于 +有 +有的 +有关 +有些 +又 +于 +于是 +于是乎 +与 +与此同时 +与否 +与其 +越是 +云云 +哉 +再说 +再者 +在 +在下 +咱 +咱们 +则 +怎 +怎么 +怎么办 +怎么样 +怎样 +咋 +照 +照着 +者 +这 +这边 +这儿 +这个 +这会儿 +这就是说 +这里 +这么 +这么点儿 +这么些 +这么样 +这时 +这些 +这样 +正如 +吱 +之 +之类 +之所以 +之一 +只是 +只限 +只要 +只有 +至 +至于 +诸位 +着 +着呢 +自 +自从 +自个儿 +自各儿 +自己 +自家 +自身 +综上所述 +总的来看 +总的来说 +总的说来 +总而言之 +总之 +纵 +纵令 +纵然 +纵使 +遵照 +作为 +兮 +呃 +呗 +咚 +咦 +喏 +啐 +喔唷 +嗬 +嗯 +嗳 +~ +! +. +: +" +' +( +) +* +A +白 +社会主义 +-- +.. +>> + [ + ] + +< +> +/ +\ +| +- +_ ++ += +& +^ +% +# +@ +` +; +$ +（ +） +—— +— +￥ +· +... +‘ +’ +〉 +〈 +… +　 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +０ +１ +２ +３ +４ +５ +６ +７ +８ +９ +二 +三 +四 +五 +六 +七 +八 +九 +零 +＞ +＜ +＠ +＃ +＄ +％ +︿ +＆ +＊ +＋ +～ +｜ +［ +］ +｛ +｝ +啊哈 +啊呀 +啊哟 +挨次 +挨个 +挨家挨户 +挨门挨户 +挨门逐户 +挨着 +按理 +按期 +按时 +按说 +暗地里 +暗中 +暗自 +昂然 +八成 +白白 +半 +梆 +保管 +保险 +饱 +背地里 +背靠背 +倍感 +倍加 +本人 +本身 +甭 +比起 +比如说 +比照 +毕竟 +必 +必定 +必将 +必须 +便 +别人 +并非 +并肩 +并没 +并没有 +并排 +并无 +勃然 +不 +不必 +不常 +不大 +不但...而且 +不得 +不得不 +不得了 +不得已 +不迭 +不定 +不对 +不妨 +不管怎样 +不会 +不仅...而且 +不仅仅 +不仅仅是 +不经意 +不可开交 +不可抗拒 +不力 +不了 +不料 +不满 +不免 +不能不 +不起 +不巧 +不然的话 +不日 +不少 +不胜 +不时 +不是 +不同 +不能 +不要 +不外 +不外乎 +不下 +不限 +不消 +不已 +不亦乐乎 +不由得 +不再 +不择手段 +不怎么 +不曾 +不知不觉 +不止 +不止一次 +不至于 +才 +才能 +策略地 +差不多 +差一点 +常 +常常 +常言道 +常言说 +常言说得好 +长此下去 +长话短说 +长期以来 +长线 +敞开儿 +彻夜 +陈年 +趁便 +趁机 +趁热 +趁势 +趁早 +成年 +成年累月 +成心 +乘机 +乘胜 +乘势 +乘隙 +乘虚 +诚然 +迟早 +充分 +充其极 +充其量 +抽冷子 +臭 +初 +出 +出来 +出去 +除此 +除此而外 +除此以外 +除开 +除去 +除却 +除外 +处处 +川流不息 +传 +传说 +传闻 +串行 +纯 +纯粹 +此后 +此中 +次第 +匆匆 +从不 +从此 +从此以后 +从古到今 +从古至今 +从今以后 +从宽 +从来 +从轻 +从速 +从头 +从未 +从无到有 +从小 +从新 +从严 +从优 +从早到晚 +从中 +从重 +凑巧 +粗 +存心 +达旦 +打从 +打开天窗说亮话 +大 +大不了 +大大 +大抵 +大都 +大多 +大凡 +大概 +大家 +大举 +大略 +大面儿上 +大事 +大体 +大体上 +大约 +大张旗鼓 +大致 +呆呆地 +带 +殆 +待到 +单 +单纯 +单单 +但愿 +弹指之间 +当场 +当儿 +当即 +当口儿 +当然 +当庭 +当头 +当下 +当真 +当中 +倒不如 +倒不如说 +倒是 +到处 +到底 +到了儿 +到目前为止 +到头 +到头来 +得起 +得天独厚 +的确 +等到 +叮当 +顶多 +定 +动不动 +动辄 +陡然 +都 +独 +独自 +断然 +顿时 +多次 +多多 +多多少少 +多多益善 +多亏 +多年来 +多年前 +而后 +而论 +而又 +尔等 +二话不说 +二话没说 +反倒 +反倒是 +反而 +反手 +反之亦然 +反之则 +方 +方才 +方能 +放量 +非常 +非得 +分期 +分期分批 +分头 +奋勇 +愤然 +风雨无阻 +逢 +弗 +甫 +嘎嘎 +该当 +概 +赶快 +赶早不赶晚 +敢 +敢情 +敢于 +刚 +刚才 +刚好 +刚巧 +高低 +格外 +隔日 +隔夜 +个人 +各式 +更 +更加 +更进一步 +更为 +公然 +共 +共总 +够瞧的 +姑且 +古来 +故而 +故意 +固 +怪 +怪不得 +惯常 +光 +光是 +归根到底 +归根结底 +过于 +毫不 +毫无 +毫无保留地 +毫无例外 +好在 +何必 +何尝 +何妨 +何苦 +何乐而不为 +何须 +何止 +很 +很多 +很少 +轰然 +后来 +呼啦 +忽地 +忽然 +互 +互相 +哗啦 +话说 +还 +恍然 +会 +豁然 +活 +伙同 +或多或少 +或许 +基本 +基本上 +基于 +极 +极大 +极度 +极端 +极力 +极其 +极为 +急匆匆 +即将 +即刻 +即是说 +几度 +几番 +几乎 +几经 +既...又 +继之 +加上 +加以 +间或 +简而言之 +简言之 +简直 +见 +将才 +将近 +将要 +交口 +较比 +较为 +接连不断 +接下来 +皆可 +截然 +截至 +藉以 +借此 +借以 +届时 +仅 +仅仅 +谨 +进来 +进去 +近 +近几年来 +近来 +近年来 +尽管如此 +尽可能 +尽快 +尽量 +尽然 +尽如人意 +尽心竭力 +尽心尽力 +尽早 +精光 +经常 +竟 +竟然 +究竟 +就此 +就地 +就算 +居然 +局外 +举凡 +据称 +据此 +据实 +据说 +据我所知 +据悉 +具体来说 +决不 +决非 +绝 +绝不 +绝顶 +绝对 +绝非 +均 +喀 +看 +看来 +看起来 +看上去 +看样子 +可好 +可能 +恐怕 +快 +快要 +来不及 +来得及 +来讲 +来看 +拦腰 +牢牢 +老 +老大 +老老实实 +老是 +累次 +累年 +理当 +理该 +理应 +历 +立 +立地 +立刻 +立马 +立时 +联袂 +连连 +连日 +连日来 +连声 +连袂 +临到 +另方面 +另行 +另一个 +路经 +屡 +屡次 +屡次三番 +屡屡 +缕缕 +率尔 +率然 +略 +略加 +略微 +略为 +论说 +马上 +蛮 +满 +没 +没有 +每逢 +每每 +每时每刻 +猛然 +猛然间 +莫 +莫不 +莫非 +莫如 +默默地 +默然 +呐 +那末 +奈 +难道 +难得 +难怪 +难说 +内 +年复一年 +凝神 +偶而 +偶尔 +怕 +砰 +碰巧 +譬如 +偏偏 +乒 +平素 +颇 +迫于 +扑通 +其后 +其实 +奇 +齐 +起初 +起来 +起首 +起头 +起先 +岂 +岂非 +岂止 +迄 +恰逢 +恰好 +恰恰 +恰巧 +恰如 +恰似 +千 +千万 +千万千万 +切 +切不可 +切莫 +切切 +切勿 +窃 +亲口 +亲身 +亲手 +亲眼 +亲自 +顷 +顷刻 +顷刻间 +顷刻之间 +请勿 +穷年累月 +取道 +去 +权时 +全都 +全力 +全年 +全然 +全身心 +然 +人人 +仍 +仍旧 +仍然 +日复一日 +日见 +日渐 +日益 +日臻 +如常 +如此等等 +如次 +如今 +如期 +如前所述 +如上 +如下 +汝 +三番两次 +三番五次 +三天两头 +瑟瑟 +沙沙 +上 +上来 +上去 + diff --git a/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl b/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl index 8823899d..db23118c 100644 --- a/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl +++ b/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Controller.ftl @@ -1,7 +1,7 @@ package ${package}.rest; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; @@ -21,7 +21,7 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "${apiAlias}管理") + @RequestMapping("/api/${changeClassName}") @Slf4j public class ${className}Controller { diff --git a/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Entity.ftl b/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Entity.ftl index cfa758e2..9d853e1a 100644 --- a/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Entity.ftl +++ b/mes/hd/nladmin-system/src/main/resources/templates/generator/admin/Entity.ftl @@ -4,7 +4,7 @@ import lombok.Data; import java.util.Date; import cn.hutool.core.bean.BeanUtil; -import io.swagger.annotations.ApiModelProperty; + import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; <#if isNotNullColumns??> @@ -57,9 +57,9 @@ public class ${className} implements Serializable { <#if column.remark != ''> - @ApiModelProperty(value = "${column.remark}") + <#else> - @ApiModelProperty(value = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}; diff --git a/mes/qd/src/views/monitor/eslog/view/index.vue b/mes/qd/src/views/monitor/eslog/view/index.vue index 79507bc6..6ca88f50 100644 --- a/mes/qd/src/views/monitor/eslog/view/index.vue +++ b/mes/qd/src/views/monitor/eslog/view/index.vue @@ -33,6 +33,14 @@ /> + + + - - - + + + + + + + + + - + @@ -201,6 +210,7 @@ export default { labelsOptions: [], // 所有标签和对应所有值数据 systemOptions: [], // 所有标签和对应所有值数据 logLevelValue: '', + requestMethod: '', system: '', timeRange: [], message: '', @@ -302,6 +312,7 @@ export default { // 清空查询数据 this.clearParam() queryParam.logLevel = this.logLevelValue + queryParam.requestMethod = this.requestMethod const time = new Date() if (this.timeZoneValue !== '') { queryParam.startTime = new Date(((time.getTime() - this.timeZoneValue))) @@ -312,7 +323,7 @@ export default { } queryParam.message = this.message.replace(/^\s*|\s*$/g, '') queryParam.filterSql = this.filterSql === '1' - queryParam.isRequest = this.filterSql === '1' + queryParam.isRequest = this.isRequest === '1' queryParam.traceId = this.traceId queryParam.size = this.size queryParam.page = this.page @@ -323,8 +334,8 @@ export default { this.total = res.total // 清空 this.logs = [] - for (const j in res.records) { // 用push的方式将所有日志数组添加进去 - this.logs.push(res.records[j]) + for (const j in res.page) { // 用push的方式将所有日志数组添加进去 + this.logs.push(res.page[j]) } }) }, diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 99f4b556..8eabdc59 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -335,6 +335,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String target_roadway = ""; String is_flip = ""; String tray_full_num = ""; + + if (checkParam(errArr, workorder_id, workorder_code, material_code, qty, device_code, is_needmove)) { + continue; + } if (ObjectUtil.isNotEmpty(package_ext)) { //是否启用封箱线 is_used_fxx = ObjectUtil.isEmpty(package_ext.get("is_used_fxx")) ? null : package_ext.get("is_used_fxx").toString(); @@ -406,65 +410,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { //码盘数量 tray_num = ObjectUtil.isEmpty(extra_map.get("tray_num")) ? null : extra_map.get("tray_num").toString(); } - Map params = param.getJSONObject("params"); - if (ObjectUtil.isNotEmpty(params)) { ealingOrderDto = JSONObject.toJavaObject(JSON.parseObject(JSON.toJSONString(params)), EalingOrderDto.class); ealingOrderDto.setOrder_code(workorder_code); } - if (StrUtil.isEmpty(workorder_id)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "工单id不能为空"); - errArr.add(json); - continue; - } - if (StrUtil.isEmpty(workorder_code)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "工单编码不能为空"); - errArr.add(json); - continue; - } - ProduceshiftorderDto byCode = produceshiftorderService.findByCode(workorder_code); - if (ObjectUtil.isNotEmpty(byCode)) { - if (!byCode.getOrder_status().equals(WorkerOrderEnum.FORCEFINISH.getCode())&&!byCode.getOrder_status().equals(WorkerOrderEnum.COMPLETE.getCode())){ - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "下发执行工单不是完成状态"); - errArr.add(json); - continue; - } - } - if (StrUtil.isEmpty(material_code)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "物料编码不能为空"); - errArr.add(json); - continue; - } - if (StrUtil.isEmpty(qty)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "生产数量不能为空"); - errArr.add(json); - continue; - } - if (StrUtil.isEmpty(device_code)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "生产设备编码不能为空"); - errArr.add(json); - continue; - } - if (StrUtil.isEmpty(is_needmove)) { - JSONObject json = new JSONObject(); - json.put("workorder_id", workorder_id); - json.put("message", "是否需要AGV搬运不能为空"); - errArr.add(json); - continue; - } + + ProduceshiftorderDto dto = new ProduceshiftorderDto(); dto.setExt_order_id(workorder_id); dto.setOrder_code(workorder_code); @@ -521,6 +473,62 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { return resultJson; } + private boolean checkParam(JSONArray errArr, String workorder_id, String workorder_code, String material_code, String qty, String device_code, String is_needmove) { + if (StrUtil.isEmpty(workorder_id)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "工单id不能为空"); + errArr.add(json); + return true; + } + if (StrUtil.isEmpty(workorder_code)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "工单编码不能为空"); + errArr.add(json); + return true; + } + ProduceshiftorderDto byCode = produceshiftorderService.findByCode(workorder_code); + if (ObjectUtil.isNotEmpty(byCode)) { + if (!byCode.getOrder_status().equals(WorkerOrderEnum.FORCEFINISH.getCode())&&!byCode.getOrder_status().equals(WorkerOrderEnum.COMPLETE.getCode())){ + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "下发执行工单不是完成状态"); + errArr.add(json); + return true; + } + } + if (StrUtil.isEmpty(material_code)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "物料编码不能为空"); + errArr.add(json); + return true; + } + if (StrUtil.isEmpty(qty)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "生产数量不能为空"); + errArr.add(json); + return true; + } + if (StrUtil.isEmpty(device_code)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "生产设备编码不能为空"); + errArr.add(json); + return true; + } + if (StrUtil.isEmpty(is_needmove)) { + JSONObject json = new JSONObject(); + json.put("workorder_id", workorder_id); + json.put("message", "是否需要AGV搬运不能为空"); + errArr.add(json); + return true; + } + return false; + } + @Override public Map updateTaskStatus(List taskStatus) { diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java index 992e98a4..fb4acfe3 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -89,7 +89,6 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { long endTime = System.currentTimeMillis(); log.info("建立索引共耗时{}毫秒", endTime - startTime); indexWriter.commit(); - indexWriter.close(); // MDC.put("DEVICECODE", luceneLogDto.getDevice_code()); } catch (Exception e) { log.error(e.getMessage(), e);