`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/TblMiniprogram.java

@@ -50,7 +50,7 @@ public class TblMiniprogram extends BaseEntity {
     /**
      * 描述
      */
-    private String desc;
+    private String remark;
 
     /**
      * 扩展1

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/bo/TblMiniprogramBo.java

@@ -48,7 +48,7 @@ public class TblMiniprogramBo extends BaseEntity {
     /**
      * 描述
      */
-    private String desc;
+    private String remark;
 
     /**
      * 扩展1

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/domain/vo/TblMiniprogramVo.java

@@ -62,7 +62,7 @@ public class TblMiniprogramVo implements Serializable {
      * 描述
      */
     @ExcelProperty(value = "描述")
-    private String desc;
+    private String remark;
 
     /**
      * 扩展1

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblMiniprogramServiceImpl.java

@@ -65,7 +65,7 @@ public class TblMiniprogramServiceImpl implements ITblMiniprogramService {
         lqw.eq(StringUtils.isNotBlank(bo.getLogo()), TblMiniprogram::getLogo, bo.getLogo());
         lqw.eq(StringUtils.isNotBlank(bo.getUrl()), TblMiniprogram::getUrl, bo.getUrl());
         lqw.eq(bo.getStatus() != null, TblMiniprogram::getStatus, bo.getStatus());
-        lqw.eq(StringUtils.isNotBlank(bo.getDesc()), TblMiniprogram::getDesc, bo.getDesc());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemark()), TblMiniprogram::getRemark, bo.getRemark());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblMiniprogram::getExt1, bo.getExt1());
         lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblMiniprogram::getExt2, bo.getExt2());
         return lqw;

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/CabinetUtil.java

@@ -90,7 +90,7 @@ public class CabinetUtil {
         String str_sign = appid + "=" + times + "=" + appid;
         str_sign = encrypt(str_sign);
 
-        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/box_info_list/").body(JSON.toJSONString(Map.of("device_number",cabinetCode)))
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/box_info_list/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"page_size",1000)))
             .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
             .execute().body();
         return result3;
@@ -141,7 +141,7 @@ public class CabinetUtil {
         String str_sign = appid + "=" + times + "=" + appid;
         str_sign = encrypt(str_sign);
 
-        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/clear_box/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"box_uid",boxUUId)))
+        String result3= HttpRequest.post(hosts + "/kd/api/v2/action/clear_box_open/").body(JSON.toJSONString(Map.of("device_number",cabinetCode,"box_uid",boxUUId)))
             .addHeaders(Map.of("timestamp",times+"","Content-Type","application/json","appid",appid,"sign",str_sign))
             .execute().body();
         return result3;

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/util/MessageUtils.java

@@ -5,19 +5,20 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.StringUtils;
 import org.springframework.context.annotation.Import;
 
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
 @Import(cn.hutool.extra.spring.SpringUtil.class)
 @Slf4j
 public class MessageUtils {
-    public static void sendLed(String devicecode,String message){
+    public static void sendLed(String devicecode,String message) throws UnsupportedEncodingException {
         if(StringUtils.isNotEmpty(devicecode)&&StringUtils.isNotEmpty(message)) {
             Map<String, String> data = new HashMap<>();
             data.put("devtype", "led");
             data.put("devcode", devicecode);
             final CamelDataUtil camelDataUtil = SpringUtil.getBean("camelDataUtil");
-            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}", message), "mqheader", data);
+            camelDataUtil.SendData("direct:sendMessage", StringUtils.format("{\"val\":\"{}\"}", message).getBytes("GBK"), "mqheader", data);
         }else {
             log.error("------------------");
             log.error("devicecode:"+devicecode.toString()+"     message:"+message.toString());