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

fix: 规约修改

Browse Source
This commit is contained in:
lishuai
2023-12-08 13:52:33 +08:00
parent 936d17a437
commit db3cc16658
35 changed files with 360 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java
View File

@@ -50,20 +50,38 @@ public enum RequestMethodEnum {
press_request_material(19, "pressRequestMaterial", "压机叫料", "0");
//驱动索引
/**
* 驱动索引
*/
private int index;
//驱动编码
/**
* 驱动编码
*/
private String code;
// 驱动名字
/**
* 驱动名字
*/
private String name;
//驱动描述
/**
* 驱动描述
*/
private String desc;
//设备驱动类型
/**
* 设备驱动类型
*/
private String type;
//是否隐藏显示 0否1是
/**
* 是否隐藏显示 0否1是
*/
private String isHidden;
// 构造方法
/**
* 构造方法
* @param index
* @param code
* @param name
* @param isHidden
*/
RequestMethodEnum(int index, String code, String name, String isHidden) {
this.index = index;
this.code = code;
@@ -72,7 +90,10 @@ public enum RequestMethodEnum {
}
//只反馈未隐藏的
/**
* 只反馈未隐藏的
* @return
*/
public static JSONArray getList() {
JSONArray arr = new JSONArray();
for (RequestMethodEnum em : RequestMethodEnum.values()) {

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

@@ -56,7 +56,9 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
;
@Autowired
AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
//车辆ip 0-未知；1-需充电；2-可执行任务；3-充满电
/**
* 车辆ip 0-未知；1-需充电；2-可执行任务；3-充满电
*/
String agv_mode = "0";
String last_mode = "0";
@@ -124,15 +126,25 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
Instruction inst = null;
protected ItemProtocol itemProtocol = new ItemProtocol(this);
//最小电量
/**
* 最小电量
*/
double min_electric = 0.0;
//最大电量
/**
* 最大电量
*/
double cancle_electric = 0.0;
//执行任务电量
/**
* 执行任务电量
*/
double task_electric = 0.0;
//休息点
/**
* 休息点
*/
int relax_point = 0;
//充电点
/**
* 充电点
*/
int charge_point = 0;
@Override
@@ -173,11 +185,6 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
stop = this.itemProtocol.getStop();
if (home_relocation != last_home_relocation) {
// LuceneLogDto logDto = LuceneLogDto.builder()
// .device_code(device_code)
// .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.to_home_relocation + "变更从" + this.last_home_relocation + "->" + this.home_relocation)
// .build();
// luceneExecuteLogService.deviceExecuteLog(logDto);
luceneExecuteLogService.deviceExecuteLog(
new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.to_home_relocation, this.last_home_relocation, this.home_relocation));
}

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java
View File

@@ -10,9 +10,11 @@ import java.io.Serializable;
@NoArgsConstructor
@AllArgsConstructor
public class Paper implements Serializable {
//设备号
/**
* 设备号
*/
private String device_code;
//
private String material_code;
private String qty;

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/ItemProtocol.java
View File

@@ -45,7 +45,9 @@ public class ItemProtocol {
* 行走列
*/
public static String item_to_command = "to_command";
//下发起始站
/**
* 下发起始站
*/
public static String item_to_onset = "to_onset";
/**
* 下发目标站

19
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -100,7 +100,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
private Date instruction_require_time = new Date();
private int instruction_require_time_out;
//行架机械手申请任务成功标识
/**
* 行架机械手申请任务成功标识
*/
boolean requireSucess = false;
private int instruction_finished_time_out;
@@ -108,12 +110,16 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
int branchProtocol = 0;
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
/**
* 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
*/
int flag;
String device_code;
//0 无任务执行 1更新指令状态 2下发电气信号 3允许取货 允许放货 5放货完成
/**
* 0 无任务执行 1更新指令状态 2下发电气信号 3允许取货 允许放货 5放货完成
*/
int now_steps_type = 0;
String notCreateTaskMessage = "";
String notCreateInstMessage = "";
@@ -675,7 +681,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
this.control(itemMap);
}
//判断取货位或放货位为烘箱设备时关联的同一列烘箱设备是否有开门
/**
* 判断取货位或放货位为烘箱设备时关联的同一列烘箱设备是否有开门
* @param start_device_code
* @param next_device_code
* @return
*/
public boolean judgeCloseDoor(String start_device_code, String next_device_code) {
Boolean isClose = false;

30
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -76,7 +76,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
private StorageCellMapper storageCellMapper;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
/**
@@ -96,7 +98,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
int last_carrier_direction = 0;
/**
* 报警
*/信号
*/
int error = 0;
int last_error = 0;
/**
@@ -136,9 +138,13 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
String inst_message;
String last_inst_message;
//当前指令
/**
* 当前指令
*/
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
/**
* 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
*/
int flag;
String device_code;
@@ -301,13 +307,17 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}
break;
case 4:
//申请捆扎
/**
* 申请捆扎
*/
if (move > 0) {
applyLaStrangulation();
}
break;
case 5:
//申请贴标
/**
* 申请贴标
*/
if (move > 0 && !requireSucess) {
applyLabeling();
@@ -704,7 +714,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}
}
//申请贴标
/**
* 申请贴标
*/
public synchronized void applyLabeling() {
Date date = new Date();
if (date.getTime() - this.require_apply_labeling_time.getTime() < (long) this.instruction_require_time_out) {
@@ -759,7 +771,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}
}
//申请捆扎
/**
* 申请捆扎
*/
@SneakyThrows
public synchronized void applyLaStrangulation() {
Date date = new Date();

22
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
View File

@@ -76,7 +76,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
@Autowired
StorageCellMapper storageCellMapper;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
/**
@@ -96,7 +98,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
int last_carrier_direction = 0;
/**
* 报警
*/信号
*/
int error = 0;
int last_error = 0;
/**
@@ -122,7 +124,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
private Date require_empty_out_time = new Date();
private int instruction_require_time_out = 3000;
//行架机械手申请任务成功标识
/**
* 行架机械手申请任务成功标识
*/
boolean requireSucess = false;
boolean requireApplyLabelingSuccess = false;
boolean requireApplyLaStrangulationSuccess = false;
@@ -135,7 +139,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
String inst_message;
String last_inst_message;
//当前指令
/**
* 当前指令
*/
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
int flag;
@@ -694,7 +700,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
}
}
//申请贴标
/**
* 申请贴标
*/
public synchronized void applyLabeling() {
Date date = new Date();
if (date.getTime() - this.require_apply_labeling_time.getTime() < (long) this.instruction_require_time_out) {
@@ -746,7 +754,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
}
}
//申请捆扎
/**
* 申请捆扎
*/
@SneakyThrows
public synchronized void applyLaStrangulation() {
Date date = new Date();

48
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
View File

@@ -82,22 +82,34 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
@Autowired
StorageCellMapper storageCellMapper;
// 当前指令
/**
* 当前指令
*/
Instruction inst = null;
// 工作模式
/**
* 工作模式
*/
int mode = 0;
int last_mode = 0;
// 光电信号
/**
* 光电信号
*/
int move = 0;
int last_move = 0;
// 托盘方向
/**
* 托盘方向
*/
int carrier_direction = 0;
int last_carrier_direction = 0;
// 报警信号
/**
* 报警信号
*/
int error = 0;
int last_error = 0;
// 任务号
/**
* 任务号
*/
int task = 0;
int weight = 0;
int last_task = 0;
@@ -118,7 +130,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
private Date require_empty_out_time = new Date();
private int instruction_require_time_out;
// 行架机械手申请任务成功标识
/**
* 行架机械手申请任务成功标识
*/
boolean requireSucess = false;
boolean requireApplyLabelingSuccess = false;
boolean requireApplyLaStrangulationSuccess = false;
@@ -129,9 +143,13 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
int branchProtocol = 0;
String inst_message;
// 当前指令
/**
* 当前指令
*/
// 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
/**
* 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
*/
int flag;
String device_code;
@@ -274,7 +292,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
}
break;
case 5:
// 申请贴标
/**
* 申请贴标
*/
if (move > 0 && !requireSucess) {
applyLabeling();
}
@@ -703,7 +723,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
}
}
// 申请贴标
/**
* 申请贴标
*/
public synchronized void applyLabeling() {
Date date = new Date();
if (date.getTime() - this.require_apply_labeling_time.getTime()
@@ -773,7 +795,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
}
}
// 申请捆扎
/**
* 申请捆扎
*/
public synchronized void applyLaStrangulation() {
Date date = new Date();
if (date.getTime() - this.require_apply_strangulation_time.getTime()

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

@@ -36,7 +36,7 @@ public class ItemProtocol {
public static String item_walk_y = "walk_y";
/**
* 报警
*/信号
*/
public static String item_error = "error";
//任务类型
public static String item_type = "type";

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -245,7 +245,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task2));
if (inst2 != null) {
if (StrUtil.equals(inst2.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) {
//当前指令更新状态
//指令更新状态
now_steps_type2 = 1;
inst2.setInstruction_status(InstructionStatusEnum.BUSY.getIndex());
inst2.setExecute_device_code(this.device_code);
@@ -273,7 +273,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task1));
if (inst2 != null) {
if (StrUtil.equals(inst2.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) {
//当前指令更新状态
//指令更新状态
inst2.setInstruction_status(InstructionStatusEnum.BUSY.getIndex());
inst2.setExecute_device_code(this.device_code);
instructionService.update(inst2);

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
View File

@@ -127,11 +127,15 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
int branchProtocol = 0;
//备注
String remark;
//数量
/**
* 数量
*/
String qty;
//物料
String material;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
//上次指令
Instruction last_inst = null;

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java
View File

@@ -128,11 +128,15 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
int branchProtocol = 0;
//备注
String remark;
//数量
/**
* 数量
*/
String qty;
//物料
String material;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
//上次指令
Instruction last_inst = null;

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -77,7 +77,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
private Date instruction_finished_time = new Date();
private Date instruction_apply_time = new Date();
private int instruction_require_time_out = 3000;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
int heartbeat = 0;
int mode = 0;
@@ -114,7 +116,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
*/
Boolean requireSucess = false;
//申请成功标记
/**
* 申请成功标记
*/
Boolean applySucess = false;
public boolean exe_declaration() {

44
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -60,9 +60,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
String container_type_desc;
String last_container_type_desc;
String last_container;
//放货准备锁
/**
* 放货准备锁
*/
String putReadyLock = null;
//有货标记
/**
* 有货标记
*/
protected boolean has_goods_tag = false;
private Date time = new Date();
@@ -108,26 +112,44 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
private int instruction_finished_time_out;
int branchProtocol = 0;
//备注
/**
* 备注
*/
String remark;
//数量
/**
* 数量
*/
String qty;
//物料
/**
* 物料
*/
String material;
//批次
/**
* 批次
*/
String batch;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
//上次指令
/**
* 上次指令
*/
Instruction last_inst = null;
//触摸屏手动触发任务
/**
* 触摸屏手动触发任务
*/
private Boolean is_has_task = false;
//满盅入库请求标记
/**
* 满盅入库请求标记
*/
boolean Sucess = false;
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
/**
* 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
*/
int flag;
String devicecode;

52
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -62,37 +62,63 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
int branchProtocol = 0;
int last_branchProtocol = 0;
//是否需要输入物料
/**
* 是否需要输入物料
*/
String input_material = "0";
//备注
/**
* 备注
*/
String remark = "";
//数量
/**
* 数量
*/
String qty = "";
//批次
/**
* 批次
*/
String batch = "";
//物料
/**
* 物料
*/
String material = "";
//目标点位
/**
* 目标点位
*/
String purpose = "";
//当前指令
/**
* 当前指令
*/
Instruction inst = null;
//上次指令
/**
* 上次指令
*/
Instruction last_inst = null;
boolean requireSucess = false;
//触摸屏手动触发任务
/**
* 触摸屏手动触发任务
*/
private Boolean is_has_task = false;
//申请搬运任务
/**
* 申请搬运任务
*/
private Boolean apply_handling = false;
//申请物料
/**
* 申请物料
*/
private Boolean apply_material = false;
// 1取货完成 2放货完成 3进入区域 4离开区域
/**
* 1取货完成 2放货完成 3进入区域 4离开区域
*/
private int flag;
//人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0
/**
* 人工确认信号 默认0 agv到达后请求置1 等人工确认后变为2 反馈agv后继续为0
*/
private int manua_confirm = 0;
String device_code = null;

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java
View File

@@ -168,6 +168,8 @@ public class ItemProtocol {
public static String item_fork_runingTimes = "fork_runingTimes";
/**
* 心跳
*/
public static String item_to_heartbeat = "to_heartbeat";
/**
@@ -178,7 +180,9 @@ public class ItemProtocol {
* 轴运行次数
*/
public static String item_to_command = "to_command";
//物料类型
/**
* 物料类型
*/
public static String item_to_type = "to_type";
/**
* 任务号

28
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
View File

@@ -91,10 +91,14 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Integer task = 0;
Integer last_task = 0;
//y轴报警(载货台)
/**
* y轴报警(载货台)
*/
Integer error = 0;
Integer last_error = 0;
//行走排号
/**
* 行走排号
*/
Integer z = 0;
Integer last_z = 0;
/**
@@ -102,7 +106,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Integer x = null;
Integer last_x = null;
//行走层号
/**
* 行走层号
*/
Integer y = 0;
Integer last_y = 0;
/**
@@ -110,7 +116,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Float move = 0F;
Float last_move = 0F;
//载货台开关信号
/**
* 载货台开关信号
*/
Float cargoMove = 0F;
Float last_cargoMove = 0F;
/**
@@ -123,7 +131,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Integer distancex = 0;
Integer last_distancex = 0;
//起升激光数值
/**
* 起升激光数值
*/
Integer distancey = 0;
Integer last_distancey = 0;
/**
@@ -166,7 +176,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Float storage_cache = 0F;
Float last_storage_cache = 0F;
/* /**
/**
* 速度（转/分钟）
*/
Integer stacker_rpm = 0;
@@ -225,7 +235,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*货叉轴运行次数
*/
Integer fork_runingTimes = 0;
Integer last_fork_runingTimes = 0;*/
Integer last_fork_runingTimes = 0;
String message = null;
@@ -245,7 +255,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
*/
Boolean requireSucess = false;
//当前指令
/**
* 当前指令
*/
Instruction inst = null;

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java
View File

@@ -9,6 +9,8 @@ import java.util.Map;
public interface WmsToAcsService {
org.nl.acs.ext.wms.data.CreateTaskResponse crateTask(String param);
/**
* 创建任务
*
@@ -47,7 +49,7 @@ public interface WmsToAcsService {
* @param jsonObject 条件
* @return Map<String, Object>
*/
PutActionResponse putAction(String jsonObject) throws Exception;
org.nl.acs.ext.wms.data.PutActionResponse putAction(String jsonObject) throws Exception;
/**
* 查询设备状态

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java
View File

@@ -29,7 +29,6 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class MaterialbaseServiceImpl extends CommonServiceImpl<MaterialbaseMapper, Materialbase> implements MaterialbaseService {
// private final RedisUtils redisUtils;
private final MaterialbaseMapper materialbaseMapper;
@Override

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
View File

@@ -38,7 +38,6 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class OpcPlcServiceImpl extends CommonServiceImpl<OpcPlcMapper, OpcPlc> implements OpcPlcService {
// private final RedisUtils redisUtils;
private final OpcPlcMapper opcPlcMapper;
@Override

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -29,7 +29,6 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class ProduceshiftorderServiceImpl extends CommonServiceImpl<ProduceshiftorderMapper, Produceshiftorder> implements ProduceshiftorderService {
// private final RedisUtils redisUtils;
private final ProduceshiftorderMapper produceshiftorderMapper;
@Override

9
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
View File

@@ -70,12 +70,15 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
Map<String, RoutePlanDto> routePlans = new HashMap();
Map<Integer, String> routeIndex = new HashMap();
Map<String, List> routeLines = new HashMap();
//用来确定设备在 路由二维数组中的坐标
/**
* 用来确定设备在 路由二维数组中的坐标
*/
Map<String, Integer> deviceCoordinate = null;
//路由二维数组
/**
* 路由二维数组
*/
Map<String, String>[][] routeChart = null;
List<Map> routePlansList = new ArrayList<>();
// private final RedisUtils redisUtils;
private final RouteLineMapper routeLineMapper;
private final DeviceMapper deviceMapper;
@Autowired

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -84,7 +84,6 @@ import java.util.stream.Collectors;
*/
@Service
@Slf4j
// @CacheConfig(cacheNames = TaskService.CACHE_KEY)
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> implements TaskService, ApplicationAutoInitial {

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
View File

@@ -6,10 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.nl.common.enums.QueryTEnum;
/*
* @author ZZQ
* @Date 2022/12/15 1:41 下午
*/
@Builder
public class QParam {
public String[] k;

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java
View File

@@ -7,10 +7,7 @@ import org.nl.common.domain.query.LConsumer;
import java.util.Collection;
/*
* @author ZZQ
* @Date 2022/12/14 8:26 下午
*/
@Getter
public enum QueryTEnum {
//

22
acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java
View File

@@ -21,23 +21,35 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class SaTokenConfigure implements WebMvcConfigurer {
// 白名单
/**
* 白名单
*/
@Autowired
private SecurityProperties securityProperties;
// Sa-Token 整合 jwt (Simple 简单模式)
/**
* Sa-Token 整合 jwt (Simple 简单模式)
* @return
*/
@Bean
public StpLogic getStpLogicJwt() {
return new StpLogicJwtForSimple();
}
// 注册 Sa-Token 拦截器，打开注解式鉴权功能
/**
* 注册 Sa-Token 拦截器，打开注解式鉴权功能
* @param registry
*/
@Override
public void addInterceptors(InterceptorRegistry registry) {
// 注册 Sa-Token 拦截器，打开注解式鉴权功能
/**
* 注册 Sa-Token 拦截器，打开注解式鉴权功能
*/
registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
.addPathPatterns("/**")
// 白名单
/**
* 白名单
*/
.excludePathPatterns(securityProperties.getExcludes());
}

7
acs/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java
View File

@@ -1,17 +1,12 @@
package org.nl.config;
import org.checkerframework.checker.units.qual.K;
import org.springframework.util.CollectionUtils;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
/*
* @author ZZQ
* @Date 2022/11/29 2:55 下午
*/
public class MapOf implements Serializable {
public static <K> HashMap of(K... key){

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java
View File

@@ -31,7 +31,9 @@ import java.util.List;
public class SpringContextHolder implements ApplicationContextAware, DisposableBean {
private static ApplicationContext applicationContext = null;
//数据库连接的bean名字
/**
* 数据库连接的bean名字
*/
public static String dataSourceBeanName="dataSource";
private static final List<CallBack> CALL_BACKS = new ArrayList<>();
private static boolean addCallback = true;

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
View File

@@ -9,7 +9,9 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class StaticConfig {
//日志索引目录
/**
* 日志索引目录
*/
@Value("${lucene.index.path}")
private String luceneDir;

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitCOnfig.java
View File

@@ -7,10 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ModelAndView;
/*
* @author ZZQ
* @Date 2022/11/28 10:58 上午
*/
@Configuration
public class SaInitCOnfig {

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
View File

@@ -84,7 +84,6 @@ public class UserController {
@Log("修改用户：个人中心")
@ApiOperation("修改用户：个人中心")
// @PutMapping(value = "center")
public ResponseEntity<Object> center(@RequestBody SysUser resources){
if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){
throw new BadRequestException(LangProcess.msg("error_sysAuth"));
@@ -96,7 +95,6 @@ public class UserController {
@Log("删除用户")
@ApiOperation("删除用户")
@DeleteMapping
// @SaCheckPermission("user:del")
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
userService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);

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

@@ -11,61 +11,101 @@ import lombok.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：否 */
/**
* 是否删除 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;

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

@@ -20,7 +20,9 @@ import java.util.Map;
@Slf4j
public class LuceneServiceImpl implements LuceneService {
//日志索引目录
/**
* 日志索引目录
*/
@Value("${lucene.index.path}")
private String luceneUrl;

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/SysUserDetail.java
View File

@@ -8,10 +8,7 @@ import org.nl.system.service.user.dao.SysUser;
import java.util.List;
/*
* @author ZZQ
* @Date 2022/12/16 10:02 上午
*/
@Data
public class SysUserDetail extends SysUser {
private List<SysDept> depts;

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dto/UserQuery.java
View File

@@ -6,10 +6,7 @@ import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.system.service.user.dao.SysUser;
/*
* @author ZZQ
* @Date 2022/12/15 9:53 上午
*/
@Data
public class UserQuery extends BaseQuery<SysUser> {