From 11c1526e83c6ef2529f8f1ca016cbd2131dafa05 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 6 May 2023 17:48:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A9=BC=E5=B3=B0=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E4=B8=8B=E5=88=92=E7=BA=BF=E3=80=81lucene?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/nlsso-server/pom.xml | 50 +- .../java/org/nl/common/enums/LogTypeEnum.java | 15 + .../java/org/nl/config/lucene/Indexer.java | 178 +++++++ .../nl/config/lucene/LuceneIndexWriter.java | 65 +++ .../java/org/nl/config/lucene/Searcher.java | 132 +++++ .../org/nl/config/lucene/StaticConfig.java | 21 + .../java/org/nl/config/lucene/UrlConfig.java | 13 + .../org/nl/modules/common/utils/ColUtil.java | 5 - .../nl/modules/loki/rest/LokiController.java | 40 -- .../nl/modules/loki/service/LokiService.java | 25 - .../loki/service/impl/LokiServiceImpl.java | 113 ----- .../coderule/SysCodeRuleController.java | 6 +- .../coderule/SysCodeRuleDetailController.java | 7 +- .../controller/dept/DeptController.java | 6 +- .../dept/SysUserDeptController.java | 20 - .../controller/dict/SysDictController.java | 5 +- .../generator/CodeGenConfigController.java | 6 +- .../generator/CodeGeneratorController.java | 10 +- .../controller/lucence/LuceneController.java | 35 ++ .../controller/menu/SysMenuController.java | 5 +- .../controller/param/SysParamController.java | 6 +- .../SysDataPermissionController.java | 5 +- .../quartz/SysQuartzJobController.java | 6 +- .../controller/role/SysRoleController.java | 6 +- .../secutiry/AuthorizationController.java | 24 +- .../tools/ToolLocalStorageController.java | 6 +- .../controller/user/OnlineController.java | 5 +- .../controller/user/UserController.java | 2 +- .../impl/SysCodeRuleDetailServiceImpl.java | 11 +- .../coderule/impl/SysCodeRuleServiceImpl.java | 14 +- .../service/dict/impl/SysDictServiceImpl.java | 6 +- .../impl/CodeGenConfigServiceImpl.java | 10 +- .../impl/CodeGeneratorServiceImpl.java | 6 +- .../lucene/LuceneExecuteLogService.java | 40 ++ .../system/service/lucene/LuceneService.java | 19 + .../service/lucene/dto/LuceneLogDto.java | 86 ++++ .../impl/LuceneExecuteLogServiceImpl.java | 104 ++++ .../lucene/impl/LuceneServiceImpl.java | 44 ++ .../service/menu/impl/SysMenuServiceImpl.java | 15 +- .../param/impl/SysParamServiceImpl.java | 11 +- .../dao/mapper/SysDataPermissionMapper.xml | 4 +- .../impl/SysDataPermissionServiceImpl.java | 28 +- .../quartz/impl/SysQuartzJobServiceImpl.java | 20 +- .../service/role/impl/SysRoleServiceImpl.java | 14 +- .../secutiry/impl/OnlineUserService.java | 3 +- .../impl/ToolLocalStorageServiceImpl.java | 8 +- .../service/user/dao/mapper/SysUserMapper.xml | 2 +- .../user/impl/ISysUserServiceImpl.java | 17 +- .../workshop/service/dao/MdBaseWorkshop.java | 4 +- .../impl/MdBaseWorkshopServiceImpl.java | 4 - .../controller/PdmBdWorkorderController.java | 66 +++ .../pdm/service/IPdmBdWorkorderService.java | 43 ++ .../wms/pdm/service/dao/PdmBdWorkorder.java | 113 +++++ .../dao/mapper/PdmBdWorkorderMapper.java | 12 + .../dao/mapper/PdmBdWorkorderMapper.xml | 5 + .../pdm/service/dto/PdmBdWorkorderDto.java | 101 ++++ .../pdm/service/dto/PdmBdWorkorderQuery.java | 12 + .../impl/PdmBdWorkorderServiceImpl.java | 80 +++ .../main/resources/config/application-dev.yml | 5 - .../resources/config/application-prod.yml | 4 - .../resources/config/application-test.yml | 4 - .../src/main/resources/config/application.yml | 3 + .../src/main/resources/generator.properties | 11 +- .../main/resources/log/XgAgvDeviceDriver.xml | 34 ++ .../src/main/resources/logback-spring.xml | 37 +- .../template/generator/admin/Dto.ftl | 6 + .../template/generator/admin/Entity.ftl | 7 +- .../template/generator/admin/ServiceImpl.ftl | 1 - nladmin-ui/src/store/modules/user.js | 1 + nladmin-ui/src/views/loki/view/index.vue | 454 ------------------ nladmin-ui/src/views/lucene/api/log.js | 10 + .../api/loki.js => lucene/api/lucene.js} | 4 +- nladmin-ui/src/views/lucene/index.vue | 108 +++++ nladmin-ui/src/views/lucene/search.vue | 113 +++++ nladmin-ui/src/views/lucene/time.vue | 63 +++ nladmin-ui/src/views/system/dept/index.vue | 6 +- nladmin-ui/src/views/system/menu/index.vue | 2 +- nladmin-ui/src/views/system/role/index.vue | 2 +- nladmin-ui/src/views/system/user/index.vue | 62 ++- .../src/views/wms/basedata/material/index.vue | 12 +- .../src/views/wms/basedata/workshop/index.vue | 14 +- .../src/views/wms/pdm/workerorder/index.vue | 195 ++++++++ .../wms/pdm/workerorder/pdmBdWorkorder.js | 27 ++ 83 files changed, 2005 insertions(+), 899 deletions(-) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/rest/LokiController.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/LokiService.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/SysUserDeptController.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderController.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java create mode 100644 nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml delete mode 100644 nladmin-ui/src/views/loki/view/index.vue create mode 100644 nladmin-ui/src/views/lucene/api/log.js rename nladmin-ui/src/views/{loki/api/loki.js => lucene/api/lucene.js} (84%) create mode 100644 nladmin-ui/src/views/lucene/index.vue create mode 100644 nladmin-ui/src/views/lucene/search.vue create mode 100644 nladmin-ui/src/views/lucene/time.vue create mode 100644 nladmin-ui/src/views/wms/pdm/workerorder/index.vue create mode 100644 nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 6e390d7..599d93a 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -28,6 +28,7 @@ 0.11.1 5.9.0 + 8.2.0 1.9 @@ -389,13 +390,6 @@ 5.0.1 - - - - com.github.loki4j - loki-logback-appender-jdk8 - 1.3.2 - org.apache.httpcomponents httpclient @@ -411,6 +405,48 @@ jakarta.persistence-api 2.2.3 + + + commons-io + commons-io + 2.8.0 + + + + + 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} + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java new file mode 100644 index 0000000..112429a --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java @@ -0,0 +1,15 @@ +package org.nl.common.enums; + +public enum LogTypeEnum { + DEVICE_LOG("设备日志"), + INTERFACE_LOG("接口日志"); + + private String desc; + + LogTypeEnum(String desc) { + this.desc = desc; + } + public String getDesc() { + return desc; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java new file mode 100644 index 0000000..18eff3f --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Indexer.java @@ -0,0 +1,178 @@ +package org.nl.config.lucene; + +import com.alibaba.fastjson.JSONObject; +import org.apache.commons.io.FileUtils; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.TextField; +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.springframework.beans.factory.annotation.Value; +import org.wltea.analyzer.lucene.IKAnalyzer; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Set; + +/** + * lucene索引器 + */ +public class Indexer { + /** + * 写索引实例 + */ + private IndexWriter writer; + + public IndexWriter getWriter() { + return writer; + } + + /** + * 构造方法，实例化IndexWriter + * @param indexDir + * @throws Exception + */ + public Indexer(String indexDir) throws Exception { + Directory dir = FSDirectory.open(Paths.get(indexDir)); + //标准分词器，会自动去掉空格啊，is a the等单词 +// Analyzer analyzer = new StandardAnalyzer(); + Analyzer analyzer = new IKAnalyzer(); + //将标准分词器配到写索引的配置中 + IndexWriterConfig config = new IndexWriterConfig(analyzer); + //实例化写索引对象 + writer = new IndexWriter(dir, config); + } + + /** + * 索引指定目录下的所有文件 + * @param dataDir + * @return + * @throws Exception + */ + public int indexAll(String dataDir) throws Exception { + // 获取该路径下的所有文件 + File[] files = new File(dataDir).listFiles(); + if (null != files) { + for (File file : files) { + //调用下面的indexFile方法，对每个文件进行索引 + indexFile(file); + } + } + //返回索引的文件数 +// return writer.numDocs(); + return writer.numRamDocs(); + } + + /** + * 索引指定的文件 + * @param file + * @throws Exception + */ + private void indexFile(File file) throws Exception { + System.out.println("索引文件的路径：" + file.getCanonicalPath()); + //调用下面的getDocument方法，获取该文件的document + Document doc = getDocument(file); + //添加索引文档 + //Document doc = json2Doc(jsonDoc); +// Document doc = new Document(); +// doc.add(new TextField("content", jsonDoc, Field.Store.YES)); + Field fieldContent=new TextField("fieldContent", FileUtils.readFileToString(null,"UTF-8"), Field.Store.YES); + + //将doc添加到索引中 + writer.addDocument(doc); + } + + /** + * 获取文档，文档里再设置每个字段，就类似于数据库中的一行记录 + * @param file + * @return + * @throws Exception + */ + private Document getDocument(File file) throws Exception { + Document doc = new Document(); + //开始添加字段 + //添加内容 + doc.add(new TextField("contents", new FileReader(file))); + //添加文件名，并把这个字段存到索引文件里 + doc.add(new TextField("fileName", file.getName(), Field.Store.YES)); + //添加文件路径 + doc.add(new TextField("fullPath", file.getCanonicalPath(), Field.Store.YES)); + return doc; + } + public Document json2Doc(String strDoc) { + Document doc = new Document(); + JSONObject jsonDoc = JSONObject.parseObject(strDoc); + Set keys = jsonDoc.keySet(); + for (String key : keys) { + doc.add(new TextField(key, jsonDoc.getString(key), Field.Store.YES)); + } + return doc; + } + + public void addLogIndex(String msg) throws IOException { + //步骤一：创建Directory对象，用于指定索引库的位置 RAMDirectory内存 + Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath()); + //步骤二：创建一个IndexWriter对象，用于写索引 +// Analyzer analyzer = new StandardAnalyzer(); + IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new IKAnalyzer(false))); +// indexWriter.deleteAll();//清理所有索引库 +// IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer())); + //记录索引开始时间 + long startTime = System.currentTimeMillis(); + //步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象 + Document document = new Document(); +// document.add(new TextField("fieldContent", device_id, Field.Store.YES)); + document.add(new TextField("fieldContent", msg, Field.Store.YES)); + indexWriter.addDocument(document); + //记录索引结束时间 + long endTime = System.currentTimeMillis(); + System.out.println("建立索引"+ "共耗时" + (endTime-startTime) + "毫秒"); + indexWriter.commit(); + //步骤八：关闭资源 + indexWriter.close(); + System.out.println("建立索引成功-----关闭资源"); + } + //系统的日志文件路径 + @Value("${logging.file.path}") + private String logUrl; + + public static void main(String[] args)throws IOException { + //步骤一：创建Directory对象，用于指定索引库的位置 RAMDirectory内存 + Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath()); + //步骤二：创建一个IndexWriter对象，用于写索引 +// Analyzer analyzer = new StandardAnalyzer(); + IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new IKAnalyzer(false))); + + indexWriter.deleteAll();//清理所有索引库 +// IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer())); + //记录索引开始时间 + long startTime = System.currentTimeMillis(); + //步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象 + File file=new File("D:\\testlog"); + //步骤四：获取文件列表 + File[] files = file.listFiles(); + for (File item:files) { + BufferedReader bufferedReader = new BufferedReader(new FileReader(item)); + String strLine = null; + while(null != (strLine = bufferedReader.readLine())){ + Document document = new Document(); +// document.add(new Field()); + document.add(new TextField("fieldContent", strLine, Field.Store.YES)); + indexWriter.addDocument(document); + } + } + //记录索引结束时间 + long endTime = System.currentTimeMillis(); + System.out.println("建立索引"+ "共耗时" + (endTime-startTime) + "毫秒"); + indexWriter.commit(); + //步骤八：关闭资源 + indexWriter.close(); + System.out.println("建立索引成功-----关闭资源"); + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java new file mode 100644 index 0000000..62a2ee9 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java @@ -0,0 +1,65 @@ +package org.nl.config.lucene; + +import cn.hutool.core.date.DateUtil; +import org.apache.lucene.index.CorruptIndexException; +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.wltea.analyzer.lucene.IKAnalyzer; + +import java.io.File; +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class LuceneIndexWriter { + private static IndexWriter indexWriter; + + static { + try { + Directory directory = FSDirectory.open(new File(UrlConfig.luceneUrl).toPath()); + IndexWriterConfig config = new IndexWriterConfig(new IKAnalyzer()); + indexWriter = new IndexWriter(directory, config); + } catch (Exception e) { + e.printStackTrace(); + } + /**当当前线程结束时，自动关闭IndexWriter，使用Runtime对象*/ + Runtime.getRuntime().addShutdownHook(new Thread(){ + @Override + public void run() { + try { + closeIndexWriter(); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + /**在线程结束时，自动关闭IndexWriter*/ + public static IndexWriter getIndexWriter() { + return indexWriter; + } + /**关闭IndexWriter + * @throws IOException + * @throws CorruptIndexException */ + public static void closeIndexWriter() throws Exception { + if(indexWriter != null) { + indexWriter.close(); + } + } + + public static void main(String[] args) throws IOException { + indexWriter.deleteAll(); + } + + public static String getDate(String timeString) throws ParseException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");//时间格式 + Date date = sdf.parse(timeString); + timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");//格式化后的时间 + return timeString; + } + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java new file mode 100644 index 0000000..6b2e7b4 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java @@ -0,0 +1,132 @@ +package org.nl.config.lucene; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.util.BytesRef; +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.wltea.analyzer.lucene.IKAnalyzer; + +import java.nio.file.Paths; +import java.util.*; + +/** + * lucene查询器 + */ +@Slf4j +public class Searcher { + + public static Map search(String indexDir, String ext,Map whereJson) throws Exception { + //获取要查询的路径，也就是索引所在的位置 + Directory dir = FSDirectory.open(Paths.get(indexDir)); + IndexReader reader = DirectoryReader.open(dir); + //构建IndexSearcher + IndexSearcher searcher = new IndexSearcher(reader); + //标准分词器，会自动去掉空格啊，is a the等单词 +// Analyzer analyzer = new StandardAnalyzer(); + Analyzer analyzer = new IKAnalyzer(false); + //查询解析器 + QueryParser queryParser = new QueryParser("fieldContent", analyzer); + + //记录索引开始时间 + long startTime = System.currentTimeMillis(); + // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数： + int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数 + int pageNum = Integer.parseInt(whereJson.get("page").toString());// 当前页码 + int start = pageNum * pageSize;// 当前页的起始条数 + int end = start + pageSize;// 当前页的结束条数（不能包含） + // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序 + Sort sort = new Sort(new SortField("logTime", SortField.Type.DOC,true)); + + TopDocs docs = null; + BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); + //时间范围查询 + String startDate = (String) whereJson.get("begin_time"); + String endDate = (String) whereJson.get("end_time"); + Calendar calendar=Calendar.getInstance(); + calendar.set(1970, 0, 1); + if (startDate == null){ + startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS"); + }else{ + startDate = LuceneIndexWriter.getDate(startDate); + } + if (endDate == null){ + endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS"); + } else { + endDate = LuceneIndexWriter.getDate(endDate); + } + TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true); + booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); + if (whereJson.get("device_code") != null){ + Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code"))); + booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + } + if (whereJson.get("method") != null){ + Query termQuery = new TermQuery(new Term("method", (String) whereJson.get("method"))); + booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + } + if (whereJson.get("status_code") != null){ + Query termQuery = new TermQuery(new Term("status_code", (String) whereJson.get("status_code"))); + booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + } + if (whereJson.get("blurry") != null) { + Query query = queryParser.parse((String) whereJson.get("blurry")); + booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); + } + docs = searcher.search(booleanQueryBuilder.build(), end,sort); + //记录索引时间 + long endTime = System.currentTimeMillis(); + log.info("匹配{}共耗时{}毫秒",booleanQueryBuilder.build(),(endTime-startTime)); + log.info("查询到{}条日志文件", docs.totalHits.value); + List list = new ArrayList<>(); + ScoreDoc[] scoreDocs = docs.scoreDocs; + if (end > docs.totalHits.value) end = (int) docs.totalHits.value; + JSONArray array = new JSONArray(); + + for (int i = start; i < end; i++) { + ScoreDoc scoreDoc = scoreDocs[i]; + Document doc = reader.document(scoreDoc.doc); + JSONObject object = new JSONObject(); + object.put("content",doc.get("fieldContent")); + object.put("device_code",doc.get("device_code")); + object.put("logTime",doc.get("logTime")); + object.put("method",doc.get("method")); + object.put("status_code",doc.get("status_code")); + object.put("requestparam",doc.get("requestparam")); + object.put("responseparam",doc.get("responseparam")); + if(doc.get("fieldContent") != null) { + array.add(object); + } + } + for(Object logDto:array){ + log.info(logDto.toString()); + } + reader.close(); + JSONObject jo = new JSONObject(); + jo.put("content", array); + jo.put("totalElements", docs.totalHits.value); + return jo; + } + + public static void main(String[] args) { + String indexDir = "D:\\lucene\\index"; + //查询这个字符串 + String q = "07.832"; + Map whereJson = null; + try { + search(indexDir, q,whereJson); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java new file mode 100644 index 0000000..c7958bb --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java @@ -0,0 +1,21 @@ +package org.nl.config.lucene; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @deprecated 设置静态参数初始化 + */ +@Configuration +public class StaticConfig { + //日志索引目录 + @Value("${lucene.index.path}") + private String luceneDir; + + @Bean + public int initStatic() { + UrlConfig.setLuceneUrl(luceneDir); + return 0; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java new file mode 100644 index 0000000..dd7ce01 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/UrlConfig.java @@ -0,0 +1,13 @@ +package org.nl.config.lucene; + +public class UrlConfig { + public static String luceneUrl; + + public static String getLuceneUrl() { + return luceneUrl; + } + + public static void setLuceneUrl(String luceneUrl) { + UrlConfig.luceneUrl = luceneUrl; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/ColUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/ColUtil.java index 5dfd9c4..e948b64 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/ColUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/ColUtil.java @@ -6,11 +6,6 @@ import org.apache.commons.configuration.PropertiesConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author: lyd - * @description: sql字段转java - * @Date: 2022/12/3 - */ public class ColUtil { private static final Logger log = LoggerFactory.getLogger(ColUtil.class); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/rest/LokiController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/rest/LokiController.java deleted file mode 100644 index e498cb6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/rest/LokiController.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.nl.modules.loki.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.annotation.RateLimiter; -import org.nl.modules.loki.service.LokiService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -/** - * @Author: lyd - * @Description: 日志监控 - * @Date: 2022-08-15 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "日志监控") -@RequestMapping("/api/loki") -@Slf4j -public class LokiController { - - private final LokiService lokiService; - - @GetMapping("/labels/values") - @ApiOperation("获取标签") - public ResponseEntity labelsValues() { - return new ResponseEntity<>(lokiService.getLabelsValues(), HttpStatus.OK); - } - - @PostMapping("/logs") - @ApiOperation("获取日志") - @RateLimiter(value = 1, timeout = 300) // 限流 - public ResponseEntity getLogData(@RequestBody JSONObject json) { - return new ResponseEntity<>(lokiService.getLogData(json), HttpStatus.OK); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/LokiService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/LokiService.java deleted file mode 100644 index 10101c9..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/LokiService.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.nl.modules.loki.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -/** - * @Author: lyd - * @Description: 服务类 - * @Date: 2022-08-15 - */ -public interface LokiService { - - /** - * 获取日志信息 - * @param json - * @return - */ - JSONObject getLogData(JSONObject json); - - /** - * 获取labels和values树 - * @return - */ - JSONArray getLabelsValues(); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java deleted file mode 100644 index f6eeb49..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/loki/service/impl/LokiServiceImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.nl.modules.loki.service.impl; - -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import org.nl.modules.loki.service.LokiService; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -/** - * @Author: lyd - * @Description: 实现类 - * @Date: 2022-08-15 - */ -@Service -@RequiredArgsConstructor -public class LokiServiceImpl implements LokiService { - - @Value("${loki.url}") - private String lokiUrl; - - @Value("${loki.systemName}") - private String systemName; - - @Override - public JSONObject getLogData(JSONObject json) { - String logLabel = ""; - String logLabelValue = ""; - Long start = 0L; - Long end = 0L; - String text = ""; - String limit = "100"; - String direction = "backward"; - if (json.get("logLabel") != null) logLabel = json.getString("logLabel"); - if (json.get("logLabelValue") != null) logLabelValue = json.getString("logLabelValue"); - if (json.get("text") != null) text = json.getString("text"); - if (json.get("start") != null) start = json.getLong("start"); - if (json.get("end") != null) end = json.getLong("end"); - if (json.get("limits") != null) limit = json.getString("limits"); - if (json.get("direction") != null) direction = json.getString("direction"); - /** - * 组织参数 - * 纳秒数 - * 1660037391880000000 - * 1641453208415000000 - * http://localhost:3100/loki/api/v1/query_range?query={host="localhost"} |= ``&limit=1500&start=1641453208415000000&end=1660027623419419002 - */ - JSONObject parse = null; - String query = lokiUrl + "/query_range?query={system=\"" + systemName + "\", " + logLabel + "=\"" + logLabelValue + "\"} |= `" + text + "`"; - String result = ""; - if (start==0L) { - result = HttpUtil.get(query + "&limit=" + limit + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8); - } else { - result = HttpUtil.get(query + "&limit=" + limit + "&start=" + start + "&end=" + end + "&direction=" + direction, CharsetUtil.CHARSET_UTF_8); - } - try { - parse = (JSONObject) JSONObject.parse(result); - } catch (Exception e) { -// reslut的值可能为:too many outstanding requests,无法转化成Json - System.out.println("reslut:" + result); -// e.printStackTrace(); - } - return parse; - } - - /** - * 获取labels和values树 - * - * @return - */ - @Override - public JSONArray getLabelsValues() { - /** - * [{ - * label: - * value: - * children:[{ - * label - * value - * }] - * }] - */ - JSONArray result = new JSONArray(); - // 获取所有标签 - String labelString = HttpUtil.get(lokiUrl + "/labels", CharsetUtil.CHARSET_UTF_8); - JSONObject parse = (JSONObject) JSONObject.parse(labelString); - JSONArray labels = parse.getJSONArray("data"); - for (int i=0; i - * 部门表 前端控制器 - *

- * - * @author generator - * @since 2022-12-15 - */ -@RestController -@RequestMapping("/sysUserDept") -public class SysUserDeptController { - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index cdcf92c..e9809e8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -9,6 +9,7 @@ import org.nl.modules.logging.annotation.Log; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dto.DictQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -28,11 +29,11 @@ import java.util.Set; * @since 2022-12-14 */ @RestController -@RequiredArgsConstructor @RequestMapping("/api/dict") public class SysDictController { - private final ISysDictService dictService; + @Autowired + private ISysDictService dictService; @Log("查询字典") @GetMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 26297fc..81d06da 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -22,11 +23,12 @@ import org.springframework.web.bind.annotation.*; */ @SaIgnore @RestController -@RequiredArgsConstructor @Api(tags = "系统：代码生成管理") @RequestMapping("api/genConfig") public class CodeGenConfigController { - private final ICodeGenConfigService genConfigService; + + @Autowired + private ICodeGenConfigService genConfigService; @ApiOperation("查询表数据") @GetMapping(value = "/{tableName}") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index b6b1eff..964d0ff 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -1,16 +1,15 @@ package org.nl.system.controller.generator; - import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.ICodeGeneratorService; import org.nl.system.service.generator.dao.CodeColumnConfig; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -30,12 +29,13 @@ import java.util.List; */ @SaIgnore @RestController -@RequiredArgsConstructor @RequestMapping("/api/generator") @Api(tags = "系统：代码生成管理") public class CodeGeneratorController { - private final ICodeGeneratorService generatorService; - private final ICodeGenConfigService genConfigService; + @Autowired + private ICodeGeneratorService generatorService; + @Autowired + private ICodeGenConfigService genConfigService; @Value("${generator.enabled}") private Boolean generatorEnabled; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java new file mode 100644 index 0000000..609c992 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java @@ -0,0 +1,35 @@ +package org.nl.system.controller.lucence; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.system.service.lucene.LuceneService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@Api(tags = "日志检索") +@RequestMapping("/api/lucene") +@Slf4j +public class LuceneController { + + private final LuceneService luceneService; + + @GetMapping("/getAll") + @Log("日志检索") + @ApiOperation("日志检索") + //@PreAuthorize("@el.check('task:list')") + public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK); + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 2af853b..ed233ca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -15,6 +15,7 @@ import org.nl.system.service.menu.ISysMenuService; import org.nl.system.service.menu.dao.SysMenu; import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.dto.MenuQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -33,9 +34,9 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api/sysMenu") -@RequiredArgsConstructor public class SysMenuController { - private final ISysMenuService iSysMenuService; + @Autowired + private ISysMenuService iSysMenuService; @GetMapping(value = "/build") @ApiOperation("根据用户获取菜单") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java index a1f8fa9..6700fc4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -3,13 +3,13 @@ package org.nl.system.controller.param; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -31,10 +31,10 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("/api/param") -@RequiredArgsConstructor class SysParamController { - private final ISysParamService paramService; + @Autowired + private ISysParamService paramService; @GetMapping @Log("查询系统参数") @ApiOperation("查询系统参数") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index a057b70..359094a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -13,6 +13,7 @@ import org.nl.sso.service.dto.DataPermissionDto; import org.nl.system.service.permission.ISysDataPermissionService; import org.nl.system.service.permission.dao.SysDataPermission; import org.nl.system.service.permission.dto.SysDataPermissionQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -30,12 +31,12 @@ import java.util.Set; */ @Slf4j @RestController -@RequiredArgsConstructor @Api(tags = "数据管理") @RequestMapping("/api/dataPermission") public class SysDataPermissionController { - private final ISysDataPermissionService dataPermissionService; + @Autowired + private ISysDataPermissionService dataPermissionService; @GetMapping @Log("查询数据权限") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 3a35b01..a0f1d6d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -4,7 +4,6 @@ package org.nl.system.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -13,6 +12,7 @@ import org.nl.modules.logging.annotation.Log; import org.nl.system.service.quartz.ISysQuartzJobService; import org.nl.system.service.quartz.dao.SysQuartzJob; import org.nl.system.service.quartz.dto.JobQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -30,13 +30,13 @@ import java.util.Set; */ @Slf4j @RestController -@RequiredArgsConstructor @RequestMapping("/api/jobs") @Api(tags = "系统:定时任务管理") public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; - private final ISysQuartzJobService quartzJobService; + @Autowired + private ISysQuartzJobService quartzJobService; @ApiOperation("查询定时任务") @GetMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java index 9e804a8..ceee3a8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -3,11 +3,11 @@ package org.nl.system.controller.role; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.nl.system.service.role.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -25,10 +25,10 @@ import java.util.Set; */ @RestController @RequestMapping("/api/sysRole") -@RequiredArgsConstructor public class SysRoleController { - private final ISysRoleService roleService; + @Autowired + private ISysRoleService roleService; @ApiOperation("分页查询角色") @GetMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index ebd3b4b..a90f557 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.SecurityUtils; @@ -20,11 +19,12 @@ import org.nl.modules.system.service.RoleService; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.nl.system.service.user.ISysUserService; +import org.nl.system.service.user.dao.SysUser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; @@ -38,22 +38,25 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") -@RequiredArgsConstructor @Api(tags = "系统：系统授权接口") public class AuthorizationController { - private final RedisUtils redisUtils; - private final OnlineUserService onlineUserService; - private final ISysUserService userService; - private final RoleService roleService; + @Autowired + private RedisUtils redisUtils; + @Autowired + private OnlineUserService onlineUserService; + @Autowired + private ISysUserService userService; + @Autowired + private RoleService roleService; - @Resource + @Autowired private LoginProperties loginProperties; @ApiOperation("登录授权") @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap) throws Exception { if (ObjectUtil.isEmpty(authMap)){ - return ResponseEntity.noContent().build(); + return ResponseEntity.noContent().build(); } return ResponseEntity.ok(onlineUserService.login(authMap)); } @@ -73,8 +76,7 @@ public class AuthorizationController { @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null){ - WQLObject userTab = WQLObject.getWQLObject("sys_user"); - JSONObject user = userTab.query("user_id = '" + loginId + "'").uniqueResult(0); + SysUser user = userService.getById(loginId); return ResponseEntity.ok(user); } return ResponseEntity.noContent().build(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java index 3937396..ce58347 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java @@ -5,7 +5,6 @@ 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.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; @@ -14,6 +13,7 @@ import org.nl.modules.logging.annotation.Log; import org.nl.system.service.tools.IToolLocalStorageService; import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -31,11 +31,11 @@ import java.util.Set; * @since 2022-12-20 */ @RestController -@RequiredArgsConstructor @Api(tags = "工具：本地存储管理") @RequestMapping("/api/localStorage") public class ToolLocalStorageController { - private final IToolLocalStorageService localStorageService; + @Autowired + private IToolLocalStorageService localStorageService; @ApiOperation("查询文件") @GetMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java index 6b0f7bd..55e67b8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.modules.common.utils.EncryptUtils; import org.nl.system.service.secutiry.impl.OnlineUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -33,12 +34,12 @@ import java.util.Set; * @author Zheng Jie */ @RestController -@RequiredArgsConstructor @RequestMapping("/auth/online") @Api(tags = "系统：在线用户管理") public class OnlineController { - private final OnlineUserService onlineUserService; + @Autowired + private OnlineUserService onlineUserService; @ApiOperation("查询在线用户") @GetMapping diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index ad08770..c1b6bfd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -52,7 +52,7 @@ import java.util.Set; public class UserController { @Autowired - ISysUserService userService; + private ISysUserService userService; @ApiOperation("查询用户") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java index f804806..6a839eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java @@ -5,15 +5,15 @@ import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.utils.SecurityUtils; +import org.nl.system.service.coderule.ISysCodeRuleDetailService; import org.nl.system.service.coderule.dao.SysCodeRuleDetail; import org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper; -import org.nl.system.service.coderule.ISysCodeRuleDetailService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.coderule.dto.CodeRuleDetailQuery; import org.nl.system.service.coderule.utils.CodeRuleTypeEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,10 +28,9 @@ import java.util.Date; * @since 2022-12-20 */ @Service -@RequiredArgsConstructor public class SysCodeRuleDetailServiceImpl extends ServiceImpl implements ISysCodeRuleDetailService { - - private final SysCodeRuleDetailMapper codeRuleDetailMapper; + @Autowired + private SysCodeRuleDetailMapper codeRuleDetailMapper; @Override public IPage queryAll(CodeRuleDetailQuery form, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java index 455140c..669914c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -6,19 +6,19 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.RequiredArgsConstructor; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.tools.MapOf; +import org.nl.system.service.coderule.ISysCodeRuleService; import org.nl.system.service.coderule.dao.SysCodeRule; import org.nl.system.service.coderule.dao.SysCodeRuleDetail; import org.nl.system.service.coderule.dao.mapper.SysCodeRuleDetailMapper; import org.nl.system.service.coderule.dao.mapper.SysCodeRuleMapper; -import org.nl.system.service.coderule.ISysCodeRuleService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.coderule.dto.CodeRuleQuery; import org.nl.system.service.coderule.utils.CodeRuleTypeEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,11 +36,11 @@ import java.util.Set; * @since 2022-12-19 */ @Service -@RequiredArgsConstructor public class SysCodeRuleServiceImpl extends ServiceImpl implements ISysCodeRuleService { - - private final SysCodeRuleMapper codeRuleMapper; - private final SysCodeRuleDetailMapper codeRuleDetailMapper; + @Autowired + private SysCodeRuleMapper codeRuleMapper; + @Autowired + private SysCodeRuleDetailMapper codeRuleDetailMapper; @Override public IPage queryAll(CodeRuleQuery form, PageQuery pageable) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index c1ce6e8..8a90e43 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.dict.dto.DictQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,10 +33,9 @@ import java.util.Set; * @since 2022-12-14 */ @Service -@RequiredArgsConstructor public class SysDictServiceImpl extends ServiceImpl implements ISysDictService { - - private final SysDictMapper sysDictMapper; + @Autowired + private SysDictMapper sysDictMapper; @Override public IPage queryAll(Map whereJson, PageQuery page) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java index f021080..7d0f5af 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.RequiredArgsConstructor; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; import org.nl.system.service.generator.dao.mapper.CodeGenConfigMapper; -import org.nl.system.service.generator.ICodeGenConfigService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.File; @@ -22,10 +22,10 @@ import java.io.File; * @since 2023-05-03 */ @Service -@RequiredArgsConstructor public class CodeGenConfigServiceImpl extends ServiceImpl implements ICodeGenConfigService { - private final CodeGenConfigMapper codeGenConfigMapper; + @Autowired + private CodeGenConfigMapper codeGenConfigMapper; @Override public CodeGenConfig findByTableName(String tableName) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java index cedf9f0..ae860f9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; @@ -20,6 +19,7 @@ import org.nl.system.service.generator.dao.CodeGenConfig; import org.nl.system.service.generator.dao.mapper.CodeColumnConfigMapper; import org.nl.system.service.generator.dto.ColumnInfo; import org.nl.system.service.generator.dto.TablesInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -41,10 +41,10 @@ import java.util.stream.Collectors; * @since 2023-05-03 */ @Service -@RequiredArgsConstructor public class CodeGeneratorServiceImpl extends ServiceImpl implements ICodeGeneratorService { - private final CodeColumnConfigMapper columnConfigMapper; + @Autowired + private CodeColumnConfigMapper columnConfigMapper; @Override public IPage getTables(String name, PageQuery pageQuery) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java new file mode 100644 index 0000000..cd2f571 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java @@ -0,0 +1,40 @@ +package org.nl.system.service.lucene; + +import org.nl.system.service.lucene.dto.LuceneLogDto; + +import java.io.IOException; + +public interface LuceneExecuteLogService { + /** + * 设备光电变化实时光电信号 + * + * @param device_code 设备编号 + * @param key plc信号 + * @param value plc信号值 + */ + void deviceItemValue(String device_code, String key, String value); + + /** + * 设备执行日志,会保留历史记录 + * + * @param luceneLogDto 日志结果对象 + */ + void deviceExecuteLog(LuceneLogDto luceneLogDto); + + /** + * 接口日志,会保留历史记录 + * + * @param luceneLogDto 日志结果对象 + */ + void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException; + + /** + * 设备执行日志,会保留历史记录 + * + * @param name 日志名称 + * @param message 日志信息 + */ + void extLog(String name, String message); + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java new file mode 100644 index 0000000..96560e8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java @@ -0,0 +1,19 @@ +package org.nl.system.service.lucene; + +import com.alibaba.fastjson.JSONArray; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + + +public interface LuceneService { + + /** + * 获取数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map getAll(Map whereJson, Pageable page); +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java new file mode 100644 index 0000000..7cda043 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java @@ -0,0 +1,86 @@ +package org.nl.system.service.lucene.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class LuceneLogDto { + + /* 日志标识 */ + private String log_uuid; + /*日志类型*/ + private String logType; + /*设备编号*/ + private String device_code; + /*内容详情*/ + private String content; + + /* 任务编码 */ + private String task_code; + + /* 指令编码 */ + private String instruct_code; + + /* 任务标识 */ + private String task_id; + + /* 载具号 */ + private String vehicle_code; + + /* 备注 */ + private String remark; + + /* 日志类型 */ + private String log_type; + + /* 方法 */ + private String method; + + /* 请求参数 */ + private String requestparam; + + /* 响应参数 */ + private String responseparam; + + /* 请求地址 */ + private String requesturl; + + /* 状态码 */ + private String status_code; + + /* 是否删除 1:是；0：否 */ + private String is_delete; + + /* 创建者 */ + private String create_by; + + /* 创建时间 YYYY-MM-DD hh:mm:ss */ + private String create_time; + + /* 修改者 */ + private String update_by; + + /* 修改时间 */ + private String update_time; + + + + public LuceneLogDto (final String opc_server_code,final String opc_plc_code, + final String device_code,final String to_home,final int last_home, + final int home) { + super (); + this.device_code = device_code; + this.content = "信号" + + opc_server_code + "." + + opc_plc_code + "." + + device_code + "." + + to_home + "变更从" + + last_home + "->" + + home; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java new file mode 100644 index 0000000..8379a43 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java @@ -0,0 +1,104 @@ +package org.nl.system.service.lucene.impl; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.StringField; +import org.apache.lucene.document.TextField; +import org.apache.lucene.index.IndexWriter; +import org.nl.common.enums.LogTypeEnum; +import org.nl.config.lucene.LuceneIndexWriter; +import org.nl.system.service.lucene.LuceneExecuteLogService; +import org.nl.system.service.lucene.dto.LuceneLogDto; +import org.slf4j.MDC; +import org.springframework.stereotype.Service; + +import java.io.IOException; + +/** + * @author jlm + * @description 服务实现 + * @date 2023-04-11 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { + + @Override + public void deviceItemValue(String device_code, String key, String value) { + String now = DateUtil.now(); + } + + @SneakyThrows + @Override + public void deviceExecuteLog(LuceneLogDto luceneLogDto) { + luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); + addIndex(luceneLogDto); + } + + @Override + public void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException { + luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); + addIndex(luceneLogDto); + } + + private void addIndex(LuceneLogDto luceneLogDto) throws IOException { + IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter(); + //创建一个Document对象 + Document document = new Document(); + try { + //记录索引开始时间 + long startTime = System.currentTimeMillis(); + //向document对象中添加域。 + if (ObjectUtil.isNotEmpty(luceneLogDto.getDevice_code())) { + document.add(new StringField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES)); +// document.add(new TextField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getContent())) { + document.add(new TextField("fieldContent", luceneLogDto.getContent(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getMethod())) { + document.add(new StringField("method", luceneLogDto.getMethod(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getStatus_code())) { + document.add(new StringField("status_code", luceneLogDto.getStatus_code(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getRequestparam())) { + document.add(new TextField("requestparam", luceneLogDto.getRequestparam(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getResponseparam())) { + document.add(new TextField("responseparam", luceneLogDto.getResponseparam(), Field.Store.YES)); + } + document.add(new StringField("logType", luceneLogDto.getLogType(), Field.Store.YES)); + document.add(new StringField("logTime", DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS"), Field.Store.YES)); + indexWriter.addDocument(document); + //记录索引结束时间 + long endTime = System.currentTimeMillis(); + log.info("建立索引共耗时{}毫秒", endTime - startTime); + indexWriter.commit(); + MDC.put("DEVICECODE", luceneLogDto.getDevice_code()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { +// MDC.remove("DEVICECODE"); + } + } + + @Override + public void extLog(String name, String message) { + try { + MDC.put(name, name); + log.info("{}", message); + } catch (Exception e) { + e.printStackTrace(); + } finally { + MDC.remove(name); + } + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java new file mode 100644 index 0000000..f7cc829 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java @@ -0,0 +1,44 @@ +package org.nl.system.service.lucene.impl; + +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.config.lucene.Searcher; +import org.nl.system.service.lucene.LuceneService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.Map; + + +@Service +@RequiredArgsConstructor +@Slf4j +public class LuceneServiceImpl implements LuceneService { + + //日志索引目录 + @Value("${lucene.index.path}") + private String luceneUrl; + + @Override + public Map getAll(Map whereJson, Pageable page) { + JSONObject jo = new JSONObject(); + try { + JSONObject jsonObject = (JSONObject) Searcher.search(luceneUrl, "", whereJson); + JSONArray array = jsonObject.getJSONArray("content"); + int totalElements = Integer.parseInt(jsonObject.get("totalElements").toString()); + jo.put("content", array); + jo.put("totalElements", totalElements); + } catch (Exception e) { + log.error("索引查询为空", e); + throw new NullPointerException("索引查询为空"); + } + + return jo; + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index 7467828..1eb6370 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -21,11 +21,14 @@ import org.nl.modules.system.util.CopyUtil; import org.nl.modules.tools.IdUtil; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; +import org.nl.system.service.lucene.LuceneExecuteLogService; +import org.nl.system.service.lucene.dto.LuceneLogDto; import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.ISysMenuService; import org.nl.system.service.menu.dao.SysMenu; import org.nl.system.service.menu.dao.mapper.SysMenuMapper; import org.nl.system.service.menu.dto.MenuQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -42,12 +45,17 @@ import java.util.stream.Collectors; * @since 2022-12-15 */ @Service -@RequiredArgsConstructor @Slf4j public class SysMenuServiceImpl extends ServiceImpl implements ISysMenuService { - private final SysMenuMapper baseMapper; - private final SysDictMapper sysDictMapper; + @Autowired + private SysMenuMapper baseMapper; + + @Autowired + private SysDictMapper sysDictMapper; + + @Autowired + private LuceneExecuteLogService luceneExecuteLogService; @Override public List queryAll(Map param) { @@ -59,6 +67,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List query(MenuQuery query, PageQuery page) { + luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder().log_type("we").device_code("sd").content("saf").build()); if (StringUtils.isNotEmpty(query.getBlurry())){ query.setPid(null); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index e72093e..63f70e5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.system.service.param.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** *

@@ -66,7 +68,14 @@ public class SysParamServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void update(Param param) { Param paramObj = paramMapper.selectById(param.getId()); - if (ObjectUtil.isEmpty(paramObj)) throw new BadRequestException("被删除或无权限，操作失败!"); + if (ObjectUtil.isEmpty(paramObj)) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } + Param param1 = paramMapper.selectOne(new LambdaQueryWrapper().eq(Param::getCode, param.getCode()) + .and(lam -> lam.ne(Param::getId, param.getId()))); + if (ObjectUtil.isNotEmpty(param1)) { + throw new BadRequestException("编码[" + param.getCode() + "]已存在"); + } param.setUpdate_id(SecurityUtils.getCurrentUserId()); param.setUpdate_name(SecurityUtils.getCurrentNickName()); param.setUpdate_time(DateUtil.now()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml index 15d24e2..7311d1f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml @@ -3,11 +3,11 @@ INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id) - VALUES (#{dataScope.selfUserId}, #{dataScope.permissionScopeType}, #{dataScope.userId}) + VALUES (#{dataScope.self_user_id}, #{dataScope.permission_scope_type}, #{dataScope.user_id}) INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id, dept_id) - VALUES (#{dataScope.selfUserId}, #{dataScope.permissionScopeType}, #{dataScope.userId}, #{dataScope.deptId}) + VALUES (#{dataScope.self_user_id}, #{dataScope.permission_scope_type}, #{dataScope.user_id}, #{dataScope.dept_id}) DELETE FROM sys_data_scope WHERE self_user_id = #{userId} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index 5f768fc..f39a6a8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java @@ -7,21 +7,21 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.RequiredArgsConstructor; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; +import org.nl.system.service.permission.ISysDataPermissionService; import org.nl.system.service.permission.dao.SysDataPermission; import org.nl.system.service.permission.dao.SysDataScope; import org.nl.system.service.permission.dao.mapper.SysDataPermissionMapper; -import org.nl.system.service.permission.ISysDataPermissionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.permission.dto.DataScopeEnum; import org.nl.system.service.permission.dto.SysDataPermissionQuery; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dto.UserDataPermissionDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,12 +37,14 @@ import java.util.Set; * @since 2022-12-20 */ @Service -@RequiredArgsConstructor public class SysDataPermissionServiceImpl extends ServiceImpl implements ISysDataPermissionService { - private final SysDataPermissionMapper dataPermissionMapper; - private final ISysUserService userService; - private final SysDictMapper dictMapper; + @Autowired + private SysDataPermissionMapper dataPermissionMapper; + @Autowired + private ISysUserService userService; + @Autowired + private SysDictMapper dictMapper; @Override public IPage queryAll(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { @@ -122,7 +124,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl user_ids = userService.getUserIdByDeptId(deptId); + String dept_id = dept.getString("dept_id"); + List user_ids = userService.getUserIdByDeptId(dept_id); user_ids.forEach(id -> { SysDataScope dataScope = new SysDataScope(); dataScope.setUser_id(id); - dataScope.setDept_id(deptId); + dataScope.setDept_id(dept_id); dataScope.setSelf_user_id(user_id); dataScope.setPermission_scope_type(permission_scope_type); dataPermissionMapper.insertDataScopes(dataScope); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java index f5fdfd6..f563e57 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java @@ -7,20 +7,20 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.SecurityUtils; +import org.nl.system.service.quartz.ISysQuartzJobService; import org.nl.system.service.quartz.dao.SysQuartzJob; import org.nl.system.service.quartz.dao.SysQuartzLog; import org.nl.system.service.quartz.dao.mapper.SysQuartzJobMapper; -import org.nl.system.service.quartz.ISysQuartzJobService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.quartz.dao.mapper.SysQuartzLogMapper; import org.nl.system.service.quartz.dto.JobQuery; import org.nl.system.service.quartz.utils.QuartzManage; import org.quartz.CronExpression; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,13 +38,15 @@ import java.util.Set; * @since 2022-12-19 */ @Service -@RequiredArgsConstructor public class SysQuartzJobServiceImpl extends ServiceImpl implements ISysQuartzJobService { - - private final SysQuartzJobMapper quartzJobMapper; - private final SysQuartzLogMapper quartzLogMapper; - private final QuartzManage quartzManage; - private final RedisUtils redisUtils; + @Autowired + private SysQuartzJobMapper quartzJobMapper; + @Autowired + private SysQuartzLogMapper quartzLogMapper; + @Autowired + private QuartzManage quartzManage; + @Autowired + private RedisUtils redisUtils; @Override public IPage queryAll(JobQuery criteria, PageQuery pageable) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 44e4661..cbef266 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -10,15 +10,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; +import org.nl.system.service.menu.dao.mapper.SysMenuMapper; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.role.dao.SysRole; import org.nl.system.service.role.dao.mapper.SysRoleMapper; -import org.nl.system.service.menu.dao.mapper.SysMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -34,12 +34,12 @@ import java.util.*; * @since 2022-12-15 */ @Service -@RequiredArgsConstructor public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService { - private final SysRoleMapper roleMapper; - - private final SysMenuMapper sysMenuMapper; + @Autowired + private SysRoleMapper roleMapper; + @Autowired + private SysMenuMapper sysMenuMapper; @Override public IPage query(Map param, PageQuery page) { @@ -112,7 +112,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void updateMenu(JSONObject form) { - String roleId = form.getString("roleId"); + String roleId = form.getString("role_id"); JSONArray menus = form.getJSONArray("menus"); Set menuIds = new HashSet<>(); for (int i = 0; i < menus.size(); i++) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index a8b0a56..44f08d9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -56,7 +56,8 @@ public class OnlineUserService { private ISysUserService sysUserService; @Autowired private ISysRoleService roleService; - private final RedisUtils redisUtils; + @Autowired + private RedisUtils redisUtils; public OnlineUserService(RedisUtils redisUtils) { this.redisUtils = redisUtils; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java index 64df7d1..4bad2f4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.system.service.tools.dao.mapper.ToolLocalStorageMapper; import org.nl.system.service.tools.IToolLocalStorageService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -32,11 +33,12 @@ import java.util.Set; * @since 2022-12-20 */ @Service -@RequiredArgsConstructor public class ToolLocalStorageServiceImpl extends ServiceImpl implements IToolLocalStorageService { - private final FileProperties properties; - private final ToolLocalStorageMapper localStorageMapper; + @Autowired + private FileProperties properties; + @Autowired + private ToolLocalStorageMapper localStorageMapper; @Override public IPage queryAll(ToolLocalStorageQuery criteria, PageQuery pageable) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 1876bf2..719c300 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -25,7 +25,7 @@ sys_user.extuser_id as extuserId - INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) VALUES (#{dataPermission.userId}, #{dataPermission.permissionScopeType}, #{dataPermission.permissionId}) + INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) VALUES (#{dataPermission.user_id}, #{dataPermission.permission_scope_type}, #{dataPermission.permission_id}) DELETE FROM sys_user_data_permission WHERE user_id = #{userId} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 1de352b..7e5e0b8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -100,22 +100,19 @@ public class ISysUserServiceImpl extends ServiceImpl imp @Override @Transactional public void update(Map userDetail) { - if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("userId")==null){ + if(CollectionUtils.isEmpty(userDetail) || ObjectUtil.isEmpty(userDetail.get("user_id"))){ return; } SysUser sysUser = new SysUser(); org.springframework.beans.BeanUtils.copyProperties(userDetail,sysUser); //转换器 - ConvertUtils.register(new Converter() { - @Override - public Object convert(Class aClass, Object o) { - try { - if (o == null){ return null; } - return new SimpleDateFormat("yyyy-MM-dd").parse(o.toString()); - }catch (Exception ex){ - return null; - } + ConvertUtils.register((aClass, o) -> { + try { + if (o == null){ return null; } + return new SimpleDateFormat("yyyy-MM-dd").parse(o.toString()); + }catch (Exception ex){ + return null; } }, Date.class); try { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java index cc3555d..37a487a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java @@ -31,10 +31,10 @@ public class MdBaseWorkshop implements Serializable { private String remark; @ApiModelProperty(value = "是否启用") - private String is_used; + private Boolean is_used; @ApiModelProperty(value = "是否删除") - private String is_delete; + private Boolean is_delete; @ApiModelProperty(value = "创建人") private String create_id; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java index c696379..b11a793 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java @@ -46,7 +46,6 @@ public class MdBaseWorkshopServiceImpl extends ServiceImpl query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增工单管理") + @ApiOperation("新增工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:add')") + public ResponseEntity create(@Validated @RequestBody PdmBdWorkorder entity){ + pdmBdWorkorderService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改工单管理") + @ApiOperation("修改工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:edit')") + public ResponseEntity update(@Validated @RequestBody PdmBdWorkorder entity){ + pdmBdWorkorderService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除工单管理") + @ApiOperation("删除工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + pdmBdWorkorderService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java new file mode 100644 index 0000000..95ef218 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java @@ -0,0 +1,43 @@ +package org.nl.wms.pdm.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-05-05 +**/ +public interface IPdmBdWorkorderService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(PdmBdWorkorder entity); + + /** + * 编辑 + * @param entity / + */ + void update(PdmBdWorkorder entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java new file mode 100644 index 0000000..39040a2 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java @@ -0,0 +1,113 @@ +package org.nl.wms.pdm.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** +* @description / +* @author lyd +* @date 2023-05-05 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bd_workorder") +public class PdmBdWorkorder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "workorder_id", type = IdType.NONE) + @ApiModelProperty(value = "工单标识") + private String workorder_id; + + @ApiModelProperty(value = "工单编号") + private String workorder_code; + + @ApiModelProperty(value = "生产日期") + private String produce_date; + + @ApiModelProperty(value = "计划数量") + private BigDecimal plan_qty; + + @ApiModelProperty(value = "实际数量") + private BigDecimal real_qty; + + @ApiModelProperty(value = "物料标识") + private String material_id; + + @ApiModelProperty(value = "载具类型") + private String vehicle_type; + + @ApiModelProperty(value = "计划开始时间") + private String planproducestart_date; + + @ApiModelProperty(value = "计划结束时间") + private String planproduceend_date; + + @ApiModelProperty(value = "实际开始时间") + private String realproducestart_date; + + @ApiModelProperty(value = "实际结束时间") + private String realproduceend_date; + + @ApiModelProperty(value = "静置时间(分钟)") + private BigDecimal standing_time; + + @ApiModelProperty(value = "点位编码") + private String point_code; + + @ApiModelProperty(value = "点位名称") + private String point_name; + + @ApiModelProperty(value = "区域编码") + private String region_code; + + @ApiModelProperty(value = "区域名称") + private String region_name; + + @ApiModelProperty(value = "工单状态") + private String workorder_status; + + @ApiModelProperty(value = "是否需要AGV搬运") + private String is_needmove; + + @ApiModelProperty(value = "工单类型") + private String workorder_type; + + @ApiModelProperty(value = "回传MES状态") + private String passback_status; + + @ApiModelProperty(value = "车间编码") + private String workshop_code; + + @ApiModelProperty(value = "外部标识") + private String ext_id; + + @ApiModelProperty(value = "是否删除") + private Boolean is_delete; + + @ApiModelProperty(value = "创建人") + private String create_id; + + @ApiModelProperty(value = "创建人") + private String create_name; + + @ApiModelProperty(value = "创建时间") + private String create_time; + + @ApiModelProperty(value = "修改人") + private String update_id; + + @ApiModelProperty(value = "修改人") + private String update_name; + + @ApiModelProperty(value = "修改时间") + private String update_time; + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java new file mode 100644 index 0000000..bebac07 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.pdm.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public interface PdmBdWorkorderMapper extends BaseMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml new file mode 100644 index 0000000..6319a41 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java new file mode 100644 index 0000000..d1789d4 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java @@ -0,0 +1,101 @@ +package org.nl.wms.pdm.service.dto; + +import lombok.Data; +import java.io.Serializable; +import java.math.BigDecimal; + +/** +* @description / +* @author lyd +* @date 2023-05-05 +**/ +@Data +public class PdmBdWorkorderDto implements Serializable { + + /** 工单标识 */ + private String workorder_id; + + /** 工单编号 */ + private String workorder_code; + + /** 生产日期 */ + private String produce_date; + + /** 计划数量 */ + private BigDecimal plan_qty; + + /** 实际数量 */ + private BigDecimal real_qty; + + /** 物料标识 */ + private String material_id; + + /** 载具类型 */ + private String vehicle_type; + + /** 计划开始时间 */ + private String planproducestart_date; + + /** 计划结束时间 */ + private String planproduceend_date; + + /** 实际开始时间 */ + private String realproducestart_date; + + /** 实际结束时间 */ + private String realproduceend_date; + + /** 静置时间(分钟) */ + private BigDecimal standing_time; + + /** 点位编码 */ + private String point_code; + + /** 点位名称 */ + private String point_name; + + /** 区域编码 */ + private String region_code; + + /** 区域名称 */ + private String region_name; + + /** 工单状态 */ + private String workorder_status; + + /** 是否需要AGV搬运 */ + private String is_needmove; + + /** 工单类型 */ + private String workorder_type; + + /** 回传MES状态 */ + private String passback_status; + + /** 车间编码 */ + private String workshop_code; + + /** 外部标识 */ + private String ext_id; + + /** 是否删除 */ + private Boolean is_delete; + + /** 创建人 */ + private String create_id; + + /** 创建人 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private String update_id; + + /** 修改人 */ + private String update_name; + + /** 修改时间 */ + private String update_time; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java new file mode 100644 index 0000000..df98db8 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.pdm.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; + +/** +* @author lyd +* @date 2023-05-05 +**/ +public class PdmBdWorkorderQuery extends BaseQuery { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java new file mode 100644 index 0000000..e8de2b3 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java @@ -0,0 +1,80 @@ +package org.nl.wms.pdm.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.wms.pdm.service.IPdmBdWorkorderService; +import org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderMapper; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author lyd +* @date 2023-05-05 +**/ +@Slf4j +@Service +public class PdmBdWorkorderServiceImpl extends ServiceImpl implements IPdmBdWorkorderService { + + @Autowired + private PdmBdWorkorderMapper pdmBdWorkorderMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pdmBdWorkorderMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(PdmBdWorkorder entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + pdmBdWorkorderMapper.insert(entity); + } + + @Override + public void update(PdmBdWorkorder entity) { + PdmBdWorkorder dto = pdmBdWorkorderMapper.selectById(entity.getWorkorder_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + + pdmBdWorkorderMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + pdmBdWorkorderMapper.deleteBatchIds(ids); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 5aa8f06..7e2d7ef 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -161,8 +161,3 @@ sa-token: password: # 连接超时时间 timeout: 10s - - -loki: - url: http://localhost:3100/loki/api/v1 - systemName: acs diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index 1d3bb43..f0fc978 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -159,7 +159,3 @@ sa-token: token-prefix: Bearer is-read-cookie: false is-read-body: false - -loki: - url: http://localhost:3100/loki/api/v1 - systemName: lms diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml index d5f3408..f10e4cb 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-test.yml @@ -157,7 +157,3 @@ sa-token: jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq # token 前缀 token-prefix: Bearer - -loki: - url: http://localhost:3100/loki/api/v1 - systemName: lms diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 428c6ef..1df2c54 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -89,3 +89,6 @@ mybatis-plus: global-config: db-config: id-type: INPUT +lucene: + index: + path: D:\lucene\index diff --git a/nladmin-system/nlsso-server/src/main/resources/generator.properties b/nladmin-system/nlsso-server/src/main/resources/generator.properties index 0aee49d..0ec883b 100644 --- a/nladmin-system/nlsso-server/src/main/resources/generator.properties +++ b/nladmin-system/nlsso-server/src/main/resources/generator.properties @@ -1,27 +1,20 @@ -#数据库类型转Java类型 -tinyint=Integer +# ????Java???? +tinyint=Boolean smallint=Integer mediumint=Integer int=Integer integer=Integer - bigint=Long - float=Float - double=Double - decimal=BigDecimal - bit=Boolean - char=String varchar=String tinytext=String text=String mediumtext=String longtext=String - date=Date datetime=Date Date=Date diff --git a/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml new file mode 100644 index 0000000..42391d4 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml @@ -0,0 +1,34 @@ + + + + + + + + + + ${LOG_HOME}/XgAgvDeviceDriver/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 2GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + + + + + + + + diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 3e68ee7..db627cc 100644 --- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -14,14 +14,11 @@ https://juejin.cn/post/6844903775631572999 - - - - + @@ -57,29 +54,10 @@ https://juejin.cn/post/6844903775631572999 500 - - - - 1000 - - ${LOKI_URL}/push - - - - - ${log.pattern} - - true - - - - @@ -124,55 +102,42 @@ https://juejin.cn/post/6844903775631572999 - - - - - - - - - - - - - diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl index b439e9a..07f913f 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Dto.ftl @@ -1,5 +1,11 @@ package ${package}.service.dto; +<#if hasTimestamp> +import java.sql.Timestamp; + +<#if hasBigDecimal> +import java.math.BigDecimal; + import lombok.Data; import java.io.Serializable; diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl index 6a777b8..93dfaa8 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl @@ -9,7 +9,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Table; +<#if hasTimestamp> +import java.sql.Timestamp; + +<#if hasBigDecimal> +import java.math.BigDecimal; + import java.io.Serializable; /** diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl index 8ab80ef..eeabbf8 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -20,7 +20,6 @@ import org.springframework.stereotype.Service; import java.util.Map; import java.util.Set; - /** * @description 服务实现 * @author ${author} diff --git a/nladmin-ui/src/store/modules/user.js b/nladmin-ui/src/store/modules/user.js index c824fa1..cf272e8 100644 --- a/nladmin-ui/src/store/modules/user.js +++ b/nladmin-ui/src/store/modules/user.js @@ -82,6 +82,7 @@ export const logOut = (commit) => { } export const setUserInfo = (res, commit) => { + console.log(res) // 如果没有任何权限，则赋予一个默认的权限，避免请求死循环 if (res.roles && res.roles.length > 0) { commit('SET_ROLES', res.roles) diff --git a/nladmin-ui/src/views/loki/view/index.vue b/nladmin-ui/src/views/loki/view/index.vue deleted file mode 100644 index 054cd61..0000000 --- a/nladmin-ui/src/views/loki/view/index.vue +++ /dev/null @@ -1,454 +0,0 @@ - - - - - diff --git a/nladmin-ui/src/views/lucene/api/log.js b/nladmin-ui/src/views/lucene/api/log.js new file mode 100644 index 0000000..0b7ef0a --- /dev/null +++ b/nladmin-ui/src/views/lucene/api/log.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +export function delAll(id) { + return request({ + url: 'api/lucene/' + id, + method: 'delete' + }) +} + +export default { delAll } diff --git a/nladmin-ui/src/views/loki/api/loki.js b/nladmin-ui/src/views/lucene/api/lucene.js similarity index 84% rename from nladmin-ui/src/views/loki/api/loki.js rename to nladmin-ui/src/views/lucene/api/lucene.js index f71149d..674bb2c 100644 --- a/nladmin-ui/src/views/loki/api/loki.js +++ b/nladmin-ui/src/views/lucene/api/lucene.js @@ -2,8 +2,8 @@ import request from '@/utils/request' export function getLogData(param) { return request({ - url: 'api/loki/logs', - method: 'post', + url: 'api/lucene/getAll', + method: 'get', data: param }) } diff --git a/nladmin-ui/src/views/lucene/index.vue b/nladmin-ui/src/views/lucene/index.vue new file mode 100644 index 0000000..051df24 --- /dev/null +++ b/nladmin-ui/src/views/lucene/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/nladmin-ui/src/views/lucene/search.vue b/nladmin-ui/src/views/lucene/search.vue new file mode 100644 index 0000000..88a7655 --- /dev/null +++ b/nladmin-ui/src/views/lucene/search.vue @@ -0,0 +1,113 @@ + + + diff --git a/nladmin-ui/src/views/lucene/time.vue b/nladmin-ui/src/views/lucene/time.vue new file mode 100644 index 0000000..37b1601 --- /dev/null +++ b/nladmin-ui/src/views/lucene/time.vue @@ -0,0 +1,63 @@ + + + diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue index cde3861..eedd374 100644 --- a/nladmin-ui/src/views/system/dept/index.vue +++ b/nladmin-ui/src/views/system/dept/index.vue @@ -92,7 +92,7 @@ v-loading="crud.loading" lazy :load="getDeptDatas" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" + :tree-props="{children: 'children', hasChildren: 'has_children'}" :data="crud.data" row-key="dept_id" @select="crud.selectChange" @@ -220,7 +220,7 @@ export default { if (data.children) { this.buildDepts(data.children) } - if (data.hasChildren && !data.children) { + if (data.has_children && !data.children) { data.children = null } }) @@ -228,7 +228,7 @@ export default { getDepts() { crudDept.getDeptvo({ is_used: true }).then(res => { this.depts = res.content.map(function(obj) { - if (obj.hasChildren) { + if (obj.has_children) { obj.children = null } return obj diff --git a/nladmin-ui/src/views/system/menu/index.vue b/nladmin-ui/src/views/system/menu/index.vue index 8243bdd..a72e00d 100644 --- a/nladmin-ui/src/views/system/menu/index.vue +++ b/nladmin-ui/src/views/system/menu/index.vue @@ -141,7 +141,7 @@ :load="getMenus" :auto-load-root-options="false" :data="crud.data" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" + :tree-props="{children: 'children', hasChildren: 'has_children'}" row-key="menu_id" @select="crud.selectChange" diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue index 84eb41a..a283801 100644 --- a/nladmin-ui/src/views/system/role/index.vue +++ b/nladmin-ui/src/views/system/role/index.vue @@ -112,7 +112,7 @@ check-strictly accordion show-checkbox - node-key="menuId" + node-key="menu_id" @check="menuChange" /> diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue index b19ab2b..647b879 100644 --- a/nladmin-ui/src/views/system/user/index.vue +++ b/nladmin-ui/src/views/system/user/index.vue @@ -5,7 +5,7 @@
- + @@ -395,7 +395,7 @@ export default { dataPerm: false, dataDialog: {}, permissions: [], - permissionId: '', + permission_id: '', multipleSelection: [], // 选中 relevanceUser: false, // 关联用户 rowData: {}, // 当行数据 @@ -465,7 +465,7 @@ export default { this.getSupDepts(form.dept_id) } // this.getRoleLevel() 暂时不用 - form.is_used = form.enabled.toString() + // form.is_used = form.enabled.toString() }, // 新增前将多选的值设置为空 [CRUD.HOOK.beforeToAdd]() { @@ -534,11 +534,8 @@ export default { }, 100) }, getDepts() { - console.log('获取部门') crudDept.getDepts({ is_used: true }).then(res => { - console.log('获取的部门信息', res) this.depts = res.content.map(function(obj) { - console.log('---', obj) if (obj.hasChildren) { obj.children = null } @@ -548,7 +545,6 @@ export default { }, getSupDepts(deptId) { crudDept.getDeptSuperior(deptId).then(res => { - console.log('父部门', res) const date = res.content this.buildDepts(date) this.depts = date @@ -580,7 +576,7 @@ export default { }, normalizer(node) { return { - id: node.deptId, + id: node.dept_id, label: node.name, children: node.children } @@ -643,13 +639,13 @@ export default { crudDept.getDeptTree().then(res => { this.deptsDatas = res.content }) - this.openDrawer() + this.openDrawer() // 打开抽屉 this.drawerTitle = '分配部门权限' this.flag = true // 默认选中 const deptIds = [] for (var index in row.depts) { - deptIds.push(row.depts[index].deptId) + deptIds.push(row.depts[index].dept_id) } this.$nextTick(() => { this.$refs.deptUser.setCheckedKeys(deptIds) @@ -684,23 +680,25 @@ export default { this.multipleSelection = [] // 获取权限范围 crudDataPermission.getDataScopeType().then(res => { + console.log('权限范围', res) this.dataDialog.dataScopeType = res // permissions crudDataPermission.getDataPermissionOption().then(res => { - // console.log(res) + console.log('数据权限', res) this.permissions = res this.dataDialog.person_name = row.person_name this.dataDialog.username = row.username - this.dataDialog.userId = row.userId + this.dataDialog.user_id = row.user_id this.dataPermissionTitle = '[' + row.person_name + '] 数据权限' this.dataPerm = true // 回显数据 - crudDataPermission.getDataShow(row.userId).then(res => { + crudDataPermission.getDataShow(row.user_id).then(res => { + console.log('要回显的数据', res) this.$nextTick(function() { for (var index = 0; index < res.length; index++) { for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { if (this.dataDialog.dataScopeType[i].value == res[index].permissionScopeType) { - this.dataDialog.dataScopeType[i].permissionId = res[index].permissionId + this.dataDialog.dataScopeType[i].permission_id = res[index].permission_id if (res[index].users) this.dataDialog.dataScopeType[i].users = res[index].users if (res[index].depts) this.dataDialog.dataScopeType[i].depts = res[index].depts // 选中 @@ -719,24 +717,23 @@ export default { }, openRelevance(row, index) { for (var i = 0; i < this.permissions.length; i++) { - if (this.permissions[i].permissionId != undefined && this.permissions[i].permissionId && this.permissions[i].permissionId != row.permissionId) { - this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permissionId.toString()) + if (this.permissions[i].permission_id != undefined && this.permissions[i].permission_id && this.permissions[i].permission_id != row.permission_id) { + this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permission_id.toString()) } } - this.$set(this.dataDialog.dataScopeType[index], this.dataDialog.dataScopeType[index].permissionId, row.permissionId) + this.$set(this.dataDialog.dataScopeType[index], this.dataDialog.dataScopeType[index].permission_id, row.permission_id) this.rowData = {} this.deptIds = [] this.userIds = [] - console.log(row) - if (row.permissionId == '1605129738328870912') { // 选择用户 + if (row.permission_id == '1605129738328870912') { // 选择用户 this.userIds = this.dataDialog.dataScopeType[index].users this.rowData = row this.relevanceUser = true - } else if (row.permissionId == '1605129882164137984') { // 选择部门 + } else if (row.permission_id == '1605129882164137984') { // 选择部门 this.deptIds = this.dataDialog.dataScopeType[index].depts this.rowData = row this.relevanceDept = true - } else if (row.permissionId == '1605128919449735168') { // 自身 + } else if (row.permission_id == '1605128919449735168') { // 自身 const param = { userId: this.dataDialog.userId } @@ -749,7 +746,7 @@ export default { }, selectUsers(row) { // row对话框传来的数据 for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { - if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) { + if (this.dataDialog.dataScopeType[i].dict_id == this.rowData.dict_id) { if (this.dataDialog.dataScopeType[i].depts != undefined && this.dataDialog.dataScopeType[i].depts.length > 0) this.dataDialog.dataScopeType[i].depts = [] this.dataDialog.dataScopeType[i].users = row break @@ -759,7 +756,7 @@ export default { }, selectDepts(row) { for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { - if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) { + if (this.dataDialog.dataScopeType[i].dict_id == this.rowData.dictId) { if (this.dataDialog.dataScopeType[i].users != undefined && this.dataDialog.dataScopeType[i].users.length > 0) this.dataDialog.dataScopeType[i].users = [] this.dataDialog.dataScopeType[i].depts = row break @@ -772,10 +769,9 @@ export default { }, savePermise() { const param = { - userId: this.dataDialog.userId, + user_id: this.dataDialog.user_id, datas: this.multipleSelection } - console.log('param', param) crudDataPermission.saveDataPermission(param).then(res => { this.dataPerm = false this.crud.notify('添加数据权限成功', CRUD.NOTIFICATION_TYPE.SUCCESS) @@ -788,7 +784,7 @@ export default { this.depChecked = [] }, giveValue(row) { - this.depCheckedId = row.userId + this.depCheckedId = row.user_id }, clearCheck() { // 清空选中 if (this.flag) this.$refs.deptUser.setCheckedKeys([]) @@ -806,12 +802,12 @@ export default { }, saveChecked() { const user = { - userId: this.depCheckedId + user_id: this.depCheckedId } if (this.flag) { user.deptIds = this.$refs.deptUser.getCheckedKeys() } else { - user.rolesIds = this.crud.selections.map(item => (item.roleId)) + user.rolesIds = this.crud.selections.map(item => (item.role_id)) } crudUser.edit(user).then(res => { this.cancelForm() diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue index cd7b813..c726090 100644 --- a/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -44,8 +44,16 @@ - - + + + + + + diff --git a/nladmin-ui/src/views/wms/basedata/workshop/index.vue b/nladmin-ui/src/views/wms/basedata/workshop/index.vue index 96997f1..a6f31bc 100644 --- a/nladmin-ui/src/views/wms/basedata/workshop/index.vue +++ b/nladmin-ui/src/views/wms/basedata/workshop/index.vue @@ -17,7 +17,8 @@ - + 否 + 是
@@ -31,8 +32,11 @@ - - + + + @@ -64,8 +68,8 @@ const defaultForm = { workshop_code: null, workshop_name: null, remark: null, - is_used: null, - is_delete: null, + is_used: true, + is_delete: false, create_id: null, create_name: null, create_time: null, diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue new file mode 100644 index 0000000..5dfdd47 --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js b/nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js new file mode 100644 index 0000000..a47b51b --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/pdmBdWorkorder', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/pdmBdWorkorder/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/pdmBdWorkorder', + method: 'put', + data + }) +} + +export default { add, edit, del }