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

周末更新统一提交

Browse Source
This commit is contained in:
psh
2024-06-24 11:23:48 +08:00
parent da0b260a1c
commit 1973464fd3
8 changed files with 70 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,10 +234,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
//上报异常信息 //上报异常信息
//（不需要WCS反馈） //（不需要WCS反馈）
if (phase == 0x67 || phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) { if (phase == 0x70 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74) {
device = deviceAppService.findDeviceByCode("AGV0" +agvaddr); device = deviceAppService.findDeviceByCode("AGV0" +agvaddr);
} else { } else {
device = deviceAppService.findDeviceByCode("AGV0" + arr[20]); device = deviceAppService.findDeviceByCode("AGV0" + Integer.toString(arr[20]));
} }
if (ObjectUtil.isNotEmpty(device)) { if (ObjectUtil.isNotEmpty(device)) {
if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {

5
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -125,9 +125,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
acsToWmsService.notify(request); acsToWmsService.notify(request);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
} }
TaskDto task = new TaskDto();
if(ObjectUtil.isNotEmpty(inst)){
task = taskService.findById(inst.getTask_id());
}
TaskDto task = taskService.findById(inst.getTask_id());
//分配 车id //分配 车id
//(不需要WCS反馈) //(不需要WCS反馈)

30
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java
View File

@@ -146,14 +146,14 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
VW7046 = this.itemProtocol.getVW7046(); VW7046 = this.itemProtocol.getVW7046();
VW7056 = this.itemProtocol.getVW7056(); VW7056 = this.itemProtocol.getVW7056();
VW7058 = this.itemProtocol.getVW7058(); VW7058 = this.itemProtocol.getVW7058();
VW7076 = this.itemProtocol.getVW7076(); // VW7076 = this.itemProtocol.getVW7076();
VW70001 = this.itemProtocol.getVW70001(); // VW70001 = this.itemProtocol.getVW70001();
VW70002 = this.itemProtocol.getVW70002(); // VW70002 = this.itemProtocol.getVW70002();
VW70003 = this.itemProtocol.getVW70003(); // VW70003 = this.itemProtocol.getVW70003();
VW70004 = this.itemProtocol.getVW70004(); // VW70004 = this.itemProtocol.getVW70004();
VW70005 = this.itemProtocol.getVW70005(); // VW70005 = this.itemProtocol.getVW70005();
VW70006 = this.itemProtocol.getVW70006(); // VW70006 = this.itemProtocol.getVW70006();
VW70007 = this.itemProtocol.getVW70007(); // VW70007 = this.itemProtocol.getVW70007();
if(VW7058!=last_VW7058){ if(VW7058!=last_VW7058){
//固化室状态变更后通知lms更新固化室状态 //固化室状态变更后通知lms更新固化室状态
@@ -207,13 +207,13 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
last_VW7056 = VW7056; last_VW7056 = VW7056;
last_VW7058 = VW7058; last_VW7058 = VW7058;
last_VW7076 = VW7076; last_VW7076 = VW7076;
last_VW70001 = VW70001; // last_VW70001 = VW70001;
last_VW70002 = VW70002; // last_VW70002 = VW70002;
last_VW70003 = VW70003; // last_VW70003 = VW70003;
last_VW70004 = VW70004; // last_VW70004 = VW70004;
last_VW70005 = VW70005; // last_VW70005 = VW70005;
last_VW70006 = VW70006; // last_VW70006 = VW70006;
last_VW70007 = VW70007; // last_VW70007 = VW70007;
} }

74
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/ItemProtocol.java
View File

@@ -34,26 +34,26 @@ public class ItemProtocol {
public static String item_VW7056 = "VW7056"; public static String item_VW7056 = "VW7056";
public static String item_VW7058 = "VW7058"; public static String item_VW7058 = "VW7058";
public static String item_VW7076 = "VW7076"; public static String item_VW7076 = "VW7076";
public static String item_VW70001 = "VW7000.1"; public static String item_VW70001 = "VW70001";
public static String item_VW70002 = "VW7000.2"; public static String item_VW70002 = "VW70002";
public static String item_VW70003 = "VW7000.3"; public static String item_VW70003 = "VW70003";
public static String item_VW70004 = "VW7000.4"; public static String item_VW70004 = "VW70004";
public static String item_VW70005 = "VW7000.5"; public static String item_VW70005 = "VW70005";
public static String item_VW70006 = "VW7000.6"; public static String item_VW70006 = "VW70006";
public static String item_VW70007 = "VW7000.7"; public static String item_VW70007 = "VW70007";
//写入信号 //写入信号
public static String item_VW70040 = "VW7004.0"; public static String item_VW70040 = "VW70040";
public static String item_VW70041 = "VW7004.1"; public static String item_VW70041 = "VW70041";
public static String item_VW70042 = "VW7004.2"; public static String item_VW70042 = "VW70042";
public static String item_VW70043 = "VW7004.3"; public static String item_VW70043 = "VW70043";
public static String item_VW70044 = "VW7004.4"; public static String item_VW70044 = "VW70044";
public static String item_VW70045 = "VW7004.5"; public static String item_VW70045 = "VW70045";
public static String item_VW70050 = "VW7005.0"; public static String item_VW70050 = "VW70050";
public static String item_VW70051 = "VW7005.1"; public static String item_VW70051 = "VW70051";
public static String item_VW70052 = "VW7005.2"; public static String item_VW70052 = "VW70052";
public static String item_VW70053 = "VW7005.3"; public static String item_VW70053 = "VW70053";
public static String item_VW70054 = "VW7005.4"; public static String item_VW70054 = "VW70054";
private GuhuashiSiteDeviceDriver driver; private GuhuashiSiteDeviceDriver driver;
@@ -224,33 +224,33 @@ public class ItemProtocol {
list.add(new ItemDto(item_VW7040, "阶段累加分", "VW7040")); list.add(new ItemDto(item_VW7040, "阶段累加分", "VW7040"));
list.add(new ItemDto(item_VW7042, "实际运行程序套数", "VW7042")); list.add(new ItemDto(item_VW7042, "实际运行程序套数", "VW7042"));
list.add(new ItemDto(item_VW7044, "正在执行的阶段数", "VW7044")); list.add(new ItemDto(item_VW7044, "正在执行的阶段数", "VW7044"));
list.add(new ItemDto(item_VW7046, "报警内容", "VW7046")); // list.add(new ItemDto(item_VW7046, "报警内容", "VW7046"));
list.add(new ItemDto(item_VW7056, "工作模式", "VW7056")); list.add(new ItemDto(item_VW7056, "工作模式", "VW7056"));
list.add(new ItemDto(item_VW7058, "设备状态", "VW7058")); list.add(new ItemDto(item_VW7058, "设备状态", "VW7058"));
list.add(new ItemDto(item_VW7076, "心跳", "VW7076")); list.add(new ItemDto(item_VW7076, "心跳", "VW7076"));
list.add(new ItemDto(item_VW70001, "工艺运行中信号", "VW7004.0")); // list.add(new ItemDto(item_VW70001, "工艺运行中信号", "VW7004.0"));
list.add(new ItemDto(item_VW70002, "工艺运行结束信号", "VW7004.1")); // list.add(new ItemDto(item_VW70002, "工艺运行结束信号", "VW7004.1"));
list.add(new ItemDto(item_VW70003, "固化室内允许进板或出板信号（室内温度低于允许进入温度）", "VW7004.2")); // list.add(new ItemDto(item_VW70003, "固化室内允许进板或出板信号（室内温度低于允许进入温度）", "VW7004.2"));
list.add(new ItemDto(item_VW70004, "固化室前门已开信号", "VW7004.3")); // list.add(new ItemDto(item_VW70004, "固化室前门已开信号", "VW7004.3"));
list.add(new ItemDto(item_VW70005, "固化室前门已关信号", "VW7004.4")); // list.add(new ItemDto(item_VW70005, "固化室前门已关信号", "VW7004.4"));
list.add(new ItemDto(item_VW70006, "固化室后门已开信号", "VW7005.0")); // list.add(new ItemDto(item_VW70006, "固化室后门已开信号", "VW7005.0"));
list.add(new ItemDto(item_VW70007, "固化室后门已关信号", "VW7005.1")); // list.add(new ItemDto(item_VW70007, "固化室后门已关信号", "VW7005.1"));
return list; return list;
} }
public static List<ItemDto> getWriteableItemDtos() { public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_VW70040, "", "VW7004.0")); // list.add(new ItemDto(item_VW70040, "", "VW7004.0"));
list.add(new ItemDto(item_VW70041, "", "VW7004.1")); // list.add(new ItemDto(item_VW70041, "", "VW7004.1"));
list.add(new ItemDto(item_VW70042, "", "VW7004.2")); // list.add(new ItemDto(item_VW70042, "", "VW7004.2"));
list.add(new ItemDto(item_VW70043, "", "VW7004.3")); // list.add(new ItemDto(item_VW70043, "", "VW7004.3"));
list.add(new ItemDto(item_VW70044, "", "VW7004.4")); // list.add(new ItemDto(item_VW70044, "", "VW7004.4"));
list.add(new ItemDto(item_VW70045, "", "VW7004.5")); // list.add(new ItemDto(item_VW70045, "", "VW7004.5"));
list.add(new ItemDto(item_VW70050, "", "VW7005.0")); // list.add(new ItemDto(item_VW70050, "", "VW7005.0"));
list.add(new ItemDto(item_VW70051, "", "VW7005.1")); // list.add(new ItemDto(item_VW70051, "", "VW7005.1"));
list.add(new ItemDto(item_VW70052, "", "VW7005.2")); // list.add(new ItemDto(item_VW70052, "", "VW7005.2"));
list.add(new ItemDto(item_VW70053, "", "VW7005.3")); // list.add(new ItemDto(item_VW70053, "", "VW7005.3"));
list.add(new ItemDto(item_VW70054, "", "VW7005.4")); // list.add(new ItemDto(item_VW70054, "", "VW7005.4"));
return list; return list;
} }

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java
View File

