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

ACS基础版本结构调整

Browse Source
This commit is contained in:
郑旭明\73939
2026-04-03 10:46:46 +08:00
parent 4e54170aa5
commit c304b75a2b
333 changed files with 1552 additions and 3588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java
View File

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/agv说明
View File

@@ -1 +0,0 @@
1=magic 2=NDC 3=XZ 4=ZHEDA

84
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/NDCAgvService.java
View File

@@ -1,84 +0,0 @@
package org.nl.acs.agv.server;
import org.nl.acs.agv.server.dto.AgvDto;
import org.nl.acs.instruction.domain.Instruction;
import java.util.Map;
/**
* @Author: lyd
* @Description:
* @Date: 2022-08-15
*/
public interface NDCAgvService {
/**
* 删除NDC任务
*
* @param inst
* @throws Exception
*/
public void deleteAgvInstToNDC(Instruction inst) throws Exception;
/**
* 下发任务
* @param agv_system_type
* @param inst
* @throws Exception
*/
public void sendAgvInstToNDC(String agv_system_type, Instruction inst) throws Exception;
/**
* 一号agv指令
* @param phase
* @param index
* @param result
* @param startPoint
* @param nextPoint
* @param startHigh
* @param nextHigh
* @return
*/
public byte[] sendAgvOneModeInst(int phase, int index, int result, int startPoint, int nextPoint, int startHigh, int nextHigh);
/**
* 下发二号agv指令
* @param phase
* @param index
* @param result
* @return
*/
public byte[] sendAgvTwoModeInst(int phase, int index, int result);
/**
* 下发agv偏移指令
* @param phase
* @param index
* @param result
* @return
*/
public byte[] sendAgvTwoModeInst(int phase, int index, int result,int offset,int quantity);
public byte[] sendAgvTwoModeInst();
/**
* 下发一号agv指令
* @param phase
* @param index
* @param result
* @return
*/
public byte[] sendAgvOneModeInst(int phase, int index, int result);
/**
* 下发充电任务
*
* @param carno
* @return
*/
public boolean createChargingTaskToNDC(String carno);
public void charge(String carno);
}

80
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java
View File

@@ -1,80 +0,0 @@
package org.nl.acs.agv.server.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @author wangsong
*/
@Data
public class AgvDto implements Serializable {
/**
* 名称
*/
private String name;
/**
* 机器人当前的自身状态
* <p>
* UNKNOWN：未知状态
* UNAVAILABLE：通信超时或者已断开连接
* ERROR：错误状态
* IDLE：空闲状态
* EXECUTING：正在执行运单
* CHARGING：正在充电
*/
private String state;
/**
* 机器人的剩余电量值（单位：整数百分比）
*/
private String energyLevel;
/**
*
*/
private String energyLevelGood;
/**
* 机器人在 SRD 系统中的在线状态
* <p>
* TO_BE_IGNORED：机器人处于离线状态，SRD 不会标识出机器人位置。
* TO_BE_NOTICED：机器人处于离线状态，SRD 标识出机器人的位置。
* TO_BE_RESPECTED：机器人处于在线状态，但不能接受新的运单。
* TO_BE_UTILIZED：机器人处于在线状态，可以接受并执行新的运单。
*/
private String integrationLevel;
/**
* 机器人当前的运单执行状态
* <p>
* UNAVAILABLE：无法执行任何运单和任务
* IDLE：空闲状态
* AWAITING_ORDER：机器人在等待运单中新的子任务
* PROCESSING_ORDER：机器人正在执行运单
*/
private String procState;
/**
* 角度
*/
private String positionAngle;
/**
* X坐标
*/
private String positionX;
/**
* Y坐标
*/
private String positionY;
/**
* 当前任务号
*/
private String transportOrder;
}

