电子厂列表修改

src/main/java/com/ifish/enums/PushTypeEnum.java

@@ -1,22 +1,12 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.ifish.enums;
 
-/**
- * 推送消息类型
- *
- * @author Administrator
- */
 public enum PushTypeEnum {
-    remove_device("remove_device", "解绑通知"),
+    remove_device("remove_device", "OUT OF CONTROL"),//解绑通知
-    wendu_warn("wendu_warn", "温度预警"),
+    wendu_warn("wendu_warn", "TEMPERTURE WARNING"),//温度预警
     qu_reply("qu_reply", "问题反馈"),
-    app_update("app_update", "IOS更新推送"),
+    app_update("app_update", "UPDATE NOTICE"),//IOS更新推送
-    remind_water("remind_water", "换水提醒"),
+    remind_water("remind_water", "WATER CHANGE NOTIEC"),//换水提醒
-    offline_push("offline_push", "离线通知"),
+    offline_push("offline_push", "OFF-LINE NOTICE"),//离线通知
     send_report("send_report", "看护报告"),
     shops_push("shops_push", "看护通知"),
     all_push("all_push", "所有用户推送"),
@@ -30,16 +20,6 @@ public enum PushTypeEnum {
     private String key;
     private String value;
 
-    //普通方法
-    public static String getValue(String key) {
-        for (PushTypeEnum c : PushTypeEnum.values()) {
-            if (c.getKey().equals(key)) {
-                return c.getValue();
-            }
-        }
-        return null;
-    }
-
     public String getKey() {
         return key;
     }

src/main/java/com/ifish/helper/FactoryHelper.java

@@ -86,7 +86,7 @@ public class FactoryHelper implements FactoryHelperI {
             List<Tbl_HardWare_Type> hardWare_TypeList = tbl_Factory_List_Mapper.getFactoryHardware_TypeListData(map.get("factoryCode").toString());
             String hardWareString = "";
             for (Tbl_HardWare_Type tbl_HardWare_Type : hardWare_TypeList) {
-                hardWareString = hardWareString + tbl_HardWare_Type.getHardwareName();
+                hardWareString = hardWareString + tbl_HardWare_Type.getHardwareName() + "，";
             }
             map.put("hardWareString", hardWareString);
 

src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java

@@ -243,6 +243,9 @@ public class Tbl_Device_MapperSql {
         if (StringUtils.isNotBlank(device.getWaterRemind())) {
             sb.append("water_remind = #{device.waterRemind}, ");
         }
+        if (device.getRemindDate() != null) {
+            sb.append("remind_date = #{device.remindDate}, ");
+        }
         if (device.getRemindCycle() != null && device.getRemindCycle() > 0) {
             sb.append("remind_cycle = #{device.remindCycle}, ");
         }

src/main/webapp/WEB-INF/views/factory/list.jsp

@@ -36,6 +36,10 @@
         });
     }
 
+    function deleteFactory(code) {
+        console.log(code);
+    }
+
     $(document).ready(function () {
         var table = $('#datatable').on('init.dt', function () {
             var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
@@ -125,7 +129,7 @@
                     render: function (data, type, row, meta) {
                         var str = "<a href='userDetail?userId=" + row.userId + "' target='_blank' title='查看报表' class='label label-success'><span class='im-profile'></span></a>";
                         str = str + "<a href='updateFactoryDetail?code=" + row.factoryCode + "' target='_blank' title='修改' class='label label-primary'><span class='fa-edit'></span></a>";
-                        str = str + "<a href='userDetail?userId=" + row.userId + "' target='_blank' title='删除' class='label label-danger'><span class='im-profile'></span></a>";
+                        str = str + "<a href='javascript:void(0);' onclick='deleteFactory('" + row.factoryCode + "')' target='_blank' title='删除' class='label label-danger'><span class='im-profile'></span></a>";
                         return str;
                     }
                 }