Merge remote-tracking branch 'origin/test' into test

src/main/java/com/szwl/controller/IndexController.java

@@ -4,6 +4,7 @@ package com.szwl.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.gson.Gson;
 import com.qiniu.http.Response;
@@ -101,6 +102,9 @@ public class IndexController {
     @Autowired
     TGoodsDataService goodsDataService;
 
+    @Autowired
+    TAlarmRecordService alarmRecordService;
+
     private static final String appid = "07784f5fedb508046c841b391005b7de";
 
     @ApiOperation(value = "心跳")
@@ -168,7 +172,15 @@ public class IndexController {
                 if (isAlarm == 1) {
                     newEquipment.setIsAlarm(true);
                 } else if (isAlarm == 0) {
+                    // 更改报警状态，并消除以往的报警记录
+                    LambdaUpdateWrapper<TAlarmRecord> wrapper = Wrappers.lambdaUpdate();
+                    wrapper.eq(TAlarmRecord::getClientId, clientId);
+                    wrapper.eq(TAlarmRecord::getIsEliminate, 0);
+                    wrapper.le(TAlarmRecord::getCreateDate, new Date());
+                    wrapper.set(TAlarmRecord::getIsEliminate, 1);
+                    alarmRecordService.update(wrapper);
                     newEquipment.setIsAlarm(false);
+
                 }
             }
             newEquipment.setGtClientId(gtClientId);

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -225,8 +225,9 @@ public class TEquipmentController {
         // 公司平台
         if (StringUtils.isNotEmpty(companyType)) {
             if (companyType.equals("0")) {
-                query.isNull(TEquipment::getCompanyType)
-                        .or().eq(TEquipment::getCompanyType, companyType);
+//                query.isNull(TEquipment::getCompanyType)
+//                        .or().eq(TEquipment::getCompanyType, companyType);
+                query.ne(TEquipment::getCompanyType, "1");
             } else {
                 query.eq(TEquipment::getCompanyType, companyType);
             }