no message

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<Object> stockMsg() {
+    public ResponseEntity<Object> stockMsg(String msg) {
-        String stockMsg = stockService.stockMsg();
+        String stockMsg = stockService.stockMsg(msg);
         return new ResponseEntity<>(stockMsg, HttpStatus.OK);
     }
 

youchain-system/src/main/java/com/youchain/basicdata/service/StockService.java

@@ -207,6 +207,6 @@ public interface StockService {
     /**
      * 消息推送
      */
-    String stockMsg();
+    String stockMsg(String msg);
 
 }

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";
     }
 
     /**

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{

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;
-    }
-
-
 }