李天标 2 rokov pred
rodič
commit
4f6aee27b1

+ 6 - 6
src/main/java/com/szwl/controller/AlarmRecordIndexController.java

@@ -38,7 +38,7 @@ public class AlarmRecordIndexController {
     /**
      * 添加报警记录
      */
-    @RequestMapping(value = "/addAlarmRecord", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
+    @RequestMapping(value = "/addAlarmRecord.htm", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
     @ResponseBody
     public String addAlarmRecord(@RequestBody AlarmRecordVo alarmRecordVo) {
 
@@ -54,10 +54,10 @@ public class AlarmRecordIndexController {
 //            return JsonMessage.error("添加报警记录失败");
             return "添加报警记录失败";
         }
-        if (equipment.getType() == null) {
-//            return JsonMessage.error("商家类型不存在");
-            return "商家类型不存在";
-        }
+//        if (equipment.getType() == null) {
+////            return JsonMessage.error("商家类型不存在");
+//            return "商家类型不存在";
+//        }
         Integer type = equipment.getType();
         Long adminId = equipment.getAdminId();
         Long equipmentId = equipment.getId();
@@ -197,7 +197,7 @@ public class AlarmRecordIndexController {
      * @param
      * @return
      */
-    @GetMapping(value = "/eliminate", produces = "text/html;charset=utf-8")
+    @GetMapping(value = "/eliminate.htm", produces = "text/html;charset=utf-8")
     @ResponseBody
     public String eliminate(String id){
         TAlarmRecord alarmRecord = alarmRecordService.getById(Long.valueOf(id));

+ 23 - 8
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -146,20 +146,22 @@ public class TEquipmentController {
             Calendar calendar_end=new GregorianCalendar();
             calendar.setTime(date);
             calendar_end.setTime(date);
+
             calendar.set(Calendar.HOUR_OF_DAY, 0);
             calendar.set(Calendar.MINUTE, 0);
             calendar.set(Calendar.SECOND, 0);
             calendar.set(Calendar.MILLISECOND, 0);
-            Date date_start=calendar.getTime();
+
             calendar_end.set(Calendar.HOUR_OF_DAY, 23);
             calendar_end.set(Calendar.MINUTE, 59);
             calendar_end.set(Calendar.SECOND, 59);
             calendar_end.set(Calendar.MILLISECOND, 999);
+            Date date_start=calendar.getTime();
             Date date_end=calendar_end.getTime();
             LambdaQueryWrapper<TAlarmRecord> query1 = Wrappers.lambdaQuery();
             query1.eq(TAlarmRecord::getEquipmentId,equipmentDTO.getId());
             query1.gt(TAlarmRecord::getOccurrenceTime,date_start);
-            query1.le(TAlarmRecord::getOccurrenceTime,date_start);
+            query1.le(TAlarmRecord::getOccurrenceTime,date_end);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             if(alarmRecordList.size()>0){
                 equipmentDTO.setHasTodayAlarm(true);
@@ -365,6 +367,7 @@ public class TEquipmentController {
                 //发信息
                 tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("flowers", equipment.getFlowers()).toString());
             }
+            oldEquipment.setFlowers(equipment.getFlowers());
         }
         tEquipmentService.updateById(oldEquipment);
         String channel = oldEquipment.getChannel();
@@ -373,12 +376,24 @@ public class TEquipmentController {
         if(equipment.getPayType()!=null){
             tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("payType", oldEquipment.getPayType().toString() + ":" + oldEquipment.getTimeRuleId()).toString());
         }
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("phone", oldEquipment.getContactName() + ":" + oldEquipment.getContactPhone().toString()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("companyPhone", oldEquipment.getCompanyPhone()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("plcVersion",  oldEquipment.getPlcVersion()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("selfName", oldEquipment.getSelfName()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("pushTimeRule", oldEquipment.getTimeRuleId() + "").toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("operational", oldEquipment.getOperationalName() + ":" + oldEquipment.getOperationalPhone()).toString());
+        if(StringUtils.isNotEmpty(oldEquipment.getContactName())&&StringUtils.isNotEmpty(oldEquipment.getContactPhone())){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("phone", oldEquipment.getContactName() + ":" + oldEquipment.getContactPhone().toString()).toString());
+        }
+        if(StringUtils.isNotEmpty(oldEquipment.getCompanyPhone())){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("companyPhone", oldEquipment.getCompanyPhone()).toString());
+        }
+        if(StringUtils.isNotEmpty(oldEquipment.getPlcVersion())){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("plcVersion",  oldEquipment.getPlcVersion()).toString());
+        }
+        if(StringUtils.isNotEmpty(oldEquipment.getSelfName())){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("selfName", oldEquipment.getSelfName()).toString());
+        }
+        if(oldEquipment.getTimeRuleId()!=null){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("pushTimeRule", oldEquipment.getTimeRuleId() + "").toString());
+        }
+        if(StringUtils.isNotEmpty(oldEquipment.getOperationalName())){
+            tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("operational", oldEquipment.getOperationalName() + ":" + oldEquipment.getOperationalPhone()).toString());
+        }
 
         return R.ok("null","更新成功!");
     }

+ 1 - 1
src/main/java/com/szwl/controller/TOrderController.java

@@ -176,7 +176,7 @@ public class TOrderController {
 //                    refInfo.put("altRefAmount", altInfoObject.getString("altAmount"));
 //                }
                 BigDecimal altAmountPrice = new BigDecimal(altAmount).setScale(2, RoundingMode.HALF_DOWN);
-                BigDecimal divide = altAmountPrice.divide(sumPrice,2,BigDecimal.ROUND_HALF_UP).setScale(2, RoundingMode.HALF_DOWN);
+                BigDecimal divide = altAmountPrice.divide(sumPrice,3,BigDecimal.ROUND_HALF_UP).setScale(3, RoundingMode.HALF_DOWN);
                 altAmountPrice = refusePrice.multiply(divide).setScale(2, RoundingMode.HALF_DOWN);
                 p = p.add(altAmountPrice);
                 refInfo.put("altRefAmount", altAmountPrice.toString());