From a4e99a6a39284643fdf2b04dbe55212e5954973c Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期一, 20 五月 2024 17:37:25 +0800
Subject: [PATCH] firsh

---
 src/main/java/com/skyline/electricity/controller/DetectController.java |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/skyline/electricity/controller/DetectController.java b/src/main/java/com/skyline/electricity/controller/DetectController.java
index 11d2f80..f644865 100644
--- a/src/main/java/com/skyline/electricity/controller/DetectController.java
+++ b/src/main/java/com/skyline/electricity/controller/DetectController.java
@@ -37,18 +37,18 @@
     private ConfigInfo configInfo;
     GeometryFactory geometryFactory;
     WKTReader reader;
-    
+
     public DetectController() {
         this.geometryFactory = new GeometryFactory();
         this.reader = new WKTReader(this.geometryFactory);
     }
-    
+
     @RequestMapping(value = { "/getAlarmInfo" }, method = { RequestMethod.POST })
     @ApiOperation("瀹炴椂鍒ゆ柇鐢靛瓙鍥存爮鍜屼汉鍛樺畾浣嶇殑浣嶇疆鍏崇郴骞跺瓨鍌ㄩ璀︿俊鎭�")
     public void getAlarmInfo() {
         this.schedulerTask.getInfo();
     }
-    
+
     @RequestMapping(value = { "/saveFixedFence" }, method = { RequestMethod.POST })
     @ApiOperation("淇濆瓨鍥哄畾鐢靛瓙鍥存爮淇℃伅浠ュ強杩斿洖鍥存爮閲嶅彔淇℃伅")
     @ResponseBody
@@ -104,7 +104,7 @@
             return null;
         }
     }
-    
+
     @RequestMapping(value = { "/saveTempFence" }, method = { RequestMethod.POST })
     @ApiOperation("淇濆瓨涓存椂鐢靛瓙鍥存爮淇℃伅浠ュ強杩斿洖鍥存爮閲嶅彔淇℃伅")
     @ResponseBody
@@ -173,7 +173,7 @@
             return null;
         }
     }
-    
+
     @RequestMapping(value = { "/getRoute" }, method = { RequestMethod.POST })
     @ApiImplicitParam(paramType = "query", name = "username", value = "浜哄憳濮撳悕", required = true, dataType = "String")
     @ApiOperation("鑾峰彇浜哄憳娲诲姩杞ㄨ抗")
@@ -182,7 +182,7 @@
         final List<String> route = (List<String>)this.detectService.getRoute(username);
         return route.toString();
     }
-    
+
     @RequestMapping(value = { "/getWifiInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇Wifi璁惧鍧愭爣")
     @ResponseBody
@@ -205,7 +205,7 @@
         map.put("data", dtoList);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getMonitorInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鎽勫儚澶磋澶囧潗鏍�")
     @ResponseBody
@@ -233,7 +233,7 @@
         map.put("data", dtoList);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getMonitorDeviceInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鎽勫儚澶磋澶囦俊鎭�")
     @ResponseBody
@@ -260,7 +260,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getMonitorDeviceInfoById" }, method = { RequestMethod.POST })
     @ApiOperation("閫氳繃ID鑾峰彇鎽勫儚澶磋澶囦俊鎭�")
     @ResponseBody
@@ -287,7 +287,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getDoorAccessInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇闂ㄧ璁惧鍧愭爣")
     @ResponseBody
@@ -297,7 +297,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getEnabledFenceInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鏈夋晥鐨勭數瀛愬洿鏍忎俊鎭�")
     @ResponseBody
@@ -307,7 +307,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getFixedFenceInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇鍥哄畾鐨勭數瀛愬洿鏍忎俊鎭�")
     @ResponseBody
@@ -317,7 +317,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getFenceInfoById" }, method = { RequestMethod.POST })
     @ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String")
     @ApiOperation("鏍规嵁宸ヤ綔绁↖D鑾峰彇鐢靛瓙鍥存爮淇℃伅")
@@ -328,7 +328,7 @@
         map.put("data", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/updateFenceInfo" }, method = { RequestMethod.POST })
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", name = "fname", value = "鐢靛瓙鍥存爮鍚嶇О", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "workLeader", value = "宸ヤ綔绁ㄨ礋璐d汉", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "starttime", value = "鐢靛瓙鍥存爮鐢熸晥鏃堕棿", required = false, dataType = "String"), @ApiImplicitParam(paramType = "query", name = "disabledtime", value = "鐢靛瓙鍥存爮澶辨晥鏃堕棿", required = false, dataType = "String") })
     @ApiOperation("鏇存柊鐢靛瓙鍥存爮淇℃伅")
@@ -371,7 +371,7 @@
         result.setMessage("杈撳叆鐨勫洿鏍忕浉鍏充俊鎭湁璇� 鏇存柊澶辫触");
         return result;
     }
-    
+
     @RequestMapping(value = { "/deleteFenceById" }, method = { RequestMethod.POST })
     @ApiImplicitParam(paramType = "query", name = "workId", value = "宸ヤ綔绁↖D", required = true, dataType = "String")
     @ApiOperation("鏍规嵁宸ヤ綔绁↖D鍒犻櫎鐢靛瓙鍥存爮淇℃伅")
@@ -395,7 +395,7 @@
         result.setMessage("鍒犻櫎澶辫触");
         return result;
     }