@@ -33,6 +33,8 @@ public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
MDC.remove("device_code_log"); MDC.remove("device_code_log");
log.info("successNum:" + OpcUtl.successNum);
log.info("errNum:" + OpcUtl.errNum);
} }
} }

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java
View File

@@ -23,6 +23,9 @@ public class OpcUtl {
private static int timeout = 1 * 60 * 1000; private static int timeout = 1 * 60 * 1000;
private static String key = "rpc.socketTimeout"; private static String key = "rpc.socketTimeout";
public static int successNum=0;
public static int errNum=0;
static { static {
checkTimeout(); checkTimeout();
} }
@@ -224,9 +227,14 @@ public class OpcUtl {
server = new Server(getConnection(host, clsid, user, password, domain), server = new Server(getConnection(host, clsid, user, password, domain),
Executors.newSingleThreadScheduledExecutor()); Executors.newSingleThreadScheduledExecutor());
server.connect(); server.connect();
successNum++;
return server; return server;
} catch (Exception e) { } catch (Exception e) {
errNum++;
throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
}finally{
log.info("successNum:"+successNum);
log.info("errNum:"+errNum);
} }
} }

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/task/SyncPoint.java
View File

@@ -51,7 +51,7 @@ public class SyncPoint {
SchBasePoint schBasePoint = new SchBasePoint(); SchBasePoint schBasePoint = new SchBasePoint();
schBasePoint.setRegion_code("ZC"); schBasePoint.setRegion_code("ZC");
List<SchBasePoint> schBasePointList = schBasePointService.getPointList(schBasePoint); List<SchBasePoint> schBasePointList = schBasePointService.getPointList(schBasePoint);
JSONArray jsonArray = JSONArray.parseArray(result.body()); JSONArray jsonArray = JSONObject.parseObject(result.body()).getJSONArray("data");
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i); JSONObject jsonObject = jsonArray.getJSONObject(i);
for (SchBasePoint temp : schBasePointList) { for (SchBasePoint temp : schBasePointList) {

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
View File

@@ -49,6 +49,7 @@
AND p.point_status = '1' AND p.point_status = '1'
AND p.is_used = TRUE AND p.is_used = TRUE
AND p.point_code like '%01-01%' AND p.point_code like '%01-01%'
AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
ORDER BY p.row_num, p.col_num ORDER BY p.row_num, p.col_num
LIMIT 1; LIMIT 1;
</select> </select>