diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java deleted file mode 100644 index e69de29..0000000 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/agv说明 b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/agv说明 deleted file mode 100644 index 5e92bca..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/agv说明 +++ /dev/null @@ -1 +0,0 @@ -1=magic 2=NDC 3=XZ 4=ZHEDA \ No newline at end of file diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/NDCAgvService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/NDCAgvService.java deleted file mode 100644 index 7dc740e..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/NDCAgvService.java +++ /dev/null @@ -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); -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java deleted file mode 100644 index 97f7cf2..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java +++ /dev/null @@ -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; - - /** - * 机器人当前的自身状态 - *

- * UNKNOWN：未知状态 - * UNAVAILABLE：通信超时或者已断开连接 - * ERROR：错误状态 - * IDLE：空闲状态 - * EXECUTING：正在执行运单 - * CHARGING：正在充电 - */ - private String state; - - /** - * 机器人的剩余电量值（单位：整数百分比） - */ - private String energyLevel; - - /** - * - */ - private String energyLevelGood; - - /** - * 机器人在 SRD 系统中的在线状态 - *

- * TO_BE_IGNORED：机器人处于离线状态，SRD 不会标识出机器人位置。 - * TO_BE_NOTICED：机器人处于离线状态，SRD 标识出机器人的位置。 - * TO_BE_RESPECTED：机器人处于在线状态，但不能接受新的运单。 - * TO_BE_UTILIZED：机器人处于在线状态，可以接受并执行新的运单。 - */ - private String integrationLevel; - - /** - * 机器人当前的运单执行状态 - *

- * UNAVAILABLE：无法执行任何运单和任务 - * IDLE：空闲状态 - * AWAITING_ORDER：机器人在等待运单中新的子任务 - * PROCESSING_ORDER：机器人正在执行运单 - */ - private String procState; - - /** - * 角度 - */ - private String positionAngle; - - /** - * X坐标 - */ - private String positionX; - - /** - * Y坐标 - */ - private String positionY; - - /** - * 当前任务号 - */ - private String transportOrder; - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java deleted file mode 100644 index 190ffd8..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ /dev/null @@ -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 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; - } - - - - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/domain/Address.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/domain/Address.java index daf062f..db43317 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/domain/Address.java @@ -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

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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/rest/AddressController.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/rest/AddressController.java index 89004f3..f1b341e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/rest/AddressController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/AddressService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/AddressService.java index d82ebea..190b2e4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/AddressService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressDto.java index 5b6faa3..7ab129a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressQueryParam.java index 77f621a..0ced6c5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/dto/AddressQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/dto/AddressQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/impl/AddressServiceImpl.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/impl/AddressServiceImpl.java index 548a775..483301b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/impl/AddressServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/mapper/AddressMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/mapper/AddressMapper.java index c063228..ab04c01 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/address/service/mapper/AddressMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/MsgTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/MsgTypeEnum.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/MsgTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/MsgTypeEnum.java index c316b9b..ebb85cc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/MsgTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/MsgTypeEnum.java @@ -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, "创建任务"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskPhaseEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskPhaseEnum.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskPhaseEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskPhaseEnum.java index c563cc6..00541ad 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskPhaseEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskPhaseEnum.java @@ -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", "取货请求或者取请求应答（允许取货）"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskStateEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskStateEnum.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskStateEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskStateEnum.java index 52c63db..73e5881 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/enums/TaskStateEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/enums/TaskStateEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.kit.enums; +package org.nl.acs.api.kit.enums; public enum TaskStateEnum { NOT_STARTED("0", "任务未启动"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/AcsToKitController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/AcsToKitController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/AcsToKitController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/AcsToKitController.java index 3c6c0e6..5e41b18 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/AcsToKitController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/AcsToKitController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/KitToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/KitToAcsController.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/KitToAcsController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/KitToAcsController.java index 7b77614..2cc8a24 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/rest/KitToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/rest/KitToAcsController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/AcsToKitService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/AcsToKitService.java similarity index 62% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/AcsToKitService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/AcsToKitService.java index 1f71627..7b55b01 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/AcsToKitService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/AcsToKitService.java @@ -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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/KitToAcsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/KitToAcsService.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/KitToAcsService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/KitToAcsService.java index 0f6a0ef..58cd67d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/KitToAcsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/KitToAcsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.kit.service; +package org.nl.acs.api.kit.service; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/AcsToKitServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/AcsToKitServiceImpl.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/AcsToKitServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/AcsToKitServiceImpl.java index 6305c26..bd31b36 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/AcsToKitServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/AcsToKitServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/KitToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/KitToAcsServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/KitToAcsServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/KitToAcsServiceImpl.java index f9e1b69..955a94b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/kit/service/impl/KitToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/kit/service/impl/KitToAcsServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/AcsUtil.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/AcsUtil.java index 5901e40..dbe7e9a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/AcsUtil.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/LmsUtil.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/LmsUtil.java index 2db3961..5823ebd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/LmsUtil.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/AcsToWmsController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/AcsToWmsController.java index f97c22b..6609798 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/AcsToWmsController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/WmsToAcsController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/WmsToAcsController.java index 2aa083e..f45fc81 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/rest/WmsToAcsController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/AcsToWmsService.java similarity index 52% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/AcsToWmsService.java index e5ebf04..56ec25c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/AcsToWmsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.wms.service; +package org.nl.acs.api.wms.service; public interface AcsToWmsService { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/WmsToAcsService.java similarity index 53% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/WmsToAcsService.java index 97f5993..0d1937f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/WmsToAcsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.wms.service; +package org.nl.acs.api.wms.service; public interface WmsToAcsService { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/AcsToWmsServiceImpl.java similarity index 71% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/AcsToWmsServiceImpl.java index f4c0482..86e6253 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/AcsToWmsServiceImpl.java @@ -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 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/WmsToAcsServiceImpl.java similarity index 71% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/WmsToAcsServiceImpl.java index 74bfd13..7fa6fc4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/wms/service/impl/WmsToAcsServiceImpl.java @@ -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 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AcsInit.java similarity index 83% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AcsInit.java index 4429bcb..2f28e74 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AcsInit.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AutoRunController.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AutoRunController.java index fbb5bd4..01476d9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/AutoRunController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitial.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitial.java index bdf7872..d51b6ee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitial.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.initial; +package org.nl.acs.autoThread.initial; /** * Demo class diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitialExecuter.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitialExecuter.java index 8c88540..18234b1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/ApplicationAutoInitialExecuter.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitial.java similarity index 83% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitial.java index 5d416db..aea9df4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitial.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.initial; +package org.nl.acs.autoThread.initial; /** * Demo class * diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitialExecuter.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitialExecuter.java index 2d5d705..c665e41 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/initial/WebAutoInitialExecuter.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AbstractAutoRunnable.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AbstractAutoRunnable.java index f106ddb..4efeef6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AbstractAutoRunnable.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; import lombok.extern.slf4j.Slf4j; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunService.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunService.java index 41057ca..ea79aa6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunService.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; import java.util.List; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunServiceImpl.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunServiceImpl.java index 494f482..2c7e71c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/AutoRunServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/DevelopConfig.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/DevelopConfig.java index 7efc94a..23b23df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/DevelopConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; import java.util.ArrayList; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/SystemConfig.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/SystemConfig.java index da7da13..13b6f3c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/SystemConfig.java @@ -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 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadDto.java index 03f0260..dbb87c6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; import java.util.Date; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadStatusEnum.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadStatusEnum.java index 6fade68..a9b8750 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadStatusEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; /** * Demo class * diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadUsedStatusEnum.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadUsedStatusEnum.java index 4ffb8ad..c62dde9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/ThreadUsedStatusEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.auto.run; +package org.nl.acs.autoThread.run; /** * Demo class * diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/TwoNDCSocketConnectionAutoRun.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/TwoNDCSocketConnectionAutoRun.java index 772a3a5..d5c1161 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/run/TwoNDCSocketConnectionAutoRun.java @@ -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; + } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java index 143936d..47f8b10 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java @@ -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) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java index f2d2016..b68e34f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java @@ -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 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java index 4417d70..598ae35 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java @@ -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 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java index dbe10c3..bb489a7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java @@ -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 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java index b12dcbe..90fcaad 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java @@ -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 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java index 6030ebe..93fdf8c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java @@ -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 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) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java index cdbcf9d..5b8b9b6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java @@ -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 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) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java index 5158bdf..05ab3d5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java @@ -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 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/ItemDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/ItemDto.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/ItemDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/ItemDto.java index d01583a..a2bd1d0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/ItemDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/ItemDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.domain; +package org.nl.acs.device.device.domain; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java index dff18ec..93c4056 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.enums; +package org.nl.acs.device.device.enums; import cn.hutool.core.util.StrUtil; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java index 627079a..cffa7bf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.enums; +package org.nl.acs.device.device.enums; public enum ErrorType { // diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java index 8a6fb4d..c6c1d92 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java index ea2b94a..8078edf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java index 637e033..1ecdc1c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java index cc1d26c..49d7cf9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java index ba33778..12f4afd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java index 0fae6b0..fae66a8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java @@ -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 { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java index 3cf784c..0f2b494 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java @@ -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 { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java index 03c1224..f696a5c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java index ef54ba9..8435654 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java similarity index 81% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java index c39e008..4787ddf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java index 0eff5a9..21fb970 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java index ec8041e..95af949 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java similarity index 84% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java index 1b5eea3..1aa98bc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java index 4c74dbb..5dccdac 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java index 53b190e..c6ca932 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java index b5d6c8a..f4d74ed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java index 9fd6843..6e4003f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java index 6a7e54a..64529a5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java index 955a3bb..c5a2a61 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java index 7429e0b..420c78b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java index 8fc4f1d..8f54f61 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java index fa0440f..7e1a0eb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java index e9f11db..40ba528 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.service.dto; +package org.nl.acs.device.device.service.dto; import lombok.*; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java index 61286db..a2e8a33 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java similarity index 75% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java index 42bdf3f..32ae13e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java index d3820c3..17e396c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java index 5ea2de2..e59e8c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java index 9fe6bb7..f06219c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java @@ -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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java similarity index 76% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java index 2dae32d..62428df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java index b2554ac..5560d9b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java index 4863911..68778dd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java index 6bf9409..63b4f53 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java index 5e94751..4a1e720 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java similarity index 81% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java index 2057bdd..67b4261 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java index 573e903..100b1f5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java index 2f56784..5d1e5ff 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java index c5731ea..3b6289e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java index 6459046..fc13b3e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java index 1f9c490..dd83747 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java index 602fad8..594cc1b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java index 3fd6369..801862d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java similarity index 56% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java index b3610d3..d33e23b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java @@ -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 { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java index 49acb4d..05bc319 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java index bb25217..cc4260d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java @@ -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; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriver.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriver.java index 78a1ec2..784ac56 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriver.java @@ -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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverDefination.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverDefination.java index 891f718..e86ce72 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverDefination.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.device_driver; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RequestMethodEnum.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RequestMethodEnum.java index 729262f..d0ea1d6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RequestMethodEnum.java @@ -1,10 +1,9 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.device_driver; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.common.base.CommonFinalParam; /** * 驱动类型 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RouteableDeviceDriver.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RouteableDeviceDriver.java index b0b2e49..dc5ac16 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/RouteableDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.device_driver; public interface RouteableDeviceDriver extends DeviceDriver { /** @@ -16,4 +16,4 @@ public interface RouteableDeviceDriver extends DeviceDriver { default boolean isExist() { return this.getDevice().getIs_exist(); } -} \ No newline at end of file +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/ItemProtocol.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/ItemProtocol.java index f497737..ddbfa50 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.device_driver.conveyor.standard_inspect_site; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.ItemDto; +import org.nl.acs.device.device.domain.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java similarity index 79% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java index 90b79a7..1b6d26f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.device_driver.conveyor.standard_inspect_site; -import org.nl.acs.device.domain.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.device.domain.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 10a8678..0bc7a70 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.device_driver.conveyor.standard_inspect_site; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,28 +8,27 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.kit.service.AcsToKitService; -import org.nl.acs.history.ErrorUtil; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.impl.StorageCellServiceImpl; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.RouteableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.api.kit.service.AcsToKitService; +import org.nl.acs.task.history.ErrorUtil; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.instruction.service.InstructionService; +import org.nl.acs.layout.device.DeviceStageMonitor; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.device.storage_cell.service.dto.StorageCellDto; +import org.nl.acs.device.storage_cell.service.impl.StorageCellServiceImpl; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.nl.config.lucene.service.LuceneExecuteLogService; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java similarity index 78% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java index f2fd473..efcfaa7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.conveyor.standard_ordinary_site; +package org.nl.acs.device.device_driver.conveyor.standard_ordinary_site; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 16a1e1c..bffb4b9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_ordinary_site; +package org.nl.acs.device.device_driver.conveyor.standard_ordinary_site; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,19 +8,19 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.kit.service.AcsToKitService; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.impl.StorageCellServiceImpl; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.RouteableDeviceDriver; +import org.nl.acs.device.device_driver.driver.AbstractDeviceDriver; +import org.nl.acs.device.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.api.kit.service.AcsToKitService; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.instruction.service.InstructionService; +import org.nl.acs.layout.device.DeviceStageMonitor; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.device.storage_cell.service.dto.StorageCellDto; +import org.nl.acs.device.storage_cell.service.impl.StorageCellServiceImpl; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/defination/OpcDeviceDriverDefination.java similarity index 65% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/defination/OpcDeviceDriverDefination.java index 7af3be5..34b7d9b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/defination/OpcDeviceDriverDefination.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver.defination; +package org.nl.acs.device.device_driver.defination; -import org.nl.acs.device.domain.ItemDto; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.ItemDto; +import org.nl.acs.device.device_driver.DeviceDriverDefination; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractDeviceDriver.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractDeviceDriver.java index f475d7e..b9bb20d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractDeviceDriver.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.device_driver.driver; import lombok.Data; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; @Data public class AbstractDeviceDriver implements DeviceDriver { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractOpcDeviceDriver.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractOpcDeviceDriver.java index 77aeebb..5d2b7c9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/AbstractOpcDeviceDriver.java @@ -1,15 +1,15 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.device_driver.driver; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.opc.*; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; -import org.nl.acs.udw.UnifiedDataAppService; +import org.nl.acs.iot.opc.*; +import org.nl.acs.iot.opc.*; +import org.nl.acs.iot.udw.UnifiedDataAccessor; +import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; +import org.nl.acs.iot.udw.UnifiedDataAppService; import org.nl.config.SpringContextHolder; import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Item; import org.openscada.opc.lib.da.ItemState; -import org.springframework.beans.factory.annotation.Autowired; import java.util.*; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ExecutableDeviceDriver.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ExecutableDeviceDriver.java index 9ae9b2b..665b324 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ExecutableDeviceDriver.java @@ -1,6 +1,6 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.device_driver.driver; -import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.DeviceDriver; public interface ExecutableDeviceDriver extends DeviceDriver { /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ItemValue.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ItemValue.java index 824c769..5b704db 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/ItemValue.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.device_driver.driver; /** * @author ldjun diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/OpcDeviceDriver.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/OpcDeviceDriver.java index dec0681..f120bfa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/driver/OpcDeviceDriver.java @@ -1,19 +1,17 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.device_driver.driver; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.opc.OpcItemDto; -import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; -import org.nl.acs.udw.UnifiedDataAccessor; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.service.mapper.DeviceExtraMapper; +import org.nl.acs.iot.opc.OpcItemDto; +import org.nl.acs.iot.udw.UnifiedDataAccessor; import org.nl.config.SpringContextHolder; import java.util.ArrayList; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/domain/StorageCell.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/domain/StorageCell.java index 0c9ade3..e700d23 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/domain/StorageCell.java @@ -1,6 +1,6 @@ -package org.nl.acs.storage_cell.domain; +package org.nl.acs.device.storage_cell.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,61 +33,61 @@ import java.io.Serializable; public class StorageCell extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String storage_id; - + @NotBlank private String storage_code; - + @NotBlank private String x; - + @NotBlank private String y; - + @NotBlank private String z; - + private Integer address; private Integer address1; - + 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 parent_storage_code; public void copyFrom(StorageCell source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/rest/StorageCellController.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/rest/StorageCellController.java index 07b0de5..46cf551 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/rest/StorageCellController.java @@ -1,10 +1,8 @@ -package org.nl.acs.storage_cell.rest; +package org.nl.acs.device.storage_cell.rest; import org.nl.common.logging.annotation.Log; -import org.nl.acs.storage_cell.domain.StorageCell; -import org.nl.acs.storage_cell.service.StorageCellService; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; +import org.nl.acs.device.storage_cell.service.StorageCellService; +import org.nl.acs.device.storage_cell.service.dto.StorageCellDto; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -16,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm @@ -32,7 +29,7 @@ public class StorageCellController { @GetMapping @Log("查询库位管理") - + //@PreAuthorize("@el.check('storageCell:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(storageCellService.queryAll(whereJson, page), HttpStatus.OK); @@ -40,7 +37,7 @@ public class StorageCellController { @PostMapping @Log("新增库位管理") - + //@PreAuthorize("@el.check('storageCell:add')") public ResponseEntity create(@Validated @RequestBody StorageCellDto dto) { storageCellService.create(dto); @@ -49,7 +46,7 @@ public class StorageCellController { @PutMapping @Log("修改库位管理") - + //@PreAuthorize("@el.check('storageCell:edit')") public ResponseEntity update(@Validated @RequestBody StorageCellDto dto) { storageCellService.update(dto); @@ -57,7 +54,7 @@ public class StorageCellController { } @Log("删除库位管理") - + //@PreAuthorize("@el.check('storageCell:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +63,7 @@ public class StorageCellController { } @Log("导出库位管理") - + @GetMapping(value = "/download") //@PreAuthorize("@el.check('storageCell:list')") public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/StorageCellService.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/StorageCellService.java index 372ab71..d61391c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/StorageCellService.java @@ -1,10 +1,10 @@ -package org.nl.acs.storage_cell.service; +package org.nl.acs.device.storage_cell.service; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.storage_cell.domain.StorageCell; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; +import org.nl.common.db.PageInfo; +import org.nl.common.db.CommonService; +import org.nl.acs.device.storage_cell.domain.StorageCell; +import org.nl.acs.device.storage_cell.service.dto.StorageCellDto; +import org.nl.acs.device.storage_cell.service.dto.StorageCellQueryParam; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellDto.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellDto.java index e81cdd3..ca11327 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.storage_cell.service.dto; +package org.nl.acs.device.storage_cell.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,46 +26,46 @@ import java.sql.Timestamp; public class StorageCellDto implements Serializable { private static final long serialVersionUID = 1L; - + private String storage_id; - + private String storage_code; - + private String x; - + private String y; - + private String z; - + private Integer address; private Integer address1; - + 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 parent_storage_code; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellQueryParam.java similarity index 74% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellQueryParam.java index 83dc6b3..c69a16d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/dto/StorageCellQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.storage_cell.service.dto; +package org.nl.acs.device.storage_cell.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/impl/StorageCellServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/impl/StorageCellServiceImpl.java index a0d39d4..0e4b4f7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/impl/StorageCellServiceImpl.java @@ -1,31 +1,30 @@ -package org.nl.acs.storage_cell.service.impl; +package org.nl.acs.device.storage_cell.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -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.service.DeviceService; +import org.nl.acs.autoThread.initial.ApplicationAutoInitial; +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.DeviceService; +import org.nl.acs.device.storage_cell.domain.StorageCell; +import org.nl.acs.device.storage_cell.service.mapper.StorageCellMapper; import org.nl.common.exception.BadRequestException; -import org.nl.acs.utils.ConvertUtil; +import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.acs.storage_cell.domain.StorageCell; -import org.nl.acs.storage_cell.service.StorageCellService; -import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; -import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; +import org.nl.common.utils.utils.PageUtil; +import org.nl.acs.device.storage_cell.service.StorageCellService; +import org.nl.acs.device.storage_cell.service.dto.StorageCellDto; +import org.nl.acs.device.storage_cell.service.dto.StorageCellQueryParam; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/mapper/StorageCellMapper.java similarity index 78% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/mapper/StorageCellMapper.java index 907c801..339cba4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storage_cell/service/mapper/StorageCellMapper.java @@ -1,10 +1,10 @@ -package org.nl.acs.storage_cell.service.mapper; +package org.nl.acs.device.storage_cell.service.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.storage_cell.domain.StorageCell; +import org.nl.common.db.CommonMapper; +import org.nl.acs.device.storage_cell.domain.StorageCell; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java deleted file mode 100644 index 87efc38..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.nl.acs.device_driver.agv.utils; - -public interface IAgv { - /** - * 获取phase名称 - * @param phase - * @return - */ - String getPhaseName(Integer phase); -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java deleted file mode 100644 index d611d3f..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.nl.acs.device_driver.agv.utils; - -import org.springframework.stereotype.Service; - -@Service -public class OneAgvPhase implements IAgv { - @Override - public String getPhaseName(Integer phase) { - if (phase == 0x01) { - return "开始任务/上报订单号"; - } else if (phase == 0x02) { - return "分配车id"; - } else if (phase == 0x03) { - return "到达取货点"; - } else if (phase == 0x05) { - return "取货完毕"; - } else if (phase == 0x07) { - return "到达放货点"; - } else if (phase == 0x09) { - return "放货完毕"; - } else if (phase == 0x0A) { - return "任务完毕"; - } else if (phase == 0x30) { - return "请求删除任务"; - } else if (phase == 0xFF) { - return "任务删除确认"; - } else if (phase == 0x64) { - return "到达位置点"; - } else if (phase == 0x65) { - return "称重就绪"; - } - return null; - } -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java deleted file mode 100644 index 0050427..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.acs.device_driver.agv.utils; - -import org.springframework.stereotype.Service; - -@Service -public class TwoAgvPhase implements IAgv { - @Override - public String getPhaseName(Integer phase) { - if (phase == 0x01) { - return "开始任务/上报订单号"; - } else if (phase == 0x02) { - return "分配车id"; - } else if (phase == 0x03) { - return "到达取货点1"; - } else if (phase == 0x05) { - return "取货点1取货完毕"; - } else if (phase == 0x07) { - return "到达取货点2"; - } else if (phase == 0x09) { - return "取货点2取货完毕"; - } else if (phase == 0x0A) { - return "自动缓存线--到达送满框1"; - } else if (phase == 0x0B) { - return "到达倒料点1"; - } else if (phase == 0x0C) { - return "自动缓存线--送满框完毕1"; - } else if (phase == 0x0D) { - return "倒料点1倒料完毕"; - } else if (phase == 0x0E) { - return "自动缓存线--到达取空框1"; - } else if (phase == 0x0F) { - return "到达倒料点2"; - } else if (phase == 0x11) { - return "倒料点2倒料完毕"; - } else if (phase == 0x13) { - return "到达送箱点1"; - } else if (phase == 0x15) { - return "送箱点1送箱完毕"; - } else if (phase == 0x17) { - return "到达送箱点2"; - } else if (phase == 0x19) { - return "送箱完毕/送空框完毕2"; - } else if (phase == 0x30) { - return "请求删除任务"; - } else if (phase == 0xFF) { - return "任务删除确认"; - } else if (phase == 0x64) { - return "取货完毕/取满框完毕1/点对点取货完毕"; - } else if (phase == 0x65) { - return "称重就绪"; - } else if (phase == 0x1A) { - return "任务完毕"; - } - return null; - } -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDefination.java deleted file mode 100644 index 02bee0c..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDefination.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.nl.acs.device_driver.ndctwo; - -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * NDC双工位AGV - */ -@Service -public class AgvNdcTwoDefination implements DeviceDriverDefination { - @Override - public String getDriverCode() { - return "agv_ndc_two"; - } - - @Override - public String getDriverName() { - return "NDC双工位AGV"; - } - - @Override - public String getDriverDescription() { - return "NDC双工位AGV"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new AgvNdcTwoDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return AgvNdcTwoDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.agv); - return types; - } -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDeviceDriver.java deleted file mode 100644 index 9345be7..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ndctwo/AgvNdcTwoDeviceDriver.java +++ /dev/null @@ -1,474 +0,0 @@ -package org.nl.acs.device_driver.ndctwo; - - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.AcsConfig; -import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.agv.utils.TwoAgvPhase; -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.driver.AbstractDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.history.ErrorUtil; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; -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.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.JsonUtl; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.impl.TaskServiceImpl; -import org.nl.config.SpringContextHolder; -import org.nl.config.lucene.enums.LogLevelEnum; -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; - -import java.time.LocalTime; -import java.util.Map; - - -/** - * NDC双工位AGV - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, DeviceStageMonitor { - - ISysParamService ISysParamService = SpringContextHolder.getBean(ISysParamService.class); - InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); - TaskService taskService = SpringContextHolder.getBean(TaskServiceImpl.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class); - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); - DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); - LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class); - TwoAgvPhase twoAgvPhase = new TwoAgvPhase(); - ISysDictService dictService = SpringContextHolder.getBean(ISysDictService.class); - - String error_code = "0"; - int agvaddr = 0; - int agvaddr_copy = 0; - int weight = 0; - int agv_power = 0; - String device_code = ""; - int phase = 0; - int region = 0; - int error = 0; - int last_error = 0; - private Instruction instruction; - String message = null; - int x = 0; //x坐标 - int y = 0; //y坐标 - int angle = 0; //角度 - int electric_qty = 0; //电量 - int status = 0; //三色灯状态 - int last_status = 0; //三色灯状态 - String error_message = ""; - String error_type = "agv_error_type"; - Boolean isonline = true; - Boolean iserror = false; - boolean isCharge = false; - - private synchronized void setErrorInfo(int error, String error_code, String error_message) { - this.error = error; - this.error_code = error_code; - this.error_message = error_message; - } - - public synchronized void processSocket(int[] arr) throws Exception { - device_code = this.getDeviceCode(); - byte[] data = null; - phase = arr[16] * 256 + arr[17]; - // agv任务号 - int index = arr[12] * 256 + arr[13]; - /** - * 任务号 - */ - int ikey = arr[26] * 256 + arr[27]; - //站点号 - agvaddr = arr[18] * 256 + arr[19]; - //车号 - int carno = arr[20]; - Instruction inst = null; - Device agv_device = null; - if (carno != 0) { - agv_device = deviceAppService.findDeviceByCode(String.valueOf(carno)); - } - TaskDto task = null; - if (ikey != 0) { - if (phase != 0x67 && phase != 0x71 && phase != 0x72 && phase != 0x73 && phase != 0x74 && phase != 0x75) { - inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); - this.instruction = inst; - } - if (ObjectUtil.isNotEmpty(inst)) { -// log.info("该指令号未找到对应指令:" + ikey); -// message = "该指令号未找到对应指令:" + ikey; -// logServer.deviceExecuteLog(this.device_code, "", "", "该指令号未找到对应指令:" + ikey); -// return; - task = taskService.findByTaskCode(inst.getTask_code()); - } else { - - - } - } - - - Device device = null; - String old_device_code = null; - String emptyNum = null; - String device_code = null; - - if (agvaddr != 0) { - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - CommonFinalParam commonFinalParam = new CommonFinalParam(); - if (StrUtil.contains(old_device_code, commonFinalParam.getBARRE())) { - String[] point = old_device_code.split(commonFinalParam.getBARRE()); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, commonFinalParam.getPOINT())) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - } - device = deviceAppService.findDeviceByCode(device_code); - - //普通站点 - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - //标准-光电检测 - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - - - - if (phase == 0x02) { - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - return; - } - inst.setCarno(String.valueOf(carno)); - instructionService.update(inst); - } - //到达取货点 - //(Itype=1/2/3,需要WCS反馈Phase) - else if (phase == 0x03) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - if (agvaddr != 0) { - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - CommonFinalParam commonFinalParam = new CommonFinalParam(); - if (StrUtil.contains(old_device_code, commonFinalParam.getBARRE())) { - String[] point = old_device_code.split(commonFinalParam.getBARRE()); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, commonFinalParam.getPOINT())) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - } - - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(device_code) - .content(agvaddr + "对应设备号为空") - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto); - return; - } - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - return; - } - if (ObjectUtil.isEmpty(inst.getCarno())) { - inst.setCarno(String.valueOf(carno)); - instructionService.update(inst); - } - - - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - - data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("agvphase:" + phase + "反馈:" + data) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - } - } - - - - // 取货完毕 - //(Itype=1/2/3,需要WCS反馈Phase) - else if (phase == 0x05) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("agv地址参数有误,phase:" + phase) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - return; - } - if (agvaddr != 0) { - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - CommonFinalParam commonFinalParam = new CommonFinalParam(); - if (StrUtil.contains(old_device_code, commonFinalParam.getBARRE())) { - String[] point = old_device_code.split(commonFinalParam.getBARRE()); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, commonFinalParam.getPOINT())) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - } - device = deviceAppService.findDeviceByCode(device_code); - - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("对应设备号为空" + device_code) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - return; - } - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - return; - } - if (ObjectUtil.isEmpty(inst.getCarno())) { - inst.setCarno(String.valueOf(carno)); - instructionService.update(inst); - } - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("agvphase:" + phase + "反馈:" + data) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - } - } - - - - - // 到达放货点 - //（Itype=1/2/3,需要WCS反馈） - else if (phase == 0x07) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(device_code) - .content("agv地址参数有误,phase:" + phase) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - return; - } - if (agvaddr != 0) { - CommonFinalParam commonFinalParam = new CommonFinalParam(); - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - if (StrUtil.contains(old_device_code, commonFinalParam.getBARRE())) { - String[] point = old_device_code.split(commonFinalParam.getBARRE()); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, commonFinalParam.getPOINT())) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - } - - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - return; - } - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); - data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("agvphase:" + phase + "反馈:" + data) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - } - } - - - //放货完成 - //(Itype=1/2/3,需要WCS反馈) - else if (phase == 0x09) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(device_code) - .content("agv地址参数有误,phase:" + phase) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - return; - } - if (agvaddr != 0) { - CommonFinalParam commonFinalParam = new CommonFinalParam(); - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - if (StrUtil.contains(old_device_code, commonFinalParam.getBARRE())) { - String[] point = old_device_code.split(commonFinalParam.getBARRE()); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, commonFinalParam.getPOINT())) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - } - - - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - return; - } - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(this.getDeviceCode()) - .content("agvphase:" + phase + "反馈:" + data) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); - } - } - - - - - //上报异常信息 - //（不需要WCS反馈） - else if (phase == 0x67) { - //故障信息 - if (ikey == 0) { - this.setErrorInfo(ikey, "0", "正常"); - } else { - Map error = ErrorUtil.getAgvErrorMsg(ikey); - String code = error.get("code"); - String info = error.get("info"); - this.setErrorInfo(ikey, code, info); - - } - - } - if (!ObjectUtil.isEmpty(data)) { - LuceneLogDto logDto = LuceneLogDto.builder() - .deviceCode(device_code) - .content("agvphase:" + phase + "反馈:" + data) - .build(); - logDto.setLogLevel((LogLevelEnum.ERROR)); - luceneExecuteLogService.deviceExecuteLog(logDto); -// if (StrUtil.equals(inst.getAgv_system_type(), "2")) { -// TwoNDCSocketConnectionAutoRun.write(data); -// } -// else if (StrUtil.equals(inst.getAgv_system_type(), "3")) { -// TwoNDC2SocketConnectionAutoRun.write(data); -// } - if (StrUtil.equals(inst.getAgv_system_type(), "2")) { - TwoNDCSocketConnectionAutoRun.write(data); - } - } - } - - - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - //agv编码 - jo.put("car_no", this.getDevice().getDevice_code()); - //agv名称 - jo.put("device_name", this.getDevice().getDevice_name()); - //x坐标 - jo.put("x", this.getX()); - //y坐标 - jo.put("y", this.getY()); - //角度 - jo.put("angle", this.getAngle()); - jo.put("phase", phase); - jo.put("phase_name", twoAgvPhase.getPhaseName(phase)); - //电量 - jo.put("electricity", this.getElectric_qty()); - String status_name = this.status == 1 ? "关机" : this.status == 2 ? "工作中" : this.status == 3 ? "交通管制" : this.status == 4 ? "任务等待" : this.status == 5 ? "充电中" : this.status == 6 ? "故障中" : this.status == 7 ? "电量低" : "正常"; - //agv状态 - jo.put("status_name", status_name); - //任务号 - jo.put("task_code", ObjectUtil.isEmpty(instruction) ? "0" : instruction.getTask_code()); - //异常 - jo.put("fault", this.getError_message()); - jo.put("message", message); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - - } - - - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/BlockedRunable.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/BlockedRunable.java index 5ebf03f..f2f1798 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/BlockedRunable.java @@ -1,12 +1,8 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import javax.annotation.Resource; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; /** * @author LENOVO diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppService.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppService.java index e2abe6c..fdb0434 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppService.java @@ -1,8 +1,8 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device_driver.DeviceDriver; import java.util.List; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppServiceImpl.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppServiceImpl.java index 19fa68f..26528ee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceAppServiceImpl.java @@ -1,16 +1,16 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceDriverDefinationAppService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device_driver.driver.OpcDeviceDriver; +import org.nl.acs.autoThread.initial.ApplicationAutoInitial; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device_driver.driver.OpcDeviceDriver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceDriverDefinationAppServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceDriverDefinationAppServiceImpl.java index f3a3b0d..c051d7e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceDriverDefinationAppServiceImpl.java @@ -1,10 +1,10 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceDriverDefinationAppService; -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.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.device_driver.DeviceDriver; +import org.nl.acs.device.device_driver.DeviceDriverDefination; import org.nl.common.exception.BadRequestException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExecuteAutoRun.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExecuteAutoRun.java index febe698..2204e64 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExecuteAutoRun.java @@ -1,24 +1,15 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import lombok.extern.slf4j.Slf4j; -import org.dromara.dynamictp.core.DtpRegistry; -import org.dromara.dynamictp.core.executor.DtpExecutor; -import org.dromara.dynamictp.core.executor.OrderedDtpExecutor; -import org.dromara.dynamictp.core.executor.eager.EagerDtpExecutor; -import org.dromara.dynamictp.core.support.ExecutorWrapper; -import org.nl.acs.auto.run.AbstractAutoRunnable; -import org.nl.acs.auto.run.AutoRunService; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; -import org.nl.config.SpringContextHolder; +import org.nl.acs.autoThread.run.AbstractAutoRunnable; +import org.nl.acs.autoThread.run.AutoRunService; +import org.nl.acs.device.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.iot.udw.UnifiedDataAccessor; +import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; import org.nl.config.thread.ThreadPoolExecutorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import picocli.CommandLine; -import javax.annotation.Resource; -import java.lang.reflect.Field; import java.util.*; import java.util.concurrent.*; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExtraManageDto.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExtraManageDto.java index 1a7d63d..067f0e2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceExtraManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageDto.java index 30f34d3..c964f34 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import com.baomidou.mybatisplus.annotation.TableField; import eu.bitwalker.useragentutils.DeviceType; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageService.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageService.java index 856ac5e..b89bc8d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageService.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageServiceImpl.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageServiceImpl.java index 9254b5e..7a3ae5d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceManageServiceImpl.java @@ -1,22 +1,21 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; -import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.acs.device.service.mapper.DeviceRunpointMapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.domain.OpcPlc; -import org.nl.acs.opc.service.mapper.OpcMapper; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceExtra; +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.iot.opc.domain.Opc; +import org.nl.acs.iot.opc.domain.OpcPlc; +import org.nl.acs.iot.opc.service.mapper.OpcMapper; +import org.nl.acs.iot.opc.service.mapper.OpcPlcMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcProtocolRunable.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcProtocolRunable.java index 634733a..4e81bfc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcProtocolRunable.java @@ -1,20 +1,16 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.service.dto.OpcServerManageDto; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; -import org.nl.acs.udw.UnifiedDataAppService; -import org.nl.common.enums.LogTypeEnum; +import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.udw.UnifiedDataAccessor; +import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; +import org.nl.acs.iot.udw.UnifiedDataAppService; 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.param.ISysParamService; import org.openscada.opc.lib.da.*; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcSynchronizeAutoRun.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcSynchronizeAutoRun.java index 69ee0c4..9103ddc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/DeviceOpcSynchronizeAutoRun.java @@ -1,21 +1,17 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.util.ObjectUtil; import org.dromara.dynamictp.core.support.ThreadPoolBuilder; -import org.nl.acs.auto.run.AbstractAutoRunnable; -import org.nl.acs.opc.service.dto.OpcServerManageDto; -import org.nl.config.thread.TheadFactoryName; +import org.nl.acs.autoThread.run.AbstractAutoRunnable; +import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import static org.dromara.dynamictp.common.em.QueueTypeEnum.MEMORY_SAFE_LINKED_BLOCKING_QUEUE; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/JsonUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/JsonUtl.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/JsonUtl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/JsonUtl.java index ccdb0da..516b1ad 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/JsonUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/JsonUtl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ObjectUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ObjectUtl.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ObjectUtl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ObjectUtl.java index fa4dbd1..c3a1a9c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ObjectUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ObjectUtl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import java.util.Arrays; @@ -67,4 +67,4 @@ public class ObjectUtl { return Object.class.isAssignableFrom(clazz); } } -} \ No newline at end of file +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcConfig.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcConfig.java index 44eccaa..33a8e70 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcEntity.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcEntity.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcItemDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcItemDto.java index e392778..520d0f3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcItemDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerManageService.java similarity index 73% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerManageService.java index 0426284..fa757d4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerManageService.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import org.nl.acs.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerService.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerService.java index 8620680..379bd25 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerService.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import org.nl.acs.device_driver.driver.ItemValue; +import org.nl.acs.device.device_driver.driver.ItemValue; import org.openscada.opc.lib.da.Group; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerServiceImpl.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerServiceImpl.java index 1695b1c..9506b2d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerServiceImpl.java @@ -1,10 +1,10 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.util.StrUtil; import org.jinterop.dcom.common.JIException; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.device_driver.driver.ItemValue; -import org.nl.acs.opc.service.dto.OpcServerManageDto; +import org.nl.acs.autoThread.initial.ApplicationAutoInitial; +import org.nl.acs.device.device_driver.driver.ItemValue; +import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; import org.openscada.opc.lib.common.NotConnectedException; import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Server; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerUtl.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerUtl.java index 0a42cdb..0664900 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcServerUtl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; import cn.hutool.core.util.StrUtil; import org.openscada.opc.lib.da.Server; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcStartTag.java similarity index 80% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcStartTag.java index c782740..022d99f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcStartTag.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcUtl.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcUtl.java index ca6e9d7..bc20bdf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcUtl.java @@ -1,21 +1,16 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.TimeInterval; import cn.hutool.core.util.NumberUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.dynamictp.core.DtpRegistry; import org.jinterop.dcom.common.JIException; import org.jinterop.dcom.core.*; -import org.nl.acs.device_driver.driver.ItemValue; +import org.nl.acs.device.device_driver.driver.ItemValue; import org.nl.common.exception.BadRequestException; -import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.openscada.opc.lib.common.ConnectionInformation; import org.openscada.opc.lib.da.*; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/QualityTypeValue.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/QualityTypeValue.java index 62df4c5..fa0a454 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/QualityTypeValue.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ThreadUtl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ThreadUtl.java index c2e51c0..3868716 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/ThreadUtl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; /** * @author ldjun diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/WcsConfig.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/WcsConfig.java index 70f6e77..32a34f7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/WcsConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/Opc.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/Opc.java index a97d7e0..f2642cc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/Opc.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc.domain; +package org.nl.acs.iot.opc.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,63 +33,63 @@ import java.io.Serializable; public class Opc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String opc_id; - + @NotBlank private String opc_code; - + @NotBlank private String opc_name; - + private String opc_host; - + private String user; - + @NotBlank private String password; - + private String prog_id; - + private String cls_id; - + private String domain; - + 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/OpcPlc.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/OpcPlc.java index 91e7f43..f441aa2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/domain/OpcPlc.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc.domain; +package org.nl.acs.iot.opc.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,50 +33,50 @@ import java.io.Serializable; public class OpcPlc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String plc_id; - + @NotBlank private String plc_code; - + @NotBlank private String plc_name; - + private String plc_host; - + private String opc_server_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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcServerManageServiceImpl.java similarity index 83% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcServerManageServiceImpl.java index a4ad211..327b17d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcServerManageServiceImpl.java @@ -1,13 +1,11 @@ -package org.nl.acs.opc; +package org.nl.acs.iot.opc; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcServerManageDto; -import org.nl.acs.opc.service.mapper.OpcMapper; -import org.nl.acs.utils.ConvertUtil; +import org.nl.acs.iot.opc.domain.Opc; +import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.opc.service.mapper.OpcMapper; +import org.nl.common.utils.ConvertUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/rest/OpcController.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/rest/OpcController.java index 77e24aa..9237021 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/rest/OpcController.java @@ -1,9 +1,9 @@ -package org.nl.acs.opc.rest; +package org.nl.acs.iot.opc.rest; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; +import org.nl.acs.iot.opc.service.OpcService; +import org.nl.acs.iot.opc.service.dto.OpcDto; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcService.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcService.java index 87e2a0c..60570cf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcService.java @@ -1,12 +1,12 @@ -package org.nl.acs.opc.service; +package org.nl.acs.iot.opc.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; +import org.nl.acs.iot.opc.service.dto.OpcDto; +import org.nl.acs.iot.opc.service.dto.OpcQueryParam; +import org.nl.acs.iot.opc.domain.Opc; +import org.nl.common.db.PageInfo; +import org.nl.common.db.CommonService; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcDto.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcDto.java index e7b8169..dcc1955 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.iot.opc.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,52 +26,52 @@ import java.sql.Timestamp; public class OpcDto implements Serializable { private static final long serialVersionUID = 1L; - + private String opc_id; - + private String opc_code; - + private String opc_name; - + private String opc_host; - + private String user; - + private String password; - + private String prog_id; - + private String cls_id; - + private String domain; - + 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 hasChildren; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcDto.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcDto.java index 1c662f2..19a49a2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.iot.opc.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,39 +26,39 @@ import java.sql.Timestamp; public class OpcPlcDto implements Serializable { private static final long serialVersionUID = 1L; - + private String plc_id; - + private String plc_code; - + private String plc_name; - + private String plc_host; - + private String opc_server_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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcQueryParam.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcQueryParam.java index dda5913..41a9767 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcPlcQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.iot.opc.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcQueryParam.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcQueryParam.java index 0cda8b5..ac26a01 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.iot.opc.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java index 7acf41e..ca33629 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.iot.opc.service.dto; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServiceImpl.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServiceImpl.java index ac7f6c1..6b7cabb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.impl; +package org.nl.acs.iot.opc.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -10,22 +10,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.opc.domain.OpcPlc; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; -import org.nl.acs.utils.ReadUtil; -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.common.db.CommonFinalParam; +import org.nl.acs.iot.opc.service.mapper.OpcMapper; +import org.nl.acs.iot.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.iot.opc.domain.OpcPlc; +import org.nl.common.utils.ReadUtil; +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.FileUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; -import org.nl.acs.opc.service.mapper.OpcMapper; +import org.nl.common.utils.utils.PageUtil; +import org.nl.acs.iot.opc.domain.Opc; +import org.nl.acs.iot.opc.service.OpcService; +import org.nl.acs.iot.opc.service.dto.OpcDto; +import org.nl.acs.iot.opc.service.dto.OpcQueryParam; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcMapper.java similarity index 58% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcMapper.java index 85be5f9..19bfdd1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.opc.service.mapper; +package org.nl.acs.iot.opc.service.mapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.iot.opc.domain.Opc; +import org.nl.common.db.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcPlcMapper.java similarity index 58% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcPlcMapper.java index 4390c5b..a4c4579 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/mapper/OpcPlcMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.opc.service.mapper; +package org.nl.acs.iot.opc.service.mapper; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.opc.domain.OpcPlc; +import org.nl.common.db.CommonMapper; +import org.nl.acs.iot.opc.domain.OpcPlc; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/rest/OpcPlcController.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/rest/OpcPlcController.java index 1fa0c7e..655f2df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/rest/OpcPlcController.java @@ -1,9 +1,9 @@ -package org.nl.acs.plc.rest; +package org.nl.acs.iot.plc.rest; +import org.nl.acs.iot.opc.service.dto.OpcPlcDto; +import org.nl.acs.iot.opc.service.dto.OpcPlcQueryParam; +import org.nl.acs.iot.plc.service.OpcPlcService; import org.nl.common.logging.annotation.Log; -import org.nl.acs.plc.service.OpcPlcService; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -28,7 +28,7 @@ public class OpcPlcController { @GetMapping @Log("查询plc服务") - + //@PreAuthorize("@el.check('opcPlc:list')") public ResponseEntity query(OpcPlcQueryParam query, Pageable pageable) { return new ResponseEntity<>(opcPlcService.queryAll(query, pageable), HttpStatus.OK); @@ -36,7 +36,7 @@ public class OpcPlcController { @PostMapping @Log("新增plc服务") - + //@PreAuthorize("@el.check('opcPlc:add')") public ResponseEntity create(@Validated @RequestBody OpcPlcDto resources) { return new ResponseEntity<>(opcPlcService.insert(resources), HttpStatus.CREATED); @@ -44,7 +44,7 @@ public class OpcPlcController { @PutMapping @Log("修改plc服务") - + //@PreAuthorize("@el.check('opcPlc:edit')") public ResponseEntity update(@Validated @RequestBody OpcPlcDto resources) { opcPlcService.updateById(resources); @@ -53,7 +53,7 @@ public class OpcPlcController { @DeleteMapping @Log("删除plc服务") - + //@PreAuthorize("@el.check('opcPlc:del')") public ResponseEntity delete(@RequestBody Set ids) { opcPlcService.removeByIds(ids); @@ -62,7 +62,7 @@ public class OpcPlcController { @GetMapping("/selectList") @Log("下拉选PLC") - + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectList() { return new ResponseEntity<>(opcPlcService.selectList(), HttpStatus.OK); @@ -70,7 +70,7 @@ public class OpcPlcController { @GetMapping("/selectList/{opc_uuid}") @Log("下拉选PLC") - + //@PreAuthorize("@el.check('routePlan:list')") public ResponseEntity selectListByOpcID(@PathVariable String opc_uuid) { return new ResponseEntity<>(opcPlcService.selectListByOpcID(opc_uuid), HttpStatus.OK); @@ -78,7 +78,7 @@ public class OpcPlcController { /* @Log("导出plc服务") - + @GetMapping(value = "/download") //@PreAuthorize("@el.check('opcPlc:list')") public void download(HttpServletResponse response, OpcPlcQueryParam query) throws IOException { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/OpcPlcService.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/OpcPlcService.java index 8cdad9d..0789bb0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/OpcPlcService.java @@ -1,10 +1,10 @@ -package org.nl.acs.plc.service; +package org.nl.acs.iot.plc.service; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.opc.domain.OpcPlc; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; +import org.nl.common.db.CommonService; +import org.nl.common.db.PageInfo; +import org.nl.acs.iot.opc.domain.OpcPlc; +import org.nl.acs.iot.opc.service.dto.OpcPlcDto; +import org.nl.acs.iot.opc.service.dto.OpcPlcQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java index d969ae1..a59b086 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java @@ -1,19 +1,19 @@ -package org.nl.acs.plc.service.impl; +package org.nl.acs.iot.plc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.opc.domain.OpcPlc; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; -import org.nl.acs.plc.service.OpcPlcService; -import org.nl.acs.utils.ConvertUtil; -import org.nl.acs.utils.PageUtil; +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.acs.iot.opc.domain.OpcPlc; +import org.nl.acs.iot.opc.service.dto.OpcPlcDto; +import org.nl.acs.iot.opc.service.dto.OpcPlcQueryParam; +import org.nl.acs.iot.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.iot.plc.service.OpcPlcService; +import org.nl.common.utils.ConvertUtil; +import org.nl.common.utils.utils.PageUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UdwConfig.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UdwConfig.java index f44e6df..1f81188 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UdwConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.udw; +package org.nl.acs.iot.udw; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedData.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedData.java index a82edec..b985793 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedData.java @@ -1,4 +1,4 @@ -package org.nl.acs.udw; +package org.nl.acs.iot.udw; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessor.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessor.java index 0a8d2ac..1431a08 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessor.java @@ -1,4 +1,4 @@ -package org.nl.acs.udw; +package org.nl.acs.iot.udw; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessorFactory.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessorFactory.java index d050563..0335238 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAccessorFactory.java @@ -1,7 +1,7 @@ -package org.nl.acs.udw; +package org.nl.acs.iot.udw; -import org.nl.acs.udw.service.impl.UnifiedDataAccessorImpl; -import org.nl.acs.udw.service.impl.UnifiedDataAppServiceImpl; +import org.nl.acs.iot.udw.service.impl.UnifiedDataAccessorImpl; +import org.nl.acs.iot.udw.service.impl.UnifiedDataAppServiceImpl; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAppService.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAppService.java index 4f55faf..e11edf4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/UnifiedDataAppService.java @@ -1,7 +1,7 @@ -package org.nl.acs.udw; +package org.nl.acs.iot.udw; import cn.hutool.core.util.ObjectUtil; -import org.nl.acs.udw.service.impl.UnifiedDataUnit; +import org.nl.acs.iot.udw.service.impl.UnifiedDataUnit; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/dto/UdwDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/dto/UdwDto.java index 4f6ad6d..3da731e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/dto/UdwDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.udw.dto; +package org.nl.acs.iot.udw.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/rest/UdwManagerController.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/rest/UdwManagerController.java index b5f1931..94d80e6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/rest/UdwManagerController.java @@ -1,5 +1,5 @@ -package org.nl.acs.udw.rest; +package org.nl.acs.iot.udw.rest; import cn.dev33.satoken.annotation.SaIgnore; @@ -7,7 +7,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.udw.service.UdwManageService; +import org.nl.acs.iot.udw.service.UdwManageService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -29,7 +29,7 @@ public class UdwManagerController { // @GetMapping // @Log("查询内存点位") -// +// // @SaIgnore // public ResponseEntity query(@RequestParam JSONObject whereJson) { // return new ResponseEntity<>(udwManageService.queryByConditions(whereJson), HttpStatus.OK); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/UdwManageService.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/UdwManageService.java index f5defbf..d60ab27 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/UdwManageService.java @@ -1,7 +1,7 @@ -package org.nl.acs.udw.service; +package org.nl.acs.iot.udw.service; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.udw.dto.UdwDto; +import org.nl.acs.iot.udw.dto.UdwDto; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UdwManagerServiceImpl.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UdwManagerServiceImpl.java index c48f892..12e5a29 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UdwManagerServiceImpl.java @@ -1,11 +1,11 @@ -package org.nl.acs.udw.service.impl; +package org.nl.acs.iot.udw.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAccessorFactory; -import org.nl.acs.udw.dto.UdwDto; -import org.nl.acs.udw.service.UdwManageService; +import org.nl.acs.iot.udw.UnifiedData; +import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; +import org.nl.acs.iot.udw.dto.UdwDto; +import org.nl.acs.iot.udw.service.UdwManageService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAccessorImpl.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAccessorImpl.java index c810105..bd0ca49 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAccessorImpl.java @@ -1,8 +1,8 @@ -package org.nl.acs.udw.service.impl; +package org.nl.acs.iot.udw.service.impl; -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAppService; +import org.nl.acs.iot.udw.UnifiedData; +import org.nl.acs.iot.udw.UnifiedDataAccessor; +import org.nl.acs.iot.udw.UnifiedDataAppService; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAppServiceImpl.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAppServiceImpl.java index d56062c..ce617a5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataAppServiceImpl.java @@ -1,9 +1,9 @@ -package org.nl.acs.udw.service.impl; +package org.nl.acs.iot.udw.service.impl; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.udw.UdwConfig; -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAppService; +import org.nl.acs.iot.udw.UdwConfig; +import org.nl.acs.iot.udw.UnifiedData; +import org.nl.acs.iot.udw.UnifiedDataAppService; import org.nl.common.exception.BadRequestException; import java.util.*; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataUnit.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataUnit.java index 5937238..1f917f1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/udw/service/impl/UnifiedDataUnit.java @@ -1,7 +1,7 @@ -package org.nl.acs.udw.service.impl; +package org.nl.acs.iot.udw.service.impl; import lombok.Data; -import org.nl.acs.udw.UnifiedData; +import org.nl.acs.iot.udw.UnifiedData; import java.util.Collections; import java.util.HashMap; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/controller/AgvCarController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/controller/AgvCarController.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/controller/AgvCarController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/controller/AgvCarController.java index a26294f..68870f1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/controller/AgvCarController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/controller/AgvCarController.java @@ -1,11 +1,11 @@ -package org.nl.modules.layout.car.controller; +package org.nl.acs.layout.agv.car.controller; import cn.dev33.satoken.annotation.SaIgnore; import org.nl.common.utils.query.PageQuery; -import org.nl.modules.layout.car.dao.AgvCarQuery; -import org.nl.modules.layout.car.dto.AgvCarDto; -import org.nl.modules.layout.car.entity.AgvCar; -import org.nl.modules.layout.car.service.AgvCarService; +import org.nl.acs.layout.agv.car.dao.AgvCarQuery; +import org.nl.acs.layout.agv.car.dto.AgvCarDto; +import org.nl.acs.layout.agv.car.entity.AgvCar; +import org.nl.acs.layout.agv.car.service.AgvCarService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dao/AgvCarQuery.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dao/AgvCarQuery.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dao/AgvCarQuery.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dao/AgvCarQuery.java index 55a099c..4bbbba2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dao/AgvCarQuery.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dao/AgvCarQuery.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.car.dao; +package org.nl.acs.layout.agv.car.dao; import org.apache.commons.lang3.StringUtils; +import org.nl.acs.layout.agv.car.entity.AgvCar; import org.nl.common.utils.query.BaseQuery; -import org.nl.modules.layout.car.entity.AgvCar; /** * 车辆信息查询对象 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dto/AgvCarDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dto/AgvCarDto.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dto/AgvCarDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dto/AgvCarDto.java index 4e1e1ae..6c2a932 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/dto/AgvCarDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/dto/AgvCarDto.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.car.dto; +package org.nl.acs.layout.agv.car.dto; import lombok.Data; @@ -11,22 +11,22 @@ import java.io.Serializable; public class AgvCarDto implements Serializable { private Integer id; - + /** * 车辆ID */ private String carId; - + /** * 车辆类型 */ private String type; - + /** * 车辆图标地址 */ private String icon; - + /** * 图标文件ID */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/entity/AgvCar.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/entity/AgvCar.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/entity/AgvCar.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/entity/AgvCar.java index f06eadf..1c93aa8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/entity/AgvCar.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/entity/AgvCar.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.car.entity; +package org.nl.acs.layout.agv.car.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/mapper/AgvCarMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/mapper/AgvCarMapper.java similarity index 69% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/mapper/AgvCarMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/mapper/AgvCarMapper.java index b5ecb83..7c1265f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/mapper/AgvCarMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/mapper/AgvCarMapper.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.car.mapper; +package org.nl.acs.layout.agv.car.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.modules.layout.car.entity.AgvCar; +import org.nl.acs.layout.agv.car.entity.AgvCar; /** * 车辆信息Mapper diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/AgvCarService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/AgvCarService.java similarity index 62% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/AgvCarService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/AgvCarService.java index 653c57c..c9dd30a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/AgvCarService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/AgvCarService.java @@ -1,7 +1,7 @@ -package org.nl.modules.layout.car.service; +package org.nl.acs.layout.agv.car.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.modules.layout.car.entity.AgvCar; +import org.nl.acs.layout.agv.car.entity.AgvCar; /** * 车辆信息Service diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/impl/AgvCarServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/impl/AgvCarServiceImpl.java similarity index 56% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/impl/AgvCarServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/impl/AgvCarServiceImpl.java index e61aa7d..311c198 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/car/service/impl/AgvCarServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/car/service/impl/AgvCarServiceImpl.java @@ -1,9 +1,9 @@ -package org.nl.modules.layout.car.service.impl; +package org.nl.acs.layout.agv.car.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.modules.layout.car.entity.AgvCar; -import org.nl.modules.layout.car.mapper.AgvCarMapper; -import org.nl.modules.layout.car.service.AgvCarService; +import org.nl.acs.layout.agv.car.entity.AgvCar; +import org.nl.acs.layout.agv.car.mapper.AgvCarMapper; +import org.nl.acs.layout.agv.car.service.AgvCarService; import org.springframework.stereotype.Service; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/controller/BaseDataDeviceController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/controller/BaseDataDeviceController.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/controller/BaseDataDeviceController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/controller/BaseDataDeviceController.java index 89b0f11..7fd4d3a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/controller/BaseDataDeviceController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/controller/BaseDataDeviceController.java @@ -1,11 +1,11 @@ -package org.nl.modules.layout.device.controller; +package org.nl.acs.layout.agv.device.controller; import cn.dev33.satoken.annotation.SaIgnore; +import org.nl.acs.layout.agv.device.dao.BaseDataDeviceQuery; +import org.nl.acs.layout.agv.device.dto.BaseDataDeviceDto; +import org.nl.acs.layout.agv.device.entity.BaseDataDevice; import org.nl.common.utils.query.PageQuery; -import org.nl.modules.layout.device.dao.BaseDataDeviceQuery; -import org.nl.modules.layout.device.dto.BaseDataDeviceDto; -import org.nl.modules.layout.device.entity.BaseDataDevice; -import org.nl.modules.layout.device.service.BaseDataDeviceService; +import org.nl.acs.layout.agv.device.service.BaseDataDeviceService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dao/BaseDataDeviceQuery.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dao/BaseDataDeviceQuery.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dao/BaseDataDeviceQuery.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dao/BaseDataDeviceQuery.java index c72080d..d51c5a8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dao/BaseDataDeviceQuery.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dao/BaseDataDeviceQuery.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.device.dao; +package org.nl.acs.layout.agv.device.dao; import org.apache.commons.lang3.StringUtils; +import org.nl.acs.layout.agv.device.entity.BaseDataDevice; import org.nl.common.utils.query.BaseQuery; -import org.nl.modules.layout.device.entity.BaseDataDevice; /** * 设备信息查询对象 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dto/BaseDataDeviceDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dto/BaseDataDeviceDto.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dto/BaseDataDeviceDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dto/BaseDataDeviceDto.java index 02eee4b..5654f50 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/dto/BaseDataDeviceDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/dto/BaseDataDeviceDto.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.device.dto; +package org.nl.acs.layout.agv.device.dto; import lombok.Data; @@ -12,87 +12,87 @@ import java.util.Date; public class BaseDataDeviceDto implements Serializable { private Integer id; - + /** * 编码 */ private String code; - + /** * 设备名称 */ private String name; - + /** * 设备类型 */ private String type; - + /** * 设备描述 */ private String description; - + /** * 设备扩展信息 */ private String editParam; - + /** * 图标地址 */ private String icon; - + /** * 图标文件ID */ private String fileId; - + /** * 所属区域 */ private String region; - + /** * x坐标 */ private Integer x; - + /** * y坐标 */ private Integer y; - + /** * 角度 */ private Integer angle; - + /** * 放大比例 */ private Integer size; - + /** * 创建时间 */ private Date createTime; - + /** * 创建用户 */ private String createName; - + /** * 修改时间 */ private Date updateTime; - + /** * 修改用户 */ private String updateName; - + /** * 是否启用 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/entity/BaseDataDevice.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/entity/BaseDataDevice.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/entity/BaseDataDevice.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/entity/BaseDataDevice.java index ac6384d..e8c586c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/entity/BaseDataDevice.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/entity/BaseDataDevice.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.device.entity; +package org.nl.acs.layout.agv.device.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -24,93 +24,93 @@ public class BaseDataDevice implements Serializable { @TableId(type = IdType.AUTO) private Integer id; - + /** * 编码 */ private String code; - + /** * 设备名称 */ private String name; - + /** * 设备类型 */ private String type; - + /** * 设备描述 */ private String description; - + /** * 设备扩展信息 */ @TableField("edit_param") private String editParam; - + /** * 图标地址 */ private String icon; - + /** * 图标文件ID */ @TableField("file_id") private String fileId; - + /** * 所属区域 */ private String region; - + /** * x坐标 */ private Integer x; - + /** * y坐标 */ private Integer y; - + /** * 角度 */ private Integer angle; - + /** * 放大比例 */ private Integer size; - + /** * 创建时间 */ @TableField("create_time") private Date createTime; - + /** * 创建用户 */ @TableField("create_name") private String createName; - + /** * 修改时间 */ @TableField("update_time") private Date updateTime; - + /** * 修改用户 */ @TableField("update_name") private String updateName; - + /** * 是否启用 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/mapper/BaseDataDeviceMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/mapper/BaseDataDeviceMapper.java similarity index 67% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/mapper/BaseDataDeviceMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/mapper/BaseDataDeviceMapper.java index c0dec1a..6466008 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/mapper/BaseDataDeviceMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/mapper/BaseDataDeviceMapper.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.device.mapper; +package org.nl.acs.layout.agv.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.modules.layout.device.entity.BaseDataDevice; +import org.nl.acs.layout.agv.device.entity.BaseDataDevice; /** * 设备信息Mapper diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/BaseDataDeviceService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/BaseDataDeviceService.java similarity index 61% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/BaseDataDeviceService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/BaseDataDeviceService.java index 29eac1e..e8052cd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/BaseDataDeviceService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/BaseDataDeviceService.java @@ -1,7 +1,7 @@ -package org.nl.modules.layout.device.service; +package org.nl.acs.layout.agv.device.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.modules.layout.device.entity.BaseDataDevice; +import org.nl.acs.layout.agv.device.entity.BaseDataDevice; /** * 设备信息Service diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/impl/BaseDataDeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/impl/BaseDataDeviceServiceImpl.java similarity index 55% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/impl/BaseDataDeviceServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/impl/BaseDataDeviceServiceImpl.java index 48cec45..6f8ce37 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/device/service/impl/BaseDataDeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/device/service/impl/BaseDataDeviceServiceImpl.java @@ -1,9 +1,9 @@ -package org.nl.modules.layout.device.service.impl; +package org.nl.acs.layout.agv.device.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.modules.layout.device.entity.BaseDataDevice; -import org.nl.modules.layout.device.mapper.BaseDataDeviceMapper; -import org.nl.modules.layout.device.service.BaseDataDeviceService; +import org.nl.acs.layout.agv.device.entity.BaseDataDevice; +import org.nl.acs.layout.agv.device.mapper.BaseDataDeviceMapper; +import org.nl.acs.layout.agv.device.service.BaseDataDeviceService; import org.springframework.stereotype.Service; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/controller/AgvLayoutDeviceController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/controller/AgvLayoutDeviceController.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/controller/AgvLayoutDeviceController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/controller/AgvLayoutDeviceController.java index e114408..bff4f86 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/controller/AgvLayoutDeviceController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/controller/AgvLayoutDeviceController.java @@ -1,11 +1,11 @@ -package org.nl.modules.layout.deviceLayout.controller; +package org.nl.acs.layout.agv.deviceLayout.controller; import cn.dev33.satoken.annotation.SaIgnore; +import org.nl.acs.layout.agv.deviceLayout.service.AgvLayoutDeviceService; import org.nl.common.utils.query.PageQuery; -import org.nl.modules.layout.deviceLayout.dao.AgvLayoutDeviceQuery; -import org.nl.modules.layout.deviceLayout.dto.AgvLayoutDeviceDto; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; -import org.nl.modules.layout.deviceLayout.service.AgvLayoutDeviceService; +import org.nl.acs.layout.agv.deviceLayout.dao.AgvLayoutDeviceQuery; +import org.nl.acs.layout.agv.deviceLayout.dto.AgvLayoutDeviceDto; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dao/AgvLayoutDeviceQuery.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dao/AgvLayoutDeviceQuery.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dao/AgvLayoutDeviceQuery.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dao/AgvLayoutDeviceQuery.java index a9a9f11..496a533 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dao/AgvLayoutDeviceQuery.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dao/AgvLayoutDeviceQuery.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.deviceLayout.dao; +package org.nl.acs.layout.agv.deviceLayout.dao; import lombok.Data; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; import org.nl.common.utils.query.BaseQuery; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dto/AgvLayoutDeviceDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dto/AgvLayoutDeviceDto.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dto/AgvLayoutDeviceDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dto/AgvLayoutDeviceDto.java index aba21c1..01fe742 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/dto/AgvLayoutDeviceDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/dto/AgvLayoutDeviceDto.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.deviceLayout.dto; +package org.nl.acs.layout.agv.deviceLayout.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/entity/AgvLayoutDevice.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/entity/AgvLayoutDevice.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/entity/AgvLayoutDevice.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/entity/AgvLayoutDevice.java index 5332d8f..7ec3b93 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/entity/AgvLayoutDevice.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/entity/AgvLayoutDevice.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.deviceLayout.entity; +package org.nl.acs.layout.agv.deviceLayout.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/mapper/AgvLayoutDeviceMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/mapper/AgvLayoutDeviceMapper.java similarity index 65% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/mapper/AgvLayoutDeviceMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/mapper/AgvLayoutDeviceMapper.java index 9f3b9f4..7dd72e9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/mapper/AgvLayoutDeviceMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/mapper/AgvLayoutDeviceMapper.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.deviceLayout.mapper; +package org.nl.acs.layout.agv.deviceLayout.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; /** * 设备布局Mapper diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/AgvLayoutDeviceService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/AgvLayoutDeviceService.java similarity index 59% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/AgvLayoutDeviceService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/AgvLayoutDeviceService.java index 6b48a45..2449f3e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/AgvLayoutDeviceService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/AgvLayoutDeviceService.java @@ -1,7 +1,7 @@ -package org.nl.modules.layout.deviceLayout.service; +package org.nl.acs.layout.agv.deviceLayout.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; /** * 设备布局Service diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java similarity index 56% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java index 7ab43bd..4af4cbb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/deviceLayout/service/impl/AgvLayoutDeviceServiceImpl.java @@ -1,9 +1,9 @@ -package org.nl.modules.layout.deviceLayout.service.impl; +package org.nl.acs.layout.agv.deviceLayout.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; -import org.nl.modules.layout.deviceLayout.mapper.AgvLayoutDeviceMapper; -import org.nl.modules.layout.deviceLayout.service.AgvLayoutDeviceService; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; +import org.nl.acs.layout.agv.deviceLayout.service.AgvLayoutDeviceService; +import org.nl.acs.layout.agv.deviceLayout.mapper.AgvLayoutDeviceMapper; import org.springframework.stereotype.Service; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/controller/AgvLayoutMapController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/controller/AgvLayoutMapController.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/controller/AgvLayoutMapController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/controller/AgvLayoutMapController.java index c0c87cd..706b382 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/controller/AgvLayoutMapController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/controller/AgvLayoutMapController.java @@ -1,14 +1,12 @@ -package org.nl.modules.layout.mapLayout.controller; +package org.nl.acs.layout.agv.mapLayout.controller; import cn.dev33.satoken.annotation.SaIgnore; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.lang3.StringUtils; +import org.nl.acs.layout.agv.mapLayout.dao.AgvLayoutMapQuery; +import org.nl.acs.layout.agv.mapLayout.dto.AgvLayoutMapDto; +import org.nl.acs.layout.agv.mapLayout.dto.AgvStatus; +import org.nl.acs.layout.agv.mapLayout.entity.AgvLayoutMap; import org.nl.common.utils.query.PageQuery; -import org.nl.modules.layout.mapLayout.dao.AgvLayoutMapQuery; -import org.nl.modules.layout.mapLayout.dto.AgvLayoutMapDto; -import org.nl.modules.layout.mapLayout.dto.AgvStatus; -import org.nl.modules.layout.mapLayout.entity.AgvLayoutMap; -import org.nl.modules.layout.mapLayout.service.AgvLayoutMapService; +import org.nl.acs.layout.agv.mapLayout.service.AgvLayoutMapService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dao/AgvLayoutMapQuery.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dao/AgvLayoutMapQuery.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dao/AgvLayoutMapQuery.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dao/AgvLayoutMapQuery.java index 7dfa616..cf646c4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dao/AgvLayoutMapQuery.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dao/AgvLayoutMapQuery.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.mapLayout.dao; +package org.nl.acs.layout.agv.mapLayout.dao; import lombok.Data; +import org.nl.acs.layout.agv.mapLayout.entity.AgvLayoutMap; import org.nl.common.utils.query.BaseQuery; -import org.nl.modules.layout.mapLayout.entity.AgvLayoutMap; /** * 地图布局查询对象 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvLayoutMapDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvLayoutMapDto.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvLayoutMapDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvLayoutMapDto.java index 3597106..5430721 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvLayoutMapDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvLayoutMapDto.java @@ -1,7 +1,7 @@ -package org.nl.modules.layout.mapLayout.dto; +package org.nl.acs.layout.agv.mapLayout.dto; import lombok.Data; -import org.nl.modules.layout.deviceLayout.dto.AgvLayoutDeviceDto; +import org.nl.acs.layout.agv.deviceLayout.dto.AgvLayoutDeviceDto; import java.io.Serializable; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvStatus.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvStatus.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvStatus.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvStatus.java index 9c529db..345d37b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/dto/AgvStatus.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/dto/AgvStatus.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.mapLayout.dto; +package org.nl.acs.layout.agv.mapLayout.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/entity/AgvLayoutMap.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/entity/AgvLayoutMap.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/entity/AgvLayoutMap.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/entity/AgvLayoutMap.java index a369c30..d51a543 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/entity/AgvLayoutMap.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/entity/AgvLayoutMap.java @@ -1,4 +1,4 @@ -package org.nl.modules.layout.mapLayout.entity; +package org.nl.acs.layout.agv.mapLayout.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -23,49 +23,49 @@ public class AgvLayoutMap implements Serializable { @TableId(type = IdType.AUTO) private Integer id; - + /** * 地图ID */ @TableField("map_id") private String mapId; - + /** * 地图名称 */ @TableField("map_name") private String mapName; - + /** * 版本 */ private String version; - + /** * 地图URL */ private String url; - + /** * 高度 */ private Integer height; - + /** * 宽度 */ private Integer width; - + /** * x坐标 */ private Integer x; - + /** * y坐标 */ private Integer y; - + /** * 是否启用 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/AgvLayoutMapMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/AgvLayoutMapMapper.java similarity index 78% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/AgvLayoutMapMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/AgvLayoutMapMapper.java index c0a91a2..8bacac6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/AgvLayoutMapMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/AgvLayoutMapMapper.java @@ -1,11 +1,11 @@ -package org.nl.modules.layout.mapLayout.mapper; +package org.nl.acs.layout.agv.mapLayout.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Options; -import org.nl.modules.layout.mapLayout.dto.AgvLayoutMapDto; -import org.nl.modules.layout.mapLayout.entity.AgvLayoutMap; +import org.nl.acs.layout.agv.mapLayout.dto.AgvLayoutMapDto; +import org.nl.acs.layout.agv.mapLayout.entity.AgvLayoutMap; /** * 地图布局Mapper diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml index 700e231..6b22cad 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/mapper/mappinng/AgvLayoutMapMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -11,7 +11,7 @@ - + diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/AgvLayoutMapService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/AgvLayoutMapService.java similarity index 59% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/AgvLayoutMapService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/AgvLayoutMapService.java index 3e787b5..72f5388 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/AgvLayoutMapService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/AgvLayoutMapService.java @@ -1,8 +1,8 @@ -package org.nl.modules.layout.mapLayout.service; +package org.nl.acs.layout.agv.mapLayout.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.modules.layout.mapLayout.dto.AgvLayoutMapDto; -import org.nl.modules.layout.mapLayout.entity.AgvLayoutMap; +import org.nl.acs.layout.agv.mapLayout.dto.AgvLayoutMapDto; +import org.nl.acs.layout.agv.mapLayout.entity.AgvLayoutMap; /** * 地图布局Service diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/impl/AgvLayoutMapServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/impl/AgvLayoutMapServiceImpl.java similarity index 80% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/impl/AgvLayoutMapServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/impl/AgvLayoutMapServiceImpl.java index d794ea9..9b7cb99 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/modules/layout/mapLayout/service/impl/AgvLayoutMapServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/agv/mapLayout/service/impl/AgvLayoutMapServiceImpl.java @@ -1,13 +1,13 @@ -package org.nl.modules.layout.mapLayout.service.impl; +package org.nl.acs.layout.agv.mapLayout.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.modules.layout.deviceLayout.dto.AgvLayoutDeviceDto; -import org.nl.modules.layout.deviceLayout.entity.AgvLayoutDevice; -import org.nl.modules.layout.deviceLayout.mapper.AgvLayoutDeviceMapper; -import org.nl.modules.layout.mapLayout.dto.AgvLayoutMapDto; -import org.nl.modules.layout.mapLayout.entity.AgvLayoutMap; -import org.nl.modules.layout.mapLayout.mapper.AgvLayoutMapMapper; -import org.nl.modules.layout.mapLayout.service.AgvLayoutMapService; +import org.nl.acs.layout.agv.mapLayout.entity.AgvLayoutMap; +import org.nl.acs.layout.agv.deviceLayout.dto.AgvLayoutDeviceDto; +import org.nl.acs.layout.agv.deviceLayout.entity.AgvLayoutDevice; +import org.nl.acs.layout.agv.deviceLayout.mapper.AgvLayoutDeviceMapper; +import org.nl.acs.layout.agv.mapLayout.dto.AgvLayoutMapDto; +import org.nl.acs.layout.agv.mapLayout.mapper.AgvLayoutMapMapper; +import org.nl.acs.layout.agv.mapLayout.service.AgvLayoutMapService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/DeviceStageMonitor.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/DeviceStageMonitor.java index 43d29c9..f353340 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/DeviceStageMonitor.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/DeviceStageMonitor.java @@ -1,4 +1,4 @@ -package org.nl.acs.monitor; +package org.nl.acs.layout.device; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/rest/DeviceStageMonitorController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/rest/DeviceStageMonitorController.java index 9f749b0..42ab044 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/rest/DeviceStageMonitorController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/rest/DeviceStageMonitorController.java @@ -1,11 +1,11 @@ -package org.nl.acs.monitor.rest; +package org.nl.acs.layout.device.rest; import com.alibaba.fastjson.JSONArray; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.monitor.service.DeviceStageMonitorService; +import org.nl.acs.layout.device.service.DeviceStageMonitorService; import org.nl.common.logging.annotation.Log; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/DeviceStageMonitorService.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/DeviceStageMonitorService.java index 8877f9a..df4fae5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/DeviceStageMonitorService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/DeviceStageMonitorService.java @@ -1,4 +1,4 @@ -package org.nl.acs.monitor.service; +package org.nl.acs.layout.device.service; import com.alibaba.fastjson.JSONArray; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java index a9fc42a..966b559 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java @@ -1,14 +1,14 @@ -package org.nl.acs.monitor.service.impl; +package org.nl.acs.layout.device.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.monitor.service.DeviceStageMonitorService; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.layout.device.DeviceStageMonitor; +import org.nl.acs.layout.device.service.DeviceStageMonitorService; +import org.nl.acs.iot.opc.DeviceAppService; import org.springframework.stereotype.Service; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/test.txt b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/test.txt similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/test.txt rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/test.txt diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/domain/LimitRegional.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/domain/LimitRegional.java deleted file mode 100644 index a7a1a85..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/domain/LimitRegional.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.nl.acs.limit_regional.domain; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.*; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import java.util.List; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName("acs_regional_flow_control") -public class LimitRegional { - - private static final long serialVersionUID = 1L; - - - private String id; - - /** - * 起始区域 - */ - private String start_regional; - - /** - * 目标区域 - */ - private String next_regional; - - /** - * 起始区域排除设备 - */ - private String start_exclude_device; - @TableField(exist = false) - private List startExcludeDevice; - - /** - * 目标区域排除设备 - */ - private String next_exclude_device; - @TableField(exist = false) - private List nextExcludeDevice; - - /** - * 最大数量 - */ - private String max_num; - - /** - * 备注 - */ - private String remark; - - /** - * 是否启用 - */ - private String is_active; - - /** - * 创建者 - */ - @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; - - /** - * 修改时间 - */ - @NotBlank - @TableField(fill = FieldFill.INSERT_UPDATE) - private String update_time; - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java deleted file mode 100644 index 2268514..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/rest/LimitRegionalController.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.nl.acs.limit_regional.rest; - -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import org.nl.acs.limit_regional.server.LimitRegionalService; -import org.nl.common.logging.annotation.Log; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/acsRegional") -public class LimitRegionalController { - - @Autowired - private LimitRegionalService limitRegionalService; - - @GetMapping - @Log("分页查询流量限制") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(limitRegionalService.queryByPage(whereJson, page), HttpStatus.OK); - } - - @GetMapping("synchronous") - @Log("同步流量限制") - public ResponseEntity queryAll() { - limitRegionalService.queryAll(); - return new ResponseEntity<>( HttpStatus.OK); - } - - @PostMapping - @Log("新增流量限制") - public ResponseEntity add(@RequestBody JSONObject json) { - limitRegionalService.add(json); - return new ResponseEntity<>(HttpStatus.OK); - } - - - @PutMapping - @Log("修改流量限制") - public ResponseEntity update(@RequestBody JSONObject json) { - limitRegionalService.update(json); - return new ResponseEntity<>( HttpStatus.OK); - } - - @DeleteMapping - @Log("删除流量限制") - public ResponseEntity del(@RequestBody String[] ids) { - limitRegionalService.del(ids); - return new ResponseEntity<>( HttpStatus.OK); - } - - @GetMapping("selectByRegion") - @Log("查询区域") - public ResponseEntity selectByRegion() { - return new ResponseEntity<>(limitRegionalService.selectByRegion(), HttpStatus.OK); - } - - @GetMapping("updateActive") - @Log("修改流量限制状态") - public ResponseEntity updateStatusById(@RequestParam Map whereJson) { - limitRegionalService.updateStatusById(whereJson); - return new ResponseEntity<>( HttpStatus.OK); - } - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java deleted file mode 100644 index c434f92..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.acs.limit_regional.server; - -import com.alibaba.fastjson.JSONObject; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.limit_regional.domain.LimitRegional; -import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -public interface LimitRegionalService extends CommonService { - - /** - * 分页查询 - * @param whereJson - * @param page - * @return - */ - Map queryByPage(Map whereJson, Pageable page); - - /** - * 查询全部流量限制 - * @param whereJson - * @param page - * @return - */ - void queryAll(); - - /** - * 新增流量限制 - * @param json - * @return - */ - void add(JSONObject json); - - - /** - * 删除流量限制 - * @param json - */ - void del(String[] ids); - - /** - * 修改流量限制 - * @param json - */ - void update(JSONObject json); - - /** - * 修改流量限制状态 - * @param whereJson - */ - void updateStatusById(Map whereJson); - - /** - * 根绝起点目标区域查询流量限制 - * @param startdevice - * @param nextRegion - */ - LimitRegionalDto selectByReging(String startdevice, String nextRegion); - - /** - * 查询区域 - * @return - */ - TreeSet selectByRegion(); -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/dto/LimitRegionalDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/dto/LimitRegionalDto.java deleted file mode 100644 index 9d379f9..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/dto/LimitRegionalDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.acs.limit_regional.server.dto; - -import lombok.*; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -@Data -@Builder -@Accessors(chain = true) -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -public class LimitRegionalDto implements Serializable { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 起始区域 - */ - private String start_regional; - - /** - * 目标区域 - */ - private String next_regional; - - /** - * 起始区域排除设备 - */ - private String start_exclude_device; - private List startExcludeDevice; - - /** - * 目标区域排除设备 - */ - private String next_exclude_device; - private List nextExcludeDevice; - - /** - * 最大数量 - */ - private String max_num; - - /** - * 备注 - */ - private String remark; - - /** - * 是否启用 - */ - private String is_active; - - /** - * 创建者 - */ - private String create_by; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改者 - */ - private String update_by; - - /** - * 修改时间 - */ - private String update_time; - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java deleted file mode 100644 index 687d15e..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -package org.nl.acs.limit_regional.server.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -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.limit_regional.domain.LimitRegional; -import org.nl.acs.limit_regional.server.LimitRegionalService; -import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.nl.acs.limit_regional.server.mapper.LimitRegionalMapper; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.utils.ConvertUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.language.LangProcess; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.PostConstruct; -import java.util.*; - - -@Service -@AllArgsConstructor -@Slf4j -@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class LimitRegionalServiceImpl extends CommonServiceImpl implements LimitRegionalService { - - @Autowired - private LimitRegionalMapper limitRegionalMapper; - - @Autowired - private DeviceAppService deviceAppService; - - public List dataList; - - - @Override - public Map queryByPage(Map whereJson, Pageable page) { - for (LimitRegional dto : dataList) { - String next_exclude_device = dto.getNext_exclude_device(); - String elementStr = next_exclude_device.replaceAll("[\\[\\] ]", ""); - String[] elements = elementStr.split(","); - List list = new ArrayList<>(); - list.addAll(Arrays.asList(elements)); - String start_exclude_device = dto.getStart_exclude_device(); - String elementStr1 = start_exclude_device.replaceAll("[\\[\\] ]", ""); - String[] elements1 = elementStr1.split(","); - List list1 = new ArrayList<>(); - list1.addAll(Arrays.asList(elements1)); - dto.setNextExcludeDevice(list); - dto.setStartExcludeDevice(list1); - } - JSONObject jsonObject = new JSONObject(); - jsonObject.put("content",dataList); - jsonObject.put("totalElements",dataList.size()); - return jsonObject; - } - - - - @Override - @PostConstruct - public void queryAll() { - dataList = limitRegionalMapper.selectList(null); - } - - - @Override - public void add(JSONObject json) { - LimitRegional limitRegional = new LimitRegional(); - limitRegional.setId(RandomUtil.randomNumbers(8)); - limitRegional.setStart_regional(json.getString("start_regional")); - limitRegional.setNext_regional(json.getString("next_regional")); - limitRegional.setStart_exclude_device(json.getString("startExcludeDevice")); - limitRegional.setNext_exclude_device(json.getString("nextExcludeDevice")); - String max_num = json.getString("max_num"); - String regex = "\\d+"; - boolean isNumeric = max_num.matches(regex); - if(!isNumeric){ - throw new BadRequestException("请输入纯数字"); - } - limitRegional.setIs_active("1"); - limitRegional.setMax_num(max_num); - limitRegional.setCreate_by(SecurityUtils.getCurrentNickName()); - limitRegional.setCreate_time(DateUtil.now()); - limitRegionalMapper.insert(limitRegional); - dataList.add(limitRegional); - } - - - @Override - public void del(String[] ids) { - if(CollUtil.isEmpty(Arrays.asList(ids)) || ids.length < 1){ - return; - } - for (String id : ids) { - LimitRegional limitRegional = limitRegionalMapper.selectById(id); - if(ObjectUtil.isNull(limitRegional)){ - throw new BadRequestException("这个对象不存在"); - } - limitRegionalMapper.deleteById(id); - } - dataList.removeIf(limitRegional -> CollUtil.contains(Arrays.asList(ids), limitRegional.getId())); - } - - - @Override - public void update(JSONObject json) { - if(StrUtil.isEmpty(json.getString("id"))){ - throw new BadRequestException(LangProcess.msg("error_checkNull", "流量限制id")); - } - LimitRegional id = limitRegionalMapper.selectById(json.getString("id")); - if(ObjectUtil.isNull(id)){ - throw new BadRequestException(LangProcess.msg("error_isNull", "流量限制id="+json.getString("id"))); - } - LimitRegional limitRegional = new LimitRegional(); - String currentUsername = SecurityUtils.getCurrentNickName(); - limitRegional.setId(json.getString("id")); - limitRegional.setStart_regional(json.getString("start_regional")); - limitRegional.setNext_regional(json.getString("next_regional")); - limitRegional.setStart_exclude_device(json.getString("startExcludeDevice")); - limitRegional.setNext_exclude_device(json.getString("nextExcludeDevice")); - String max_num = json.getString("max_num"); - String regex = "\\d+"; - boolean isNumeric = max_num.matches(regex); - if(!isNumeric){ - throw new RuntimeException("请输入纯数字"); - } - limitRegional.setMax_num(max_num); - limitRegional.setUpdate_by(currentUsername); - limitRegional.setUpdate_time(DateUtil.now()); - limitRegionalMapper.updateById(limitRegional); - dataList.forEach(limitRegional1 -> { - if (limitRegional.getId().equals(limitRegional1.getId())) { - limitRegional1.setStart_regional(limitRegional.getStart_regional()); - limitRegional1.setNext_regional(limitRegional.getNext_regional()); - limitRegional1.setStart_exclude_device(limitRegional.getStart_exclude_device()); - limitRegional1.setNext_exclude_device(limitRegional.getNext_exclude_device()); - limitRegional1.setMax_num(limitRegional.getMax_num()); - limitRegional1.setUpdate_by(limitRegional.getUpdate_by()); - limitRegional1.setUpdate_time(limitRegional.getUpdate_time()); - } - }); - } - - @Override - public void updateStatusById(Map whereJson) { - String id = whereJson.get("id").toString(); - if(StrUtil.isEmpty(id)){ - throw new BadRequestException("id为空"); - } - LimitRegional limitRegional = new LimitRegional(); - limitRegional.setId(id); - limitRegional.setIs_active(whereJson.get("is_active").toString()); - limitRegional.setUpdate_by(SecurityUtils.getCurrentNickName()); - limitRegional.setUpdate_time(DateUtil.now()); - limitRegionalMapper.updateById(limitRegional); - dataList.forEach(limitRegional1 -> {if (limitRegional.getId().equals(limitRegional1.getId())) { - limitRegional1.setIs_active(limitRegional.getIs_active()); - limitRegional1.setUpdate_by(limitRegional.getUpdate_by()); - limitRegional1.setUpdate_time(limitRegional.getUpdate_time()); - } - }); - } - - @Override - public LimitRegionalDto selectByReging(String startRegion, String nextRegion) { - if (StrUtil.isNotEmpty(startRegion)&&StrUtil.isNotEmpty(nextRegion)) { - for (LimitRegional limitRegional : dataList) { - if (startRegion.equals(limitRegional.getStart_regional()) && nextRegion.equals(limitRegional.getNext_regional())) { - return ConvertUtil.convert(limitRegional, LimitRegionalDto.class); - } - } - } - return null; - } - - @Override - public TreeSet selectByRegion() { - TreeSet integers = deviceAppService.selectRegion(); - integers.remove(0); - return integers; - } -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java deleted file mode 100644 index 3a4a7d2..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.acs.limit_regional.server.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.device.domain.Device; -import org.nl.acs.limit_regional.domain.LimitRegional; -import org.springframework.stereotype.Repository; - -@Repository -public interface LimitRegionalMapper extends CommonMapper { - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java index 91f2921..eae59d7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java @@ -1,6 +1,6 @@ package org.nl.acs.log.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,66 +33,66 @@ import java.io.Serializable; public class Log extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String log_uuid; - + @NotBlank private String task_code; - + @NotBlank private String task_id; private String vehicle_code; - + private String remark; - + @NotBlank private String log_type; - + @NotBlank private String method; - + @NotBlank private String requestparam; - + @NotBlank private String responseparam; - + @NotBlank private String requesturl; - + @NotBlank private String status_code; - + @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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java index 91e072c..8422fc7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java @@ -1,7 +1,7 @@ //package org.nl.acs.log.service; // -//import org.nl.acs.common.base.PageInfo; -//import org.nl.acs.common.base.CommonService; +//import org.nl.common.db.PageInfo; +//import org.nl.common.db.CommonService; //import org.nl.acs.log.domain.Log; //import org.nl.acs.log.service.dto.LogDto; //import org.nl.acs.log.service.dto.LogQueryParam; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java index de87529..027413e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.OpcUtl; import org.slf4j.MDC; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java index 6dd85a4..49412bb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java @@ -2,9 +2,9 @@ // //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.common.db.PageInfo; +//import org.nl.common.db.QueryHelpMybatisPlus; +//import org.nl.common.db.impl.CommonServiceImpl; //import org.nl.acs.utils.ConvertUtil; //import org.nl.acs.utils.PageUtil; //import org.nl.acs.log.domain.Log; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java index ee0249f..de72a62 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.log.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.common.db.CommonMapper; import org.nl.acs.log.domain.Log; import org.springframework.stereotype.Repository; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/ErrorUtil.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/ErrorUtil.java index 5d0db51..81b1a5d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/ErrorUtil.java @@ -1,4 +1,4 @@ -package org.nl.acs.history; +package org.nl.acs.task.history; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/domain/AcsDeviceErrorLog.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/domain/AcsDeviceErrorLog.java index abb4aea..31efd55 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/domain/AcsDeviceErrorLog.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/domain/AcsDeviceErrorLog.java @@ -1,4 +1,4 @@ -package org.nl.acs.history.domain; +package org.nl.acs.task.history.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -19,20 +19,20 @@ import java.io.Serializable; public class AcsDeviceErrorLog implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String error_log_uuid; - + private String device_code; - + private String error_code; - + private String error_info; - + private String error_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/rest/DeviceErrorLogController.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/rest/DeviceErrorLogController.java index 8965864..d6830a3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/rest/DeviceErrorLogController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/rest/DeviceErrorLogController.java @@ -1,13 +1,12 @@ -package org.nl.acs.history.rest; +package org.nl.acs.task.history.rest; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.dto.DeviceErrorLogDto; +import org.nl.acs.task.history.service.DeviceErrorLogService; +import org.nl.acs.task.history.service.dto.DeviceErrorLogDto; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/DeviceErrorLogService.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/DeviceErrorLogService.java index 9415241..56b45ea 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/DeviceErrorLogService.java @@ -1,9 +1,9 @@ -package org.nl.acs.history.service; +package org.nl.acs.task.history.service; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.history.domain.AcsDeviceErrorLog; -import org.nl.acs.history.service.dto.DeviceErrorLogDto; +import org.nl.common.db.CommonService; +import org.nl.acs.task.history.domain.AcsDeviceErrorLog; +import org.nl.acs.task.history.service.dto.DeviceErrorLogDto; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/dto/DeviceErrorLogDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/dto/DeviceErrorLogDto.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/dto/DeviceErrorLogDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/dto/DeviceErrorLogDto.java index ff53838..506fc09 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/dto/DeviceErrorLogDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/dto/DeviceErrorLogDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.history.service.dto; +package org.nl.acs.task.history.service.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java index 2e4b7d1..ccbfc05 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java @@ -1,29 +1,24 @@ -package org.nl.acs.history.service.impl; +package org.nl.acs.task.history.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.nl.acs.common.base.impl.CommonServiceImpl; -import org.nl.acs.history.domain.AcsDeviceErrorLog; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.dto.DeviceErrorLogDto; -import org.nl.acs.history.service.mapper.AcsDeviceErrorLogMapper; -import org.nl.acs.task.domain.Task; -import org.nl.acs.utils.PageUtil; +import org.nl.common.db.impl.CommonServiceImpl; +import org.nl.acs.task.history.domain.AcsDeviceErrorLog; +import org.nl.acs.task.history.service.DeviceErrorLogService; +import org.nl.acs.task.history.service.dto.DeviceErrorLogDto; +import org.nl.acs.task.history.service.mapper.AcsDeviceErrorLogMapper; +import org.nl.common.utils.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/mapper/AcsDeviceErrorLogMapper.java similarity index 51% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/mapper/AcsDeviceErrorLogMapper.java index 007ec6e..4943fc3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/mapper/AcsDeviceErrorLogMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.history.service.mapper; +package org.nl.acs.task.history.service.mapper; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.history.domain.AcsDeviceErrorLog; +import org.nl.common.db.CommonMapper; +import org.nl.acs.task.history.domain.AcsDeviceErrorLog; import org.springframework.stereotype.Repository; @Repository diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorAsc.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorAsc.java index 7eeca82..cdca27a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorAsc.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorEx.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorEx.java index b48de06..622144b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/ComparatorEx.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; import java.util.Comparator; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrder.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrder.java index 00ca371..f9e1d7b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrder.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrderComparator.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrderComparator.java index 3780f29..b0483b8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/CompareOrderComparator.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/InstructionComparator.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/InstructionComparator.java index a7ad9d0..25032a3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/InstructionComparator.java @@ -1,11 +1,9 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; -import cn.hutool.core.util.StrUtil; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.task.instruction.domain.Instruction; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; + /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OperateType.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OperateType.java index bbdfc53..7dda61e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OperateType.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OptionType.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OptionType.java index e51d048..f9a32bd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/OptionType.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction; +package org.nl.acs.task.instruction; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/Instruction.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/Instruction.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/Instruction.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/Instruction.java index 714db04..55dc045 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/Instruction.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/Instruction.java @@ -1,6 +1,6 @@ -package org.nl.acs.instruction.domain; +package org.nl.acs.task.instruction.domain; -import org.nl.acs.instruction.service.dto.InstructionDto; +import org.nl.acs.task.instruction.service.dto.InstructionDto; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/InstructionMybatis.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/InstructionMybatis.java index a438867..6053fa1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/domain/InstructionMybatis.java @@ -1,6 +1,6 @@ -package org.nl.acs.instruction.domain; +package org.nl.acs.task.instruction.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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/enums/InstructionStatusEnum.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/enums/InstructionStatusEnum.java index 259b293..215a1b5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/enums/InstructionStatusEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction.enums; +package org.nl.acs.task.instruction.enums; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/rest/InstructionController.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/rest/InstructionController.java index 5a7a516..79af3b6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/rest/InstructionController.java @@ -1,12 +1,9 @@ -package org.nl.acs.instruction.rest; +package org.nl.acs.task.instruction.rest; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.util.ObjectUtil; import org.nl.common.logging.annotation.Log; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.InstructionDto; -import org.nl.acs.instruction.service.dto.InstructionQueryParam; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.instruction.service.InstructionService; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/InstructionService.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/InstructionService.java index 75a9c70..8a8564d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/InstructionService.java @@ -1,13 +1,12 @@ -package org.nl.acs.instruction.service; +package org.nl.acs.task.instruction.service; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.instruction.service.dto.InstructionDto; -import org.nl.acs.instruction.service.dto.InstructionQueryParam; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.task.instruction.domain.InstructionMybatis; +import org.nl.acs.task.instruction.service.dto.InstructionDto; +import org.nl.acs.task.instruction.service.dto.InstructionQueryParam; +import org.nl.common.db.PageInfo; +import org.nl.common.db.CommonService; +import org.nl.acs.task.instruction.domain.Instruction; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/SortUtlEx.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/SortUtlEx.java index f894431..91ff542 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/SortUtlEx.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction.service; +package org.nl.acs.task.instruction.service; import java.util.Collections; import java.util.Comparator; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionDto.java index 5565396..d259663 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionDto.java @@ -1,7 +1,7 @@ -package org.nl.acs.instruction.service.dto; +package org.nl.acs.task.instruction.service.dto; import lombok.Data; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import java.io.Serializable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionQueryParam.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionQueryParam.java index 4305043..b3ff838 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InstructionQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction.service.dto; +package org.nl.acs.task.instruction.service.dto; import lombok.Builder; import lombok.Getter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InteractionJsonDTO.java similarity index 75% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InteractionJsonDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InteractionJsonDTO.java index 4ab6cfa..182d806 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InteractionJsonDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/dto/InteractionJsonDTO.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction.service.dto; +package org.nl.acs.task.instruction.service.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java index 181ef57..4e14209 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.instruction.service.impl; +package org.nl.acs.task.instruction.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -7,7 +7,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -18,46 +17,40 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.AcsConfig; -import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.dto.InstructionDto; -import org.nl.acs.instruction.service.dto.InstructionQueryParam; -import org.nl.acs.instruction.service.dto.InteractionJsonDTO; -import org.nl.acs.limit_regional.server.LimitRegionalService; -import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.impl.RouteLineServiceImpl; -import org.nl.acs.task.TaskInstructionLock; -import org.nl.acs.task.domain.Task; -import org.nl.acs.task.enums.AgvSystemTypeEnum; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -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.task.service.dto.TaskIdAndStatusDTO; -import org.nl.acs.task.service.mapper.TaskMapper; +import org.nl.acs.autoThread.initial.ApplicationAutoInitial; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.instruction.domain.InstructionMybatis; +import org.nl.acs.task.instruction.enums.InstructionStatusEnum; +import org.nl.acs.task.instruction.service.mapper.InstructionMapper; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.device.service.impl.DeviceServiceImpl; +import org.nl.acs.device.device_driver.DeviceDriverDefination; +import org.nl.acs.task.instruction.service.dto.InstructionDto; +import org.nl.acs.task.instruction.service.dto.InstructionQueryParam; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.iot.opc.DeviceAppServiceImpl; +import org.nl.acs.task.route.service.RouteLineService; +import org.nl.acs.task.route.service.dto.RouteLineDto; +import org.nl.acs.task.route.service.impl.RouteLineServiceImpl; +import org.nl.acs.task.task.domain.Task; +import org.nl.acs.task.task.enums.AgvSystemTypeEnum; +import org.nl.acs.task.task.enums.TaskStatusEnum; +import org.nl.acs.task.task.enums.TaskTypeEnum; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; +import org.nl.common.db.PageInfo; +import org.nl.common.db.QueryHelpMybatisPlus; +import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO; +import org.nl.acs.task.task.service.mapper.TaskMapper; +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.FileUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.mapper.InstructionMapper; +import org.nl.common.utils.utils.PageUtil; +import org.nl.acs.task.instruction.service.InstructionService; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.nl.config.lucene.enums.LogLevelEnum; @@ -67,7 +60,6 @@ import org.nl.system.service.param.ISysParamService; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -103,8 +95,6 @@ public class InstructionServiceImpl extends CommonServiceImpl list1 = Arrays.asList(array); - for (String s : list1) { - if (s.equals(next_device_code)) { - nextRegionalExit = false; - } - } - } - String start_exclude_device = limitRegionalDtos.getStart_exclude_device(); - if (StrUtil.isNotEmpty(start_exclude_device)) { - String content = start_exclude_device.substring(1, start_exclude_device.length() - 1); - boolean contains = content.contains(","); - String[] array = contains ? content.split(",") : new String[]{content}; - List list1 = Arrays.asList(array); - for (String s : list1) { - if (s.equals(start_device_code)) { - startRegionalExit = false; - } - } - } - } - if (ObjectUtil.isNotEmpty(limitRegionalDtos) && (startRegionalExit || nextRegionalExit)) { - List instructiones = instructions.stream().filter(instruction -> Integer.parseInt(instruction.getInstruction_status()) <= 1).collect(Collectors.toList()); - for (Instruction instructionMybati : instructiones) { - Device startDevice = deviceAppService.findDeviceByCode(instructionMybati.getStart_device_code()); - Device nextDevice = deviceAppService.findDeviceByCode(instructionMybati.getNext_device_code()); - if ((StrUtil.isNotEmpty(startDevice.getRegion()) ? startDevice.getRegion() : "0").equals(startRegion) && (StrUtil.isNotEmpty(nextDevice.getRegion()) ? nextDevice.getRegion() : "0").equals(nextRegion)) { - String start_exclude_device = limitRegionalDtos.getStart_exclude_device(); - if (StrUtil.isNotEmpty(start_exclude_device)) { - String content = start_exclude_device.substring(1, start_exclude_device.length() - 1); - boolean contains = content.contains(","); - String[] array = contains ? content.split(",") : new String[]{content}; - List list1 = Arrays.asList(array); - for (String s : list1) { - if (s.equals(instructionMybati.getStart_device_code())) { - startRegionalExit = false; - } - } - } - String next_exclude_device = limitRegionalDtos.getNext_exclude_device(); - if (StrUtil.isNotEmpty(next_exclude_device)) { - String content = next_exclude_device.substring(1, next_exclude_device.length() - 1); - boolean contains = content.contains(","); - String[] array = contains ? content.split(",") : new String[]{content}; - List list2 = Arrays.asList(array); - for (String s : list2) { - if (s.equals(instructionMybati.getNext_device_code())) { - nextRegionalExit = false; - } - } - } - if (startRegionalExit || nextRegionalExit) { - ++count; - } - if (count >= Integer.parseInt(limitRegionalDtos.getMax_num())) { - log.info("同区域指令数量过多,等待指令完成再此创建"); - return true; - } - } - } - } - return false; - } - - } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/mapper/InstructionMapper.java similarity index 70% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/mapper/InstructionMapper.java index dfc18bf..431eb1d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/mapper/InstructionMapper.java @@ -1,12 +1,12 @@ -package org.nl.acs.instruction.service.mapper; +package org.nl.acs.task.instruction.service.mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.task.instruction.domain.InstructionMybatis; +import org.nl.common.db.CommonMapper; +import org.nl.acs.task.instruction.domain.Instruction; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLine.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLine.java index 11c7c71..4586320 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLine.java @@ -1,6 +1,6 @@ -package org.nl.acs.route.domain; +package org.nl.acs.task.route.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,65 +33,65 @@ import java.io.Serializable; public class RouteLine extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String line_uuid; - + @NotBlank private String device_code; - + @NotBlank private String start_device_type; - + @NotBlank private String next_device_code; - + @NotBlank private String next_device_type; - + private String type; - + @NotBlank private String weights; - + private String points; - + private String route_plan_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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLoc.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLoc.java index a67a464..1e36f62 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RouteLoc.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.domain; +package org.nl.acs.task.route.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,47 +25,47 @@ import java.io.Serializable; public class RouteLoc extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String ioc_uuid; - + @NotBlank private String device_code; - + @NotBlank private String ioc_value; - + private String route_plan_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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RoutePlan.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RoutePlan.java index b0de341..5b827e0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/domain/RoutePlan.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.domain; +package org.nl.acs.task.route.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,44 +25,44 @@ import java.io.Serializable; public class RoutePlan extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String plan_uuid; - + @NotBlank private String plan_code; - + @NotBlank private String plan_name; - + 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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLineController.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLineController.java index f45ca7b..ad84910 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLineController.java @@ -1,9 +1,8 @@ -package org.nl.acs.route.rest; +package org.nl.acs.task.route.rest; +import org.nl.acs.task.route.service.RouteLineService; import org.nl.common.logging.annotation.Log; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.dto.RouteLineQueryParam; +import org.nl.acs.task.route.service.dto.RouteLineDto; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.sql.SQLException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLocController.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLocController.java index 78f7b6b..c09eb7e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RouteLocController.java @@ -1,11 +1,10 @@ -package org.nl.acs.route.rest; +package org.nl.acs.task.route.rest; import lombok.RequiredArgsConstructor; -import org.nl.acs.route.service.RouteLocService; -import org.nl.acs.route.service.dto.RouteLocDto; -import org.nl.acs.route.service.dto.RouteLocQueryParam; +import org.nl.acs.task.route.service.RouteLocService; +import org.nl.acs.task.route.service.dto.RouteLocDto; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RoutePlanController.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RoutePlanController.java index a152f83..ec5ee7a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/rest/RoutePlanController.java @@ -1,11 +1,10 @@ -package org.nl.acs.route.rest; +package org.nl.acs.task.route.rest; import lombok.RequiredArgsConstructor; -import org.nl.acs.route.service.RoutePlanService; -import org.nl.acs.route.service.dto.RoutePlanDto; -import org.nl.acs.route.service.dto.RoutePlanQueryParam; +import org.nl.acs.task.route.service.RoutePlanService; +import org.nl.acs.task.route.service.dto.RoutePlanDto; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLineService.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLineService.java index 88bc0ff..b72a31e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLineService.java @@ -1,11 +1,11 @@ -package org.nl.acs.route.service; +package org.nl.acs.task.route.service; import com.alibaba.fastjson.JSONArray; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.route.domain.RouteLine; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.dto.RouteLineQueryParam; +import org.nl.common.db.PageInfo; +import org.nl.common.db.CommonService; +import org.nl.acs.task.route.domain.RouteLine; +import org.nl.acs.task.route.service.dto.RouteLineDto; +import org.nl.acs.task.route.service.dto.RouteLineQueryParam; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLocService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLocService.java index 337d4a2..ae8e615 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RouteLocService.java @@ -1,10 +1,10 @@ -package org.nl.acs.route.service; +package org.nl.acs.task.route.service; -import org.nl.acs.route.domain.RouteLoc; -import org.nl.acs.route.service.dto.RouteLocDto; -import org.nl.acs.route.service.dto.RouteLocQueryParam; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.common.base.PageInfo; +import org.nl.acs.task.route.domain.RouteLoc; +import org.nl.acs.task.route.service.dto.RouteLocDto; +import org.nl.acs.task.route.service.dto.RouteLocQueryParam; +import org.nl.common.db.CommonService; +import org.nl.common.db.PageInfo; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RoutePlanService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RoutePlanService.java index 42dfd17..f305275 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/RoutePlanService.java @@ -1,11 +1,11 @@ -package org.nl.acs.route.service; +package org.nl.acs.task.route.service; import com.alibaba.fastjson.JSONArray; -import org.nl.acs.route.domain.RoutePlan; -import org.nl.acs.route.service.dto.RoutePlanDto; -import org.nl.acs.route.service.dto.RoutePlanQueryParam; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.common.base.PageInfo; +import org.nl.acs.task.route.domain.RoutePlan; +import org.nl.acs.task.route.service.dto.RoutePlanDto; +import org.nl.acs.task.route.service.dto.RoutePlanQueryParam; +import org.nl.common.db.CommonService; +import org.nl.common.db.PageInfo; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineDto.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineDto.java index be927d3..4c0d8c7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,55 +24,55 @@ import java.io.Serializable; public class RouteLineDto implements Serializable { private static final long serialVersionUID = 1L; - + private String line_uuid; - + private String device_code; - + private String start_device_type; - + private String next_device_code; - + private String next_device_type; - + private String type; /** * 路由路线 */ private String path; - + private String weights; - + private String points; - + private String route_plan_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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineQueryParam.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineQueryParam.java index efe2e9c..792ca8c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLineQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLineQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocDto.java index ce8088b..cf089f3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.*; @@ -19,36 +19,36 @@ import java.io.Serializable; public class RouteLocDto implements Serializable { private static final long serialVersionUID = 1L; - + private String ioc_uuid; - + private String device_code; - + private String ioc_value; - + private String route_plan_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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocQueryParam.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocQueryParam.java index 04e0d84..b76c13e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RouteLocQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RouteLocQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanDto.java similarity index 88% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanDto.java index 125f438..ea09ae6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.*; @@ -19,33 +19,33 @@ import java.io.Serializable; public class RoutePlanDto implements Serializable { private static final long serialVersionUID = 1L; - + private String plan_uuid; - + private String plan_code; - + private String plan_name; - + 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; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanQueryParam.java similarity index 77% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanQueryParam.java index 64c6c2f..cbd3233 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/dto/RoutePlanQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/dto/RoutePlanQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.dto; +package org.nl.acs.task.route.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java index f1303c1..9515216 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.impl; +package org.nl.acs.task.route.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -13,29 +13,29 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device.service.dto.DeviceDto; -import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RoutePlanService; -import org.nl.acs.route.service.dto.RoutePlanDto; -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.task.route.domain.RouteLine; +import org.nl.acs.task.route.service.RouteLineService; +import org.nl.acs.task.route.service.RoutePlanService; +import org.nl.acs.task.route.service.mapper.RouteLineMapper; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.device.service.dto.DeviceDto; +import org.nl.acs.device.device.service.mapper.DeviceMapper; +import org.nl.acs.device.device_driver.RouteableDeviceDriver; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.task.route.service.dto.RoutePlanDto; +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.FileUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.acs.route.domain.RouteLine; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.dto.RouteLineQueryParam; -import org.nl.acs.route.service.mapper.RouteLineMapper; +import org.nl.common.utils.utils.PageUtil; +import org.nl.acs.task.route.service.dto.RouteLineDto; +import org.nl.acs.task.route.service.dto.RouteLineQueryParam; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java index 8ae806f..fa1484a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.impl; +package org.nl.acs.task.route.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.route.domain.RouteLoc; -import org.nl.acs.route.service.RouteLocService; -import org.nl.acs.route.service.dto.RouteLocDto; -import org.nl.acs.route.service.dto.RouteLocQueryParam; -import org.nl.acs.route.service.mapper.RouteLocMapper; -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.task.route.domain.RouteLoc; +import org.nl.acs.task.route.service.mapper.RouteLocMapper; +import org.nl.acs.task.route.service.RouteLocService; +import org.nl.acs.task.route.service.dto.RouteLocDto; +import org.nl.acs.task.route.service.dto.RouteLocQueryParam; +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.FileUtil; -import org.nl.acs.utils.PageUtil; +import org.nl.common.utils.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java index 7695b5a..8c0fa74 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.route.service.impl; +package org.nl.acs.task.route.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -9,19 +9,19 @@ 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.route.domain.RoutePlan; -import org.nl.acs.route.service.RoutePlanService; -import org.nl.acs.route.service.dto.RoutePlanDto; -import org.nl.acs.route.service.dto.RoutePlanQueryParam; -import org.nl.acs.route.service.mapper.RoutePlanMapper; -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.task.route.domain.RoutePlan; +import org.nl.acs.task.route.service.RoutePlanService; +import org.nl.acs.task.route.service.mapper.RoutePlanMapper; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.task.route.service.dto.RoutePlanDto; +import org.nl.acs.task.route.service.dto.RoutePlanQueryParam; +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.FileUtil; -import org.nl.acs.utils.PageUtil; +import org.nl.common.utils.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLineMapper.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLineMapper.java index a87ca08..3ef7be3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLineMapper.java @@ -1,11 +1,11 @@ -package org.nl.acs.route.service.mapper; +package org.nl.acs.task.route.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.route.domain.RouteLine; +import org.nl.acs.task.route.domain.RouteLine; +import org.nl.common.db.CommonMapper; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLocMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLocMapper.java index 6d24b02..68ab556 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RouteLocMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.route.service.mapper; +package org.nl.acs.task.route.service.mapper; -import org.nl.acs.route.domain.RouteLoc; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.task.route.domain.RouteLoc; +import org.nl.common.db.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RoutePlanMapper.java similarity index 57% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RoutePlanMapper.java index 268a997..8127332 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/mapper/RoutePlanMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.route.service.mapper; +package org.nl.acs.task.route.service.mapper; -import org.nl.acs.route.domain.RoutePlan; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.task.route.domain.RoutePlan; +import org.nl.common.db.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskInstructionLock.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/TaskInstructionLock.java similarity index 79% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskInstructionLock.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/TaskInstructionLock.java index f272d79..e591450 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/TaskInstructionLock.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/TaskInstructionLock.java @@ -1,4 +1,4 @@ -package org.nl.acs.task; +package org.nl.acs.task.task; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/Task.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/Task.java index c1e76c9..ce5fecb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/Task.java @@ -1,6 +1,6 @@ -package org.nl.acs.task.domain; +package org.nl.acs.task.task.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; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/TaskFeedback.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/TaskFeedback.java index b5f2523..2675b79 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/domain/TaskFeedback.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.domain; +package org.nl.acs.task.task.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,98 +25,98 @@ import java.io.Serializable; public class TaskFeedback extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; - + @TableId(type = IdType.ASSIGN_ID) private String taskback_id; - + private String task_id; - + @NotBlank private String task_code; - + private String vehicle_code; - + private String vehicle_type; - + @NotBlank private String task_type; - + @NotBlank private String task_status; - + @NotBlank private String is_finished; - + private String error_code; - + private String start_time; - + private String finish_time; - + @NotBlank private String create_type; - + @NotBlank private String finish_type; - + @NotBlank private String retry_times; - + private String start_point_code; - + private String start_device_code; - + private String next_point_code; - + private String next_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; - + private String agv_system_type; public void copyFrom(TaskFeedback source) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/ActionTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/ActionTypeEnum.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/ActionTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/ActionTypeEnum.java index 6278738..bc45618 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/ActionTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/ActionTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvActionTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvActionTypeEnum.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvActionTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvActionTypeEnum.java index 0c4dedc..cd718c9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvActionTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvActionTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; import lombok.AllArgsConstructor; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvSystemTypeEnum.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvSystemTypeEnum.java index abf9625..6a4f71c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/AgvSystemTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/AgvSystemTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/StorageTaskTypeEnum.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/StorageTaskTypeEnum.java index 8685601..8a568cd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/StorageTaskTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/StorageTaskTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskStatusEnum.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskStatusEnum.java index 4717baf..a410ef2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskStatusEnum.java @@ -1,6 +1,5 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskTypeEnum.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskTypeEnum.java index 2178201..bbee672 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/enums/TaskTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.enums; +package org.nl.acs.task.task.enums; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskController.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskController.java index 8f5135b..7348638 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskController.java @@ -1,13 +1,13 @@ -package org.nl.acs.task.rest; +package org.nl.acs.task.task.rest; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; +import org.nl.acs.task.task.enums.TaskTypeEnum; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; +import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO; import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.config.language.LangProcess; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskFeedbackController.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskFeedbackController.java index 04fb44d..3c6c42c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskFeedbackController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/rest/TaskFeedbackController.java @@ -1,8 +1,8 @@ -package org.nl.acs.task.rest; +package org.nl.acs.task.task.rest; import lombok.RequiredArgsConstructor; -import org.nl.acs.task.service.TaskFeedbackService; +import org.nl.acs.task.task.service.TaskFeedbackService; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskFeedbackService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskFeedbackService.java index 2be1d0f..0a8588a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskFeedbackService.java @@ -1,10 +1,10 @@ -package org.nl.acs.task.service; +package org.nl.acs.task.task.service; -import org.nl.acs.task.domain.TaskFeedback; -import org.nl.acs.task.service.dto.TaskFeedbackDto; -import org.nl.acs.task.service.dto.TaskFeedbackQueryParam; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.common.base.PageInfo; +import org.nl.acs.task.task.service.dto.TaskFeedbackDto; +import org.nl.acs.task.task.service.dto.TaskFeedbackQueryParam; +import org.nl.acs.task.task.domain.TaskFeedback; +import org.nl.common.db.CommonService; +import org.nl.common.db.PageInfo; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskService.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskService.java index 7b141e4..e4cd249 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/TaskService.java @@ -1,18 +1,17 @@ -package org.nl.acs.task.service; +package org.nl.acs.task.task.service; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.task.domain.Task; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskIdAndStatusDTO; -import org.nl.acs.task.service.dto.TaskQueryParam; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.task.service.dto.TaskDto; +import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO; +import org.nl.acs.task.task.service.dto.TaskQueryParam; +import org.nl.common.db.PageInfo; +import org.nl.common.db.CommonService; +import org.nl.acs.task.task.domain.Task; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.time.LocalDateTime; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskDto.java index 8a77885..a9d1ede 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskDto.java @@ -1,8 +1,8 @@ -package org.nl.acs.task.service.dto; +package org.nl.acs.task.task.service.dto; import com.alibaba.fastjson.JSONObject; import lombok.Data; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import java.io.Serializable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackDto.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackDto.java index 08467af..c38371d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.service.dto; +package org.nl.acs.task.task.service.dto; import lombok.*; @@ -19,81 +19,81 @@ import java.io.Serializable; public class TaskFeedbackDto implements Serializable { private static final long serialVersionUID = 1L; - + private String taskback_id; - + private String task_id; - + private String task_code; - + private String vehicle_code; - + private String vehicle_type; - + private String task_type; - + private String task_status; - + private String is_finished; - + private String error_code; - + private String start_time; - + private String finish_time; - + private String create_type; - + private String finish_type; - + private String retry_times; - + private String start_point_code; - + private String start_device_code; - + private String next_point_code; - + private String next_device_code; - + 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 agv_system_type; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackQueryParam.java similarity index 78% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackQueryParam.java index 093069b..9e8b26d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskFeedbackQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.service.dto; +package org.nl.acs.task.task.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskIdAndStatusDTO.java similarity index 75% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskIdAndStatusDTO.java index 6d1e4c7..5784bb9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskIdAndStatusDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskIdAndStatusDTO.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.service.dto; +package org.nl.acs.task.task.service.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskQueryParam.java similarity index 80% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskQueryParam.java index f6c80a0..c37eef4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/dto/TaskQueryParam.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.service.dto; +package org.nl.acs.task.task.service.dto; import lombok.Getter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java index 287b7d2..b9851f0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java @@ -1,31 +1,28 @@ -package org.nl.acs.task.service.impl; +package org.nl.acs.task.task.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.task.domain.TaskFeedback; -import org.nl.acs.task.service.TaskFeedbackService; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskFeedbackDto; -import org.nl.acs.task.service.dto.TaskFeedbackQueryParam; -import org.nl.acs.task.service.mapper.TaskFeedbackMapper; -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.task.task.service.mapper.TaskFeedbackMapper; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.api.wms.service.AcsToWmsService; +import org.nl.acs.task.task.domain.TaskFeedback; +import org.nl.acs.task.task.service.TaskFeedbackService; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskFeedbackDto; +import org.nl.acs.task.task.service.dto.TaskFeedbackQueryParam; +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.FileUtil; -import org.nl.acs.utils.PageUtil; +import org.nl.common.utils.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java index c884f7f..c5eda0b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.task.service.impl; +package org.nl.acs.task.task.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -14,48 +14,46 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import groovy.lang.Lazy; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.nl.acs.AcsConfig; -import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceAssignedService; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device.service.dto.DeviceAssignedDto; -import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.InstructionDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.domain.RoutePlan; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.mapper.RoutePlanMapper; -import org.nl.acs.task.enums.AgvSystemTypeEnum; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskFeedbackService; -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.task.service.dto.TaskIdAndStatusDTO; +import org.nl.acs.autoThread.initial.ApplicationAutoInitial; +import org.nl.acs.task.task.enums.TaskStatusEnum; +import org.nl.acs.task.task.service.mapper.TaskMapper; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAssignedService; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.device.service.dto.DeviceAssignedDto; +import org.nl.acs.device.device.service.impl.DeviceServiceImpl; +import org.nl.acs.device.device_driver.DeviceDriverDefination; +import org.nl.acs.api.wms.service.AcsToWmsService; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.task.instruction.domain.InstructionMybatis; +import org.nl.acs.task.instruction.enums.InstructionStatusEnum; +import org.nl.acs.task.instruction.service.InstructionService; +import org.nl.acs.task.instruction.service.dto.InstructionDto; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.iot.opc.DeviceAppServiceImpl; +import org.nl.acs.task.route.domain.RoutePlan; +import org.nl.acs.task.route.service.RouteLineService; +import org.nl.acs.task.route.service.dto.RouteLineDto; +import org.nl.acs.task.route.service.mapper.RoutePlanMapper; +import org.nl.acs.task.task.enums.TaskTypeEnum; +import org.nl.acs.task.task.service.TaskFeedbackService; +import org.nl.common.db.PageInfo; +import org.nl.common.db.QueryHelpMybatisPlus; +import org.nl.common.db.impl.CommonServiceImpl; +import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO; import org.nl.common.exception.BadRequestException; -import org.nl.acs.utils.ConvertUtil; +import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.acs.utils.PageUtil; -import org.nl.acs.task.domain.Task; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskQueryParam; -import org.nl.acs.task.service.mapper.TaskMapper; +import org.nl.common.utils.utils.PageUtil; +import org.nl.acs.task.task.domain.Task; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; +import org.nl.acs.task.task.service.dto.TaskQueryParam; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskFeedbackMapper.java similarity index 58% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskFeedbackMapper.java index 868f442..c92576b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskFeedbackMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.task.service.mapper; +package org.nl.acs.task.task.service.mapper; -import org.nl.acs.task.domain.TaskFeedback; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.task.task.domain.TaskFeedback; +import org.nl.common.db.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskMapper.java similarity index 84% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskMapper.java index e684c92..8d5d623 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/mapper/TaskMapper.java @@ -1,9 +1,9 @@ -package org.nl.acs.task.service.mapper; +package org.nl.acs.task.task.service.mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.task.domain.Task; +import org.nl.common.db.CommonMapper; +import org.nl.acs.task.task.domain.Task; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonFinalParam.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonFinalParam.java index ba3609b..dc6ab87 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonFinalParam.java @@ -2,7 +2,7 @@ * @author ls * @date 2023/12/6 16:04 */ -package org.nl.acs.common.base; +package org.nl.common.db; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonMapper.java similarity index 89% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonMapper.java index ca27018..0eaa7e7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonMapper.java @@ -1,6 +1,5 @@ -package org.nl.acs.common.base; +package org.nl.common.db; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; @@ -8,7 +7,7 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWra import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers; import org.apache.ibatis.annotations.Mapper; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.task.instruction.domain.Instruction; /** * 公共抽象Mapper接口类 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonModel.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonModel.java index c9d9685..3ae6417 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonModel.java @@ -1,4 +1,4 @@ -package org.nl.acs.common.base; +package org.nl.common.db; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonService.java similarity index 85% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonService.java index b0e49f5..09c90f0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/CommonService.java @@ -1,4 +1,4 @@ -package org.nl.acs.common.base; +package org.nl.common.db; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/PageInfo.java similarity index 92% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/PageInfo.java index 58a218c..2cc7518 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/PageInfo.java @@ -1,4 +1,4 @@ -package org.nl.acs.common.base; +package org.nl.common.db; import com.alibaba.fastjson.JSONObject; @@ -16,10 +16,10 @@ import java.util.List; @Builder @Accessors(chain = true) public class PageInfo implements Serializable { - + private long totalElements; - + private List content; public PageInfo(long totalElements, List content) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/QueryHelpMybatisPlus.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/QueryHelpMybatisPlus.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/QueryHelpMybatisPlus.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/QueryHelpMybatisPlus.java index 181a89e..5bd21b8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/QueryHelpMybatisPlus.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/QueryHelpMybatisPlus.java @@ -1,4 +1,4 @@ -package org.nl.acs.common.base; +package org.nl.common.db; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/impl/CommonServiceImpl.java similarity index 80% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/impl/CommonServiceImpl.java index 99d6794..86b3949 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/db/impl/CommonServiceImpl.java @@ -1,8 +1,8 @@ -package org.nl.acs.common.base.impl; +package org.nl.common.db.impl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.acs.common.base.CommonService; +import org.nl.common.db.CommonService; /** * 公共抽象service实现类 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index a9c653d..f3462be 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -1,6 +1,6 @@ package org.nl.common.utils; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import org.nl.config.SpringContextHolder; import org.nl.system.service.coderule.ISysCodeRuleService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ConvertUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ConvertUtil.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ConvertUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ConvertUtil.java index 4e833c1..5738c69 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ConvertUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ConvertUtil.java @@ -1,8 +1,8 @@ -package org.nl.acs.utils; +package org.nl.common.utils; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.acs.common.base.PageInfo; +import org.nl.common.db.PageInfo; import java.util.List; import java.util.Set; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DeviceErrorUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DeviceErrorUtil.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DeviceErrorUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DeviceErrorUtil.java index 9297549..349daf9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DeviceErrorUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DeviceErrorUtil.java @@ -1,4 +1,4 @@ -package org.nl.acs.utils; +package org.nl.common.utils; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ExportCSVUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ExportCSVUtil.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ExportCSVUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ExportCSVUtil.java index 2687bfa..826b5b4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ExportCSVUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ExportCSVUtil.java @@ -1,4 +1,4 @@ -package org.nl.acs.utils; +package org.nl.common.utils; import org.apache.commons.csv.CSVFormat; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java index 8cebeed..8d0d5c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java @@ -1,16 +1,13 @@ -package org.nl.acs.utils; +package org.nl.common.utils; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; import org.jinterop.dcom.common.JIException; import org.jinterop.dcom.core.JIVariant; -import org.nl.acs.device.domain.ItemDto; -import org.nl.acs.opc.OpcUtl; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.service.mapper.OpcMapper; +import org.nl.acs.iot.opc.OpcUtl; +import org.nl.acs.iot.opc.domain.Opc; +import org.nl.acs.iot.opc.service.mapper.OpcMapper; import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/ClientUDWReceive.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/ClientUDWReceive.java index f9c7e68..dc68bd3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/ClientUDWReceive.java @@ -1,8 +1,8 @@ -package org.nl.acs.socket; +package org.nl.common.utils.socket; import cn.hutool.core.util.StrUtil; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; +import org.nl.acs.iot.udw.UnifiedDataAccessor; +import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; import org.nl.common.exception.BadRequestException; import org.nl.config.language.LangProcess; import org.slf4j.Logger; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketConfig.java similarity index 81% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketConfig.java index 591dbee..a8d8e7a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.socket; +package org.nl.common.utils.socket; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketListenerAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketListenerAutoRun.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketListenerAutoRun.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketListenerAutoRun.java index 05f2684..8bfbdc8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketListenerAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketListenerAutoRun.java @@ -1,8 +1,8 @@ -package org.nl.acs.socket; +package org.nl.common.utils.socket; import cn.hutool.core.util.StrUtil; import org.dromara.dynamictp.core.support.ThreadPoolBuilder; -import org.nl.acs.auto.run.AbstractAutoRunnable; +import org.nl.acs.autoThread.run.AbstractAutoRunnable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -14,7 +14,6 @@ import java.net.Socket; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import static org.dromara.dynamictp.common.em.QueueTypeEnum.MEMORY_SAFE_LINKED_BLOCKING_QUEUE; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketProperties.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketProperties.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketProperties.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketProperties.java index 006ce71..bd65ba4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketProperties.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketProperties.java @@ -1,4 +1,4 @@ -package org.nl.acs.socket; +package org.nl.common.utils.socket; /** * @author 20220102CG\noblelift */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketService.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketService.java index adec19d..c1ad06e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/SocketService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/socket/SocketService.java @@ -1,4 +1,4 @@ -package org.nl.acs.socket; +package org.nl.common.utils.socket; import java.io.OutputStream; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DateUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/DateUtil.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DateUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/DateUtil.java index 052b85c..3b66a70 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/DateUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/DateUtil.java @@ -1,4 +1,4 @@ -package org.nl.acs.utils; +package org.nl.common.utils.utils; /** * projectName: xxxx @@ -8,7 +8,7 @@ package org.nl.acs.utils; * copyright(c) 2017-2020 xxx公司 */ -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import java.sql.Timestamp; import java.text.ParseException; @@ -880,4 +880,4 @@ public class DateUtil { } return reStr; } -} \ No newline at end of file +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/PageUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/PageUtil.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/PageUtil.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/PageUtil.java index ec10f35..21cecfc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/PageUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/utils/PageUtil.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.nl.acs.utils; +package org.nl.common.utils.utils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; -import org.nl.acs.common.base.PageInfo; +import org.nl.common.db.PageInfo; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index adf99f6..17a042c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -10,7 +10,7 @@ import com.wf.captcha.base.Captcha; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.dto.CurrentUser; @@ -48,7 +48,7 @@ public class AuthorizationController { @Autowired private LoginProperties loginProperties; - + @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap) throws Exception { if (ObjectUtil.isEmpty(authMap)){ @@ -58,7 +58,7 @@ public class AuthorizationController { } - + @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -68,7 +68,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - + @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null){ @@ -78,7 +78,7 @@ public class AuthorizationController { return ResponseEntity.noContent().build(); } - + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -100,7 +100,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java index 13192e9..1ea57f3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dashboard/impl/DashboardServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dashboard/impl/DashboardServiceImpl.java index 91707f0..30c5241 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dashboard/impl/DashboardServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dashboard/impl/DashboardServiceImpl.java @@ -15,35 +15,16 @@ */ package org.nl.system.service.dashboard.impl; -import cn.hutool.core.date.BetweenFormatter; import cn.hutool.core.date.DateUtil; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.common.utils.ElAdminConstant; -import org.nl.common.utils.FileUtil; -import org.nl.common.utils.StringUtils; -import org.nl.config.language.LangProcess; +import org.nl.acs.task.task.enums.TaskStatusEnum; +import org.nl.acs.task.task.service.TaskService; import org.nl.system.service.dashboard.DashboardService; import org.nl.system.service.dashboard.dto.DailyTaskStats; import org.nl.system.service.dashboard.dto.TaskSummary; -import org.nl.system.service.monitor.MonitorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import oshi.SystemInfo; -import oshi.hardware.CentralProcessor; -import oshi.hardware.GlobalMemory; -import oshi.hardware.HardwareAbstractionLayer; -import oshi.hardware.VirtualMemory; -import oshi.software.os.FileSystem; -import oshi.software.os.OSFileStore; -import oshi.software.os.OperatingSystem; -import oshi.util.FormatUtil; -import oshi.util.Util; -import java.lang.management.ManagementFactory; import java.text.DecimalFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index 1e2975b..5e80161 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -11,9 +11,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.ibatis.annotations.Lang; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.mapper.DeviceMapper; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.mapper.DeviceMapper; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java index e1da0a0..ea91b26 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java index dadb08a..0227431 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.acs.common.base.CommonFinalParam; +import org.nl.common.db.CommonFinalParam; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index db639ab..2edd708 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; -import org.nl.acs.utils.PageUtil; +import org.nl.common.utils.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.MapOf; @@ -22,7 +22,6 @@ import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.dao.Param; import org.nl.system.service.param.dao.mapper.SysParamMapper; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 608a3b8..ff068a7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -1,35 +1,27 @@ package org.nl.system.service.quartz.task; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.limit_regional.server.LimitRegionalService; -import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.enums.AgvSystemTypeEnum; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; +import org.nl.common.db.CommonFinalParam; +import org.nl.acs.task.instruction.enums.InstructionStatusEnum; +import org.nl.acs.task.instruction.service.InstructionService; +import org.nl.acs.task.instruction.domain.Instruction; +import org.nl.acs.iot.opc.DeviceAppService; +import org.nl.acs.iot.opc.DeviceAppServiceImpl; +import org.nl.acs.task.route.service.RouteLineService; +import org.nl.acs.task.route.service.dto.RouteLineDto; +import org.nl.acs.task.task.enums.AgvSystemTypeEnum; +import org.nl.acs.task.task.enums.TaskStatusEnum; +import org.nl.acs.task.task.enums.TaskTypeEnum; +import org.nl.acs.task.task.service.TaskService; +import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.config.lucene.service.impl.LuceneExecuteLogServiceImpl; import org.springframework.stereotype.Component; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/DeleteDeviceErrorLog.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/DeleteDeviceErrorLog.java index b783d0a..77339be 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/DeleteDeviceErrorLog.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/DeleteDeviceErrorLog.java @@ -2,12 +2,12 @@ package org.nl.system.service.quartz.task; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.history.domain.AcsDeviceErrorLog; -import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; -import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.task.domain.Task; -import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.history.domain.AcsDeviceErrorLog; +import org.nl.acs.task.history.service.impl.DeviceErrorLogServiceImpl; +import org.nl.acs.task.instruction.domain.InstructionMybatis; +import org.nl.acs.task.instruction.service.InstructionService; +import org.nl.acs.task.task.domain.Task; +import org.nl.acs.task.task.service.TaskService; import org.nl.system.service.logging.ISysLogService; import org.nl.system.service.logging.dao.SysLog; import org.nl.system.service.param.ISysParamService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java index 0b4821f..01761b9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java @@ -5,7 +5,6 @@ package org.nl.system.service.redis.vo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import org.nl.acs.common.base.CommonFinalParam; import org.nl.system.service.redis.dao.RedisKeyDefine; import java.time.Duration; @@ -20,21 +19,21 @@ import java.time.Duration; @Builder @AllArgsConstructor public class RedisKeyDefineRespVO { - + private String keyTemplate; - + private RedisKeyDefine.KeyTypeEnum keyType; - + private Class valueType; - + private RedisKeyDefine.TimeoutTypeEnum timeoutType; - + private Duration timeout; - + private String memo; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index aa11546..747bcd9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.nl.acs.common.base.CommonFinalParam; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryBackgroundService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryBackgroundService.java index f85a383..b2ae88c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryBackgroundService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryBackgroundService.java @@ -1,7 +1,7 @@ package org.nl.system.service.trajectory; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.acs.common.base.CommonService; +import org.nl.common.db.CommonService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.trajectory.dto.TrajectoryBackground; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryConfigurationService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryConfigurationService.java index b4fd9e8..29b47be 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryConfigurationService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/TrajectoryConfigurationService.java @@ -1,7 +1,7 @@ package org.nl.system.service.trajectory; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.acs.common.base.CommonService; +import org.nl.common.db.CommonService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.trajectory.dto.TrajectoryConfiguration; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryBackgroundImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryBackgroundImpl.java index dc49871..9229ad2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryBackgroundImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryBackgroundImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryConfigurationImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryConfigurationImpl.java index d1d7544..1accc92 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryConfigurationImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryConfigurationImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java index 0c1175d..e05e07e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java @@ -1,11 +1,8 @@ package org.nl.system.service.trajectory.impl; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.device.domain.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.common.exception.BadRequestException; +import org.nl.acs.iot.opc.DeviceAppService; import org.nl.system.service.trajectory.TrajectoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -30,9 +27,9 @@ public class TrajectoryImpl implements TrajectoryService { JSONArray datas = JSONArray.parseArray(jsonObject); //agv - if (datas.size() == 0) { - throw new BadRequestException("缺少输入参数！"); - } + // if (datas.size() == 0) { + // throw new BadRequestException("缺少输入参数！"); + // } // for (int i = 0; i < datas.size(); i++) { // JSONObject jo = new JSONObject(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml index 50603c4..f0a79ab 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml @@ -23,7 +23,7 @@ - + diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/LMSToACS.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/LMSToACS.xml index 6f8517c..cbdd46f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/LMSToACS.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/LMSToACS.xml @@ -23,7 +23,7 @@ - + diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml index 4d8d438..ec40da7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml @@ -27,7 +27,7 @@ --> - + diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml index 6f9b53f..6cc4f07 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml @@ -27,7 +27,7 @@ --> - + diff --git a/acs2/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java b/acs2/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java index f4b1474..99d3d70 100644 --- a/acs2/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java +++ b/acs2/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java @@ -1,15 +1,8 @@ package org.nl; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.unit.DataUnit; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import org.junit.jupiter.api.Test; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.system.service.user.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory;