20240513_sun

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstSbxxController.java

@@ -15,6 +15,7 @@ import com.ruoyi.lnst.domain.LnstSbxx;
 import com.ruoyi.lnst.service.ILnstSbxxService;
 import com.ruoyi.system.sm4.SM4Utils;
 import com.ruoyi.system.validate.group.AddGroup;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
@@ -93,7 +94,14 @@ public class LnstSbxxController extends BaseController
         }
         LnstSbxx lnstSbxx = new LnstSbxx();
         lnstSbxx.setSbid(object.getString("sysid"));
-        lnstSbxx.setSbms(jsonStr);
+        StringBuilder sb = new StringBuilder();
+        sb.append("设备型号：").append(object.getString("model")).append("\n")
+                .append("设备品牌：").append(object.getString("brand")).append("\n")
+                .append("产品名称：").append(object.getString("product")).append("\n")
+                .append("系统版本：").append(object.getString("release")).append("\n")
+                .append("物理尺寸：").append(object.getString("physical_size")).append("\n")
+                .append("是否平板：").append(StringUtils.equals(object.getString("tablet"), "1") ? "是" : "否");
+        lnstSbxx.setSbms(sb.toString());
         lnstSbxx.setQysj(DateUtils.dateTimeNow());
         return toAjax(lnstSbxxService.insertLnstSbxx(lnstSbxx),lnstSbxx.getId());
     }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -37,9 +37,11 @@ public class YlServer {
 
     public static void main(String[] args) {
 
+        JSONObject object = new JSONObject();
+        object.put("sysid", "68cd661250796472");
         SM4Utils sm4 = new SM4Utils();
         sm4.secretKey = "d8f37edaf81f4373";
-        String jsonStr = sm4.decryptData_ECB("MTWpiE/gP7TBO3hCZszaaW33ckHoKjCUHq9taTj4GL/Cm6+o1rcaPeNVuocne4iAQk8tBfnkkWtAT6CGcOLH6M618GIAdTTPkECzKDJ4jqPDCzUhQUrs3L65wKb4XNbmMMJWGWCEk1asjqENLbx0MRYe7OlM/8SmGdZpyvvfq1vlK+rjmmLsxeMT5D0akh05UtdiCMIGqZhY4hTF5agiLTBCy/JZSjzvpxD6mAv90nnBkcIfJEbFGsjr04ZHtx5vlrbLGGy/xvIRcLDI1Q86cQ==");
+        String jsonStr = sm4.encryptData_ECB(object.toJSONString());
         System.out.println(jsonStr);
         // 禁用/启用
 //        TreeMap<String, Object> lr = new TreeMap<>();