fix:修复系统消息时间段查询条件无效bug

fix:修复新增冷链设备类型报错bug
fix:修复预警日志删选关键词无效bug

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/controller/BizNoticeController.java

@@ -33,6 +33,8 @@ import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -58,7 +60,7 @@ public class BizNoticeController {
     @Operation(summary = "获取通知公告分页")
     @SaCheckPermission("/biz/notice/page")
     @GetMapping("/biz/notice/page")
-    public CommonResult<Page<BizNotice>> page(BizNoticePageParam bizNoticePageParam) {
+    public CommonResult<Page<BizNotice>> page(BizNoticePageParam bizNoticePageParam) throws ParseException {
         return CommonResult.data(bizNoticeService.page(bizNoticePageParam));
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/service/BizNoticeService.java

@@ -20,6 +20,7 @@ import vip.xiaonuo.biz.modular.notice.param.BizNoticeEditParam;
 import vip.xiaonuo.biz.modular.notice.param.BizNoticeIdParam;
 import vip.xiaonuo.biz.modular.notice.param.BizNoticePageParam;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -36,7 +37,7 @@ public interface BizNoticeService extends IService<BizNotice> {
      * @author yubaoshan
      * @date  2024/07/11 14:46
      */
-    Page<BizNotice> page(BizNoticePageParam bizNoticePageParam);
+    Page<BizNotice> page(BizNoticePageParam bizNoticePageParam) throws ParseException;
 
     /**
      * 添加通知公告

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/service/impl/BizNoticeServiceImpl.java

@@ -37,6 +37,9 @@ import vip.xiaonuo.biz.modular.notice.param.BizNoticeIdParam;
 import vip.xiaonuo.biz.modular.notice.param.BizNoticePageParam;
 import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,9 +53,10 @@ public class BizNoticeServiceImpl extends ServiceImpl<BizNoticeMapper, BizNotice
 
 
     @Override
-    public Page<BizNotice> page(BizNoticePageParam bizNoticePageParam) {
+    public Page<BizNotice> page(BizNoticePageParam bizNoticePageParam) throws ParseException {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<BizNotice> queryWrapper = new QueryWrapper<BizNotice>().checkSqlInjection();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(ObjectUtil.isNotEmpty(bizNoticePageParam.getTitle())) {
             queryWrapper.lambda().like(BizNotice::getTitle, bizNoticePageParam.getTitle());
         }
@@ -66,7 +70,9 @@ public class BizNoticeServiceImpl extends ServiceImpl<BizNoticeMapper, BizNotice
             queryWrapper.lambda().eq(BizNotice::getStatus, bizNoticePageParam.getStatus());
         }
         if(ObjectUtil.isNotEmpty(bizNoticePageParam.getStartCreateTime()) && ObjectUtil.isNotEmpty(bizNoticePageParam.getEndCreateTime())) {
-            queryWrapper.lambda().between(BizNotice::getCreateTime, bizNoticePageParam.getStartCreateTime(), bizNoticePageParam.getEndCreateTime());
+            Date startCreateTime = sdf.parse(bizNoticePageParam.getStartCreateTime());
+            Date endCreateTime = sdf.parse(bizNoticePageParam.getEndCreateTime());
+            queryWrapper.lambda().between(BizNotice::getCreateTime, startCreateTime, endCreateTime);
         }
         if(ObjectUtil.isAllNotEmpty(bizNoticePageParam.getSortField(), bizNoticePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizNoticePageParam.getSortOrder());

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/param/MonitorDeviceTypeAddParam.java

@@ -92,4 +92,7 @@ public class MonitorDeviceTypeAddParam {
     @Schema(description = "报警下限")
     private Float co2Down;
 
+    /** 传感器类型 */
+    @Schema(description = "传感器类型")
+    private String sensorType;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/param/MonitorDeviceTypeEditParam.java

@@ -92,4 +92,7 @@ public class MonitorDeviceTypeEditParam {
     @Schema(description = "报警下限")
     private Float co2Down;
 
+    /** 传感器类型 */
+    @Schema(description = "传感器类型")
+    private String sensorType;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitornotice/param/MonitorNoticePageParam.java

@@ -46,7 +46,7 @@ public class MonitorNoticePageParam {
 
     /** 关键词 */
     @Schema(description = "关键词")
-    private String searchKey;
+    private String keyword;
 
     /** 通知类型 */
     @Schema(description = "通知类型")

snowy-web-app/src/main/java/vip/xiaonuo/weixin/miniapp/controller/WxPortalController.java

@@ -5,10 +5,13 @@ import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
 import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
+import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import vip.xiaonuo.coldchain.modular.alarmuser.service.AlarmUserService;
+import vip.xiaonuo.common.pojo.CommonResult;
 
 import java.util.Objects;
 
@@ -22,6 +25,8 @@ import java.util.Objects;
 public class WxPortalController {
     private final WxMaService wxMaService;
     private final WxMaMessageRouter wxMaMessageRouter;
+    @Resource
+    private AlarmUserService alarmUserService;
 
     @GetMapping(produces = "text/plain;charset=utf-8")
     public String authGet(@PathVariable String appid,
@@ -119,4 +124,9 @@ public class WxPortalController {
         }
     }
 
+    @GetMapping("/pc")
+    private CommonResult<String> getUserInfo(String code) {
+        alarmUserService.getUserInfo(code);
+        return CommonResult.ok();
+    }
 }