From db602f669f4f0bd25099ca6fa37bbbc2e07fd89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=A5=E5=BE=B7=E5=BD=AA=E6=9C=AC=E5=BD=AA=5C92525?= Date: Sun, 15 Sep 2024 18:42:56 +0800 Subject: [PATCH] no message --- .../basicdata/rest/StockController.java | 7 ++-- .../basicdata/service/StockService.java | 2 +- .../service/impl/StockServiceImpl.java | 12 +++--- .../modules/license/LicenseValidate.java | 6 +-- .../modules/license/domain/LicenseCheck.java | 42 ++----------------- 5 files changed, 17 insertions(+), 52 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java b/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java index e5d6bfa..de80e66 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/rest/StockController.java @@ -23,7 +23,6 @@ import com.youchain.basicdata.domain.Stock; import com.youchain.basicdata.service.StockService; import com.youchain.basicdata.service.dto.StockQueryCriteria; import com.youchain.config.FileProperties; -import com.youchain.config.thread.ThreadPoolExecutorUtil; import com.youchain.exception.handler.ApiResult; import com.youchain.modules.system.domain.Dept; import com.youchain.utils.*; @@ -202,10 +201,10 @@ public class StockController { return new ResponseEntity<>(stockService.getItemCode(stockCode), HttpStatus.OK); } - @PostMapping(value = "/stockMsg") + @GetMapping(value = "/stockMsg") @AnonymousAccess - public ResponseEntity stockMsg() { - String stockMsg = stockService.stockMsg(); + public ResponseEntity stockMsg(String msg) { + String stockMsg = stockService.stockMsg(msg); return new ResponseEntity<>(stockMsg, HttpStatus.OK); } diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java b/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java index 5c572b4..a8c9d84 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java @@ -207,6 +207,6 @@ public interface StockService { /** * 消息推送 */ - String stockMsg(); + String stockMsg(String msg); } diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java index e9ff930..effef69 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java @@ -52,7 +52,6 @@ import org.springframework.data.domain.Pageable; import java.sql.Timestamp; import java.util.*; import java.io.IOException; -import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -162,7 +161,7 @@ public class StockServiceImpl implements StockService { map.put("类型", stock.getStockType()); map.put("状态", stock.getStatus()); map.put("启用", stock.getEnabled()); - map.put("地标", stock.getPoint()==null?null:stock.getPoint().getCode()); + map.put("地标", stock.getPoint() == null ? null : stock.getPoint().getCode()); list.add(map); } @@ -631,13 +630,16 @@ public class StockServiceImpl implements StockService { } @Override - public String stockMsg() { + public String stockMsg(String msg) { try { - WebSocketServer.sendInfo(new SocketMsg("容器未解绑，请及时处理！", MsgType.INFO), "stock"); + SocketMsg socketMsg = new SocketMsg(msg, MsgType.INFO); + WebSocketServer.sendInfo(socketMsg, "stock"); + String message = JSONObject.toJSONString(socketMsg); + return message; } catch (Exception e) { e.printStackTrace(); } - return "ok"; + return "error"; } /** diff --git a/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java b/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java index 8446d35..b525430 100644 --- a/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java +++ b/youchain-system/src/main/java/com/youchain/modules/license/LicenseValidate.java @@ -50,13 +50,13 @@ public class LicenseValidate { public static LicenseCheck getSystemPrice(){ - + LicenseCheck licenseCheck=null; FileProperties properties= SpringContextHolder.getBean(FileProperties.class); String devicePath =properties.getPath().getPath()+"key/"+"device.key"; String deviceInfoJson =readDeviceFile(); if(StringUtils.isNotBlank(deviceInfoJson)){ try{ - LicenseCheck licenseCheck =JSONUtil.toBean(deviceInfoJson,LicenseCheck.class); + licenseCheck =JSONUtil.toBean(deviceInfoJson,LicenseCheck.class); BasicFileAttributes attributes = Files.readAttributes(Paths.get(devicePath), BasicFileAttributes.class); String creationTime = attributes.creationTime().toString(); String lastModifiedTime = attributes.lastModifiedTime().toString(); @@ -78,7 +78,7 @@ public class LicenseValidate { } } createDeviceFileOrRead(); - return null; + return licenseCheck; } public static void validate() throws Exception{ diff --git a/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java b/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java index f86dcc7..7fa2073 100644 --- a/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java +++ b/youchain-system/src/main/java/com/youchain/modules/license/domain/LicenseCheck.java @@ -1,10 +1,13 @@ package com.youchain.modules.license.domain; +import lombok.Data; + import java.io.Serializable; /** * @author 92525 */ +@Data public class LicenseCheck implements Serializable { @@ -25,43 +28,4 @@ public class LicenseCheck implements Serializable { */ private String createTime; - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public LicenseCheck(){ - - } - - - - public String getCpuSerial() { - return cpuSerial; - } - - public void setCpuSerial(String cpuSerial) { - this.cpuSerial = cpuSerial; - } - - public String getMainBoardSerial() { - return mainBoardSerial; - } - - public void setMainBoardSerial(String mainBoardSerial) { - this.mainBoardSerial = mainBoardSerial; - } - - }