-    
+
     @RequestMapping(value = { "/deleteFence" }, method = { RequestMethod.POST })
     @ApiOperation("鍒犻櫎鎵�鏈夌數瀛愬洿鏍忎俊鎭�")
     @ResponseBody
@@ -411,7 +411,7 @@
         result.setMessage("鍒犻櫎澶辫触");
         return result;
     }
-    
+
     @RequestMapping(value = { "/getDeviceInfo" }, method = { RequestMethod.POST })
     @ApiOperation("鑾峰彇璁惧鐨勭浉鍏充俊鎭�")
     @ResponseBody
@@ -427,7 +427,7 @@
         map.put("list", list);
         return map;
     }
-    
+
     @RequestMapping(value = { "/getDeviceInfoById" }, method = { RequestMethod.GET })
     @ApiOperation("鏍规嵁KKS缂栫爜鑾峰彇璁惧鐨勭浉鍏充俊鎭�")
     @ResponseBody
@@ -447,7 +447,7 @@
         result.setMessage("杈撳叆鐨勮澶嘔D涓嶅瓨鍦�  鏃犳硶鏌ヨ鐩稿簲鐨勬暟鎹�");
         return result;
     }
-    
+
     @RequestMapping(value = { "/selectFencePersonRelByworkid" }, method = { RequestMethod.GET })
     @ApiOperation("鏍规嵁workid鑾峰彇鍥存爮鍐呯殑浜哄憳淇℃伅")
     @ResponseBody
@@ -472,7 +472,7 @@
         }
         return result;
     }
-    
+
     @RequestMapping(value = { "/selectFenceAndfixedArea" }, method = { RequestMethod.GET })
     @ApiOperation("鑾峰彇鍥存爮鍜屽浐瀹氬尯鍩熷垪琛�")
     @ResponseBody
@@ -566,7 +566,7 @@
         }
         return fencePositionList;
     }
-    
+
     @RequestMapping(value = { "/saveFence_yq" }, method = { RequestMethod.POST })
     @ApiOperation("淇濆瓨鍖哄煙淇℃伅")
     @ResponseBody
@@ -594,7 +594,7 @@
             return null;
         }
     }
-    
+
     @RequestMapping(value = { "/saveFix" }, method = { RequestMethod.POST })
     @ApiOperation("淇濆瓨鍖哄煙淇℃伅")
     @ResponseBody
@@ -608,7 +608,7 @@
         catch (Exception e) {
             e.printStackTrace();
         }
-        System.out.println(polygon.toString());
+        //System.out.println(polygon.toString());
         final FencePosition fencePosition = new FencePosition();
         fencePosition.setFenceposition(polygon.toString());
         fencePosition.setCreatetime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()));
@@ -621,7 +621,7 @@
         this.detectService.insertPolygon(fencePosition);
         return "ok";
     }
-    
+
     static {
         DetectController.log = LoggerFactory.getLogger((Class)DetectController.class);
     }

--
Gitblit v1.9.3