root/base_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: acs_v1.0.0 lucene位置

Browse Source
This commit is contained in:
liyongde
2024-05-28 17:09:05 +08:00
parent 9a44f38d7f
commit 9b0bf8f73e
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -17,7 +17,7 @@ import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppService;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.system.service.lucene.LuceneExecuteLogService;
import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

4
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java
View File

@@ -25,8 +25,8 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.dto.TaskDto;
import org.nl.acs.utils.ReadUtil; import org.nl.acs.utils.ReadUtil;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.system.service.lucene.LuceneExecuteLogService;
import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.lucene.dto.LuceneLogDto;
import org.openscada.opc.lib.da.Server; import org.openscada.opc.lib.da.Server;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -25,7 +25,7 @@ import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.TaskService;
import org.nl.config.SpringContextHolder; import org.nl.config.SpringContextHolder;
import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.system.service.lucene.LuceneExecuteLogService;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Date; import java.util.Date;

2
nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java
View File

@@ -3,7 +3,7 @@ package org.nl.system.controller.lucence;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.logging.annotation.Log; import org.nl.common.logging.annotation.Log;
import org.nl.config.lucene.service.LuceneService; import org.nl.system.service.lucene.LuceneService;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

4
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java
View File

@@ -1,7 +1,7 @@
package org.nl.config.lucene.service; package org.nl.system.service.lucene;
import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.lucene.dto.LuceneLogDto;
public interface LuceneExecuteLogService { public interface LuceneExecuteLogService {
/** /**

2
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneService.java
View File

@@ -1,4 +1,4 @@
package org.nl.config.lucene.service; package org.nl.system.service.lucene;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;

2
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.config.lucene.service.dto; package org.nl.system.service.lucene.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;

4
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java
View File

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.enums.LogTypeEnum; import org.nl.common.enums.LogTypeEnum;
import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.lucene.LuceneExecuteLogService;
import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.system.service.lucene.dto.LuceneLogDto;
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.config.lucene.service.impl; package org.nl.system.service.lucene.impl;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
@@ -11,7 +11,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.*; import org.apache.lucene.search.*;
import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.nl.config.lucene.service.LuceneService; import org.nl.system.service.lucene.LuceneService;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;