From fab292eb6f5a177262fa98c73bb424eacbc508a3 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Thu, 5 Mar 2026 14:58:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=95=BF?=
 =?UTF-8?q?=E8=80=85=E7=AB=AF-=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=202=E3=80=81pad=E6=9C=8D=E5=8A=A1=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E6=89=8B=E5=8A=A8=E6=8B=8D=E7=85=A7/=E5=BD=95?=
 =?UTF-8?q?=E5=83=8F:=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CameraInfoServiceImpl.java   | 1485 +++++++++--------
 .../DirectiveAppraisalController.java         |    3 +-
 .../impl/DirectiveOrderPadServiceImpl.java    |   21 +
 3 files changed, 779 insertions(+), 730 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
index 8b0ffb9f..b2be1ed9 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
@@ -41,7 +41,7 @@ import static java.lang.Thread.sleep;
 /**
  * @Description: 护理单元-物联管理-摄像头信息
  * @Author: jeecg-boot
- * @Date:   2025-01-17
+ * @Date: 2025-01-17
  * @Version: V1.0
  */
 @Service
@@ -61,17 +61,19 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
+
     /**
      * 获取摄像头信息-分页
+     *
      * @param page
      * @param cameraInfo
      * @return
      */
-    public IPage<CameraInfo> findPage(Page<CameraInfo> page, CameraInfo cameraInfo){
-        return baseMapper.findPage(page,cameraInfo);
+    public IPage<CameraInfo> findPage(Page<CameraInfo> page, CameraInfo cameraInfo) {
+        return baseMapper.findPage(page, cameraInfo);
     }
 
-    public List<CameraTreeModel> findModelList(CameraInfo cameraInfo){
+    public List<CameraTreeModel> findModelList(CameraInfo cameraInfo) {
         List<CameraTreeModel> modelList = Lists.newArrayList();
         List<CameraInfo> list = baseMapper.findList(cameraInfo);
         for (int i = 0; i < list.size(); i++) {
@@ -84,26 +86,29 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取所有摄像头信息
+     *
      * @return
      */
-    public List<CameraInfo> findAllList(){
+    public List<CameraInfo> findAllList() {
         return baseMapper.findAllList();
     }
 
     /**
      * 获取护理单元信息
+     *
      * @return
      */
-    public IPage<CameraInfo> findNuPage(Page<CameraInfo> page, CameraInfo cameraInfo){
-        return baseMapper.findNuPage(page,cameraInfo);
+    public IPage<CameraInfo> findNuPage(Page<CameraInfo> page, CameraInfo cameraInfo) {
+        return baseMapper.findNuPage(page, cameraInfo);
     }
 
     /**
      * 调用接口-修改tums摄像头名称
+     *
      * @param cameraInfo
      * @return
      */
-    public Result modifyDeviceDetails(CameraInfo cameraInfo){
+    public Result modifyDeviceDetails(CameraInfo cameraInfo) {
         String id = cameraInfo.getDeviceIndex();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -112,30 +117,32 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("}");
         String jsonRes = tumsApi.modifyDeviceDetails(sb.toString());
         JSONObject jsonObject = new JSONObject(jsonRes);
-        if(jsonObject.getInt("error_code").equals(0)){
+        if (jsonObject.getInt("error_code").equals(0)) {
             return Result.OK();
-        }else{
+        } else {
             return Result.error(jsonObject.getStr("msg"));
         }
     }
 
     /**
      * 修改摄像头设备信息
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public void edit(CameraInfo cameraInfo){
+    public void edit(CameraInfo cameraInfo) {
         modifyDeviceDetails(cameraInfo);
         baseMapper.updateById(cameraInfo);
     }
 
     /**
      * 调用接口-重启摄像头设备
+     *
      * @param cameraInfo
      * @return
      */
-    public Result rebootDeviceList(CameraInfo cameraInfo){
+    public Result rebootDeviceList(CameraInfo cameraInfo) {
         //1、先设置项目 2、重启设备
         String projectId = cameraInfo.getProjectId();
         String id = cameraInfo.getDeviceIndex();
@@ -147,55 +154,57 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String pJsonRes = tumsApi.setCurrentProject(psb.toString());
         System.out.println(pJsonRes);
         JSONObject pJsonObject = new JSONObject(pJsonRes);
-        if(pJsonObject.getInt("error_code").equals(0)){
+        if (pJsonObject.getInt("error_code").equals(0)) {
             StringBuffer sb = new StringBuffer();
             sb.append("{");
             sb.append("\"deviceIndexList\"").append(":").append("[\"").append(id).append("\"]");
             sb.append("}");
             String jsonRes = tumsApi.rebootDeviceList(sb.toString());
             JSONObject jsonObject = new JSONObject(jsonRes);
-            if(jsonObject.getInt("error_code").equals(0)){
+            if (jsonObject.getInt("error_code").equals(0)) {
                 return Result.OK();
-            }else{
+            } else {
                 return Result.error(jsonObject.getStr("msg"));
             }
-        }else{
+        } else {
             return Result.error(pJsonObject.getStr("msg"));
         }
     }
 
     /**
      * 重启摄像头设备
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public void rebootDevice(CameraInfo cameraInfo){
+    public void rebootDevice(CameraInfo cameraInfo) {
         rebootDeviceList(cameraInfo);
     }
 
     /**
      * 同步摄像头设备信息入库
+     *
      * @param jsonResponse
      * @return
      */
     @Override
-    public void sync(String jsonResponse){
+    public void sync(String jsonResponse) {
         JSONObject jsonObject = new JSONObject(jsonResponse);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            if(result.getInt("total")>0){
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            if (result.getInt("total") > 0) {
                 JSONArray list = result.getJSONArray("list");
-                for(int i=0;i<list.size();i++){
+                for (int i = 0; i < list.size(); i++) {
                     ObjectMapper mapper = new ObjectMapper();
                     String jsonString = list.get(i).toString();
                     try {
                         CameraInfo cameraInfo = mapper.readValue(jsonString, CameraInfo.class);
                         CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
-                        if(entity==null){
+                        if (entity == null) {
                             //新增
                             baseMapper.insert(cameraInfo);
-                        }else{
+                        } else {
                             //修改
                             cameraInfo.setId(entity.getId());
                             baseMapper.updateById(cameraInfo);
@@ -210,25 +219,26 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步摄像头设备能力集入库
+     *
      * @param deviceIndex
      * @param jsonResponse
      * @return
      */
     @Override
-    public void syncCapability(String deviceIndex, String jsonResponse){
+    public void syncCapability(String deviceIndex, String jsonResponse) {
         JSONObject jsonObject = new JSONObject(jsonResponse);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
             String capability = result.getStr("capability");
             ObjectMapper mapper = new ObjectMapper();
             try {
                 CameraInfo cameraInfo = mapper.readValue(capability, CameraInfo.class);
                 cameraInfo.setDeviceIndex(deviceIndex);
                 CameraInfo entity = baseMapper.getCapabilityByDeviceId(cameraInfo);
-                if(entity==null){
+                if (entity == null) {
                     //新增
                     baseMapper.insertCapability(cameraInfo);
-                }else{
+                } else {
                     //修改
                     cameraInfo.setId(entity.getId());
                     baseMapper.updateCapabilityById(cameraInfo);
@@ -241,11 +251,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 接口调用-获取摄像头能力集
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result<JSONObject> getIpcCapability(CameraInfo cameraInfo){
+    public Result<JSONObject> getIpcCapability(CameraInfo cameraInfo) {
         JSONObject capability = new JSONObject();
         String id = cameraInfo.getDeviceIndex();
         StringBuffer paramsSb = new StringBuffer();
@@ -254,9 +265,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         paramsSb.append("}");
         String ipcCapabilityRes = tumsApi.getIpcCapability(paramsSb.toString());
         JSONObject jsonObject = new JSONObject(ipcCapabilityRes);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject ipcCapabilityResult = (JSONObject)jsonObject.get("result");
-            capability = (JSONObject)ipcCapabilityResult.get("capability");
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject ipcCapabilityResult = (JSONObject) jsonObject.get("result");
+            capability = (JSONObject) ipcCapabilityResult.get("capability");
         }
         return Result.OK(capability);
     }
@@ -268,7 +279,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @return
      */
     @Override
-    public Result<String> syncProjectIpcDevice(CameraInfo cameraInfo){
+    public Result<String> syncProjectIpcDevice(CameraInfo cameraInfo) {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"start\"").append(":0").append(",");
@@ -285,43 +296,44 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String jsonResponse = tumsApi.getDeviceList(sb.toString());
         JSONObject jsonObject = new JSONObject(jsonResponse);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             syncProjectIpc(jsonResponse);
             return Result.OK("同步设备成功！");
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errorCode);
                 errMsg += errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg += errorCode;
             }
-            log.info("syncProjectIpcDevice:{}",errMsg);
+            log.info("syncProjectIpcDevice:{}", errMsg);
             return Result.error(errMsg);
         }
     }
 
     /**
      * 同步IPC设备信息入库
+     *
      * @param jsonResponse
      * @return
      */
-    private void syncProjectIpc(String jsonResponse){
+    private void syncProjectIpc(String jsonResponse) {
         JSONObject jsonObject = new JSONObject(jsonResponse);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            if(result.getInt("total")>0){
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            if (result.getInt("total") > 0) {
                 JSONArray list = result.getJSONArray("list");
-                for(int i=0;i<list.size();i++){
+                for (int i = 0; i < list.size(); i++) {
                     ObjectMapper mapper = new ObjectMapper();
                     String jsonString = list.get(i).toString();
                     try {
                         CameraInfo cameraInfo = mapper.readValue(jsonString, CameraInfo.class);
                         CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
-                        if(entity==null){
+                        if (entity == null) {
                             //新增
                             baseMapper.insert(cameraInfo);
-                        }else{
+                        } else {
                             //修改
                             cameraInfo.setId(entity.getId());
                             baseMapper.updateById(cameraInfo);
@@ -338,10 +350,11 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 同步IPC设备能力集入库
+     *
      * @param cameraInfo
      * @return
      */
-    private void syncIpcCapability(CameraInfo cameraInfo){
+    private void syncIpcCapability(CameraInfo cameraInfo) {
         String deviceIndex = cameraInfo.getDeviceIndex();
         StringBuffer paramsSb = new StringBuffer();
         paramsSb.append("{");
@@ -349,18 +362,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         paramsSb.append("}");
         String ipcCapabilityRes = tumsApi.getIpcCapability(paramsSb.toString());
         JSONObject jsonObject = new JSONObject(ipcCapabilityRes);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
             String capabilityStr = result.getStr("capability");
             ObjectMapper mapper = new ObjectMapper();
             try {
                 CameraInfo capability = mapper.readValue(capabilityStr, CameraInfo.class);
                 capability.setDeviceIndex(deviceIndex);
                 CameraInfo entity = baseMapper.getCapabilityByDeviceId(capability);
-                if(entity==null){
+                if (entity == null) {
                     //新增
                     baseMapper.insertCapability(capability);
-                }else{
+                } else {
                     //修改
                     capability.setId(entity.getId());
                     baseMapper.updateCapabilityById(capability);
@@ -373,17 +386,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 更新设备在线状态
+     *
      * @param deviceIndex
      * @param errCode
      */
-    private void updateDeviceStatus(String deviceIndex,String errCode){
+    private void updateDeviceStatus(String deviceIndex, String errCode) {
         CameraInfo cameraInfo = new CameraInfo();
         cameraInfo.setDeviceIndex(deviceIndex);
-        if(errCode.equals("0")){
+        if (errCode.equals("0")) {
             //在线
             cameraInfo.setDeviceStatus("1");
             baseMapper.updateDeviceStatusByDevId(cameraInfo);
-        }else if(errCode.equals("-80327")){
+        } else if (errCode.equals("-80327")) {
             //离线
             cameraInfo.setDeviceStatus("0");
             baseMapper.updateDeviceStatusByDevId(cameraInfo);
@@ -398,7 +412,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getImageCommon(Map<String,Object> map){
+    public Result<JSONObject> getImageCommon(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String type = map.get("type").toString();
         StringBuffer sb = new StringBuffer();
@@ -414,37 +428,37 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject image = (JSONObject)responseData.get("image");
-                JSONObject data = (JSONObject)image.get(type);
-                updateDeviceStatus(id,errorCode);
+            if ("0".equals(errorCode)) {
+                JSONObject image = (JSONObject) responseData.get("image");
+                JSONObject data = (JSONObject) image.get(type);
+                updateDeviceStatus(id, errorCode);
                 return Result.OK(data);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getImageCommon:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getImageCommon:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getImageCommon:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getImageCommon:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -457,10 +471,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result setImageCommon(Map<String,Object> map){
+    public Result setImageCommon(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String type = map.get("type").toString();
-        Map<String,Object> paramMap = (Map<String,Object>)map.get("param");
+        Map<String, Object> paramMap = (Map<String, Object>) map.get("param");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(",");
@@ -477,8 +491,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             csb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(",");
         }
         String cstr = csb.toString();
-        if(cstr.length()>0){
-            cstr = cstr.substring(0,cstr.length()-1);
+        if (cstr.length() > 0) {
+            cstr = cstr.substring(0, cstr.length() - 1);
         }
         sb.append(cstr);
         sb.append("}");
@@ -488,34 +502,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK("设置成功");
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getImageCommon:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getImageCommon:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setImageCommon:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setImageCommon:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -528,7 +542,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getOsdCapability(Map<String,Object> map){
+    public Result<JSONObject> getOsdCapability(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -543,36 +557,36 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject osdCapability = (JSONObject)responseData.get("osd_capability");
-                JSONObject capability = (JSONObject)osdCapability.get("capability");
+            if ("0".equals(errorCode)) {
+                JSONObject osdCapability = (JSONObject) responseData.get("osd_capability");
+                JSONObject capability = (JSONObject) osdCapability.get("capability");
                 return Result.OK(capability);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getOsdCapability:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getOsdCapability:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getOsdCapability:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getOsdCapability:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -585,7 +599,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getOsd(Map<String,Object> map){
+    public Result<JSONObject> getOsd(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -601,35 +615,35 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject osd = (JSONObject)responseData.get("OSD");
+            if ("0".equals(errorCode)) {
+                JSONObject osd = (JSONObject) responseData.get("OSD");
                 return Result.OK(osd);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getOsd:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getOsd:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getOsd:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getOsd:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -642,7 +656,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<String> setOsd(Map<String,Object> map){
+    public Result<String> setOsd(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String dateEnabled = map.get("dateEnabled").toString();
         String weekEnabled = map.get("weekEnabled").toString();
@@ -673,34 +687,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK("设置成功");
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("setOsd:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("setOsd:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setOsd:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setOsd:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -713,7 +727,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getVideoParams(Map<String,Object> map){
+    public Result<JSONObject> getVideoParams(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -731,213 +745,213 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 JSONObject resObject = new JSONObject();
-                JSONObject video = (JSONObject)responseData.get("video");
-                JSONObject mainData = (JSONObject)video.get("main");
-                resObject.set("mainData",mainData);
-                JSONObject minorData = (JSONObject)video.get("minor");
-                resObject.set("minorData",minorData);
-                JSONObject videoCapability = (JSONObject)responseData.get("video_capability");
-                JSONObject mainCapability = (JSONObject)videoCapability.get("main");
+                JSONObject video = (JSONObject) responseData.get("video");
+                JSONObject mainData = (JSONObject) video.get("main");
+                resObject.set("mainData", mainData);
+                JSONObject minorData = (JSONObject) video.get("minor");
+                resObject.set("minorData", minorData);
+                JSONObject videoCapability = (JSONObject) responseData.get("video_capability");
+                JSONObject mainCapability = (JSONObject) videoCapability.get("main");
                 JSONArray encodeTypes = mainCapability.getJSONArray("encode_types");
                 JSONArray mainEncodeTypeArr = new JSONArray();
-                for(int i=0;i<encodeTypes.size();i++){
+                for (int i = 0; i < encodeTypes.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = encodeTypes.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     mainEncodeTypeArr.put(json);
                 }
-                resObject.set("mainEncodeTypeArr",mainEncodeTypeArr);
+                resObject.set("mainEncodeTypeArr", mainEncodeTypeArr);
                 JSONArray frameRates = mainCapability.getJSONArray("frame_rates");
                 JSONArray mainFrameRatesArr = new JSONArray();
-                for(int i=0;i<frameRates.size();i++){
+                for (int i = 0; i < frameRates.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = frameRates.get(i).toString();
-                    if("65537".equals(value)){
-                        json.set("label","1");
+                    if ("65537".equals(value)) {
+                        json.set("label", "1");
                     }
-                    if("65546".equals(value)){
-                        json.set("label","10");
+                    if ("65546".equals(value)) {
+                        json.set("label", "10");
                     }
-                    if("65551".equals(value)){
-                        json.set("label","15");
+                    if ("65551".equals(value)) {
+                        json.set("label", "15");
                     }
-                    if("65556".equals(value)){
-                        json.set("label","20");
+                    if ("65556".equals(value)) {
+                        json.set("label", "20");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     mainFrameRatesArr.put(json);
                 }
-                resObject.set("mainFrameRatesArr",mainFrameRatesArr);
+                resObject.set("mainFrameRatesArr", mainFrameRatesArr);
                 JSONArray bitrates = mainCapability.getJSONArray("bitrates");
                 JSONArray mainBitrateArr = new JSONArray();
-                for(int i=0;i<bitrates.size();i++){
+                for (int i = 0; i < bitrates.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = bitrates.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     mainBitrateArr.put(json);
                 }
-                resObject.set("mainBitrateArr",mainBitrateArr);
+                resObject.set("mainBitrateArr", mainBitrateArr);
                 JSONArray bitrateTypes = mainCapability.getJSONArray("bitrate_types");
                 JSONArray mainBitrateTypeArr = new JSONArray();
-                for(int i=0;i<bitrateTypes.size();i++){
+                for (int i = 0; i < bitrateTypes.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = bitrateTypes.get(i).toString();
-                    if("cbr".equals(value)){
-                        json.set("label","定码率");
+                    if ("cbr".equals(value)) {
+                        json.set("label", "定码率");
                     }
-                    if("vbr".equals(value)){
-                        json.set("label","变码率");
+                    if ("vbr".equals(value)) {
+                        json.set("label", "变码率");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     mainBitrateTypeArr.put(json);
                 }
-                resObject.set("mainBitrateTypeArr",mainBitrateTypeArr);
+                resObject.set("mainBitrateTypeArr", mainBitrateTypeArr);
                 JSONArray resolutions = mainCapability.getJSONArray("resolutions");
                 JSONArray mainResolutionArr = new JSONArray();
-                for(int i=0;i<resolutions.size();i++){
+                for (int i = 0; i < resolutions.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = resolutions.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     mainResolutionArr.put(json);
                 }
-                resObject.set("mainResolutionArr",mainResolutionArr);
+                resObject.set("mainResolutionArr", mainResolutionArr);
                 JSONArray qualitys = mainCapability.getJSONArray("qualitys");
                 JSONArray mainQualityArr = new JSONArray();
-                for(int i=0;i<qualitys.size();i++){
+                for (int i = 0; i < qualitys.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = qualitys.get(i).toString();
-                    if("1".equals(value)){
-                        json.set("label","低");
+                    if ("1".equals(value)) {
+                        json.set("label", "低");
                     }
-                    if("3".equals(value)){
-                        json.set("label","中");
+                    if ("3".equals(value)) {
+                        json.set("label", "中");
                     }
-                    if("5".equals(value)){
-                        json.set("label","高 ");
+                    if ("5".equals(value)) {
+                        json.set("label", "高 ");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     mainQualityArr.put(json);
                 }
-                resObject.set("mainQualityArr",mainQualityArr);
+                resObject.set("mainQualityArr", mainQualityArr);
 
-                JSONObject minorCapability = (JSONObject)videoCapability.get("minor");
+                JSONObject minorCapability = (JSONObject) videoCapability.get("minor");
                 encodeTypes = minorCapability.getJSONArray("encode_types");
                 JSONArray minorEncodeTypeArr = new JSONArray();
-                for(int i=0;i<encodeTypes.size();i++){
+                for (int i = 0; i < encodeTypes.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = encodeTypes.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     minorEncodeTypeArr.put(json);
                 }
-                resObject.set("minorEncodeTypeArr",minorEncodeTypeArr);
+                resObject.set("minorEncodeTypeArr", minorEncodeTypeArr);
                 frameRates = minorCapability.getJSONArray("frame_rates");
                 JSONArray minorFrameRatesArr = new JSONArray();
-                for(int i=0;i<frameRates.size();i++){
+                for (int i = 0; i < frameRates.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = frameRates.get(i).toString();
-                    if("65537".equals(value)){
-                        json.set("label","1");
+                    if ("65537".equals(value)) {
+                        json.set("label", "1");
                     }
-                    if("65546".equals(value)){
-                        json.set("label","10");
+                    if ("65546".equals(value)) {
+                        json.set("label", "10");
                     }
-                    if("65551".equals(value)){
-                        json.set("label","15");
+                    if ("65551".equals(value)) {
+                        json.set("label", "15");
                     }
-                    if("65556".equals(value)){
-                        json.set("label","20");
+                    if ("65556".equals(value)) {
+                        json.set("label", "20");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     minorFrameRatesArr.put(json);
                 }
-                resObject.set("minorFrameRatesArr",minorFrameRatesArr);
+                resObject.set("minorFrameRatesArr", minorFrameRatesArr);
                 bitrates = minorCapability.getJSONArray("bitrates");
                 JSONArray minorBitrateArr = new JSONArray();
-                for(int i=0;i<bitrates.size();i++){
+                for (int i = 0; i < bitrates.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = bitrates.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     minorBitrateArr.put(json);
                 }
-                resObject.set("minorBitrateArr",minorBitrateArr);
+                resObject.set("minorBitrateArr", minorBitrateArr);
                 bitrateTypes = minorCapability.getJSONArray("bitrate_types");
                 JSONArray minorBitrateTypeArr = new JSONArray();
-                for(int i=0;i<bitrateTypes.size();i++){
+                for (int i = 0; i < bitrateTypes.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = bitrateTypes.get(i).toString();
-                    if("cbr".equals(value)){
-                        json.set("label","定码率");
+                    if ("cbr".equals(value)) {
+                        json.set("label", "定码率");
                     }
-                    if("vbr".equals(value)){
-                        json.set("label","变码率");
+                    if ("vbr".equals(value)) {
+                        json.set("label", "变码率");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     minorBitrateTypeArr.put(json);
                 }
-                resObject.set("minorBitrateTypeArr",minorBitrateTypeArr);
+                resObject.set("minorBitrateTypeArr", minorBitrateTypeArr);
                 resolutions = minorCapability.getJSONArray("resolutions");
                 JSONArray minorResolutionArr = new JSONArray();
-                for(int i=0;i<resolutions.size();i++){
+                for (int i = 0; i < resolutions.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = resolutions.get(i).toString();
-                    json.set("label",value);
-                    json.set("value",value);
+                    json.set("label", value);
+                    json.set("value", value);
                     minorResolutionArr.put(json);
                 }
-                resObject.set("minorResolutionArr",minorResolutionArr);
+                resObject.set("minorResolutionArr", minorResolutionArr);
                 qualitys = minorCapability.getJSONArray("qualitys");
                 JSONArray minorQualityArr = new JSONArray();
-                for(int i=0;i<qualitys.size();i++){
+                for (int i = 0; i < qualitys.size(); i++) {
                     JSONObject json = new JSONObject();
                     String value = qualitys.get(i).toString();
-                    if("1".equals(value)){
-                        json.set("label","低");
+                    if ("1".equals(value)) {
+                        json.set("label", "低");
                     }
-                    if("3".equals(value)){
-                        json.set("label","中");
+                    if ("3".equals(value)) {
+                        json.set("label", "中");
                     }
-                    if("5".equals(value)){
-                        json.set("label","高 ");
+                    if ("5".equals(value)) {
+                        json.set("label", "高 ");
                     }
-                    json.set("value",value);
+                    json.set("value", value);
                     minorQualityArr.put(json);
                 }
-                resObject.set("minorQualityArr",minorQualityArr);
+                resObject.set("minorQualityArr", minorQualityArr);
 
                 return Result.OK(resObject);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getVideoParams:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getVideoParams:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getVideoParams:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getVideoParams:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -950,10 +964,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result setVideoParams(Map<String,Object> map){
+    public Result setVideoParams(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
-        Map<String,Object> mainMap = (Map<String,Object>)map.get("main");
-        Map<String,Object> minorMap = (Map<String,Object>)map.get("minor");
+        Map<String, Object> mainMap = (Map<String, Object>) map.get("main");
+        Map<String, Object> minorMap = (Map<String, Object>) map.get("minor");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(",");
@@ -970,8 +984,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             mainSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(",");
         }
         String mainStr = mainSb.toString();
-        if(mainStr.length()>0){
-            mainStr = mainStr.substring(0,mainStr.length()-1);
+        if (mainStr.length() > 0) {
+            mainStr = mainStr.substring(0, mainStr.length() - 1);
         }
         sb.append(mainStr);
         sb.append("},");
@@ -985,8 +999,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             minorSb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(",");
         }
         String minorStr = minorSb.toString();
-        if(minorStr.length()>0){
-            minorStr = minorStr.substring(0,minorStr.length()-1);
+        if (minorStr.length() > 0) {
+            minorStr = minorStr.substring(0, minorStr.length() - 1);
         }
         sb.append(minorStr);
         sb.append("}");
@@ -996,34 +1010,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK();
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("setVideoParams:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("setVideoParams:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setVideoParams:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setVideoParams:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1036,7 +1050,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result configRecovery(Map<String,Object> map){
+    public Result configRecovery(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1053,34 +1067,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK();
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("configRecovery:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("configRecovery:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("configRecovery:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("configRecovery:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1088,16 +1102,17 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     /**
      * 获取摄像头实时播放地址
      * 添加预览通道
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result<Map<String,String>> getPreviewUrl(CameraInfo cameraInfo){
-        Map<String,String> map = new HashMap<>();
-        map.put("url","");
-        map.put("backupUrl","");
-        map.put("wsUrl","");
-        map.put("wssUrl","");
+    public Result<Map<String, String>> getPreviewUrl(CameraInfo cameraInfo) {
+        Map<String, String> map = new HashMap<>();
+        map.put("url", "");
+        map.put("backupUrl", "");
+        map.put("wsUrl", "");
+        map.put("wssUrl", "");
         String id = cameraInfo.getDeviceIndex();
         int streamType = cameraInfo.getStreamType();
         StringBuffer addPreviewSb = new StringBuffer();
@@ -1107,10 +1122,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         addPreviewSb.append("}");
         String addPreviewRes = tumsApi.addPreviewChn(addPreviewSb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
-        if(jsonObject.getInt("error_code").equals(0)){
-            JSONObject addPreviewResult = (JSONObject)jsonObject.get("result");
+        if (jsonObject.getInt("error_code").equals(0)) {
+            JSONObject addPreviewResult = (JSONObject) jsonObject.get("result");
             String sessionId = addPreviewResult.getStr("sessionId");
-            map = getPreviewUrl(id,streamType,sessionId);
+            map = getPreviewUrl(id, streamType, sessionId);
         }
         return Result.OK(map);
     }
@@ -1118,17 +1133,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     /**
      * 获取摄像头实时播放地址
      * 获取预览通道的url
+     *
      * @param id
      * @param streamType
      * @param sessionId
      * @return
      */
-    private Map<String,String> getPreviewUrl(String id,int streamType,String sessionId){
-        Map<String,String> map = new HashMap<>();
-        map.put("url","");
-        map.put("backupUrl","");
-        map.put("wsUrl","");
-        map.put("wssUrl","");
+    private Map<String, String> getPreviewUrl(String id, int streamType, String sessionId) {
+        Map<String, String> map = new HashMap<>();
+        map.put("url", "");
+        map.put("backupUrl", "");
+        map.put("wsUrl", "");
+        map.put("wssUrl", "");
         StringBuffer getPreviewSb = new StringBuffer();
         getPreviewSb.append("{");
         getPreviewSb.append("\"id\"").append(":").append("\"").append(id).append("\"").append(",");
@@ -1138,34 +1154,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String getPreviewSbRes = tumsApi.getPreviewUrl(getPreviewSb.toString());
         JSONObject jsonObject = new JSONObject(getPreviewSbRes);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
-            JSONObject getPreviewResult = (JSONObject)jsonObject.get("result");
+        if (errorCode.equals("0")) {
+            JSONObject getPreviewResult = (JSONObject) jsonObject.get("result");
             String url = getPreviewResult.getStr("url");
             String backupUrl = getPreviewResult.getStr("backupUrl");
             String wsUrl = getPreviewResult.getStr("wsUrl");
             String wssUrl = getPreviewResult.getStr("wssUrl");
-            map.put("url",url);
-            map.put("backupUrl",backupUrl);
-            map.put("wsUrl",wsUrl);
-            map.put("wssUrl",wssUrl);
-        }else if(errorCode.equals("-80703")){
+            map.put("url", url);
+            map.put("backupUrl", backupUrl);
+            map.put("wsUrl", wsUrl);
+            map.put("wssUrl", wssUrl);
+        } else if (errorCode.equals("-80703")) {
             try {
                 sleep(1000);
-                map = getPreviewUrl(id,streamType,sessionId);
+                map = getPreviewUrl(id, streamType, sessionId);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            log.info("getPreviewUrl:{}",errorMsg);
+            log.info("getPreviewUrl:{}", errorMsg);
         }
-        updateDeviceStatus(id,errorCode);
+        updateDeviceStatus(id, errorCode);
         return map;
     }
 
@@ -1177,7 +1193,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result getStorageDevice(CameraInfo cameraInfo) throws Exception{
+    public Result getStorageDevice(CameraInfo cameraInfo) throws Exception {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\",");
@@ -1186,17 +1202,17 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getStorageDevice(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        if (errorCode == 0) {
             JSONArray result = jsonObject.getJSONArray("result");
             List list = Lists.newArrayList();
-            if(result.size() == 0){
+            if (result.size() == 0) {
                 CameraInfo ci = new CameraInfo();
                 ci.setStorageDevId("0");
                 ci.setStorageDevName("默认存储位置");
                 list.add(ci);
-            }else{
-                for(int i=0;i<result.size();i++){
-                    JSONObject json = (JSONObject)result.get(i);
+            } else {
+                for (int i = 0; i < result.size(); i++) {
+                    JSONObject json = (JSONObject) result.get(i);
                     CameraInfo ci = new CameraInfo();
                     String storageDevId = json.getStr("storageDevId");
                     ci.setStorageDevId(storageDevId);
@@ -1206,7 +1222,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 }
             }
             return Result.OK(list);
-        }else{
+        } else {
             return Result.error("获取存储设备列表失败!");
         }
     }
@@ -1219,23 +1235,23 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result getAllRecordPlans(CameraInfo cameraInfo) throws Exception{
+    public Result getAllRecordPlans(CameraInfo cameraInfo) throws Exception {
         StringBuffer sb = new StringBuffer();
         sb.append("{}");
         String res = tumsApi.getAllRecordPlans(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        if (errorCode == 0) {
             JSONArray result = jsonObject.getJSONArray("result");
             List list = Lists.newArrayList();
-            if(result.size() == 0){
+            if (result.size() == 0) {
                 CameraInfo ci = new CameraInfo();
                 ci.setStorageDevId("1");
                 ci.setStorageDevName("全天候模板");
                 list.add(ci);
-            }else{
-                for(int i=0;i<result.size();i++){
-                    JSONObject json = (JSONObject)result.get(i);
+            } else {
+                for (int i = 0; i < result.size(); i++) {
+                    JSONObject json = (JSONObject) result.get(i);
                     CameraInfo ci = new CameraInfo();
                     String recordPlanId = json.getStr("recordPlanId");
                     ci.setRecordPlanId(recordPlanId);
@@ -1245,7 +1261,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 }
             }
             return Result.OK(list);
-        }else{
+        } else {
             return Result.error("获取所有录像计划列表失败!");
         }
     }
@@ -1258,28 +1274,28 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result addRecordCfgs(CameraInfo cameraInfo) throws Exception{
+    public Result addRecordCfgs(CameraInfo cameraInfo) throws Exception {
         String ids = cameraInfo.getIds();
         String[] idArr = ids.split(",");
         StringBuffer idSb = new StringBuffer();
-        for(int i=0;i<idArr.length;i++){
+        for (int i = 0; i < idArr.length; i++) {
             idSb.append("\"").append(idArr[i]).append("\",");
         }
         String idsStr = idSb.toString();
-        if(idsStr.length()>0){
-            idsStr = idsStr.substring(0,idsStr.length()-1);
+        if (idsStr.length() > 0) {
+            idsStr = idsStr.substring(0, idsStr.length() - 1);
         }
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"devIds\"").append(":").append("[").append(idsStr).append("],");
         sb.append("\"storageList\"").append(":").append("[");
         sb.append("{");
-        if(cameraInfo.getStorageDevId()!=null&&!cameraInfo.getStorageDevId().equals("")){
+        if (cameraInfo.getStorageDevId() != null && !cameraInfo.getStorageDevId().equals("")) {
             //存储设备ID
             sb.append("\"storageDevId\"").append(":").append(cameraInfo.getStorageDevId()).append(",");
-            if(cameraInfo.getStorageDevId().equals("0")){
+            if (cameraInfo.getStorageDevId().equals("0")) {
                 sb.append("\"storageType\"").append(":").append("1").append(",");
-            }else{
+            } else {
                 sb.append("\"storageType\"").append(":").append("2").append(",");
             }
         }
@@ -1291,15 +1307,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.addRecordCfgs(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
-            for(int i=0;i<idArr.length;i++){
+        if (errorCode == 0) {
+            for (int i = 0; i < idArr.length; i++) {
                 CameraInfo entity = new CameraInfo();
                 entity.setDeviceIndex(idArr[i]);
                 entity.setRecordPlanId(cameraInfo.getRecordPlanId());
                 baseMapper.updatePlanByDevId(entity);
             }
             return Result.OK("添加录像计划成功!计划生效有延迟，请刷新查看！");
-        }else{
+        } else {
             return Result.error("添加录像计划失败!");
         }
     }
@@ -1312,7 +1328,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result setRecordCfgs(CameraInfo cameraInfo) throws Exception{
+    public Result setRecordCfgs(CameraInfo cameraInfo) throws Exception {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"ids\"").append(":").append("[").append(cameraInfo.getIds()).append("],");
@@ -1327,9 +1343,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.setRecordCfgs(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        if (errorCode == 0) {
             return Result.OK("设置录像计划成功!计划生效有延迟，请刷新查看！");
-        }else{
+        } else {
             return Result.error("设置录像计划失败!");
         }
     }
@@ -1342,18 +1358,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result delRecordCfgs(CameraInfo cameraInfo) throws Exception{
+    public Result delRecordCfgs(CameraInfo cameraInfo) throws Exception {
         String ids = cameraInfo.getIds();
         String devIds = cameraInfo.getDeviceIndex();
         String[] idArr = ids.split(",");
         String[] devIdArr = devIds.split(",");
         StringBuffer idSb = new StringBuffer();
-        for(int i=0;i<idArr.length;i++){
+        for (int i = 0; i < idArr.length; i++) {
             idSb.append("\"").append(idArr[i]).append("\",");
         }
         String idsStr = idSb.toString();
-        if(idsStr.length()>0){
-            idsStr = idsStr.substring(0,idsStr.length()-1);
+        if (idsStr.length() > 0) {
+            idsStr = idsStr.substring(0, idsStr.length() - 1);
         }
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1362,15 +1378,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.delRecordCfgs(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
-            for(int i=0;i<devIdArr.length;i++){
+        if (errorCode == 0) {
+            for (int i = 0; i < devIdArr.length; i++) {
                 CameraInfo entity = new CameraInfo();
                 entity.setDeviceIndex(devIdArr[i]);
                 entity.setRecordPlanId("-1");
                 baseMapper.updatePlanByDevId(entity);
             }
             return Result.OK("删除录像计划成功!计划生效有延迟，请刷新查看！");
-        }else{
+        } else {
             return Result.error("删除录像计划失败!");
         }
     }
@@ -1383,19 +1399,19 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public IPage<CameraInfo> getRecordCfgs(CameraInfo cameraInfo,Integer pageNo,Integer pageSize) throws Exception{
+    public IPage<CameraInfo> getRecordCfgs(CameraInfo cameraInfo, Integer pageNo, Integer pageSize) throws Exception {
         IPage<CameraInfo> page = new Page<>();
         page.setSize(pageSize);
         page.setCurrent(pageNo);
-        if(cameraInfo.getProjectId()==null||cameraInfo.getProjectId().equals("")){
+        if (cameraInfo.getProjectId() == null || cameraInfo.getProjectId().equals("")) {
             return page;
         }
-        if(cameraInfo.getRegionId()==null||cameraInfo.getRegionId().equals("")){
+        if (cameraInfo.getRegionId() == null || cameraInfo.getRegionId().equals("")) {
             return page;
         }
         StringBuffer sb = new StringBuffer();
         sb.append("{");
-        sb.append("\"start\"").append(":").append((pageNo-1)*pageSize).append(",");
+        sb.append("\"start\"").append(":").append((pageNo - 1) * pageSize).append(",");
         sb.append("\"limit\"").append(":").append(pageSize).append(",");
         sb.append("\"filterAnd\"").append(":").append("{");
         sb.append("\"projectId\"").append(":").append("\"").append(cameraInfo.getProjectId()).append("\",");
@@ -1409,16 +1425,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getRecordCfgs(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
-            JSONObject result = (JSONObject)jsonObject.get("result");
+        if (errorCode == 0) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
             Long total = result.getLong("total");
             page.setTotal(total);
-            if(total>0){
+            if (total > 0) {
                 List list = Lists.newArrayList();
                 JSONArray array = result.getJSONArray("list");
-                for(int i=0;i<array.size();i++){
+                for (int i = 0; i < array.size(); i++) {
                     CameraInfo ci = new CameraInfo();
-                    JSONObject json = (JSONObject)array.get(i);
+                    JSONObject json = (JSONObject) array.get(i);
                     String devId = json.getStr("devId");
                     ci.setDeviceIndex(devId);
                     String devName = json.getStr("devName");
@@ -1426,14 +1442,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     String ip = json.getStr("ip");
                     ci.setIp(ip);
                     JSONArray expand = json.getJSONArray("expand");
-                    JSONObject expandJson = (JSONObject)expand.get(0);
+                    JSONObject expandJson = (JSONObject) expand.get(0);
                     String id = expandJson.getStr("id");
                     ci.setIds(id);
                     String recordSwitch = expandJson.getStr("recordSwitch");
                     ci.setRecordSwitch(recordSwitch);
-                    if(recordSwitch.equals("1")){
+                    if (recordSwitch.equals("1")) {
                         ci.setRecordSwitchBoolean(true);
-                    }else{
+                    } else {
                         ci.setRecordSwitchBoolean(false);
                     }
                     int streamType = expandJson.getInt("streamType");
@@ -1444,10 +1460,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     ci.setPlanName(recordPlanName);
                     String storageType = expandJson.getStr("storageType");
                     ci.setStorageType(storageType);
-                    if(storageType.equals("0")){
+                    if (storageType.equals("0")) {
                         ci.setStorageDevId("0");
                         ci.setStorageDevName("本设备");
-                    }else{
+                    } else {
                         String storageDevId = expandJson.getStr("storageDevId");
                         ci.setStorageDevId(storageDevId);
                         String storageDevName = expandJson.getStr("storageDevName");
@@ -1469,7 +1485,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result getBatchProgress(CameraInfo cameraInfo) throws Exception{
+    public Result getBatchProgress(CameraInfo cameraInfo) throws Exception {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"batchType\"").append(":").append(cameraInfo.getBatchType());
@@ -1477,9 +1493,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getBatchProgress(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        if (errorCode == 0) {
             return Result.OK("获取批量操作录像计划进度成功!");
-        }else{
+        } else {
             return Result.error("获取批量操作录像计划进度失败!");
         }
     }
@@ -1492,7 +1508,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getTamperDet(Map<String,Object> map){
+    public Result<JSONObject> getTamperDet(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1507,36 +1523,36 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject tamperDetection = (JSONObject)responseData.get("tamper_detection");
-                JSONObject tamperDet = (JSONObject)tamperDetection.get("tamper_det");
+            if ("0".equals(errorCode)) {
+                JSONObject tamperDetection = (JSONObject) responseData.get("tamper_detection");
+                JSONObject tamperDet = (JSONObject) tamperDetection.get("tamper_det");
                 return Result.OK(tamperDet);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getTamperDet:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getTamperDet:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getTamperDet:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getTamperDet:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1549,7 +1565,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<String> setTamperDet(Map<String,Object> map){
+    public Result<String> setTamperDet(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String enabled = map.get("enabled").toString();
         StringBuffer sb = new StringBuffer();
@@ -1559,7 +1575,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"method\"").append(":").append("\"set\"").append(",");
         sb.append("\"tamper_detection\"").append(":").append("{");
         sb.append("\"tamper_det\"").append(":").append("{");
-        if("on".equals(enabled)){
+        if ("on".equals(enabled)) {
             String digitalSensitivity = map.get("digitalSensitivity").toString();
             sb.append("\"digital_sensitivity\"").append(":").append(digitalSensitivity).append(",");
         }
@@ -1571,34 +1587,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK("设置成功");
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getTamperDet:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getTamperDet:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getTamperDet:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getTamperDet:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1611,7 +1627,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getTamperNotif(Map<String,Object> map){
+    public Result<JSONObject> getTamperNotif(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1626,35 +1642,35 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject tamperDetection = (JSONObject)responseData.get("tamper_detection");
+            if ("0".equals(errorCode)) {
+                JSONObject tamperDetection = (JSONObject) responseData.get("tamper_detection");
                 return Result.OK(tamperDetection);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("setTamperDet:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("setTamperDet:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setTamperDet:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setTamperDet:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1667,7 +1683,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result setTamperNotif(Map<String,Object> map){
+    public Result setTamperNotif(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String msgPushEnabled = map.get("msgPushEnabled").toString();
         String lightAlarmEnabled = map.get("lightAlarmEnabled").toString();
@@ -1695,34 +1711,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK();
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getTamperNotif:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getTamperNotif:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getTamperNotif:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getTamperNotif:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1735,7 +1751,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result testAudio(Map<String,Object> map){
+    public Result testAudio(Map<String, Object> map) {
         String devId = map.get("deviceIndex").toString();
         String id = map.get("id").toString();
         String force = map.get("force").toString();
@@ -1755,34 +1771,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK();
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("setTamperNotif:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("setTamperNotif:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setTamperNotif:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setTamperNotif:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1795,7 +1811,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getAlarmInfo(Map<String,Object> map){
+    public Result<JSONObject> getAlarmInfo(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
@@ -1810,36 +1826,36 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject msgAlarm = (JSONObject)responseData.get("msg_alarm");
-                JSONObject alarmInfo = (JSONObject)msgAlarm.get("chn1_msg_alarm_info");
+            if ("0".equals(errorCode)) {
+                JSONObject msgAlarm = (JSONObject) responseData.get("msg_alarm");
+                JSONObject alarmInfo = (JSONObject) msgAlarm.get("chn1_msg_alarm_info");
                 return Result.OK(alarmInfo);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("testAudio:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("testAudio:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("testAudio:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("testAudio:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1852,7 +1868,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<String> setAlarmInfo(Map<String,Object> map){
+    public Result<String> setAlarmInfo(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String type = map.get("type").toString();
         String enabled = map.get("enabled").toString();
@@ -1863,10 +1879,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"method\"").append(":").append("\"set\"").append(",");
         sb.append("\"msg_alarm\"").append(":").append("{");
         sb.append("\"chn1_msg_alarm_info\"").append(":").append("{");
-        if("light".equals(type)){
+        if ("light".equals(type)) {
             sb.append("\"light_alarm_enabled\"").append(":").append("\"").append(enabled).append("\"");
         }
-        if("sound".equals(type)){
+        if ("sound".equals(type)) {
             sb.append("\"sound_alarm_enabled\"").append(":").append("\"").append(enabled).append("\"");
         }
         sb.append("}");
@@ -1876,34 +1892,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK("设置成功");
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getAlarmInfo:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getAlarmInfo:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getAlarmInfo:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getAlarmInfo:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1916,7 +1932,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result<JSONObject> getAlarmPlan(Map<String,Object> map){
+    public Result<JSONObject> getAlarmPlan(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String type = map.get("type").toString();
         StringBuffer sb = new StringBuffer();
@@ -1925,10 +1941,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"param\"").append(":").append("{");
         sb.append("\"method\"").append(":").append("\"get\"").append(",");
         sb.append("\"msg_alarm_plan\"").append(":").append("{");
-        if("light".equals(type)){
+        if ("light".equals(type)) {
             sb.append("\"name\"").append(":[").append("\"arming_schedule_light\"").append("]");
         }
-        if("sound".equals(type)){
+        if ("sound".equals(type)) {
             sb.append("\"name\"").append(":[").append("\"arming_schedule_sound\"").append("]");
         }
         sb.append("}");
@@ -1937,35 +1953,35 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
-                JSONObject alarmPlan = (JSONObject)responseData.get("msg_alarm_plan");
+            if ("0".equals(errorCode)) {
+                JSONObject alarmPlan = (JSONObject) responseData.get("msg_alarm_plan");
                 return Result.OK(alarmPlan);
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("setAlarmInfo:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("setAlarmInfo:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("setAlarmInfo:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("setAlarmInfo:{}", errMsg);
             return Result.error(errMsg);
         }
     }
@@ -1978,10 +1994,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @throws Exception
      */
     @Override
-    public Result setAlarmPlan(Map<String,Object> map){
+    public Result setAlarmPlan(Map<String, Object> map) {
         String id = map.get("deviceIndex").toString();
         String type = map.get("type").toString();
-        Map alarmPlan = (Map)map.get("alarmPlan");
+        Map alarmPlan = (Map) map.get("alarmPlan");
         String monday = alarmPlan.get("monday").toString();
         String tuesday = alarmPlan.get("tuesday").toString();
         String wednesday = alarmPlan.get("wednesday").toString();
@@ -1995,10 +2011,10 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"param\"").append(":").append("{");
         sb.append("\"method\"").append(":").append("\"set\"").append(",");
         sb.append("\"msg_alarm_plan\"").append(":").append("{");
-        if("light".equals(type)){
+        if ("light".equals(type)) {
             sb.append("\"arming_schedule_light\"");
         }
-        if("sound".equals(type)){
+        if ("sound".equals(type)) {
             sb.append("\"arming_schedule_sound\"");
         }
         sb.append(":{");
@@ -2016,45 +2032,46 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String addPreviewRes = tumsApi.passthrough(sb.toString());
         JSONObject jsonObject = new JSONObject(addPreviewRes);
         String errCode = jsonObject.getStr("error_code");
-        if("0".equals(errCode)){
-            JSONObject result = (JSONObject)jsonObject.get("result");
-            JSONObject responseData = (JSONObject)result.get("responseData");
+        if ("0".equals(errCode)) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
+            JSONObject responseData = (JSONObject) result.get("responseData");
             String errorCode = responseData.getStr("error_code");
-            if("0".equals(errorCode)){
+            if ("0".equals(errorCode)) {
                 return Result.OK();
-            }else{
+            } else {
                 String errorMsg = "";
-                try{
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errorMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errorMsg = errorCode;
                 }
-                updateDeviceStatus(id,errorCode);
-                log.info("getAlarmPlan:{}",errorMsg);
+                updateDeviceStatus(id, errorCode);
+                log.info("getAlarmPlan:{}", errorMsg);
                 return Result.error(errorMsg);
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errCode;
             }
-            updateDeviceStatus(id,errCode);
-            log.info("getAlarmPlan:{}",errMsg);
+            updateDeviceStatus(id, errCode);
+            log.info("getAlarmPlan:{}", errMsg);
             return Result.error(errMsg);
         }
     }
 
     /**
      * 搜索存在回放录像的日期-预留
+     *
      * @param videoDevId,year
      * @return
      */
-    public Map<String,JSONArray> searchYear(String videoDevId,String year){
-        Map<String,JSONArray> map = new HashMap<>();
+    public Map<String, JSONArray> searchYear(String videoDevId, String year) {
+        Map<String, JSONArray> map = new HashMap<>();
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[{");
@@ -2065,11 +2082,11 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.searchYear(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0){
+        if (errorCode == 0) {
             JSONArray result = jsonObject.getJSONArray("result");
-            map.put("result",result);
-        }else{
-            map.put("result",new JSONArray());
+            map.put("result", result);
+        } else {
+            map.put("result", new JSONArray());
         }
         return map;
     }
@@ -2084,18 +2101,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @param pageSize
      * @return
      */
-    int getVideoTotal(String deviceIndex,String parentId,String dataDate,int pageNo,int pageSize){
+    int getVideoTotal(String deviceIndex, String parentId, String dataDate, int pageNo, int pageSize) {
         int count = 0;
-        int startIdx = (pageNo-1)*pageSize;
-        int endIdx = pageNo*pageSize-1;
+        int startIdx = (pageNo - 1) * pageSize;
+        int endIdx = pageNo * pageSize - 1;
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[{");
         sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
-        if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){
+        if (parentId != null && !parentId.equals("") && !parentId.equals("0")) {
             //存储设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\"");
-        }else{
+        } else {
             //SK卡，取自身设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\"");
         }
@@ -2107,12 +2124,12 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.searchVideo(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         int errorCode = jsonObject.getInt("error_code");
-        if(errorCode == 0) {
+        if (errorCode == 0) {
             JSONObject result = (JSONObject) jsonObject.get("result");
             int total = result.getInt("total");
             count = count + total;
-            if(total>=pageSize){
-                int more = getVideoTotal(deviceIndex,parentId,dataDate,pageNo+1,pageSize);
+            if (total >= pageSize) {
+                int more = getVideoTotal(deviceIndex, parentId, dataDate, pageNo + 1, pageSize);
                 count = count + more;
             }
         }
@@ -2128,24 +2145,24 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @return
      */
     @Override
-    public Result<IPage<CameraInfo>> searchVideo(Integer pageNo, Integer pageSize, CameraInfo cameraInfo){
+    public Result<IPage<CameraInfo>> searchVideo(Integer pageNo, Integer pageSize, CameraInfo cameraInfo) {
         Page<CameraInfo> page = new Page<CameraInfo>(pageNo, pageSize);
         String deviceIndex = cameraInfo.getDeviceIndex();
         String parentId = cameraInfo.getParentId();
         String dataDate = cameraInfo.getDataDate();
-        dataDate = dataDate.replaceAll("-","");
-        int totalCount = getVideoTotal(deviceIndex,parentId,dataDate,1,800);
+        dataDate = dataDate.replaceAll("-", "");
+        int totalCount = getVideoTotal(deviceIndex, parentId, dataDate, 1, 800);
         page = new Page<CameraInfo>(pageNo, pageSize, totalCount);
-        int startIdx = (pageNo-1)*pageSize;
-        int endIdx = pageNo*pageSize-1;
+        int startIdx = (pageNo - 1) * pageSize;
+        int endIdx = pageNo * pageSize - 1;
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[{");
         sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
-        if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){
+        if (parentId != null && !parentId.equals("") && !parentId.equals("0")) {
             //存储设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\"");
-        }else{
+        } else {
             //SK卡，取自身设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\"");
         }
@@ -2157,13 +2174,13 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.searchVideo(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
-            JSONObject result = (JSONObject)jsonObject.get("result");
+        if (errorCode.equals("0")) {
+            JSONObject result = (JSONObject) jsonObject.get("result");
             int total = result.getInt("total");
-            if(total>0){
+            if (total > 0) {
                 List list = Lists.newArrayList();
                 JSONArray videos = result.getJSONArray("videos");
-                JSONObject videoJson = (JSONObject)videos.get(0);
+                JSONObject videoJson = (JSONObject) videos.get(0);
                 String videoDevId = videoJson.getStr("videoDevId");
                 String storageDevId = videoJson.getStr("storageDevId");
                 String channelId = videoJson.getStr("channelId");
@@ -2175,7 +2192,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 String errCode = videoJson.getStr("errorCode");
                 ErrorCode errVo = errorCodeService.getByCode(errCode);
                 String errMsg = errVo.getErrorMsg();
-                for(int i=0;i<total;i++){
+                for (int i = 0; i < total; i++) {
                     String videoTypeStr = videoTypeArr.get(i).toString();
                     CameraInfo entity = new CameraInfo();
                     entity.setVideoDevId(videoDevId);
@@ -2187,18 +2204,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     String endTimeStr = endTime.get(i).toString();
                     entity.setEndTime(endTimeStr);
                     String sizeStr = size.get(i).toString();
-                    long startTimeL = Long.valueOf(startTimeStr)*1000;
-                    String startTimeFt = DateUtils.formatDate(DateUtils.getDate(startTimeL),"yyyy-MM-dd HH:mm:ss");
+                    long startTimeL = Long.valueOf(startTimeStr) * 1000;
+                    String startTimeFt = DateUtils.formatDate(DateUtils.getDate(startTimeL), "yyyy-MM-dd HH:mm:ss");
                     entity.setStartTimeFt(startTimeFt);
-                    long endTimeL = Long.valueOf(endTimeStr)*1000;
-                    String endTimeFt = DateUtils.formatDate(DateUtils.getDate(endTimeL),"yyyy-MM-dd HH:mm:ss");
+                    long endTimeL = Long.valueOf(endTimeStr) * 1000;
+                    String endTimeFt = DateUtils.formatDate(DateUtils.getDate(endTimeL), "yyyy-MM-dd HH:mm:ss");
                     entity.setEndTimeFt(endTimeFt);
-                    String duration = DateUtils.dateDiff(startTimeL,endTimeL);
+                    String duration = DateUtils.dateDiff(startTimeL, endTimeL);
                     entity.setDuration(duration);
                     entity.setVideoType(videoTypeStr);
                     BigDecimal zjs = new BigDecimal(sizeStr);
                     BigDecimal hs = new BigDecimal(1024);
-                    BigDecimal MB = zjs.divide(hs).divide(hs).setScale(4,BigDecimal.ROUND_HALF_UP);
+                    BigDecimal MB = zjs.divide(hs).divide(hs).setScale(4, BigDecimal.ROUND_HALF_UP);
                     entity.setSize(MB.toString());
                     entity.setErrorCode(errCode);
                     entity.setErrorMsg(errMsg);
@@ -2206,16 +2223,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 }
                 page.setRecords(list);
             }
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(deviceIndex,errorCode);
-            log.info("searchVideo:{}",errorMsg);
+            updateDeviceStatus(deviceIndex, errorCode);
+            log.info("searchVideo:{}", errorMsg);
             return Result.error(errorMsg);
         }
         return Result.OK(page);
@@ -2223,12 +2240,13 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取指定监控点的存储设备列表
+     *
      * @param cameraInfo
      * @return
      */
-    public Map<String,Object> getStoragesById(CameraInfo cameraInfo){
-        Map<String,Object> map = new HashMap<>();
-        map.put("error","0");
+    public Map<String, Object> getStoragesById(CameraInfo cameraInfo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("error", "0");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"devIds\"").append(":").append("[\"").append(cameraInfo.getDeviceIndex()).append("\"]");
@@ -2236,18 +2254,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getStoragesById(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
-            for(int i=0;i<list.size();i++) {
-                JSONObject jsonObj = (JSONObject)list.get(i);
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject jsonObj = (JSONObject) list.get(i);
                 String devId = jsonObj.getStr("devId");
-                if(devId.equals(cameraInfo.getDeviceIndex())){
+                if (devId.equals(cameraInfo.getDeviceIndex())) {
                     JSONArray storages = jsonObj.getJSONArray("storages");
-                    for(int j=0;j<storages.size();j++) {
-                        JSONObject storage = (JSONObject)storages.get(j);
+                    for (int j = 0; j < storages.size(); j++) {
+                        JSONObject storage = (JSONObject) storages.get(j);
                         String storageType = storage.getStr("storageType");
-                        if(storageType.equals("-1")){
+                        if (storageType.equals("-1")) {
                             continue;
                         }
                         String storageDevId = storage.getStr("storageDevId");
@@ -2267,34 +2285,35 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                         entity.setScale(cameraInfo.getScale());
                         ciList.add(entity);
                     }
-                }else{
+                } else {
                     continue;
                 }
             }
-            map.put("data",ciList);
-        }else{
+            map.put("data", ciList);
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
-            map.put("error",errorCode);
-            log.info("getStoragesById:{}",errorMsg);
+            updateDeviceStatus(cameraInfo.getDeviceIndex(), errorCode);
+            map.put("error", errorCode);
+            log.info("getStoragesById:{}", errorMsg);
         }
         return map;
     }
 
     /**
      * 添加回放通道V2
+     *
      * @param cameraInfo
      * @return
      */
-    public Map<String,Object> addPlaybackChn(CameraInfo cameraInfo){
-        Map<String,Object> map = new HashMap<>();
-        map.put("error","0");
+    public Map<String, Object> addPlaybackChn(CameraInfo cameraInfo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("error", "0");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[{");
@@ -2309,11 +2328,11 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.addPlaybackChn(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
-            for(int i=0;i<list.size();i++) {
-                JSONObject jsonObj = (JSONObject)list.get(i);
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject jsonObj = (JSONObject) list.get(i);
                 String videoDevId = jsonObj.getStr("videoDevId");
                 String videoChannelId = jsonObj.getStr("videoChannelId");
                 String sessionId = jsonObj.getStr("sessionId");
@@ -2330,30 +2349,31 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 entity.setScale(cameraInfo.getScale());
                 ciList.add(entity);
             }
-            map.put("data",ciList);
-        }else{
+            map.put("data", ciList);
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
-            map.put("error",errorCode);
-            log.info("addPlaybackChn:{}",errorMsg);
+            updateDeviceStatus(cameraInfo.getDeviceIndex(), errorCode);
+            map.put("error", errorCode);
+            log.info("addPlaybackChn:{}", errorMsg);
         }
         return map;
     }
 
     /**
      * 获取回放通道的url
+     *
      * @param cameraInfo
      * @return
      */
-    public Map<String,Object> getPlaybackUrl(CameraInfo cameraInfo,int counter){
-        Map<String,Object> map = new HashMap<>();
-        map.put("error","0");
+    public Map<String, Object> getPlaybackUrl(CameraInfo cameraInfo, int counter) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("error", "0");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[{");
@@ -2368,17 +2388,17 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getPlaybackUrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             List<CameraInfo> ciList = Lists.newArrayList();
             JSONArray list = jsonObject.getJSONArray("result");
-            for(int i=0;i<list.size();i++) {
-                JSONObject jsonObj = (JSONObject)list.get(i);
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject jsonObj = (JSONObject) list.get(i);
                 String errCode = jsonObj.getStr("errorCode");
-                if(errCode.equals("0")){
+                if (errCode.equals("0")) {
                     String videoDevId = jsonObj.getStr("videoDevId");
                     String videoChannelId = jsonObj.getStr("videoChannelId");
                     String sessionId = jsonObj.getStr("sessionId");
-                    if(sessionId==null||sessionId.equals("")){
+                    if (sessionId == null || sessionId.equals("")) {
                         sessionId = cameraInfo.getSessionId();
                     }
                     String url = jsonObj.getStr("url");
@@ -2401,106 +2421,107 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                     entity.setEndTime(cameraInfo.getEndTime());
                     entity.setScale(cameraInfo.getScale());
                     ciList.add(entity);
-                }else if(errCode.equals("-80703")){
+                } else if (errCode.equals("-80703")) {
                     try {
-                        if(counter>10){
-                            deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId());
-                            map.put("error",errCode);
+                        if (counter > 10) {
+                            deletePlaybackChn(cameraInfo.getVideoDevId(), cameraInfo.getSessionId());
+                            map.put("error", errCode);
                             break;
                         }
                         sleep(1000);
-                        map = getPlaybackUrl(cameraInfo,++counter);
+                        map = getPlaybackUrl(cameraInfo, ++counter);
                         return map;
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                }else{
-                    System.out.println("getPlaybackUrl:"+errCode);
+                } else {
+                    System.out.println("getPlaybackUrl:" + errCode);
                 }
             }
-            map.put("data",ciList);
-        }else if(errorCode.equals("-80703")){
+            map.put("data", ciList);
+        } else if (errorCode.equals("-80703")) {
             try {
-                if(counter>10){
-                    deletePlaybackChn(cameraInfo.getVideoDevId(),cameraInfo.getSessionId());
+                if (counter > 10) {
+                    deletePlaybackChn(cameraInfo.getVideoDevId(), cameraInfo.getSessionId());
                 }
                 sleep(1000);
-                map = getPlaybackUrl(cameraInfo,++counter);
+                map = getPlaybackUrl(cameraInfo, ++counter);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(cameraInfo.getVideoDevId(),errorCode);
-            map.put("error",errorCode);
-            log.info("getPlaybackUrl:{}",errorMsg);
+            updateDeviceStatus(cameraInfo.getVideoDevId(), errorCode);
+            map.put("error", errorCode);
+            log.info("getPlaybackUrl:{}", errorMsg);
         }
         return map;
     }
 
     @Override
-    public Result<Map<String,Object>> getPlaybackUrlList(CameraInfo cameraInfo){
-        Map<String,Object> map = new HashMap<>();
+    public Result<Map<String, Object>> getPlaybackUrlList(CameraInfo cameraInfo) {
+        Map<String, Object> map = new HashMap<>();
         String errorMsgs = "";
         List<CameraInfo> dataList = Lists.newArrayList();
-        Map<String,Object> chnMap = addPlaybackChn(cameraInfo);
+        Map<String, Object> chnMap = addPlaybackChn(cameraInfo);
         String chnError = chnMap.get("error").toString();
-        if(chnError.equals("0")){
-            List<CameraInfo> chnList = (List)chnMap.get("data");
-            if(chnList!=null&&chnList.size()>0){
+        if (chnError.equals("0")) {
+            List<CameraInfo> chnList = (List) chnMap.get("data");
+            if (chnList != null && chnList.size() > 0) {
                 TumsConfig tumsConfig = tumsConfigMapper.getByCode();
-                for(int j=0;j<chnList.size();j++){
+                for (int j = 0; j < chnList.size(); j++) {
                     CameraInfo chn = chnList.get(j);
-                    Map<String,Object> playbackMap = getPlaybackUrl(chn,1);
+                    Map<String, Object> playbackMap = getPlaybackUrl(chn, 1);
                     String pbError = playbackMap.get("error").toString();
-                    if(pbError.equals("0")){
-                        List<CameraInfo> pbList = (List)playbackMap.get("data");
-                        if(pbList!=null&&pbList.size()>0){
-                            for(int k=0;k<pbList.size();k++){
+                    if (pbError.equals("0")) {
+                        List<CameraInfo> pbList = (List) playbackMap.get("data");
+                        if (pbList != null && pbList.size() > 0) {
+                            for (int k = 0; k < pbList.size(); k++) {
                                 CameraInfo pb = pbList.get(k);
                                 pb.setQueryAddress(tumsConfig.getTumsUrl());
                                 dataList.add(pb);
                             }
                         }
-                    }else{
+                    } else {
                         String errMsg = "";
-                        try{
+                        try {
                             ErrorCode errVo = errorCodeService.getByCode(pbError);
                             errMsg = errVo.getErrorMsg();
-                        }catch (Exception e){
+                        } catch (Exception e) {
                             errMsg = pbError;
                         }
-                        errorMsgs = errorMsgs+ "<div>获取回放通道时："+errMsg+"</div>";
+                        errorMsgs = errorMsgs + "<div>获取回放通道时：" + errMsg + "</div>";
                     }
                 }
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(chnError);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = chnError;
             }
-            errorMsgs = errorMsgs+ "<div>添加回放通道时："+errMsg+"</div>";
+            errorMsgs = errorMsgs + "<div>添加回放通道时：" + errMsg + "</div>";
         }
-        map.put("error",errorMsgs);
-        map.put("data",dataList);
+        map.put("error", errorMsgs);
+        map.put("data", dataList);
         return Result.ok(map);
     }
 
     /**
      * 删除某一回放通道
+     *
      * @param videoDevId
      * @param sessionId
      */
-    public void deletePlaybackChn(String videoDevId,String sessionId){
+    public void deletePlaybackChn(String videoDevId, String sessionId) {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("[");
@@ -2513,27 +2534,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.deletePlaybackChn(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             JSONArray list = jsonObject.getJSONArray("result");
-            for(int i=0;i<list.size();i++) {
-                JSONObject jsonObj = (JSONObject)list.get(i);
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject jsonObj = (JSONObject) list.get(i);
                 String errCode = jsonObj.getStr("errorCode");
-                if(!errCode.equals("0")){
+                if (!errCode.equals("0")) {
                     ErrorCode errVo = errorCodeService.getByCode(errCode);
                     String errMsg = errVo.getErrorMsg();
-                    log.info("deletePlaybackChn:{}","sessionId为"+jsonObj.getStr("sessionId")+"的回放通道删除失败，原因："+errMsg);
+                    log.info("deletePlaybackChn:{}", "sessionId为" + jsonObj.getStr("sessionId") + "的回放通道删除失败，原因：" + errMsg);
                 }
             }
-        }else{
+        } else {
             String errMsg = "";
-            try{
+            try {
                 ErrorCode errVo = errorCodeService.getByCode(errorCode);
                 errMsg = errVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errMsg = errorCode;
             }
-            updateDeviceStatus(videoDevId,errorCode);
-            log.info("deletePlaybackChn:{}",errMsg);
+            updateDeviceStatus(videoDevId, errorCode);
+            log.info("deletePlaybackChn:{}", errMsg);
         }
     }
 
@@ -2544,17 +2565,17 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
      * @return
      */
     @Override
-    public Result<String> deletePlaybackChn(CameraInfo cameraInfo){
+    public Result<String> deletePlaybackChn(CameraInfo cameraInfo) {
         String errorMsgs = "";
         String sessions = cameraInfo.getSessionId();
-        if(sessions!=null&&!sessions.equals("")){
+        if (sessions != null && !sessions.equals("")) {
             String[] sessionIds = sessions.split(",");
             StringBuffer sb = new StringBuffer();
             sb.append("{");
             sb.append("\"id\"").append(":").append("[");
-            for(int i=0;i<sessionIds.length;i++){
+            for (int i = 0; i < sessionIds.length; i++) {
                 String sessionId = sessionIds[i];
-                if(!sessionId.equals("")) {
+                if (!sessionId.equals("")) {
                     sb.append("{");
                     sb.append("\"videoDevId\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
                     sb.append("\"sessionId\"").append(":").append("\"").append(sessionId).append("\"");
@@ -2566,32 +2587,32 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             String res = tumsApi.deletePlaybackChn(sb.toString());
             JSONObject jsonObject = new JSONObject(res);
             String errorCode = jsonObject.getStr("error_code");
-            if(errorCode.equals("0")){
+            if (errorCode.equals("0")) {
                 JSONArray list = jsonObject.getJSONArray("result");
-                for(int i=0;i<list.size();i++) {
-                    JSONObject jsonObj = (JSONObject)list.get(i);
+                for (int i = 0; i < list.size(); i++) {
+                    JSONObject jsonObj = (JSONObject) list.get(i);
                     String errCode = jsonObj.getStr("errorCode");
-                    if(!errCode.equals("0")){
+                    if (!errCode.equals("0")) {
                         String sessionId = jsonObj.getStr("sessionId");
                         ErrorCode errVo = errorCodeService.getByCode(errCode);
                         String errMsg = errVo.getErrorMsg();
-                        errorMsgs = errorMsgs+"<div>sessionId为"+sessionId+"的回放通道删除失败，原因："+errMsg+"</div>";
+                        errorMsgs = errorMsgs + "<div>sessionId为" + sessionId + "的回放通道删除失败，原因：" + errMsg + "</div>";
                     }
                 }
-            }else{
+            } else {
                 String errMsg = "";
-                try{
+                try {
                     ErrorCode errVo = errorCodeService.getByCode(errorCode);
                     errMsg = errVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errMsg = errorCode;
                 }
                 errorMsgs = errorMsgs + errMsg;
-                log.info("deletePlaybackChn:{}",errorMsgs);
+                log.info("deletePlaybackChn:{}", errorMsgs);
             }
-            if(errorMsgs.equals("")){
+            if (errorMsgs.equals("")) {
                 return Result.error(errorMsgs);
-            }else{
+            } else {
                 return Result.OK("");
             }
         }
@@ -2601,13 +2622,14 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 获取nvmp设备双向通信URL
+     *
      * @param cameraInfo
      * @return
      */
-    public Map<String,Object> getMultitransUrl(CameraInfo cameraInfo,int counter){
-        Map<String,Object> map = new HashMap<>();
-        map.put("error","0");
-        map.put("error","0");
+    public Map<String, Object> getMultitransUrl(CameraInfo cameraInfo, int counter) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("error", "0");
+        map.put("error", "0");
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"devId\"").append(":").append("\"").append(cameraInfo.getVideoDevId()).append("\"");
@@ -2615,7 +2637,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getMultitransUrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             JSONObject result = jsonObject.getJSONObject("result");
             String url = result.getStr("rtspUrl");
             String wsUrl = result.getStr("wsUrl");
@@ -2625,82 +2647,84 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             entity.setUrl(url);
             entity.setWsUrl(wsUrl);
             entity.setWssUrl(wssUrl);
-            map.put("data",entity);
-        }else if(errorCode.equals("-80703")){
+            map.put("data", entity);
+        } else if (errorCode.equals("-80703")) {
             try {
-                if(counter>10){
-                    map.put("error",errorCode);
+                if (counter > 10) {
+                    map.put("error", errorCode);
                     return map;
                 }
                 sleep(1000);
-                map = getMultitransUrl(cameraInfo,++counter);
+                map = getMultitransUrl(cameraInfo, ++counter);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(cameraInfo.getVideoDevId(),errorCode);
-            map.put("error",errorCode);
-            log.info("getMultitransUrl:{}",errorMsg);
+            updateDeviceStatus(cameraInfo.getVideoDevId(), errorCode);
+            map.put("error", errorCode);
+            log.info("getMultitransUrl:{}", errorMsg);
         }
         return map;
     }
 
     /**
      * 获取nvmp设备双向通信URL
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result getMultitransUrl(CameraInfo cameraInfo) throws Exception{
+    public Result getMultitransUrl(CameraInfo cameraInfo) throws Exception {
         String errorMsgs = "";
-        Map<String,Object> multitransMap = getMultitransUrl(cameraInfo,1);
+        Map<String, Object> multitransMap = getMultitransUrl(cameraInfo, 1);
         String multitransError = multitransMap.get("error").toString();
-        if(multitransError.equals("0")){
+        if (multitransError.equals("0")) {
             TumsConfig tumsConfig = tumsConfigMapper.getByCode();
-            CameraInfo entity = (CameraInfo)multitransMap.get("data");
+            CameraInfo entity = (CameraInfo) multitransMap.get("data");
             entity.setQueryAddress(tumsConfig.getTumsUrl());
             return Result.OK(entity);
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(multitransError);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = multitransError;
             }
-            updateDeviceStatus(cameraInfo.getVideoDevId(),multitransError);
-            errorMsgs = errorMsgs+ "<div>获取nvmp设备双向通信URL："+errorMsg+"</div>";
+            updateDeviceStatus(cameraInfo.getVideoDevId(), multitransError);
+            errorMsgs = errorMsgs + "<div>获取nvmp设备双向通信URL：" + errorMsg + "</div>";
             return Result.error(errorMsgs);
         }
     }
 
     /**
      * 回放视频转mp4上传
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result uploadToServer(CameraInfo cameraInfo){
+    public Result uploadToServer(CameraInfo cameraInfo) {
         String ftpUsername = "";
         String ftpPassword = "";
         String ftpUploadpath = "";
         String ftpIp = "";
         String ftpPort = "";
         CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
-        if(entity.getFtpIp()!=null&&!entity.getFtpIp().equals("")){
+        if (entity.getFtpIp() != null && !entity.getFtpIp().equals("")) {
             ftpIp = entity.getFtpIp();
             ftpPort = entity.getFtpPort();
             ftpUsername = entity.getFtpUsername();
             ftpPassword = entity.getFtpPassword();
             ftpUploadpath = entity.getFtpUploadpath();
-        }else{
+        } else {
             TumsConfig tumsConfig = tumsConfigMapper.getByCode();
             ftpIp = tumsConfig.getFtpIp();
             ftpPort = tumsConfig.getFtpPort();
@@ -2708,7 +2732,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             ftpPassword = tumsConfig.getFtpPassword();
             ftpUploadpath = tumsConfig.getFtpUploadpath();
         }
-        if(StringUtils.isNotBlank(cameraInfo.getFtpUploadpath())){
+        if (StringUtils.isNotBlank(cameraInfo.getFtpUploadpath())) {
             ftpUploadpath = cameraInfo.getFtpUploadpath();
         }
         String deviceIndex = cameraInfo.getDeviceIndex();
@@ -2717,16 +2741,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
-        if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){
+        if (parentId != null && !parentId.equals("") && !parentId.equals("0")) {
             //存储设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\",");
-        }else{
+        } else {
             //SK卡，取自身设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
         }
         sb.append("\"videoType\"").append(":").append(cameraInfo.getVideoType()).append(",");
         sb.append("\"storageType\"").append(":").append("0").append(",");
-        if(fileName!=null&&!fileName.equals("")){
+        if (fileName != null && !fileName.equals("")) {
             //存储设备ID
             sb.append("\"fileName\"").append(":").append("\"").append(fileName).append("\",");
         }
@@ -2743,32 +2767,33 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.uploadToServer(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             JSONObject result = jsonObject.getJSONObject("result");
             String taskId = result.getStr("taskId");
             cameraInfo.setTaskId(taskId);
             return Result.OK(cameraInfo);
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            updateDeviceStatus(deviceIndex,errorCode);
-            log.info("uploadToServer:{}-{}",errorCode,errorMsg);
+            updateDeviceStatus(deviceIndex, errorCode);
+            log.info("uploadToServer:{}-{}", errorCode, errorMsg);
             return Result.error(errorMsg);
         }
     }
 
     /**
      * 停止转存MP4上传任务
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result<String> stopUploadToServer(CameraInfo cameraInfo){
+    public Result<String> stopUploadToServer(CameraInfo cameraInfo) {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\"");
@@ -2776,28 +2801,29 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.stopUploadToServer(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             return Result.OK("停止转存MP4上传成功");
-        }else{
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            log.info("stopUploadToServer:{}-{}",errorCode,errorMsg);
+            log.info("stopUploadToServer:{}-{}", errorCode, errorMsg);
             return Result.error(errorMsg);
         }
     }
 
     /**
      * 获取转存MP4上传任务进度
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result getUploadToServerProcess(CameraInfo cameraInfo){
+    public Result getUploadToServerProcess(CameraInfo cameraInfo) {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"taskId\"").append(":").append("\"").append(cameraInfo.getTaskId()).append("\"");
@@ -2805,33 +2831,34 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.getUploadToServerProcess(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             JSONObject result = jsonObject.getJSONObject("result");
             String process = result.getStr("process");
             cameraInfo.setProcess(process);
             return Result.OK(cameraInfo);
-        }else{
+        } else {
             String errMsg = jsonObject.getStr("msg");
-            if(errMsg == null || errMsg.equals("")) {
-                try{
+            if (errMsg == null || errMsg.equals("")) {
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errMsg = errorCode;
                 }
             }
-            log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg);
+            log.info("getUploadToServerProcess:{}-{}", errorCode, errMsg);
             return Result.error(errMsg);
         }
     }
 
     /**
      * 高速球机移动方向控制
+     *
      * @param cameraInfo
      * @return
      */
     @Override
-    public Result motionCtrl(CameraInfo cameraInfo){
+    public Result motionCtrl(CameraInfo cameraInfo) {
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
@@ -2842,7 +2869,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String res = tumsApi.motionCtrl(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
 //            StringBuffer sb2 = new StringBuffer();
 //            sb2.append("{");
 //            sb2.append("\"id\"").append(":").append("\"").append(cameraInfo.getDeviceIndex()).append("\",");
@@ -2852,18 +2879,18 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 //            sb2.append("}");
 //            String res2 = tumsApi.motionCtrl(sb2.toString());
             return Result.OK();
-        }else{
+        } else {
             String errMsg = jsonObject.getStr("msg");
-            if(errMsg == null || errMsg.equals("")) {
-                try{
+            if (errMsg == null || errMsg.equals("")) {
+                try {
                     ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                     errMsg = errorVo.getErrorMsg();
-                }catch (Exception e){
+                } catch (Exception e) {
                     errMsg = errorCode;
                 }
             }
-            updateDeviceStatus(cameraInfo.getDeviceIndex(),errorCode);
-            log.info("motionCtrl:{}-{}",errorCode,errMsg);
+            updateDeviceStatus(cameraInfo.getDeviceIndex(), errorCode);
+            log.info("motionCtrl:{}-{}", errorCode, errMsg);
             return Result.OK("到达极限，无法继续移动");
 //            return Result.error(errMsg);
         }
@@ -2878,6 +2905,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 下载tplink自定义录像
+     *
      * @param nuId
      * @param startTime
      * @param endTime
@@ -2887,22 +2915,22 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     public String zdyTplinkVideo(String nuId, String startTime, String endTime) {
 
         QueryWrapper<CameraInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("nu_id",nuId);
+        queryWrapper.eq("nu_id", nuId);
         List<CameraInfo> tplinkList = baseMapper.selectList(queryWrapper);
-        if(tplinkList.size() == 0){
+        if (tplinkList.size() == 0) {
             return "error";
         }
-        String fileName = nuId +"-"+DateUtils.formatDate(new Date(),"yyyyMMddHHmmss");
-        String year = DateUtils.formatDate(new Date(),"yyyy");
-        String month = DateUtils.formatDate(new Date(),"MM");
-        String day = DateUtils.formatDate(new Date(),"dd");
+        String fileName = nuId + "-" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss");
+        String year = DateUtils.formatDate(new Date(), "yyyy");
+        String month = DateUtils.formatDate(new Date(), "MM");
+        String day = DateUtils.formatDate(new Date(), "dd");
         CameraInfo tplinkInfo = tplinkList.get(0);
         CameraInfo cameraInfo = new CameraInfo();
         cameraInfo.setDeviceIndex(tplinkInfo.getDeviceIndex());
         cameraInfo.setParentId(tplinkInfo.getParentId());
         cameraInfo.setFileName(fileName);
         cameraInfo.setVideoType("1");
-        cameraInfo.setFtpUploadpath("/upFiles101/"+year+month+day+"/fwxm/tplinkVideo");
+        cameraInfo.setFtpUploadpath(uploadpath + "/" + year + month + day + "/fwxm/tplinkVideo");
         cameraInfo.setStartTime(startTime);
         cameraInfo.setEndTime(endTime);
         try {
@@ -2916,6 +2944,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
 
     /**
      * 回放视频转mp4上传
+     *
      * @param cameraInfo
      * @return
      */
@@ -2925,15 +2954,15 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         String ftpUploadpath = "";
         String ftpIp = "";
         String ftpPort = "";
-        log.info("uploadToServerResult - cameraInfo:{}:",cameraInfo);
+        log.info("uploadToServerResult - cameraInfo:{}:", cameraInfo);
         CameraInfo entity = baseMapper.getByDeviceId(cameraInfo);
-        if(entity.getFtpIp()!=null&&!entity.getFtpIp().equals("")){
+        if (entity.getFtpIp() != null && !entity.getFtpIp().equals("")) {
             ftpIp = entity.getFtpIp();
             ftpPort = entity.getFtpPort();
             ftpUsername = entity.getFtpUsername();
             ftpPassword = entity.getFtpPassword();
             ftpUploadpath = entity.getFtpUploadpath();
-        }else{
+        } else {
             TumsConfig tumsConfig = tumsConfigMapper.getByCode();
             ftpIp = tumsConfig.getFtpIp();
             ftpPort = tumsConfig.getFtpPort();
@@ -2941,7 +2970,7 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             ftpPassword = tumsConfig.getFtpPassword();
             ftpUploadpath = tumsConfig.getFtpUploadpath();
         }
-        if(StringUtils.isNotBlank(cameraInfo.getFtpUploadpath())){
+        if (StringUtils.isNotBlank(cameraInfo.getFtpUploadpath())) {
             ftpUploadpath = cameraInfo.getFtpUploadpath();
         }
         //判断文件夹是否存在
@@ -2952,16 +2981,16 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         StringBuffer sb = new StringBuffer();
         sb.append("{");
         sb.append("\"videoDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
-        if(parentId!=null&&!parentId.equals("")&&!parentId.equals("0")){
+        if (parentId != null && !parentId.equals("") && !parentId.equals("0")) {
             //存储设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(parentId).append("\",");
-        }else{
+        } else {
             //SK卡，取自身设备ID
             sb.append("\"storageDevId\"").append(":").append("\"").append(deviceIndex).append("\",");
         }
         sb.append("\"videoType\"").append(":").append(cameraInfo.getVideoType()).append(",");
         sb.append("\"storageType\"").append(":").append("0").append(",");
-        if(fileName!=null&&!fileName.equals("")){
+        if (fileName != null && !fileName.equals("")) {
             //存储设备ID
             sb.append("\"fileName\"").append(":").append("\"").append(fileName).append("\",");
         }
@@ -2983,42 +3012,42 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
         sb.append("\"ftpPort\"").append(":").append(ftpPort);
         sb.append("}");
         sb.append("}");
-        System.out.println("------------------"+sb.toString());
+        System.out.println("------------------" + sb.toString());
         String res = tumsApi.uploadToServer(sb.toString());
         JSONObject jsonObject = new JSONObject(res);
         String errorCode = jsonObject.getStr("error_code");
-        if(errorCode.equals("0")){
+        if (errorCode.equals("0")) {
             JSONObject result = jsonObject.getJSONObject("result");
             String taskId = result.getStr("taskId");
             cameraInfo.setTaskId(taskId);
 //            getUploadToServerProcess(cameraInfo);
-            return ftpUploadpath+"/"+fileName+".mp4";
-        }else{
+            return ftpUploadpath + "/" + fileName + ".mp4";
+        } else {
             String errorMsg = "";
-            try{
+            try {
                 ErrorCode errorVo = errorCodeService.getByCode(errorCode);
                 errorMsg = errorVo.getErrorMsg();
-            }catch (Exception e){
+            } catch (Exception e) {
                 errorMsg = errorCode;
             }
-            log.info("uploadToServerResult:{}-{}",errorCode,errorMsg);
+            log.info("uploadToServerResult:{}-{}", errorCode, errorMsg);
             return "error";
         }
     }
 
     @DS("devops")
-    public void devopsBaoxiu(CameraInfo cameraInfo){
+    public void devopsBaoxiu(CameraInfo cameraInfo) {
         baseMapper.updateById(cameraInfo);
     }
 
     @Override
     public List<CameraInfoEntity> getCameraInfoList() {
         List<CameraInfo> list = baseMapper.findAllList();
-        List<CameraInfoEntity> listDto =BeanUtil.copyToList(list, CameraInfoEntity.class);
+        List<CameraInfoEntity> listDto = BeanUtil.copyToList(list, CameraInfoEntity.class);
         return listDto;
     }
 
-    public String mkdirsFolder(String folderPath){
+    public String mkdirsFolder(String folderPath) {
         // 创建File对象
         File folder = new File(folderPath);
         String ctxPath = uploadpath;
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java
index c1216d44..a183f512 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/appraisal/controller/DirectiveAppraisalController.java
@@ -74,8 +74,7 @@ public class DirectiveAppraisalController extends JeecgController<DirectiveAppra
         Page<DirectiveAppraisal> page = new Page<DirectiveAppraisal>(pageNo, pageSize);
 
         //排序：先撤回的放前面 再是未考核的 再是应该执行时间倒序
-        queryWrapper.orderByAsc("CASE WHEN revocation IS NOT NULL AND revocation != '' THEN 0 ELSE 1 END");
-        queryWrapper.orderByAsc("CASE WHEN status = 0 THEN 0 ELSE 1 END");
+        queryWrapper.orderByAsc("CASE WHEN status = 4 THEN 0 WHEN status = 1 THEN 1 WHEN status = 2 THEN 999 WHEN status = 3 THEN 999 ELSE 999 END");
         queryWrapper.orderByDesc("start_time");
 
         IPage<DirectiveAppraisal> pageList = directiveAppraisalService.page(page, queryWrapper);
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
index f90af904..620e575f 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
@@ -14,6 +14,7 @@ import com.nu.modules.biz.order.entity.DirectiveOrderInfo;
 import com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper;
 import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
 import com.nu.modules.biz.order.mapper.DirectiveOrderInfoMapper;
+import com.nu.modules.biz.order.service.IDirectiveOrderInfoService;
 import com.nu.modules.biz.order.service.IDirectiveOrderService;
 import com.nu.modules.directiveorder.api.IDirectiveOrderLogApi;
 import com.nu.modules.order.api.IDirectiveOrderApi;
@@ -49,6 +50,8 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
     private DirectiveOrderBizLogMapper directiveOrderBizLogMapper;
     @Autowired
     private IDirectiveOrderLogApi directiveOrderLogApi;
+    @Autowired
+    private IDirectiveOrderInfoService directiveOrderInfoService;
 
     @Override
     public List<DirectiveOrderInfoEntity> queryList(DirectiveOrderInfoEntity dto) {
@@ -208,10 +211,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyMp4Path(directiveOrderEntity.getManuallyMp4Path());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");
@@ -220,10 +232,19 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
 
     @Override
     public Map<String, Object> editSubPicPath(DirectiveOrderEntity directiveOrderEntity) {
+        //主表
         DirectiveOrder directiveOrder = new DirectiveOrder();
         directiveOrder.setId(directiveOrderEntity.getId());
         directiveOrder.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
         directiveOrderService.updateById(directiveOrder);
+
+        //子表
+        DirectiveOrderInfo directiveOrderInfo = new DirectiveOrderInfo();
+        directiveOrderInfo.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
+        UpdateWrapper<DirectiveOrderInfo> uw = new UpdateWrapper<>();
+        uw.eq("main_id",directiveOrderEntity.getId());
+        directiveOrderInfoService.update(directiveOrderInfo,uw);
+
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "操作成功");