diff --git a/springboot/src/main/java/com/sincre/springboot/controller/Yinshi/DeviceControl.java b/springboot/src/main/java/com/sincre/springboot/controller/Yinshi/DeviceControl.java
index 3b9784b..6a0f553 100644
--- a/springboot/src/main/java/com/sincre/springboot/controller/Yinshi/DeviceControl.java
+++ b/springboot/src/main/java/com/sincre/springboot/controller/Yinshi/DeviceControl.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/YinShiDevice")
-@Api(tags = "设备管理部分接口—楼宇设备")
+@Api(tags = "设备管理部分接口—楼宇设备和客流统计")
 public class DeviceControl {
 
 
@@ -118,4 +118,109 @@ public class DeviceControl {
 
         return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
     }
+
+
+
+    @ApiOperation(value = "获取客流统计开关状态。")
+    @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true)
+    @GetMapping("getCustomFlowCount")
+    public ServerResponse getCustomFlowCount(@RequestParam String deviceSerial) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/passengerflow/switch/status";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
+
+    @ApiOperation(value = "查询用户下指定设备的版本信息。")
+    @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true)
+    @GetMapping("getDeviceVersionInfo")
+    public ServerResponse getDeviceVersionInfo(@RequestParam String deviceSerial) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/device/version/info";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
+
+    @ApiOperation(value = "升级设备固件至最新版本。")
+    @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true)
+    @GetMapping("deviceUpgrade")
+    public ServerResponse deviceUpgrade(@RequestParam String deviceSerial) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/device/upgrade";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
+
+
+    @ApiOperation(value = "查询用户下指定设备的升级状态，包括升级进度。")
+    @ApiImplicitParam(name="deviceSerial",value = "设备序列号",required = true)
+    @GetMapping("deviceUpgradeStatus")
+    public ServerResponse deviceUpgradeStatus(@RequestParam String deviceSerial) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/device/upgrade/status";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
+
+
+    @ApiOperation(value = "对设备布撤防状态进行修改（活动检测开关），实现布防和撤防功能")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceSerial", value = "设备序列号", required = true),
+            @ApiImplicitParam(name = "isDefence",value = "具有防护能力设备布撤防状态：0-睡眠，8-在家，16-外出，普通IPC设备布撤防状态：`0-撤防，1-布防",required = true)
+    })
+    @GetMapping("setDefenceStatus")
+    public ServerResponse setDefenceStatus(@RequestParam String deviceSerial,@RequestParam Integer isDefence) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/device/defence/set";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        map.put("isDefence",isDefence);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
+
+    @ApiOperation(value = "根据设备验证码关闭设备视频加密开关")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceSerial", value = "设备序列号", required = true),
+            @ApiImplicitParam(name = "validateCode",value = "设备验证码，设备机身上的六位大写字母OLZKQU",required = true)
+    })
+    @GetMapping("deviceVideoEncryptOff")
+    public ServerResponse deviceVideoEncryptOff(@RequestParam String deviceSerial,@RequestParam String validateCode) {
+
+        String url = YinShiServiceConfig.HostUrl + "lapp/device/encrypt/off";
+        Map<String, Object> map = new HashMap<>();
+        map.put("accessToken", YinShiServiceConfig.AccessToken);
+        map.put("deviceSerial", deviceSerial);
+        map.put("validateCode",validateCode);
+        String result = ApiHelper.doPost(url, new HashMap<String, String>(), map);
+
+        YinShiResResult yinShiResResult = JSON.parseObject(result,YinShiResResult.class);
+
+        return ResultUtils.getInstance().returnResultYingshi(yinShiResResult);
+    }
 }
--
libgit2 0.21.0