清洗报告，参数调整

app-api/src/main/java/com/hboxs/control/api/equipment/CleanController.java

@@ -80,7 +80,6 @@ public class CleanController extends BaseController {
                     if (nowTime < overdueTime) {
                         //提醒快要到期了
                         if (overdueTime - nowTime < 86400000l) {
-                            //todo 发短信
                             String result = null;
                             try {
                                 if (StringUtils.isNotEmpty(messageReceiver)) {
@@ -98,7 +97,6 @@ public class CleanController extends BaseController {
                     }
                     if (nowTime > overdueTime) {
                         //提醒已到期了
-                        //todo 发短信
                         String result = null;
                         try {
                             if (StringUtils.isNotEmpty(messageReceiver)) {
@@ -132,7 +130,6 @@ public class CleanController extends BaseController {
                 int re = Integer.parseInt(remaining);
                 //提醒次数快要用完了
                 if (re <= 5 && re > 0) {
-                    //todo 发短信
                     String result = null;
                     try {
                         if (StringUtils.isNotEmpty(messageReceiver)) {
@@ -149,7 +146,6 @@ public class CleanController extends BaseController {
                 }
                 //已用完
                 if (re == 0) {
-                    //todo 发短信
                     String result = null;
                     try {
                         if (StringUtils.isNotEmpty(messageReceiver)) {
@@ -314,49 +310,32 @@ public class CleanController extends BaseController {
         cleanHistory.setWater(water);
         cleanHistory.setName(equipment.getName());
         cleanHistoryService.save(cleanHistory);
-        //TODO减次数
-        return "success";
-    }
+        Date now = new Date();
+        long nowTime = now.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String overdueDate = equipment.getOverdueDate();
+        Date date = null;
+        try {
+            date = sdf.parse(overdueDate);
+            long overdueTime = date.getTime();
+            if(nowTime>overdueTime){
+                String remaining = equipment.getRemaining();
+                int re = Integer.parseInt(remaining)-1;
+                equipment.setRemaining(String.valueOf(re));
+                equipmentService.update(equipment);
+                if(re==0){
+                    return "机器已过期";
+                }
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
 
-    private String getMessage1(String content, String name, String clientId) {
-        //使用次数快要用完
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "使用次数即将用完。为避免停机，请尽快充值。";
-        return message;
+        return "success";
     }
-
     private String getMessage(String content, String name, String clientId) {
-        //即将到期
-//        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "即将到期。为避免停机，请尽快充值。";
         String message = "您好,机器" + content + ",机器名:" + name + ",设备号:" + clientId;
         return message;
     }
 
-    private String getMessage3(String content, String name, String clientId) {
-        //次数用完
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "因使用次数不足停机，请充值后开机恢复使用。";
-        return message;
-    }
-
-    private String getMessage4(String content, String name, String clientId) {
-        //已到期
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "因使用时间已过而停机，请充值后开机恢复使用。";
-        return message;
-    }
-
-    private String getMessage5(String content, String name, String clientId) {
-        //即将到期
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "按天数运行时间即将到期。还剩余" + content + "次清洗次数";
-        return message;
-    }
-
-    private String getMessage6(String content, String name, String clientId) {
-        //即将到期
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "按天数运行时间已到期。还剩余" + content + "次清洗次数";
-        return message;
-    }
-    private String getMessage7(String content, String name, String clientId) {
-        //即将到期
-        String message = "您好,您的机器:" + name + ",设备号:" + clientId + "天按天数运行时间已到期。还剩余" + content + "次清洗次数";
-        return message;
-    }
 }

app-api/src/main/java/com/hboxs/control/api/order/OrderController.java

@@ -1313,6 +1313,7 @@ public class OrderController extends BaseController {
                         Date dates = new Date(finalTime);
                         String dateString = formatter.format(dates);
                         byClientId.setOverdueDate(dateString);
+                        byClientId.setSmsFlag(0);
                         equipmentService.update(byClientId);
                     } catch (ParseException e) {
                         e.printStackTrace();
@@ -1328,6 +1329,7 @@ public class OrderController extends BaseController {
                         Date dates = new Date(finalTime);
                         String dateString = formatter.format(dates);
                         byClientId.setOverdueDate(dateString);
+                        byClientId.setSmsFlag(0);
                         equipmentService.update(byClientId);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -1346,6 +1348,7 @@ public class OrderController extends BaseController {
                     BigDecimal remian = rmain.add(number);
                     int value = remian.intValue();
                     byClientId.setRemaining(String.valueOf(value));
+                    byClientId.setTimesFlag(0);
                     equipmentService.update(byClientId);
                 }else{
                     int value = number.intValue();

app-backend-web/src/main/java/com/hboxs/control/admin/EquipmentController.java

@@ -5,6 +5,8 @@
  */
 package com.hboxs.control.admin;
 
+import com.alibaba.fastjson.JSONArray;
+import com.gexin.fastjson.JSON;
 import com.hboxs.ViewObject.CommonParamVo;
 import com.hboxs.common.Filter;
 import com.hboxs.common.JsonMessage;
@@ -88,6 +90,13 @@ public class EquipmentController extends BaseController {
                 }
                 model.addAttribute("rulesCkche", lis);
             }
+        }else{
+            model.addAttribute("rules", null);
+            List<String> lis = new ArrayList<>();
+            for(int i = 0;i<10;i++){
+                lis.add("a");
+            }
+            model.addAttribute("rulesCkche", lis);
         }
         if(equipment.getRule()==null){
             List<String> lis = new ArrayList<>();
@@ -335,7 +344,23 @@ public class EquipmentController extends BaseController {
         String rule = commonParamVo.getVal();
         Long id = Long.valueOf(commonParamVo.getId());
         Equipment equipment = equipmentService.find(id);
-        equipment.setRule(rule);
+        if(rule!=null&&rule.length()>=6){
+            String[] res = rule.split(",");
+            StringBuffer rules = new StringBuffer();
+            for(int i=0;i<res.length;i++){
+                if(res[i]!=null&&!res[i].equals("")){
+                    if(res[i].length()>6){
+                        rules.append(res[i]+",");
+                    }else {
+                        rules.append(res[i]+":59,");
+                    }
+                }
+            }
+            equipment.setRule(rules.toString().substring(0,rules.toString().length()-1));
+        }
+        if(rule!=null&&!rule.equals("")&&rule.length()<6){
+            equipment.setRule(rule+":59");
+        }
         equipmentService.update(equipment);
         PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("updateRule", rule).toString());
         return SUCCESS_MESSAGE;
@@ -402,8 +427,28 @@ public class EquipmentController extends BaseController {
     @ResponseBody
     public Message updateCommonParam(@RequestBody CommonParamVo commonParamVo) {
         String gtClientId = commonParamVo.getId();
-
+        String clientId = commonParamVo.getClientId();
+        String name = commonParamVo.getName();
+        String code = commonParamVo.getCode();
         PushUtils.push(gtClientId, "", "", PushUtils.buildJson("Param", commonParamVo.getName() + ":" + commonParamVo.getVal()).toString());
+        Equipment equipment = equipmentService.findByClientId(clientId);
+        List<CommonParamVo> commonParamVos = null;
+        String commonParameters = equipment.getCommonParameters();
+        String advancedParameters = equipment.getAdvancedParameters();
+        if (code.equals("0")) {
+            commonParamVos = JSON.parseArray(commonParameters, CommonParamVo.class);
+
+        } else {
+            commonParamVos = JSON.parseArray(advancedParameters, CommonParamVo.class);
+            for (CommonParamVo commonParam : commonParamVos) {
+                if (commonParam.getName().equals(name)) {
+                    commonParam.setVal(commonParamVo.getVal());
+                }
+            }
+            String param = JSONArray.toJSONString(commonParamVos);
+            equipment.setAdvancedParameters(param);
+            equipmentService.update(equipment);
+        }
 
         return SUCCESS_MESSAGE;
     }

app-backend-web/src/main/java/com/hboxs/template/method/CommonParamMethod.java

@@ -26,9 +26,13 @@ public class CommonParamMethod extends EntityTemplateMethodAdaptor {
         List<CommonParamVo> commonParamVos = null;
         String commonParameters = equipment.getCommonParameters();
         String advancedParameters = equipment.getAdvancedParameters();
-        if (StringUtils.isEmpty(commonParameters) || StringUtils.isEmpty(advancedParameters)) {
+//        if (StringUtils.isEmpty(commonParameters) || StringUtils.isEmpty(advancedParameters)) {
+//            return 0;
+//        }
+        if (StringUtils.isEmpty(advancedParameters)) {
             return 0;
         }
+
         if (code.equals("0")) {
             commonParamVos = JSON.parseArray(commonParameters, CommonParamVo.class);
 

app-dao/src/main/java/com/hboxs/dao/CleanHistoryDao.java

@@ -24,6 +24,8 @@ public interface CleanHistoryDao extends BaseDao<CleanHistory, Long> {
     List<CleanStatisticsDTO> findByTime(Long adminiId);
 
     List<AlarmStatisticsDTO> findLine(Long id, Date begin, Date end);
+
+    CleanHistory findByClentId(String clientId,int type);
 }
 
 

app-dao/src/main/java/com/hboxs/dao/impl/CleanHistoryDaoImpl.java

@@ -92,4 +92,18 @@ public class CleanHistoryDaoImpl extends BaseDaoImpl<CleanHistory, Long> impleme
             return null;
         }
     }
+
+    @Override
+    public CleanHistory findByClentId(String clientId,int type) {
+        if (clientId == null) {
+            return null;
+        }
+        try {
+            String jpql = "select cleanHistory from CleanHistory cleanHistory where lower(cleanHistory.clientId) = lower(:clientId) and lower(cleanHistory.type) = lower(:type) order by cleanHistory.createDate desc";
+            List<CleanHistory> list=entityManager.createQuery(jpql, CleanHistory.class).setFlushMode(FlushModeType.COMMIT).setParameter("clientId", clientId).setParameter("type", type).getResultList();
+            return list.get(0);
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
 }

app-entity/src/main/java/com/hboxs/entity/Equipment.java

@@ -418,6 +418,32 @@ public class Equipment extends BaseEntity {
     private String  rule;
 
     /**
+     * 短信发送次数（时间）
+     */
+    private Integer  smsFlag;
+
+    /**
+     * 短信发送次数（次数）
+     */
+    private Integer  timesFlag;
+
+    public Integer getSmsFlag() {
+        return smsFlag;
+    }
+
+    public void setSmsFlag(Integer smsFlag) {
+        this.smsFlag = smsFlag;
+    }
+
+    public Integer getTimesFlag() {
+        return timesFlag;
+    }
+
+    public void setTimesFlag(Integer timesFlag) {
+        this.timesFlag = timesFlag;
+    }
+
+    /**
      * 人流量
      */
     private Long  peopleCounting;

app-service/src/main/java/com/hboxs/service/CleanHistoryService.java

@@ -24,5 +24,7 @@ public interface CleanHistoryService extends BaseService<CleanHistory, Long> {
     List<CleanStatisticsDTO> findByTime(Long adminiId);
 
     List<AlarmStatisticsDTO> findLine(Long id, Date begin, Date end);
+
+    CleanHistory findByClentId(String clientId,int type);
 }
 

app-service/src/main/java/com/hboxs/service/impl/CleanHistoryServiceImpl.java

@@ -46,5 +46,10 @@ public class CleanHistoryServiceImpl extends BaseServiceImpl<CleanHistory, Long>
     public List<AlarmStatisticsDTO> findLine(Long id, Date begin, Date end) {
         return cleanHistoryDao.findLine(id, begin,end);
     }
+
+    @Override
+    public CleanHistory findByClentId(String clientId,int type) {
+        return cleanHistoryDao.findByClentId(clientId ,type);
+    }
 }