From 408f29990c79b53e992c1e70b0f8bfdbcc195f2a 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:49:15 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=99=BB=E5=BD=95.=E4=B8=8B=E5=8F=91=E5=88=86=E6=8B=A3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E8=B4=B4=E6=A0=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package_site/PackageSiteDeviceDriver.java | 49 ++++++++++++++++--- .../wms/service/impl/WmsToAcsServiceImpl.java | 2 + .../service/impl/InstructionServiceImpl.java | 18 +++---- .../rest/AuthorizationController.java | 1 + .../modules/system/rest/UserController.java | 2 +- .../system/service/impl/UserServiceImpl.java | 4 +- .../src/views/system/user/index.vue | 5 +- 7 files changed, 63 insertions(+), 18 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java index 8366882..e32672f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java @@ -30,10 +30,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华-包装线工位 @@ -265,8 +262,10 @@ public class PackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing("to_message",resp.getLabel_message()); - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + map.put("to_message",resp.getLabel_message()); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -405,4 +404,42 @@ public class PackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements public void setDeviceStatus(JSONObject data) { } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + try { + this.checkcontrol(itemMap); + } catch (Exception e) { + e.printStackTrace(); + try{ + this.checkcontrol(itemMap); + } catch (Exception e1){ + e1.printStackTrace(); + } + } + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 80d447f..e7bc5b7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -468,6 +468,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { map.put("to_BshortSide", BshortSide); map.put("to_Htrapezoidal", Htrapezoidal); map.put("to_Wthickness", Wthickness); + map.put("to_brick_code", product_code+formula); + map.put("to_formula", order_number); map.put("to_feedback",100); lnshPackagePalletManipulatorDeviceDriver.writing(map); is_flag = true; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 6488024..5303f60 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -680,15 +680,15 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } //变更三色灯状态 - if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) { - String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); - Device lamddevice = appService.findDeviceByCode(lamd_device); - - if (lamddevice.getDeviceDriver() instanceof LampThreecolorDeviceDriver) { - lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) lamddevice.getDeviceDriver(); - lampThreecolorDeviceDriver.writing(0); - } - } +// if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) { +// String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); +// Device lamddevice = appService.findDeviceByCode(lamd_device); +// +// if (lamddevice.getDeviceDriver() instanceof LampThreecolorDeviceDriver) { +// lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) lamddevice.getDeviceDriver(); +// lampThreecolorDeviceDriver.writing(0); +// } +// } removeByCodeFromCache(dto.getInstruction_code()); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index 7b1ced2..df33bc4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -39,6 +39,7 @@ import org.nl.modules.security.service.dto.AuthUserDto; import org.nl.modules.system.service.RoleService; import org.nl.modules.system.service.UserService; import org.nl.modules.system.service.dto.UserDto; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; 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-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 @@ 女 + + +