Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/controller/MonitorDeviceController.java

@@ -142,7 +142,7 @@ public class MonitorDeviceController {
     public CommonResult<String> getByDeviceName(String deviceName) {
         boolean b = monitorDeviceService.getByDeviceName(deviceName);
         if (b) {
-            return CommonResult.error("设备名" + deviceName + "已注册使用：{}");
+            return CommonResult.error("设备名" + deviceName + "已注册使用");
         }
         return CommonResult.ok();
     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -135,7 +135,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
 
 
     public boolean getByDeviceCode(String deviceCode) {
-        List<MonitorDevice> devices = this.list(new QueryWrapper<MonitorDevice>().like("device_code", deviceCode));
+        List<MonitorDevice> devices = this.list(new QueryWrapper<MonitorDevice>().eq("device_code", deviceCode));
         return !devices.isEmpty() ? true : false;
     }
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/controller/MonitorDeviceTypeController.java

@@ -154,7 +154,7 @@ public class MonitorDeviceTypeController {
     public CommonResult<String> getByTypeCode(String code) {
         boolean b = monitorDeviceTypeService.getByCode(code);
         if (b) {
-            return CommonResult.error("类型编码" + code + "已注册使用：{}");
+            return CommonResult.error("类型编码" + code + "已注册使用");
         }
         return CommonResult.ok();
     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitornotice/entity/MonitorNotice.java

@@ -60,4 +60,8 @@ public class MonitorNotice extends CommonEntity {
     /** 传感器路数 */
     @Schema(description = "传感器路数")
     private Integer sensorRoute;
+
+    /** 是否已推送 */
+    @Schema(description = "是否已推送")
+    private String pushFlag;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitornotice/enums/PushEnum.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.coldchain.modular.monitornotice.enums;
+
+import lombok.Getter;
+
+/**
+ * 监控通知枚举
+ *
+ * @author 黄渊昊
+ * @date  2024/11/25 10:58
+ **/
+@Getter
+public enum PushEnum {
+
+    /** 已经推送 */
+    ALREADY_PUSH("ALREADY_PUSH"),
+
+    /** 未推送 */
+    NOT_PUSH("NOT_PUSH");
+
+    private final String value;
+
+    PushEnum(String value) {
+        this.value = value;
+    }
+}

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

@@ -54,4 +54,8 @@ public class MonitorNoticeAddParam {
     /** 传感器路数 */
     @Schema(description = "传感器路数")
     private Integer sensorRoute;
+
+    /** 是否已推送 */
+    @Schema(description = "是否已推送")
+    private String pushFlag;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitornotice/service/impl/MonitorNoticeServiceImpl.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.coldchain.modular.monitornotice.enums.MonitorNoticeEnum;
+import vip.xiaonuo.coldchain.modular.monitornotice.enums.PushEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -63,6 +65,9 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
     @Override
     public void add(MonitorNoticeAddParam monitorNoticeAddParam) {
         MonitorNotice monitorNotice = BeanUtil.toBean(monitorNoticeAddParam, MonitorNotice.class);
+        if (ObjectUtil.isNull(monitorNotice.getPushFlag())) {
+            monitorNotice.setPushFlag(PushEnum.NOT_PUSH.getValue());
+        }
         this.save(monitorNotice);
     }
 

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/push/param/PushParam.java

@@ -10,17 +10,33 @@ import java.util.Set;
 @Getter
 @Setter
 public class PushParam {
-    /** 用户openId */
+    /**
+     * 用户openId
+     */
     private Set<String> userIdList = new HashSet<String>();
-    /** 设备名 */
+    /**
+     * 设备名
+     */
     private String deviceName;
-    /** 告警内容 */
+    /**
+     * 告警内容
+     */
     private String context;
-    /** 告警时间 */
+    /**
+     * 告警时间
+     */
     private Date noticeTime;
-    /** 告警值 */
+    /**
+     * 告警类型
+     */
+    private String type;
+    /**
+     * 告警值
+     */
     private String value;
-    /** 用户名 */
+    /**
+     * 用户名
+     */
     private String userName = "管理员";
 
     public PushParam(String value) {

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/push/utils/PushUtil.java

@@ -49,11 +49,26 @@ public class PushUtil {
                     .miniProgram(miniProgram)
                     .build();
             // 配置你的信息
-            String dateFormat = DateUtil.format(pushParam.getNoticeTime(), "yyyy-MM-dd HH:mm:ss");
+            if (Objects.isNull(pushParam.getDeviceName())) {
+                pushParam.setDeviceName(" ");
+            }
             templateMessage.addData(new WxMpTemplateData("thing23", pushParam.getDeviceName()));
-            templateMessage.addData(new WxMpTemplateData("thing5", pushParam.getUserName()));
+            if (Objects.isNull(pushParam.getType())) {
+                pushParam.setType(" ");
+            }
+            templateMessage.addData(new WxMpTemplateData("thing8", pushParam.getType()));
+            if (Objects.isNull(pushParam.getValue())) {
+                pushParam.setValue(" ");
+            }
             templateMessage.addData(new WxMpTemplateData("character_string28", pushParam.getValue()));
+            if (Objects.isNull(pushParam.getContext())) {
+                pushParam.setContext(" ");
+            }
             templateMessage.addData(new WxMpTemplateData("thing25", pushParam.getContext()));
+            if (Objects.isNull(pushParam.getNoticeTime())) {
+                pushParam.setNoticeTime(new Date());
+            }
+            String dateFormat = DateUtil.format(pushParam.getNoticeTime(), "yyyy-MM-dd HH:mm:ss");
             templateMessage.addData(new WxMpTemplateData("time3", dateFormat));
 
             try {

snowy-web-app/src/main/resources/application.properties

@@ -241,5 +241,6 @@ wx.miniapp.configs[0].msgDataFormat=JSON
 
 wechat.appID=wx49b1fb6f9c0d0b8d
 wechat.secret=6b177348efc2b21da105fc126b933db9
+wechat.templateId=WgKOAJrnNhnr2lIkfI_vppfY--7oImjddrd4GPnE_UA
 wechat.miniProgram=wx1eebc072a607c055
 wechat.pagePath=/pages/home/home