505
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -1,505 +0,0 @@
package org.nl.acs.agv.server.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.agv.server.NDCAgvService;
import org.nl.acs.agv.server.dto.AgvDto;
import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun;
import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.impl.DeviceServiceImpl;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.common.utils.CodeUtil;
import org.nl.config.SpringContextHolder;
import org.nl.system.service.dict.ISysDictService;
import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.param.ISysParamService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.Map;
/**
* @author 20220102CG\noblelift
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class NDCAgvServiceImpl implements NDCAgvService {
private final DeviceAppService deviceAppService;
private final ISysParamService paramService;
// private final AcsToWmsService acsToWmsService;
private final ISysDictService dictService;
private final DeviceExecuteLogService logServer;
Map<String, AgvDto> AGVDeviceStatus = new HashMap();
@Override
public void deleteAgvInstToNDC(Instruction inst) throws Exception {
if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), CommonFinalParam.ONE)) {
int index = Integer.parseInt(inst.getAgv_jobno());
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
String str = "十进制下发：";
String str1 = "十六进制下发：";
str += "index:" + index;
str1 += "ikey:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF);
System.out.println(str);
System.out.println(str1);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X06,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6E,
(byte) 0X00, (byte) 0X02,
(byte) indexhigh, (byte) indexlow,
};
log.info("下发删除AGV指令--{}", Bytes2HexString(b));
// NDCSocketConnectionAutoRun.write(b);
TwoNDCSocketConnectionAutoRun.write(b);
System.out.println("下发删除agv指令数据:" + Bytes2HexString(b));
}
}
@Override
public void sendAgvInstToNDC(String agv_system_type, Instruction inst) {
log.info("sendAgvInstToNDC 指令下发NDC:" + "inst_code:" + inst.getInstruction_code() + ",agv_system_type:" + agv_system_type + ",agv_inst_type:" + inst.getAgv_inst_type() +
",priority:" + inst.getPriority() + ",startAddress:" + inst.getStart_point_code() +
",nextAddress:" + inst.getNext_point_code());
if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
if (!StrUtil.equals(agv_system_type, "1")) {
String instcode = inst.getInstruction_code();
int type = Integer.parseInt(inst.getAgv_inst_type());
int priority = Integer.parseInt(inst.getPriority()) + 128;
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
int startAddress = deviceService.queryAddressBydeviceCode(inst.getStart_point_code());
int nextAddress = deviceService.queryAddressBydeviceCode(inst.getNext_point_code());
int startAddress2 = deviceService.queryAddressBydeviceCode(inst.getStart_point_code2());
int nextAddress2 = deviceService.queryAddressBydeviceCode(inst.getNext_point_code2());
byte ikeyhigh = (byte) IntToHexHigh(Integer.parseInt(instcode));
byte ikeylow = (byte) IntToHexLow(Integer.parseInt(instcode));
byte typehigh = (byte) IntToHexHigh(type);
byte typelow = (byte) IntToHexLow(type);
byte qhdhigh = (byte) IntToHexHigh(startAddress);
byte qhdlow = (byte) IntToHexLow(startAddress);
byte qhdhigh2 = (byte) IntToHexHigh(startAddress2);
byte qhdlow2 = (byte) IntToHexLow(startAddress2);
byte fhdhigh = (byte) IntToHexHigh(nextAddress);
byte fhdlow = (byte) IntToHexLow(nextAddress);
byte fhdhigh2 = (byte) IntToHexHigh(nextAddress2);
byte fhdlow2 = (byte) IntToHexLow(nextAddress2);
byte prioritylow = (byte) IntToHexLow(priority);
String str = "十进制下发：";
String str1 = "十六进制下发：";
str += "任务号 ikey:" + (Integer.parseInt(instcode));
str1 += "任务号 ikey:" + hexToString(ikeyhigh & 0xFF) + hexToString(ikeylow & 0xFF);
str += "指令类型 /type:" + (type);
str1 += "指令类型 /type:" + hexToString(typehigh & 0xFF) + hexToString(typelow & 0xFF);
str += "取货点 /qhd:" + (startAddress);
str1 += "取货点 /qhd:" + hexToString(qhdhigh & 0xFF) + hexToString(qhdlow & 0xFF);
str += "放货点 /fhd:" + (nextAddress);
str1 += "放货点 /fhd:" + hexToString(fhdhigh & 0xFF) + hexToString(fhdlow & 0xFF);
str += "取货点2 /qhd2:" + (startAddress2);
str1 += "取货点2 /qhd2:" + hexToString(qhdhigh2 & 0xFF) + hexToString(qhdlow2 & 0xFF);
str += "放货点2 /fhd2:" + (nextAddress2);
str1 += "放货点2 /fhd2:" + hexToString(fhdhigh2 & 0xFF) + hexToString(fhdlow2 & 0xFF);
str += "优先级 /priority:" + (priority);
str1 += "优先级 /priority:" + hexToString(prioritylow & 0xFF);
byte[] b = new byte[]{};
if (type == 1) {
b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X16,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X12,
(byte) 0X01, prioritylow,
(byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow,
(byte) ikeyhigh, (byte) ikeylow,
(byte) typehigh, (byte) typelow,
(byte) qhdhigh, (byte) qhdlow,
(byte) qhdhigh2, (byte) qhdlow2,
(byte) fhdhigh, (byte) fhdlow,
(byte) fhdhigh2, (byte) fhdlow2
};
} else if (type == 2) {
b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X16,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X12,
(byte) 0X01, prioritylow,
(byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow,
(byte) ikeyhigh, (byte) ikeylow,
(byte) typehigh, (byte) typelow,
(byte) qhdhigh, (byte) qhdlow,
(byte) 0X00, (byte) 0X00,
(byte) fhdhigh, (byte) fhdlow,
(byte) 0X00, (byte) 0X00
};
} else if (type == 3) {
b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X16,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X12,
(byte) 0X01, prioritylow,
(byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow,
(byte) ikeyhigh, (byte) ikeylow,
(byte) typehigh, (byte) typelow,
(byte) qhdhigh, (byte) qhdlow,
(byte) qhdhigh2, (byte) qhdlow2,
(byte) fhdhigh, (byte) fhdlow,
(byte) fhdhigh2, (byte) fhdlow2
};
}
log.info("下发AGV作业指令 --{}", str1);
log.info("下发AGV作业指令--{}", str);
log.info("下发agv指令数据--{}", Bytes2HexString(b));
if (StrUtil.equals(agv_system_type, "2")) {
TwoNDCSocketConnectionAutoRun.write(b);
}
}
}
}
@Override
public byte[] sendAgvOneModeInst(int phase, int index, int result, int startPoint, int nextPoint, int startHigh, int nextHigh) {
if (phase < 0 || index < 0) {
return null;
}
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
byte phasehigh = (byte) IntToHexHigh(phase);
byte phaselow = (byte) IntToHexLow(phase);
byte startPointHigh = (byte) IntToHexHigh(startPoint);
byte startPointLow = (byte) IntToHexLow(startPoint);
byte nextPointHigh = (byte) IntToHexHigh(nextPoint);
byte nextPointLow = (byte) IntToHexLow(nextPoint);
byte startHighHigh = (byte) IntToHexHigh(startHigh);
byte startHighLow = (byte) IntToHexLow(startHigh);
byte nextHighHigh = (byte) IntToHexHigh(nextHigh);
byte nextHighLow = (byte) IntToHexLow(nextHigh);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X12,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X0E,
(byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X14,
(byte) phasehigh, (byte) phaselow,
(byte) startPointHigh, (byte) startPointLow,
(byte) nextPointHigh, (byte) nextPointLow,
(byte) startHighHigh, (byte) startHighLow,
(byte) nextHighHigh, (byte) nextHighLow
};
log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF));
System.out.println("反馈agv动作数据:" + Bytes2HexString(b));
return b;
}
@Override
public byte[] sendAgvTwoModeInst(int phase, int index, int result) {
if (phase < 0 || index < 0)
return null;
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
byte phasehigh = (byte) IntToHexHigh(phase);
byte phaselow = (byte) IntToHexLow(phase);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0A,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X06,
(byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X12,
(byte) phasehigh, (byte) phaselow
};
log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF));
System.out.println("反馈agv动作数据:" + Bytes2HexString(b));
return b;
}
@Override
public byte[] sendAgvTwoModeInst(int phase, int index, int result, int offset, int quantity) {
if (phase < 0 || index < 0)
return null;
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
byte phasehigh = (byte) IntToHexHigh(phase);
byte phaselow = (byte) IntToHexLow(phase);
byte offsethigh = (byte) IntToHexHigh(offset);
byte offsetlow = (byte) IntToHexLow(offset);
byte quantityhigh = (byte) IntToHexHigh(quantity);
byte quantitylow = (byte) IntToHexLow(quantity);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0E,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X0A,
(byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X12,
(byte) phasehigh, (byte) phaselow,
(byte) offsethigh, (byte) offsetlow,
(byte) quantityhigh, (byte) quantitylow
};
log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:"
+ hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF) + ",是否侧移: " + (offset == 1 ? "侧移" : "不测移") + ",偏离量: " + quantity);
System.out.println("反馈agv动作数据:" + Bytes2HexString(b));
return b;
}
@Override
public byte[] sendAgvTwoModeInst() {
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X00,
(byte) 0X00, (byte) 0X04,
};
return b;
}
@Override
public byte[] sendAgvOneModeInst(int phase, int index, int result) {
if (phase < 0 || index < 0) {
return null;
}
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
byte phasehigh = (byte) IntToHexHigh(phase);
byte phaselow = (byte) IntToHexLow(phase);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0A,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X06,
(byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X10,
(byte) phasehigh, (byte) phaselow
};
log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF));
System.out.println("反馈agv动作数据:" + Bytes2HexString(b));
return b;
}
/* @Override
public byte[] sendAgvTwoModeInst(int phase, int index, int result) {
if (phase < 0 || index < 0)
return null;
byte indexhigh = (byte) IntToHexHigh(index);
byte indexlow = (byte) IntToHexLow(index);
byte phasehigh = (byte) IntToHexHigh(phase);
byte phaselow = (byte) IntToHexLow(phase);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0A,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X06,
(byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X12,
(byte) phasehigh, (byte) phaselow
};
log.info("反馈agv动作数据--index:" + hexToString(indexhigh & 0xFF) + hexToString(indexlow & 0xFF) + ",phase:" + hexToString(phasehigh & 0xFF) + hexToString(phaselow & 0xFF));
System.out.println("反馈agv动作数据:" + Bytes2HexString(b));
return b;
}*/
/*@Override
public byte[] sendAgvOneModeInst(int phase, int index, int result) {
return new byte[0];
}*/
@Override
@Transactional(rollbackFor = Exception.class)
public void charge(String carno) {
//检查数据字典station为0的参数
//分配车辆
Dict dict = dictService.getDictByName3("station",carno,null);
int satation=0;
if(ObjectUtil.isNotEmpty(dict)){
log.info("当前车辆{}已分配充电桩{}，退出后续判断",carno,dict.getPara1());
return;
}
Dict temp = dictService.getDictByName2("station");
if(ObjectUtil.isNotEmpty(temp)){
satation = Integer.parseInt(temp.getPara1());
}
if(satation!=0){
String instcode =CodeUtil.getNewCode("INSTRUCT_NO");
byte ikeyhigh = (byte) IntToHexHigh(Integer.parseInt(instcode));
byte ikeylow = (byte) IntToHexLow(Integer.parseInt(instcode));
byte carhigh = (byte) IntToHexHigh(Integer.parseInt(carno));
byte carlow = (byte) IntToHexLow(Integer.parseInt(carno));
byte satationhigh = (byte) IntToHexHigh(satation);
byte satationlow = (byte) IntToHexLow(satation);
String str = "十进制下发：";
String str1 = "十六进制下发：";
str += "ikey:" + (Integer.parseInt(instcode));
str1 += "ikey:" + hexToString(ikeyhigh & 0xFF) + hexToString(ikeylow & 0xFF);
str += "carno:" + (Integer.parseInt(carno));
str1 += "carno:" + hexToString(carhigh & 0xFF) + hexToString(carlow & 0xFF);
str += "/satation:" + (satation);
str1 += "/satation:" + hexToString(satationhigh & 0xFF) + hexToString(satationlow & 0xFF);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0E,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X0A,
(byte) 0X64, (byte) 0X80,
(byte) 0X00, (byte) 0X01,
(byte) ikeyhigh, (byte) ikeylow,
(byte) carhigh, (byte) carlow,
(byte) satationhigh, (byte) satationlow
};
log.info("下发AGV充电任务--{}", str1);
try{
TwoNDCSocketConnectionAutoRun.write(b);
} catch (Exception e){
log.error("下发充电任务失败{}{}",e,e.getMessage());
}
temp.setValue("1");
temp.setPara2(carno);
temp.setPara3("下发充电");
dictService.updateDetail(temp);
}else{
log.error("目前暂无可使用充电桩充电桩，暂不分配{}充电任务",carno);
}
}
@Override
public boolean createChargingTaskToNDC(String carno) {
byte carhigh = (byte) IntToHexHigh(Integer.parseInt(carno));
byte carlow = (byte) IntToHexLow(Integer.parseInt(carno));
String instcode = CodeUtil.getNewCode("INSTRUCT_NO");
byte instcodehigh = (byte) IntToHexHigh(Integer.parseInt(instcode));
byte instcodelow = (byte) IntToHexLow(Integer.parseInt(instcode));
String str = "十进制下发：";
String str1 = "十六进制下发：";
str += "carno:" + (Integer.parseInt(carno));
str1 += "carno:" + hexToString(carhigh & 0xFF) + hexToString(carlow & 0xFF);
str += "/instcode:" + (instcode);
str1 += "/instcode:" + hexToString(instcodehigh & 0xFF) + hexToString(instcodelow & 0xFF);
System.out.println(str);
System.out.println(str1);
byte[] b = new byte[]{(byte) 0X87, (byte) 0XCD,
(byte) 0X00, (byte) 0X08,
(byte) 0X00, (byte) 0X0C,
(byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X71,
(byte) 0X00, (byte) 0X08,
(byte) 0X64, (byte) 0X80,
(byte) 0X00, (byte) 0X01,
(byte) instcodehigh, (byte) instcodelow,
(byte) carhigh, (byte) carlow
};
log.info("下发AGV充电任务--{}", str1);
try {
// OneNDCSocketConnectionAutoRun.write(b);
TwoNDCSocketConnectionAutoRun.write(b);
} catch (Exception e) {
e.getMessage();
return false;
}
System.out.println("下发agv充电任务数据:" + Bytes2HexString(b));
return true;
}
String hexToString(int i) {
return (i < 16 ? "0" + Integer.toHexString(i) : Integer.toHexString(i)).toUpperCase();
}
public static int IntToHexHigh(int b) {
int big = (b & 0xFF00) >> 8;
return big;
}
public static int IntToHexLow(int b) {
int little = b & 0xFF;
return little;
}
public static String Bytes2HexString(byte[] b) {
String ret = "";
for (int i = 0; i < b.length; i++) {
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1) {
hex = '0' + hex;
}
ret += hex.toUpperCase();
}
return ret;
}
}

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/domain/Address.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.address.domain;
package org.nl.acs.api.address.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -32,49 +32,49 @@ import java.io.Serializable;
public class Address extends CommonModel<Address> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String methods_id;
@NotBlank
private String methods_code;
@NotBlank
private String methods_name;
@NotBlank
private String methods_url;
private String remark;
@NotNull
private Long create_id;
@NotBlank
private String create_name;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
private Long update_optid;
private String update_optname;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;
@NotBlank
private String is_delete;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/rest/AddressController.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.address.rest;
package org.nl.acs.api.address.rest;
import lombok.RequiredArgsConstructor;
import org.nl.acs.address.service.AddressService;
import org.nl.acs.address.service.dto.AddressDto;
import org.nl.acs.api.address.service.AddressService;
import org.nl.acs.api.address.service.dto.AddressDto;
import org.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/AddressService.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.address.service;
package org.nl.acs.api.address.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.address.domain.Address;
import org.nl.acs.address.service.dto.AddressDto;
import org.nl.acs.address.service.dto.AddressQueryParam;
import org.nl.acs.api.address.service.dto.AddressDto;
import org.nl.acs.api.address.service.dto.AddressQueryParam;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.nl.acs.api.address.domain.Address;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.address.service.dto;
package org.nl.acs.api.address.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
@@ -17,39 +17,39 @@ import java.io.Serializable;
public class AddressDto implements Serializable {
private static final long serialVersionUID = 1L;
private String methods_id;
private String methods_code;
private String methods_name;
private String methods_url;
private String remark;
private Long create_id;
private String create_name;
private String create_time;
private Long update_optid;
private String update_optname;
private String update_time;
private String is_delete;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.address.service.dto;
package org.nl.acs.api.address.service.dto;
import lombok.Getter;
import lombok.Setter;

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/impl/AddressServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.address.service.impl;
package org.nl.acs.api.address.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
@@ -12,24 +12,22 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.api.address.service.mapper.AddressMapper;
import org.nl.common.db.CommonFinalParam;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.acs.utils.ConvertUtil;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.FileUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.address.domain.Address;
import org.nl.acs.address.service.AddressService;
import org.nl.acs.address.service.dto.AddressDto;
import org.nl.acs.address.service.dto.AddressQueryParam;
import org.nl.acs.address.service.mapper.AddressMapper;
import org.nl.common.utils.utils.PageUtil;
import org.nl.acs.api.address.domain.Address;
import org.nl.acs.api.address.service.AddressService;
import org.nl.acs.api.address.service.dto.AddressDto;
import org.nl.acs.api.address.service.dto.AddressQueryParam;
import org.nl.config.language.LangProcess;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/mapper/AddressMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.address.service.mapper;
package org.nl.acs.api.address.service.mapper;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.address.domain.Address;
import org.nl.common.db.CommonMapper;
import org.nl.acs.api.address.domain.Address;
import org.springframework.stereotype.Repository;
/**

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/MsgTypeEnum.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/MsgTypeEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.enums;
package org.nl.acs.api.kit.enums;
public enum MsgTypeEnum {
CREATE_TASK_REQ(3, "创建任务"),

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskPhaseEnum.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskPhaseEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.enums;
package org.nl.acs.api.kit.enums;
public enum TaskPhaseEnum {
PICKUP_REQUEST_OR_RESPONSE("1", "取货请求或者取请求应答（允许取货）"),

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskStateEnum.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskStateEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.enums;
package org.nl.acs.api.kit.enums;
public enum TaskStateEnum {
NOT_STARTED("0", "任务未启动"),

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/AcsToKitController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/AcsToKitController.java
View File

@@ -1,5 +1,5 @@
package org.nl.acs.ext.kit.rest;
package org.nl.acs.api.kit.rest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/KitToAcsController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/KitToAcsController.java
View File

@@ -1,12 +1,12 @@
package org.nl.acs.ext.kit.rest;
package org.nl.acs.api.kit.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.ext.kit.service.KitToAcsService;
import org.nl.acs.api.kit.service.KitToAcsService;
import org.nl.common.exception.BadRequestException;
import org.nl.common.logging.annotation.Log;
import org.springframework.beans.factory.annotation.Autowired;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/AcsToKitService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/AcsToKitService.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.ext.kit.service;
package org.nl.acs.api.kit.service;
import cn.hutool.http.HttpResponse;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.task.instruction.domain.Instruction;
public interface AcsToKitService {
HttpResponse genAgvSchedulingTask(Instruction instruction, int type);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/KitToAcsService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/KitToAcsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.service;
package org.nl.acs.api.kit.service;
import com.alibaba.fastjson.JSONObject;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/AcsToKitServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/AcsToKitServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.service.impl;
package org.nl.acs.api.kit.service.impl;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
@@ -7,11 +7,11 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.address.service.AddressService;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.impl.DeviceServiceImpl;
import org.nl.acs.ext.kit.service.AcsToKitService;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.api.address.service.AddressService;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.impl.DeviceServiceImpl;
import org.nl.acs.api.kit.service.AcsToKitService;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.config.MapOf;
import org.nl.config.SpringContextHolder;
import org.nl.config.lucene.enums.LogDirectEnum;

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/KitToAcsServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/KitToAcsServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.kit.service.impl;
package org.nl.acs.api.kit.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -6,18 +6,18 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.ext.kit.enums.MsgTypeEnum;
import org.nl.acs.ext.kit.enums.TaskPhaseEnum;
import org.nl.acs.ext.kit.enums.TaskStateEnum;
import org.nl.acs.ext.kit.service.KitToAcsService;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.instruction.enums.InstructionStatusEnum;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.storage_cell.service.StorageCellService;
import org.nl.acs.storage_cell.service.dto.StorageCellDto;
import org.nl.acs.device.device.domain.Device;
import org.nl.acs.device.device_driver.DeviceDriver;
import org.nl.acs.api.kit.enums.MsgTypeEnum;
import org.nl.acs.api.kit.enums.TaskPhaseEnum;
import org.nl.acs.api.kit.enums.TaskStateEnum;
import org.nl.acs.api.kit.service.KitToAcsService;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.enums.InstructionStatusEnum;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.iot.opc.DeviceAppService;
import org.nl.acs.device.storage_cell.service.StorageCellService;
import org.nl.acs.device.storage_cell.service.dto.StorageCellDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/AcsUtil.java
View File

@@ -1,12 +1,12 @@
package org.nl.acs.ext.wms;
package org.nl.acs.api.wms;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.common.base.CommonFinalParam;
import org.nl.common.db.CommonFinalParam;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.param.ISysParamService;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/LmsUtil.java
View File

@@ -1,5 +1,5 @@
package org.nl.acs.ext.wms;
package org.nl.acs.api.wms;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/AcsToWmsController.java
View File

@@ -1,5 +1,5 @@
package org.nl.acs.ext.wms.rest;
package org.nl.acs.api.wms.rest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/WmsToAcsController.java
View File

@@ -1,5 +1,5 @@
package org.nl.acs.ext.wms.rest;
package org.nl.acs.api.wms.rest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/AcsToWmsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.wms.service;
package org.nl.acs.api.wms.service;
public interface AcsToWmsService {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/WmsToAcsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.ext.wms.service;
package org.nl.acs.api.wms.service;
public interface WmsToAcsService {

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.ext.wms.service.impl;
package org.nl.acs.api.wms.service.impl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.api.wms.service.AcsToWmsService;
import org.springframework.stereotype.Service;
@Service

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.ext.wms.service.impl;
package org.nl.acs.api.wms.service.impl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.ext.wms.service.WmsToAcsService;
import org.nl.acs.api.wms.service.WmsToAcsService;
import org.springframework.stereotype.Service;
@Service

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AcsInit.java
View File

@@ -1,12 +1,11 @@
package org.nl.acs.auto;
package org.nl.acs.autoThread;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.auto.initial.ApplicationAutoInitialExecuter;
import org.nl.acs.auto.initial.WebAutoInitialExecuter;
import org.nl.acs.autoThread.initial.ApplicationAutoInitialExecuter;
import org.nl.acs.autoThread.initial.WebAutoInitialExecuter;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
/**

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AutoRunController.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.auto;
package org.nl.acs.autoThread;
import lombok.RequiredArgsConstructor;
import org.nl.acs.auto.run.AutoRunService;
import org.nl.acs.auto.run.ThreadDto;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.autoThread.run.AutoRunService;
import org.nl.acs.autoThread.run.ThreadDto;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.logging.annotation.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitial.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.initial;
package org.nl.acs.autoThread.initial;
/**
* Demo class

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitialExecuter.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.initial;
package org.nl.acs.autoThread.initial;
import cn.hutool.core.util.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitial.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.initial;
package org.nl.acs.autoThread.initial;
/**
* Demo class
*

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitialExecuter.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.initial;
package org.nl.acs.autoThread.initial;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AbstractAutoRunnable.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import lombok.extern.slf4j.Slf4j;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import java.util.List;
import java.util.Map;

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunServiceImpl.java
View File

@@ -1,12 +1,11 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Lang;
import org.nl.acs.auto.initial.ApplicationAutoInitial;
import org.nl.acs.autoThread.initial.ApplicationAutoInitial;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/DevelopConfig.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import java.util.ArrayList;
import java.util.List;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/SystemConfig.java
View File

@@ -1,6 +1,4 @@
package org.nl.acs.auto.run;
import org.nl.acs.common.base.CommonFinalParam;
package org.nl.acs.autoThread.run;
/**
* Demo class

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import java.util.Date;
/**

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadStatusEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
/**
* Demo class
*

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadUsedStatusEnum.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
/**
* Demo class
*

44
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/TwoNDCSocketConnectionAutoRun.java
View File

@@ -1,23 +1,21 @@
package org.nl.acs.auto.run;
package org.nl.acs.autoThread.run;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.agv.server.NDCAgvService;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.device.domain.Device;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
import org.nl.acs.instruction.domain.Instruction;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
import org.nl.acs.api.wms.service.AcsToWmsService;
import org.nl.acs.api.wms.service.impl.AcsToWmsServiceImpl;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.task.instruction.service.impl.InstructionServiceImpl;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.iot.opc.DeviceAppService;
import org.nl.config.SpringContextHolder;
import org.nl.config.lucene.service.LuceneExecuteLogService;
import org.nl.config.lucene.service.dto.LuceneLogDto;
import org.nl.system.service.dict.ISysDictService;
import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.param.ISysParamService;
@@ -32,7 +30,6 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.Date;
import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString;
@Slf4j
@@ -87,13 +84,12 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
ISysParamService paramService = SpringContextHolder.getBean(SysParamServiceImpl.class);
InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class);
AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
try {
log.info("2楼1区域AGV系统链接开始");
log.info("AGV系统链接开始");
ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
// byte[] b = new byte[1024];
@@ -192,7 +188,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
inst.setAgv_jobno(String.valueOf(index));
inst.setSend_status("1");
instructionService.update(inst);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
}
flag = true;
}
@@ -212,13 +208,13 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
e.printStackTrace();
}
}
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
}
//请求删除任务
//(需要WCS反馈)
else if (phase == 0x30) {
// data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0);
data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0, 0, 0);
// data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0, 0, 0);
}
//任务删除确认
//(需要WCS反馈)
@@ -228,7 +224,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else {
instructionService.cancelNOSendAgv(inst.getInstruction_id());
}
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
} else if (phase == 0x50) {
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");
@@ -343,4 +339,16 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
}
}
public static String Bytes2HexString(byte[] b) {
String ret = "";
for (int i = 0; i < b.length; i++) {
String hex = Integer.toHexString(b[i] & 0xFF);
if (hex.length() == 1) {
hex = '0' + hex;
}
ret += hex.toUpperCase();
}
return ret;
}
}

44
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.DeviceDriverDefination;
import org.nl.acs.opc.DeviceExtraManageDto;
import org.nl.acs.device.device_driver.DeviceDriver;
import org.nl.acs.device.device_driver.DeviceDriverDefination;
import org.nl.acs.iot.opc.DeviceExtraManageDto;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -113,70 +113,70 @@ public class Device implements Serializable {
@TableField(exist = false)
private String barrels_status;
@TableId(type = IdType.ASSIGN_ID)
private String device_id;
@NotBlank
private String device_code;
@NotBlank
private String device_name;
private String device_type;
private String region;
private String manufacturer;
private String manufacturer_phone;
private String opc_server_id;
private String opc_plc_id;
@NotBlank
private String is_route;
private String driver_code;
private String remark;
@NotBlank
private String is_active;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
private String address;
@TableField(exist = false)

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.*;
import lombok.experimental.Accessors;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -25,49 +25,49 @@ import java.io.Serializable;
public class DeviceAssigned extends CommonModel<DeviceAssigned> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String assigned_id;
@NotBlank
private String device_code;
private String inst_nextDevice_code;
private String task_nextDevice_code;
private String param;
private String remark;
@NotBlank
private String is_active;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;

34
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -33,60 +33,60 @@ import java.io.Serializable;
public class DeviceDbitem extends CommonModel<DeviceDbitem> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String item_id;
@NotBlank
private String item_code;
@NotBlank
private String item_name;
private String db_code;
private String db_value;
private String value_type;
private String collect_type;
@NotBlank
private String device_id;
private String remark;
@NotBlank
private String is_active;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -31,27 +31,27 @@ import java.io.Serializable;
public class DeviceErpmapping extends CommonModel<DeviceErpmapping> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String device_id;
@NotBlank
private String device_code;
@NotBlank
private String device_name;
@NotBlank
private String device_type;
@NotBlank
private String driver_code;
@NotBlank
private String erp_code;

36
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.*;
import lombok.experimental.Accessors;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -27,64 +27,64 @@ import java.math.BigDecimal;
public class DeviceExtra extends CommonModel<DeviceExtra> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String extra_id;
@NotBlank
private String extra_code;
@NotBlank
private String extra_name;
private String extra_value;
private String value_type;
private String filed_type;
@NotNull
private BigDecimal order_seq;
@NotBlank
private String device_id;
private String device_code;
private String remark;
@NotBlank
private String is_active;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;

46
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -34,81 +34,81 @@ import java.io.Serializable;
public class DeviceMybatis extends CommonModel<DeviceMybatis> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String device_id;
@NotBlank
private String device_code;
@NotBlank
private String device_name;
private String device_type;
private String region;
private String manufacturer;
private String manufacturer_phone;
@NotBlank
private String is_config;
private String opc_server_id;
private String opc_plc_id;
@NotBlank
private String is_route;
private String driver_code;
private String remark;
@NotBlank
private String is_active;
@NotNull
private BigDecimal seq_num;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;
private String address;
public void copyFrom(Device source) {

34
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -33,60 +33,60 @@ import java.io.Serializable;
public class DeviceRunpoint extends CommonModel<DeviceRunpoint> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String device_id;
@NotBlank
private String device_code;
@NotBlank
private String hasgoods;
private String container;
private String taskno;
private String remark;
@NotBlank
private String is_active;
@NotBlank
private String is_delete;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;
private String material_type;
private String batch;
private String islock;
public void copyFrom(DeviceRunpoint source) {

20
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java
View File

@@ -1,6 +1,6 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import org.nl.acs.common.base.CommonModel;
import org.nl.common.db.CommonModel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -33,37 +33,37 @@ import java.io.Serializable;
public class Deviceisonline extends CommonModel<Deviceisonline> implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)
private String online_id;
@NotBlank
private String device_code;
@NotBlank
private String order_code;
@NotBlank
private String online_status;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_by;
@NotBlank
@TableField(fill = FieldFill.INSERT)
private String create_time;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_by;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/ItemDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/ItemDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.domain;
package org.nl.acs.device.device.domain;
import lombok.Data;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.enums;
package org.nl.acs.device.device.enums;
import cn.hutool.core.util.StrUtil;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.enums;
package org.nl.acs.device.device.enums;
public enum ErrorType {
//

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import lombok.RequiredArgsConstructor;
import org.nl.acs.device.service.DeviceAssignedService;
import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
import org.nl.acs.device.device.service.DeviceAssignedService;
import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
import org.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.dto.DeviceDto;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.dto.DeviceDto;
import org.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import org.nl.common.logging.annotation.Log;
import org.nl.acs.device.service.DeviceDbitemService;
import org.nl.acs.device.service.dto.DeviceDbitemDto;
import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
import org.nl.acs.device.device.service.DeviceDbitemService;
import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import org.nl.common.logging.annotation.Log;
import org.nl.acs.device.service.DeviceErpmappingService;
import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.device.service.DeviceErpmappingService;
import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import lombok.RequiredArgsConstructor;
import org.nl.acs.device.service.DeviceExtraService;
import org.nl.acs.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
import org.nl.acs.device.device.service.DeviceExtraService;
import org.nl.acs.device.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
import org.nl.common.logging.annotation.Log;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import org.nl.common.logging.annotation.Log;
import org.nl.acs.device.service.DeviceRunpointService;
import org.nl.acs.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
import org.nl.acs.device.device.service.DeviceRunpointService;
import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -53,7 +53,7 @@ public class DeviceRunpointController {
/*
@Log("导出设备点位")
@GetMapping(value = "/download")
//@PreAuthorize("@el.check('deviceRunpoint:list')")
public void download(HttpServletResponse response, DeviceRunpointQueryParam query) throws IOException {

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.rest;
package org.nl.acs.device.device.rest;
import org.nl.common.logging.annotation.Log;
import org.nl.acs.device.service.DeviceisonlineService;
import org.nl.acs.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
import org.nl.acs.device.device.service.DeviceisonlineService;
import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -51,7 +51,7 @@ public class DeviceisonlineController {
/*
@Log("导出设备在线状态")
@GetMapping(value = "/download")
//@PreAuthorize("@el.check('deviceisonline:list')")
public void download(HttpServletResponse response, DeviceisonlineQueryParam query) throws IOException {

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.device.domain.DeviceAssigned;
import org.nl.acs.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.device.device.domain.DeviceAssigned;
import org.nl.acs.device.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
import org.nl.common.db.CommonService;
import org.nl.common.db.PageInfo;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.device.domain.DeviceDbitem;
import org.nl.acs.device.service.dto.DeviceDbitemDto;
import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
import org.nl.acs.device.device.domain.DeviceDbitem;
import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
import org.springframework.data.domain.Pageable;
import java.util.List;

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.device.enums.DeviceType;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.DeviceDriverDefination;
import org.nl.acs.device.device.enums.DeviceType;
import org.nl.acs.device.device_driver.DeviceDriver;
import org.nl.acs.device.device_driver.DeviceDriverDefination;
import java.util.List;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.device.domain.DeviceErpmapping;
import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.nl.acs.device.device.domain.DeviceErpmapping;
import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.device.device.domain.DeviceExtra;
import org.nl.acs.device.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
import org.nl.common.db.CommonService;
import org.nl.common.db.PageInfo;
import org.springframework.data.domain.Pageable;
import java.util.List;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.device.domain.DeviceRunpoint;
import org.nl.acs.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
import org.nl.acs.device.device.domain.DeviceRunpoint;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
import org.springframework.data.domain.Pageable;
import java.util.List;

14
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java
View File

@@ -1,13 +1,13 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.acs.device.domain.Device;
import org.nl.acs.storage_cell.service.dto.StorageCellDto;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.device.service.dto.DeviceDto;
import org.nl.acs.device.service.dto.DeviceQueryParam;
import org.nl.acs.device.device.domain.Device;
import org.nl.acs.device.device.service.dto.DeviceDto;
import org.nl.acs.device.device.service.dto.DeviceQueryParam;
import org.nl.acs.device.storage_cell.service.dto.StorageCellDto;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.springframework.data.domain.Pageable;
import org.springframework.web.multipart.MultipartFile;

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.service;
package org.nl.acs.device.device.service;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.CommonService;
import org.nl.acs.device.domain.Deviceisonline;
import org.nl.acs.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
import org.nl.acs.device.device.domain.Deviceisonline;
import org.nl.common.db.PageInfo;
import org.nl.common.db.CommonService;
import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
import org.springframework.data.domain.Pageable;
import java.util.List;

14
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
@@ -19,21 +19,21 @@ import java.io.Serializable;
public class AcsDeviceErpmappingDto implements Serializable {
private static final long serialVersionUID = 1L;
private String device_id;
private String device_code;
private String device_name;
private String device_type;
private String driver_code;
private String erp_code;
}

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
@@ -19,39 +19,39 @@ import java.io.Serializable;
public class DeviceAssignedDto implements Serializable {
private static final long serialVersionUID = 1L;
private String assigned_id;
private String device_code;
private String inst_nextDevice_code;
private String task_nextDevice_code;
private String param;
private String remark;
private String is_active;
private String is_delete;
private String create_by;
private String create_time;
private String update_by;
private String update_time;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

32
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
@@ -19,48 +19,48 @@ import java.io.Serializable;
public class DeviceDbitemDto implements Serializable {
private static final long serialVersionUID = 1L;
private String item_id;
private String item_code;
private String item_name;
private String db_code;
private String db_value;
private String value_type;
private String collect_type;
private String device_id;
private String remark;
private String is_active;
private String is_delete;
private String create_by;
private String create_time;
private String update_by;
private String update_time;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

32
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
@@ -20,48 +20,48 @@ import java.io.Serializable;
public class DeviceRunpointDto implements Serializable {
private static final long serialVersionUID = 1L;
private String device_id;
private String device_code;
private String hasgoods;
private String container;
private String taskno;
private String remark;
private String is_active;
private String is_delete;
private String create_by;
private String create_time;
private String update_by;
private String update_time;
private String material_type;
private String batch;
private String islock;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

18
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.*;
import lombok.experimental.Accessors;
@@ -19,27 +19,27 @@ import java.io.Serializable;
public class DeviceisonlineDto implements Serializable {
private static final long serialVersionUID = 1L;
private String online_id;
private String device_code;
private String order_code;
private String online_status;
private String create_by;
private String create_time;
private String update_by;
private String update_time;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Getter;
import lombok.Setter;

24
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -8,18 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.device.domain.DeviceAssigned;
import org.nl.acs.device.service.DeviceAssignedService;
import org.nl.acs.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
import org.nl.acs.device.service.mapper.DeviceAssignedMapper;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.device.device.domain.DeviceAssigned;
import org.nl.acs.device.device.service.DeviceAssignedService;
import org.nl.acs.device.device.service.mapper.DeviceAssignedMapper;
import org.nl.common.db.CommonFinalParam;
import org.nl.acs.device.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

22
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java
View File

@@ -1,17 +1,17 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.domain.DeviceDbitem;
import org.nl.acs.device.service.DeviceDbitemService;
import org.nl.acs.device.service.dto.DeviceDbitemDto;
import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
import org.nl.acs.device.service.mapper.DeviceDbitemMapper;
import org.nl.acs.device.device.domain.DeviceDbitem;
import org.nl.acs.device.device.service.mapper.DeviceDbitemMapper;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.acs.device.device.service.DeviceDbitemService;
import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
@@ -8,18 +8,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.domain.DeviceErpmapping;
import org.nl.acs.device.service.DeviceErpmappingService;
import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam;
import org.nl.acs.device.service.mapper.DeviceErpmappingMapper;
import org.nl.acs.device.service.mapper.DeviceMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.device.domain.Device;
import org.nl.acs.device.device.domain.DeviceErpmapping;
import org.nl.acs.device.device.service.DeviceErpmappingService;
import org.nl.acs.device.device.service.mapper.DeviceErpmappingMapper;
import org.nl.acs.device.device.service.mapper.DeviceMapper;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.FileUtil;
import org.nl.config.language.LangProcess;

22
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -8,16 +8,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.device.service.DeviceExtraService;
import org.nl.acs.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
import org.nl.acs.device.service.mapper.DeviceExtraMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.device.domain.DeviceExtra;
import org.nl.acs.device.device.service.DeviceExtraService;
import org.nl.acs.device.device.service.mapper.DeviceExtraMapper;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.acs.device.device.service.dto.DeviceExtraDto;
import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;

22
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java
View File

@@ -1,17 +1,17 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.domain.DeviceRunpoint;
import org.nl.acs.device.service.DeviceRunpointService;
import org.nl.acs.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
import org.nl.acs.device.device.domain.DeviceRunpoint;
import org.nl.acs.device.device.service.DeviceRunpointService;
import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

76
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -18,46 +18,46 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.map.ListOrderedMap;
import org.nl.acs.auto.initial.ApplicationAutoInitial;
import org.nl.acs.device.domain.ItemDto;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.device.enums.DeviceType;
import org.nl.acs.device.service.mapper.DeviceExtraMapper;
import org.nl.acs.device.domain.DeviceRunpoint;
import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
import org.nl.acs.route.domain.RouteLine;
import org.nl.acs.route.service.mapper.RouteLineMapper;
import org.nl.acs.storage_cell.domain.StorageCell;
import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.utils.ReadUtil;
import org.nl.acs.device.service.DeviceDriverDefinationAppService;
import org.nl.acs.device.service.DeviceExtraService;
import org.nl.acs.device_driver.DeviceDriverDefination;
import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
import org.nl.acs.device.service.dto.DeviceRunpointDto;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.opc.service.OpcService;
import org.nl.acs.opc.service.dto.OpcDto;
import org.nl.acs.plc.service.OpcPlcService;
import org.nl.acs.opc.service.dto.OpcPlcDto;
import org.nl.acs.storage_cell.service.dto.StorageCellDto;
import org.nl.acs.utils.ExportCSVUtil;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.autoThread.initial.ApplicationAutoInitial;
import org.nl.acs.device.device.domain.Device;
import org.nl.acs.device.device.domain.DeviceExtra;
import org.nl.acs.device.device.domain.DeviceRunpoint;
import org.nl.acs.device.device.domain.ItemDto;
import org.nl.acs.device.device.enums.DeviceType;
import org.nl.acs.device.device.service.mapper.DeviceExtraMapper;
import org.nl.acs.device.device.service.mapper.DeviceMapper;
import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper;
import org.nl.acs.task.route.domain.RouteLine;
import org.nl.acs.task.route.service.mapper.RouteLineMapper;
import org.nl.acs.device.storage_cell.domain.StorageCell;
import org.nl.acs.device.storage_cell.service.mapper.StorageCellMapper;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.ReadUtil;
import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
import org.nl.acs.device.device.service.DeviceExtraService;
import org.nl.acs.device.device_driver.DeviceDriverDefination;
import org.nl.acs.device.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device.device_driver.defination.OpcDeviceDriverDefination;
import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
import org.nl.acs.iot.opc.DeviceAppService;
import org.nl.acs.iot.opc.DeviceAppServiceImpl;
import org.nl.acs.iot.opc.service.OpcService;
import org.nl.acs.iot.opc.service.dto.OpcDto;
import org.nl.acs.iot.plc.service.OpcPlcService;
import org.nl.acs.iot.opc.service.dto.OpcPlcDto;
import org.nl.acs.device.storage_cell.service.dto.StorageCellDto;
import org.nl.common.utils.ExportCSVUtil;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.*;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.dto.DeviceDto;
import org.nl.acs.device.service.dto.DeviceQueryParam;
import org.nl.acs.device.service.mapper.DeviceMapper;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.dto.DeviceDto;
import org.nl.acs.device.device.service.dto.DeviceQueryParam;
import org.nl.config.language.LangProcess;
import org.nl.system.service.dict.ISysDictService;
import org.nl.system.service.dict.dao.Dict;

22
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java
View File

@@ -1,17 +1,17 @@
package org.nl.acs.device.service.impl;
package org.nl.acs.device.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.nl.acs.common.base.PageInfo;
import org.nl.acs.common.base.QueryHelpMybatisPlus;
import org.nl.acs.common.base.impl.CommonServiceImpl;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.PageUtil;
import org.nl.acs.device.domain.Deviceisonline;
import org.nl.acs.device.service.DeviceisonlineService;
import org.nl.acs.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
import org.nl.acs.device.service.mapper.DeviceisonlineMapper;
import org.nl.acs.device.device.domain.Deviceisonline;
import org.nl.acs.device.device.service.DeviceisonlineService;
import org.nl.acs.device.device.service.mapper.DeviceisonlineMapper;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import org.nl.acs.device.domain.DeviceAssigned;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.device.domain.DeviceAssigned;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
/**

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.domain.DeviceDbitem;
import org.nl.acs.device.device.domain.DeviceDbitem;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
/**

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.domain.DeviceErpmapping;
import org.nl.common.db.CommonMapper;
import org.nl.acs.device.device.domain.DeviceErpmapping;
import org.springframework.stereotype.Repository;
/**

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.nl.acs.device.domain.DeviceExtra;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.device.domain.DeviceExtra;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
import java.util.List;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java
View File

@@ -1,11 +1,11 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.device.domain.Device;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
/**

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java
View File

@@ -1,9 +1,8 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.mybatis.spring.annotation.MapperScan;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.device.domain.Device;
@Mapper
public interface DeviceMappers extends BaseMapper<Device> {

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.domain.DeviceRunpoint;
import org.nl.acs.device.device.domain.DeviceRunpoint;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
/**

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.service.mapper;
package org.nl.acs.device.device.service.mapper;
import org.nl.acs.common.base.CommonMapper;
import org.nl.acs.device.domain.Deviceisonline;
import org.nl.acs.device.device.domain.Deviceisonline;
import org.nl.common.db.CommonMapper;
import org.springframework.stereotype.Repository;
/**

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriver.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device_driver;
package org.nl.acs.device.device_driver;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import org.nl.acs.common.base.CommonFinalParam;
import org.nl.acs.device.domain.Device;
import org.nl.common.db.CommonFinalParam;
import org.nl.acs.device.device.domain.Device;
import java.util.ArrayList;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More