From 14472eca34acd25e462aa362383d95f9f189680d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Sun, 21 Jan 2024 16:55:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8C=87=E4=BB=A4=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=92=8C=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/NDCAgvServiceImpl.java | 11 +- .../org/nl/acs/heartbeat/HeartbeatConfig.java | 2 +- .../java/org/nl/acs/opc/DeviceManageDto.java | 1 - .../rest/ProduceshiftorderController.java | 5 +- .../task/service/impl/TaskServiceImpl.java | 3 +- .../service/impl/StageServiceImpl.java | 1 - .../modules/quartz/task/AutoCreateInst.java | 1 + .../modules/system/rest/UserController.java | 2 +- .../system/service/impl/UserServiceImpl.java | 4 +- .../auto/run/NDCSocketConnectionAutoRun.java | 7 +- .../src/main/resources/logback-spring.xml | 56 +++++- .../acs/device/driver/lnsh/lnsh_press.vue | 177 +----------------- .../src/views/acs/instruction/index.vue | 4 +- acs/nladmin-ui/src/views/acs/task/index.vue | 4 +- .../src/views/monitor/lucene/index.vue | 2 +- .../src/views/system/user/index.vue | 5 +- 16 files changed, 92 insertions(+), 193 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index a3a4fef..5f46aa4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.start.auto.run.NDCSocketConnectionAutoRun; import org.slf4j.MDC; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -36,10 +37,12 @@ import java.util.Map; @Service @RequiredArgsConstructor public class NDCAgvServiceImpl implements NDCAgvService { - - private final DeviceAppService deviceAppService; - private final ParamService acsConfigService; - private final AcsToWmsService acsToWmsService; + @Autowired + DeviceAppService deviceAppService; + @Autowired + ParamService acsConfigService; + @Autowired + AcsToWmsService acsToWmsService; private final DeviceExecuteLogService logServer; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/HeartbeatConfig.java b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/HeartbeatConfig.java index b9d0016..e12fa57 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/HeartbeatConfig.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/HeartbeatConfig.java @@ -5,6 +5,6 @@ public class HeartbeatConfig { /** * 最大心跳时常 */ - public static Integer max_alive_time_millions = 1000 * 30; + public static Integer max_alive_time_millions = 1000; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceManageDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceManageDto.java index bbcd560..c8e13da 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceManageDto.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceManageDto.java @@ -1,7 +1,6 @@ package org.nl.acs.opc; import cn.hutool.core.util.ObjectUtil; -import eu.bitwalker.useragentutils.DeviceType; import lombok.Data; import java.util.*; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java b/acs/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java index e745214..6cbcedb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java @@ -4,6 +4,7 @@ package org.nl.acs.order.rest; import org.nl.acs.order.service.ProduceshiftorderService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.modules.logging.annotation.Log; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -26,8 +27,8 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("/api/produceshiftorder") @Slf4j public class ProduceshiftorderController { - - private final ProduceshiftorderService produceshiftorderService; + @Autowired + ProduceshiftorderService produceshiftorderService; @GetMapping @Log("查询工单信息") diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 12053c2..263467e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -83,6 +83,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { private DeviceAppService deviceAppService; @Autowired private RouteLineService routelineserver; + @Lazy @Autowired private AcsToWmsService acstowmsService; @Autowired @@ -155,7 +156,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public Map queryAllByCache(Map whereJson, Pageable page) { - this.reload(); +// this.reload(); String task_code = (String) whereJson.get("task_code"); String vehicle_code = (String) whereJson.get("vehicle_code"); String material_type = (String) whereJson.get("material_type"); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index 31c7793..69b5181 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.modules.logicflow.service.impl; 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.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java index 8677789..cfc4380 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java @@ -331,6 +331,7 @@ public class AutoCreateInst { try { instructionService.create(instdto); } catch (Exception e) { + log.error("agv创建指令异常", e); acsTask.setRemark(e.getMessage()); taskserver.updateByCodeFromCache(acsTask); continue; diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index d82eff0..c3d54f6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -109,7 +109,7 @@ public class UserController { public ResponseEntity create(@Validated @RequestBody User resources){ checkLevel(resources); // 默认密码 123456 - resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt")); + resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt")); userService.create(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index 23c5723..ad128ae 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -15,6 +15,7 @@ */ package org.nl.modules.system.service.impl; +import cn.dev33.satoken.secure.SaSecureUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.nl.modules.common.config.FileProperties; @@ -135,6 +136,7 @@ public class UserServiceImpl implements UserService { clone.setPhone(resources.getPhone()); clone.setNickName(resources.getNickName()); clone.setGender(resources.getGender()); + clone.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt")); userRepository.save(clone); // 清除缓存 @@ -169,7 +171,7 @@ public class UserServiceImpl implements UserService { } @Override - @Cacheable(key = "'username:' + #p0") +// @Cacheable(key = "'username:' + #p0") public UserDto findByName(String userName) { User user = userRepository.findByUsername(userName); if (user == null) { diff --git a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 6ce0bda..36e047a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -68,7 +68,8 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { ParamService paramService; @Autowired AutoRunService autoRunService; - + @Autowired + AcsToWmsService acsToWmsService; public NDCSocketConnectionAutoRun() { this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); @@ -86,10 +87,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { System.out.println("1楼NDCAgv链接开始"); ParamService ParamService = SpringContextHolder.getBean(ParamServiceImpl.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); +// AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class); DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); - DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); +// DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); ip = paramService.findByCode(org.nl.acs.AcsConfig.AGVURL).getValue(); port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index 06fa62a..87f3317 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -73,8 +73,35 @@ https://juejin.cn/post/6844903775631572999 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93,5 +120,32 @@ https://juejin.cn/post/6844903775631572999 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue index 5b0da9f..697012f 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue @@ -159,68 +159,6 @@ - -
- 交互相关： -
-
- - - - - 新增一行 - - - -
-
- - - - - - - - - - - -
- -
PLC读取字段： @@ -356,61 +294,8 @@ export default { dataOpcservers: [], dataOpcPlcs: [], deviceList: [], - requestMethodList: [], data1: [], data2: [], - modeform: { - tableData: [ - { - mode: '3', - request: 'order_verify' - }, - { - mode: '4', - request: 'order_finish' - }, - { - mode: '5', - request: 'apply_put_full_vehicle' - }, - { - mode: '6', - request: 'apply_put_empty_vehicle' - }, - { - mode: '7', - request: 'apply_take_empty_vehicle' - }, - { - mode: '8', - request: 'apply_take_full_vehicle' - }, - { - mode: '9', - request: 'apply_force_take_full_vehicle' - }, - { - mode: '10', - request: 'apply_force_take_full_vehicle_in_storage' - }, - { - mode: '11', - request: 'barcode_success_apply' - }, - { - mode: '12', - request: 'get_vehicle_info' - }, - { - mode: '13', - request: 'force_no_package' - }, - { - mode: '14', - request: 'apply_labelling' - } - ] - }, form: { inspect_in_stocck: true, ignore_pickup_check: true, @@ -451,13 +336,6 @@ export default { } this.data1 = data.rs this.data2 = data.ws - if (data.modeform) { - const arr = Object.keys(data.modeform) - // 不为空 - if (arr.length > 0) { - this.modeform.tableData = data.modeform - } - } this.sliceItem() }) selectPlcList().then(data => { @@ -471,19 +349,9 @@ export default { deviceCrud.selectDeviceList().then(data => { this.deviceList = data }) - deviceCrud.selectRequestMethodList().then(data => { - this.requestMethodList = data - }) }) }, methods: { - insertdtl() { - this.modeform.tableData.push({mode: '', request: '' }) - }, - deleteRow(index, rows) { - debugger - rows.splice(index, 1) - }, finishReadEdit(data) { // 编辑的是code列,并且值包含mode if (data.code.indexOf('mode') !== -1) { @@ -572,53 +440,20 @@ export default { if (this.data2[val].code.indexOf('to_material_code') !== -1) { this.data2[val].db = beforeStr + '.STRING58.50' } - if (this.data2[val].code.indexOf('to_brick_code') !== -1) { - this.data2[val].db = beforeStr + '.STRING112.50' - } - if (this.data2[val].code.indexOf('to_formula') !== -1) { - this.data2[val].db = beforeStr + '.STRING164.50' - } if (this.data2[val].code.indexOf('to_product_code') !== -1) { - this.data2[val].db = beforeStr + '.W216' + this.data2[val].db = beforeStr + '.W108' } if (this.data2[val].code.indexOf('to_AlongSide') !== -1) { - this.data2[val].db = beforeStr + '.W218' + this.data2[val].db = beforeStr + '.W110' } if (this.data2[val].code.indexOf('to_BshortSide') !== -1) { - this.data2[val].db = beforeStr + '.W220' + this.data2[val].db = beforeStr + '.W112' } if (this.data2[val].code.indexOf('to_Htrapezoidal') !== -1) { - this.data2[val].db = beforeStr + '.W222' + this.data2[val].db = beforeStr + '.W114' } if (this.data2[val].code.indexOf('to_Wthickness') !== -1) { - this.data2[val].db = beforeStr + '.W224' - } - if (this.data2[val].code.indexOf('to_size_error') !== -1) { - this.data2[val].db = beforeStr + '.REAL228' - } - if (this.data2[val].code.indexOf('to_single_weight') !== -1) { - this.data2[val].db = beforeStr + '.REAL232' - } - if (this.data2[val].code.indexOf('to_drawing_address') !== -1) { - this.data2[val].db = beforeStr + '.REAL236' - } - if (this.data2[val].code.indexOf('to_standard_weight') !== -1) { - this.data2[val].db = beforeStr + '.REAL240' - } - if (this.data2[val].code.indexOf('to_detection_error') !== -1) { - this.data2[val].db = beforeStr + '.REAL244' - } - if (this.data2[val].code.indexOf('to_standard_size_height1') !== -1) { - this.data2[val].db = beforeStr + '.REAL248' - } - if (this.data2[val].code.indexOf('to_standard_size_height2') !== -1) { - this.data2[val].db = beforeStr + '.REAL252' - } - if (this.data2[val].code.indexOf('to_standard_size_height3') !== -1) { - this.data2[val].db = beforeStr + '.REAL256' - } - if (this.data2[val].code.indexOf('to_standard_size_height4') !== -1) { - this.data2[val].db = beforeStr + '.REAL260' + this.data2[val].db = beforeStr + '.W116' } } } @@ -683,7 +518,7 @@ export default { parentForm.is_route = true parentForm.plc_id = this.plc_id parentForm.opc_id = this.opc_id - updateConfig(parentForm, this.form, this.modeform, this.data1, this.data2).then(res => { + updateConfig(parentForm, this.form, this.data1, this.data2).then(res => { this.notify('保存成功', 'success') this.configLoading = false }).catch(err => { diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue index 441dcd6..cb53813 100644 --- a/acs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue @@ -70,7 +70,7 @@
- 同步 - + --> 新增 - 同步 - + --> diff --git a/acs/nladmin-ui/src/views/monitor/lucene/index.vue b/acs/nladmin-ui/src/views/monitor/lucene/index.vue index 03a3beb..a79f9aa 100644 --- a/acs/nladmin-ui/src/views/monitor/lucene/index.vue +++ b/acs/nladmin-ui/src/views/monitor/lucene/index.vue @@ -16,7 +16,7 @@ - + diff --git a/acs/nladmin-ui/src/views/system/user/index.vue b/acs/nladmin-ui/src/views/system/user/index.vue index 9db56a5..daf4886 100644 --- a/acs/nladmin-ui/src/views/system/user/index.vue +++ b/acs/nladmin-ui/src/views/system/user/index.vue @@ -96,6 +96,9 @@ 女 + + +