李天标 преди 5 години
родител
ревизия
8d84e5db0b

+ 3 - 0
app-api/src/main/java/com/hboxs/control/api/equipment/IndexController.java

@@ -15,8 +15,11 @@ import com.hboxs.entity.EquipmentApply;
 import com.hboxs.entity.Proportion;
 import com.hboxs.service.*;
 import org.apache.commons.lang.StringUtils;
+import org.apache.xpath.operations.String;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import scala.Boolean;
+import scala.Double;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;

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

@@ -7,6 +7,7 @@ package com.hboxs.control.admin;
 
 import com.hboxs.ViewObject.CommonParamVo;
 import com.hboxs.common.Filter;
+import com.hboxs.common.JsonMessage;
 import com.hboxs.common.Message;
 import com.hboxs.common.Pageable;
 import com.hboxs.common.utils.PushUtils;
@@ -297,7 +298,22 @@ public class EquipmentController extends BaseController {
         addFlashMessage(redirectAttributes, SUCCESS_MESSAGE);
         return SUCCESS_MESSAGE;
     }
-
+    /**
+     * 远程开门
+     *
+     * @param clientId
+     * @return
+     */
+    @RequestMapping(value = "/openDoor", method = RequestMethod.POST)
+    @ResponseBody
+    public JsonMessage openDoor(String clientId) {
+        Equipment equipment = equipmentService.findByClientId(clientId);
+        if (equipment == null) {
+            return JsonMessage.error("该设备不存在");
+        }
+        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("openDoor", "0").toString());
+        return JsonMessage.success("开门成功");
+    }
     /**
      * 修改设备警报发送信息电话
      *

+ 19 - 1
app-backend-web/src/main/webapp/WEB-INF/template/admin/equipment/edit.ftl

@@ -160,7 +160,14 @@
                            value="${equipment.contactPhone} "/>
                 </td>
             </tr>
-
+            <tr>
+                <th>
+                    <span class="requiredField"></span>远程开门:
+                </th>
+                <td>
+                    <button type="button" id="openDoor" >远程开门</button>
+                </td>
+            </tr>
             <tr>
                 <th>
                     <span class="requiredField">*</span>支付方式:
@@ -1140,6 +1147,17 @@
         })
     });
 
+    // 脱离系统管理id
+    $('#openDoor').click(function(){
+        var id=	document.getElementById("aaaa").value;
+        $.ajax({
+            url:"/asl-admin/equipment/openDoor.htm?clientId="+id,
+            type:"post",
+            success: function(data){
+                layer.msg('开门成功');
+            }
+        })
+    });
     var h = '<div id="container" style="width: 1200px;height: 650px"></div>';
     $('.location').click(function () {