diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index a6b9d74..1e5a293 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.controller; import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.core.JsonParser; import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; @@ -151,6 +152,7 @@ public class CameraController { }); jsonObject.put("streams",streams); Writer write = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); + write.write(jsonObject.toJSONString()); write.flush(); write.close(); diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index 81b100c..e2c4cb2 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -89,6 +89,8 @@ public class StreetController { JYDamHelper.openDO(equip,obj.getInteger("index")); Integer status = JYDamHelper.ReadStatus(equip,obj.getInteger("num"),obj.getInteger("index")); log.info("ip:{},status:{}",lightSource.getIp(),status); + equip.DisConnect(); + } });