同步预制点

monitor_ui/src/views/centerMonitor/camera/PolygonDrawer.vue

@@ -37,7 +37,7 @@
         </div>
       </div>
 
-      <div class="action-group">
+      <div class="info-group">
         <h3 class="setting-title">操作</h3>
         <div class="actions">
           <button @click="finishCurrentPolygon" class="action-btn primary-btn" :disabled="taskId == null || pointId == null">
@@ -50,17 +50,14 @@
             <i class="fa fa-download"></i> 保存多边形
           </button>
         </div>
-      </div>
-
-      <div class="info-group">
-        <h3 class="setting-title">提示</h3>
+        <!--<h3 class="setting-title">提示</h3>
         <ul class="info-list">
           <li><i class="fa fa-circle text-xs"></i> 点击画布添加多边形顶点</li>
           <li><i class="fa fa-circle text-xs"></i> 双击画布完成当前多边形</li>
           <li><i class="fa fa-circle text-xs"></i> 可连续绘制多个多边形</li>
           <li><i class="fa fa-circle text-xs"></i> 保存的文件可用于恢复图形</li>
           <li><i class="fa fa-circle text-xs"></i> 靠近顶点时会自动吸附</li>
-        </ul>
+        </ul>-->
       </div>
     </div>
 
@@ -735,7 +732,7 @@ export default {
   display: flex;
   flex-direction: column;
   gap: 8px;
-  min-height: 100px;
+  min-height: 200px;
 }
 
 .action-btn {
@@ -783,6 +780,7 @@ export default {
 .info-group {
   padding-top: 8px;
   border-top: 1px solid #E5E7EB;
+  max-height: 100px;
 }
 
 .info-list {

monitor_ui/src/views/centerMonitor/camera/index.vue

@@ -1248,6 +1248,7 @@ export default {
           this.infoDraw = {url: row.url, cameraName: row.cameraName, channels: response.rows, tasks: [], presetPoints: [], pointId: "", pointName: "", type: "0"};
           this.openDraw = true
           this.title = "绘制围栏"
+          this.$refs.PolygonDrawer.clearCanvas()
         } else {
           this.$modal.msgSuccess('请先维护通道')
         }

src/main/java/com/sooka/sponest/monitor/channelrail/service/impl/ChannelRailServiceImpl.java

@@ -9,10 +9,7 @@ import com.sooka.sponest.monitor.dahua.service.DahuaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -61,6 +58,7 @@ public class ChannelRailServiceImpl implements IChannelRailService {
                                 map.put("channelName", channel.getString("channelName"));
                                 channelCutInfos.add(map);
                             });
+                            Collections.reverse(channelCutInfos);
                             channelPresetPointVO.put("channelCutInfos", channelCutInfos);
                         }
                         return channelPresetPointVO;

src/main/java/com/sooka/sponest/monitor/dahua/service/impl/DahuaServiceImpl.java

@@ -1073,7 +1073,7 @@ public class DahuaServiceImpl extends BaseService implements DahuaService {
     public void updateTask(com.alibaba.fastjson.JSONObject jsonObject) {
         String prBody = "";
         try {
-            IccHttpHttpRequest pr = new IccHttpHttpRequest(host + "/evo-apigw/evo-gmai/1.4.0/api/algorithmTask/update", Method.POST, jsonObject);
+            IccHttpHttpRequest pr = new IccHttpHttpRequest(host + "/evo-apigw/evo-gmai/1.4.0/api/algorithmTask/update", Method.POST, JSON.toJSONString(jsonObject));
             pr.getHttpRequest().header("Authorization", "bearer " + getTokenByPassword());
             prBody = pr.execute();
             AjaxResult.success("操作成功", JSON.parseObject(prBody));