LIVE_YE 2 سال پیش
والد
کامیت
16278c18c7

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/parkLot/GetCameraPreviewURL.java

@@ -57,7 +57,7 @@ public class GetCameraPreviewURL {
          * STEP6:调用接口
          */
         String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post请求application/json类型参数
-        System.out.println(result);
+        //System.out.println(result);
         /**
          * {
          *     "code": "0",
@@ -135,7 +135,7 @@ public class GetCameraPreviewURL {
          * STEP6:调用接口
          */
         String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post请求application/json类型参数
-        System.out.println(result);
+        //System.out.println(result);
         return result;
     }
 
@@ -200,7 +200,7 @@ public class GetCameraPreviewURL {
          * STEP6:调用接口
          */
         String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post请求application/json类型参数
-        System.out.println(result);
+        //System.out.println(result);
         return result;
     }
 }

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/parkLot/ParkLotController.java

@@ -71,7 +71,7 @@ public class ParkLotController extends BaseController {
      * @return
      */
     @PostMapping("/tempCarInRecords")
-    public TableDataInfo tempCarInRecords(@Validated @RequestBody TempCarInRecordVo tempCarInRecordVo) {
+    public TableDataInfo tempCarInRecords(TempCarInRecordVo tempCarInRecordVo) {
         //所有固定车车牌
         ArrayList chargeList = chargeList(tempCarInRecordVo.getPlateNo());
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");

+ 6 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -6,6 +6,7 @@ import com.ruoyi.system.domain.RecordData;
 import com.ruoyi.system.mapper.RecordDataMapper;
 import com.ruoyi.system.utils.timingURL;
 import org.joda.time.DateTime;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -17,6 +18,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+@EnableScheduling
 @Component
 public class Task {
 
@@ -27,7 +29,9 @@ public class Task {
      *定时任务(定时取海康威视的进场数据)
      */
     @Scheduled(cron = "0 55 23 * * ? ")
+    //@Scheduled(cron = "0 0/2 * * * ? ")
     public void parkingLotData() {
+        System.out.println("定时任务");
         DateTime dt = new DateTime();
         String endTime=dt.toString("yyyy-MM-dd'T'HH:mm:ss")+"+08:00";
 
@@ -43,7 +47,7 @@ public class Task {
             int pageNo = 1;
             String outfieldData = timingURL.timingURL(outParkSyscode,outEntranceSyscode,startTime,endTime,pageNo);
             JSONObject jsonObject = JSONObject.parseObject(outfieldData);
-            String data = (String) jsonObject.get("data");
+            String data = jsonObject.getString("data");
             JSONObject outData = JSONObject.parseObject(data);
             List<Map<String,Object>> list = (List<Map<String, Object>>) outData.get("list");
             outListAll.addAll(list);
@@ -61,7 +65,7 @@ public class Task {
             int pageNo = 1;
             String infieldfieldData = timingURL.timingURL(infieldParkSyscode,infieldEntranceSyscode,startTime,endTime,pageNo);
             JSONObject jsonObject = JSONObject.parseObject(infieldfieldData);
-            String data = (String) jsonObject.get("data");
+            String data = jsonObject.getString("data");
             JSONObject infieldData = JSONObject.parseObject(data);
             List<Map<String,Object>> list = (List<Map<String, Object>>) infieldData.get("list");
             outListAll.addAll(list);

+ 3 - 3
ruoyi-system/src/main/java/com/ruoyi/system/utils/timingURL.java

@@ -41,8 +41,8 @@ public class timingURL {
         /**
          * STEP3:设置接口的URI地址
          */
-        //final String previewURLsApi = ARTEMIS_PATH + "/api/pms/v1/crossRecords/page";
-        final String previewURLsApi = ARTEMIS_PATH + "/api/resource/v1/entrance/entranceList";
+        final String previewURLsApi = ARTEMIS_PATH + "/api/pms/v1/crossRecords/page";
+        //final String previewURLsApi = ARTEMIS_PATH + "/api/resource/v1/entrance/entranceList";
         Map<String, String> path = new HashMap<String, String>(2) {
             {
                 put("https://", previewURLsApi);//根据现场环境部署确认是http还是https
@@ -86,7 +86,7 @@ public class timingURL {
          * STEP6:调用接口
          */
         String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post请求application/json类型参数
-        System.out.println(result);
+        //System.out.println(result);
         /**
          * {
          *     "code": "0",

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/RecordDataMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     
     <insert id="insertRecordData" parameterType="RecordData">
-        insert into sys_config (
+        insert into record_data (
 			<if test="id != null and id != '' ">id,</if>
 			<if test="parkSyscode != null and parkSyscode != '' ">park_syscode,</if>
 			<if test="entranceSyscode != null and entranceSyscode != '' ">entrance_syscode,</if>