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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-06-22 09:13:21 +08:00
parent 6c201406e2 1ae38d6d86
commit 420ff2fe98
22 changed files with 103 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type"));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region"));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("is_config")), Device::getIs_config, whereJson.get("is_config"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry")));
wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time);
wrapper.orderByDesc(Device::getCreate_time);
@@ -926,6 +927,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
String vehicle_code = form.getString("vehicle_code");
String islock = form.getString("islock");
String requireSucess = form.getString("requireSucess");
String requireActionSucess = form.getString("requireActionSucess");
String fullrequireSucess = form.getString("fullrequireSucess");
if (device_code.indexOf(".") != -1) {
device_code = device_code.substring(0, device_code.indexOf("."));

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -1125,11 +1125,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
action = LangProcess.msg("universal_releasing_completed");
}
if (error == 0 && iserror) {
this.setMessage("universal_message11");
this.setMessage("信号连接异常!");
}
String requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage4");
String requireActionSucess = LangProcess.msg("universal_directives") + ":" + LangProcess.msg("universal_actionMessage4");
if(this.requireActionSucess){
requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage5");
requireActionSucess = LangProcess.msg("universal_directives") + ":" + LangProcess.msg("universal_actionMessage5");
}
map.put("device_name", this.getDevice().getDevice_name());
map.put("mode", mode);
@@ -1156,11 +1156,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
@Override
public void setDeviceStatus(JSONObject data) {
String requestSucess = data.getString("requireSucess");
String requireActionSucess = data.getString("requireActionSucess");
if (StrUtil.equals(requestSucess, "0")) {
this.requireSucess = false;
} else if (StrUtil.equals(requestSucess, "1")) {
this.requireSucess = true;
}
if (StrUtil.equals(requireActionSucess, "0")) {
this.requireActionSucess = false;
} else if (StrUtil.equals(requireActionSucess, "1")) {
this.requireActionSucess = true;
}
}
public void writing(String param, String value) {

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
View File

@@ -408,7 +408,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
Device next_device = deviceAppService.findDeviceByCode(nextDeviceCode);
if (next_device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) next_device.getDeviceDriver();
if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2&&plugPullDeviceSiteDeviceDriver.getAction() != 3)
if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2 || plugPullDeviceSiteDeviceDriver.getAction() != 3)
notCreateInstMessage = "universal_notCreateInstMessage9";
return false;
}
@@ -701,9 +701,9 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
map.put("driver_type", "siemens_conveyor");
map.put("is_click", true);
map.put("message", message);
map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError())));
/*jo.put("x", xPosition);
jo.put("y", yPosition);*/
JSONObject jo = new JSONObject(map);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java
View File

@@ -627,7 +627,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
map.put("move", move);
map.put("action", action);
map.put("isOnline", this.getIsonline());
map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
map.put("error", ErrorUtil.getDictDetail("bhhj_error_type", String.valueOf(this.getError())));
map.put("isError", this.getIserror());
map.put("message", message);
map.put("feedMessage", feedMessage);

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

@@ -95,6 +95,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
try {
MDC.put(log_file_type, log_type);
log.info("crateTask-----输入参数{}", param);
LuceneLogDto luceneLogDto = new LuceneLogDto(4, param, "acs接收lms任务");
luceneLogService.interfaceExecuteLog(luceneLogDto);
JSONArray datas = JSONArray.parseArray(param);
CreateTaskResponse response = new CreateTaskResponse();
// ParamService paramService = SpringContextHolder.getBean(ParamService.class);

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java
View File

@@ -41,7 +41,7 @@ public class ErrorUtil {
String en_label = dictDetailDto.getEn_label();
String in_label = dictDetailDto.getIn_label();
String zh_label = dictDetailDto.getZh_label();
if (StrUtil.equals(value, error_code)) {
if (StrUtil.equals(value, error_code) && ObjectUtil.isNotEmpty(language)) {
if (language.contains("zh")){
detail = zh_label;
break;
@@ -54,7 +54,10 @@ public class ErrorUtil {
detail = en_label;
break;
}
if(StrUtil.isEmpty(language)){
detail = en_label;
break;
}
}
}
}

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
View File

@@ -19,7 +19,6 @@ public class InitLocaleResolver implements LocaleResolver {
if (StringUtils.isNotEmpty(header)){
String lang = Language_Country.get(header);
language = lang;
System.out.println("lang的值为："+lang);
if (StringUtils.isNotEmpty(lang)){
String[] l = lang.split("-");
//印尼的ISO标准国家代码为id-ID

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
View File

@@ -153,6 +153,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
dic.setPara1(dict.getPara1());
dic.setPara2(dict.getPara2());
dic.setPara3(dict.getPara3());
dic.setZh_label(dict.getZh_label());
dic.setEn_label(dict.getEn_label());
dic.setIn_label(dict.getIn_label());
sysDictMapper.updateById(dic);
return;
}

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties
View File

@@ -63,6 +63,7 @@ universal_actionMessage2=\u5141\u8BB8\u53D6\u653E
universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00
universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D
universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D
universal_directives=\u6307\u4EE4

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties
View File

@@ -62,5 +62,6 @@ universal_actionMessage4=The request action has been reset
universal_actionMessage5=The request action is not reset
universal_notCreateInstMessage7=ray type is empty!
universal_notCreateInstMessage8=The barcode is blank\uFF01
universal_directives=Directives

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties
View File

@@ -62,3 +62,4 @@ universal_actionMessage4=Tindakan permintaan telah disetel ulang
universal_actionMessage5=Tindakan permintaan tidak disetel ulang
universal_notCreateInstMessage7=ponypianmereka yang kosong!
universal_notCreateInstMessage8=Kode batang kosong!
universal_directives=Arahan

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties
View File

@@ -62,6 +62,6 @@ universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93
universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4D\u6761\u4EF6\u4E0D\u6EE1\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A!
universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A!
universal_directives=\u6307\u4EE4