fix：“优化花型推送、设备状态上传"

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

@@ -1384,12 +1384,12 @@ public class IndexController {
         if (eqeStatus != null) {
             equipment.setEqeStatus(eqeStatus);
             equipment.setModifyDate(new Date());
-            if (eqeStatus == 0) {
-                equipment.setCabinetTm("0");
-                equipment.setCabinetHd("0");
-                equipment.setFurnaceTm("0");
-                equipment.setFurnaceSp("0");
-            }
+//            if (eqeStatus == 0) {
+//                equipment.setCabinetTm("0");
+//                equipment.setCabinetHd("0");
+//                equipment.setFurnaceTm("0");
+//                equipment.setFurnaceSp("0");
+//            }
             equipmentService.updateById(equipment);
         }
         return "修改成功";
@@ -1438,12 +1438,12 @@ public class IndexController {
                     wechatService.sendOnOffMessage(wechat.getOpenId(), equipment.getClientId(), netTime, companyType, name, eqeStatus);
                 }
             }
-            if (eqeStatus == 0) {
-                equipment.setCabinetTm("0");
-                equipment.setCabinetHd("0");
-                equipment.setFurnaceTm("0");
-                equipment.setFurnaceSp("0");
-            }
+//            if (eqeStatus == 0) {
+//                equipment.setCabinetTm("0");
+//                equipment.setCabinetHd("0");
+//                equipment.setFurnaceTm("0");
+//                equipment.setFurnaceSp("0");
+//            }
             equipmentService.updateById(equipment);
         }
         return "修改成功";

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

@@ -495,6 +495,7 @@ public class TEquipmentController {
     public ResponseModel<?> update(@RequestBody TEquipmentDTO equipment) {
         //获取修改前的设备
         TEquipment oldEquipment = tEquipmentService.getById(equipment.getId());
+        TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
         if (StringUtils.isNotEmpty(equipment.getSn())) {
             oldEquipment.setSn(equipment.getSn());
         }
@@ -562,7 +563,12 @@ public class TEquipmentController {
                 // 通知客户
                 tEquipmentService.informClient(oldEquipment.getAdminId(), oldEquipment.getClientId());
             }
-//            oldEquipment.setFlowers(equipment.getFlowers());
+            if (equipmentDesc != null && StringUtils.isNotEmpty(equipmentDesc.getFlowers()) && !equipmentDesc.getFlowers().equals(equipment.getFlowers())){
+                //发信息
+                tEquipmentService.sentMessage(oldEquipment.getClientId(), PushUtils.buildJson("flowers", equipment.getFlowers()).toString());
+                // 通知客户
+                tEquipmentService.informClient(oldEquipment.getAdminId(), oldEquipment.getClientId());
+            }
         }
         String[] message = new String[3];
         message[0] = equipment.getMessageReceiver1();

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

@@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.constant.JoinpayConstant;
 import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.feign.bean.PayFeign;
-import com.szwl.constant.JoinpayConstant;
 import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
@@ -34,12 +34,11 @@ import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.szwl.constant.ResponseCodesEnum.*;
+import static com.szwl.constant.ResponseCodesEnum.A0001;
+import static com.szwl.constant.ResponseCodesEnum.A0002;
 import static com.szwl.model.utils.DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss;
 
 /**
@@ -149,7 +148,7 @@ public class TPromoCodeController {
         query1.eq(TPromoCode::getCode, code);
         query1.eq(TPromoCode::getAdminId, equipment.getAdminId());
         List<TPromoCode> list1 = promoCodeService.list(query1);
-        if (list1.size() > 0) {
+        if (!list1.isEmpty()) {
             TPromoCode tPromoCode = list1.get(0);
             tPromoCode.setIsUse("1");
             if (StringUtils.isNotEmpty(equipment.getName())) {
@@ -363,16 +362,16 @@ public class TPromoCodeController {
             }
         }
         TAdmin admin = adminService.getById(adminId);
-        LocalDateTime now = LocalDateTime.now();
-        LocalDateTime startOfToday = now.with(LocalTime.MIN);
-        LocalDateTime endOfToday = now.with(LocalTime.MAX);
-        LambdaQueryWrapper<TPromoCode> promoCodeWrapper = new LambdaQueryWrapper<>();
-        promoCodeWrapper.between(TPromoCode::getCreateDate, startOfToday, endOfToday);
-        promoCodeWrapper.eq(TPromoCode::getAdminId, adminId);
-        int countCode = promoCodeService.count(promoCodeWrapper);
-        if (countCode >= 5000) {
-            return R.fail(B0002, "今日优惠码申请已达到上限");
-        }
+//        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime startOfToday = now.with(LocalTime.MIN);
+//        LocalDateTime endOfToday = now.with(LocalTime.MAX);
+//        LambdaQueryWrapper<TPromoCode> promoCodeWrapper = new LambdaQueryWrapper<>();
+//        promoCodeWrapper.between(TPromoCode::getCreateDate, startOfToday, endOfToday);
+//        promoCodeWrapper.eq(TPromoCode::getAdminId, adminId);
+//        int countCode = promoCodeService.count(promoCodeWrapper);
+//        if (countCode >= 5000) {
+//            return R.fail(B0002, "今日优惠码申请已达到上限");
+//        }
         if (String.valueOf(admin.getId()).equals("1")) {
             List<String> codes = new ArrayList<>();
             if (addMode.equals("1")) {