添加停车场标识

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -16,7 +16,7 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  停车系统启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +

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

@@ -51,6 +51,9 @@ public class ParkLotController extends BaseController {
         if (StringUtils.isEmpty(leftPlaceRedis)) {
             leftPlaceRedis = "0";
             String result = GetCameraPreviewURL.GetCameraPreviewURL();
+            if (StringUtils.isBlank(result)) {
+                return leftPlaceRedis;
+            }
             JSONObject jsonObject = JSONObject.parseObject(result);
             String code = jsonObject.getString("code");
             if ("0".equals(code)) {
@@ -72,65 +75,70 @@ public class ParkLotController extends BaseController {
      */
     @PostMapping("/tempCarInRecords")
     public TableDataInfo tempCarInRecords(TempCarInRecordVo tempCarInRecordVo) {
-        //所有固定车车牌
-        ArrayList chargeList = chargeList(tempCarInRecordVo.getPlateNo());
-        DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-        String startTime = tempCarInRecordVo.getStartTime();
-        String endTime = tempCarInRecordVo.getEndTime();
-        if (StringUtils.isNotBlank(startTime)){
-            DateTime parseStartTime = DateTime.parse(startTime, formatter);
-            startTime = parseStartTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
-        }
-        if (StringUtils.isNotBlank(endTime)){
-            DateTime parseEndTime = DateTime.parse(endTime, formatter);
-            endTime = parseEndTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
-        }
-        //获取所有在场车辆
-        String result = GetCameraPreviewURL.GetTempCarInRecordsURL(tempCarInRecordVo.getPlateNo(), startTime, endTime, tempCarInRecordVo.getPageNo(), tempCarInRecordVo.getPageSize());
-        /**
-         * {
-         *     "code": "0",
-         *     "msg": "success",
-         *     "data": {
-         *         "total": 1,
-         *         "pageNo": 1,
-         *         "pageSize": 15,
-         *         "list": [
-         *             {
-         *                 "inRecordSyscode": "h45h45h45ghhn45tg245g45r",
-         *                 "vehiclePicUri": "/pic?=d7ei703i10cd*73a-d5108a--22c6592ai2b4*=3d4id=",
-         *                 "cardNo": "613453453",
-         *                 "inTime": "2018-07-26T15:00:00+08:00",
-         *                 "parkTime": "1天1小时1分钟",
-         *                 "parkSyscode": "hju56jyt54h4h245g2345g345fg",
-         *                 "parkName": "停车库1",
-         *                 "plateNoPicUri": "/pic?=d7ei703i10cd*73a-d5108a--22c592ai2b4*=3",
-         *                 "aswSyscode": "g45ghertg34fh4hy245tgy234tg5",
-         *                 "plateNo": "浙A12345"
-         *             }
-         *         ]
-         *     }
-         * }
-         */
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        String code = jsonObject.getString("code");
         //定义返回值
         ArrayList tempCarInRecordList = new ArrayList<>();
-        if ("0".equals(code)) {
-            String data = jsonObject.getString("data");
-            JSONObject jsonObjectData = JSONObject.parseObject(data);
-            JSONArray list = jsonObjectData.getJSONArray("list");
-            if (list != null && list.size() > 0){
-                for (int i = 0; i < list.size(); i++) {
-                    JSONObject jsonObjectTempCarInRecord = list.getJSONObject(i);
-                    String plateNoTempCarInRecord = jsonObjectTempCarInRecord.getString("plateNo");
-                    boolean contains = chargeList.contains(plateNoTempCarInRecord);
-                    if (contains){
-                        TempCarInRecordVo tempCarInRecord = new TempCarInRecordVo();
-                        tempCarInRecord.setPlateNo(plateNoTempCarInRecord);
-                        tempCarInRecord.setParkTime(jsonObjectTempCarInRecord.getString("parkTime"));
-                        tempCarInRecord.setInTime(zDate(jsonObjectTempCarInRecord.getString("inTime")));
-                        tempCarInRecordList.add(tempCarInRecord);
+        //所有固定车车牌
+        ArrayList chargeList = chargeList(tempCarInRecordVo.getPlateNo());
+        if (chargeList != null && chargeList.size() > 0) {
+            DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+            String startTime = tempCarInRecordVo.getStartTime();
+            String endTime = tempCarInRecordVo.getEndTime();
+            if (StringUtils.isNotBlank(startTime)) {
+                DateTime parseStartTime = DateTime.parse(startTime, formatter);
+                startTime = parseStartTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
+            }
+            if (StringUtils.isNotBlank(endTime)) {
+                DateTime parseEndTime = DateTime.parse(endTime, formatter);
+                endTime = parseEndTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
+            }
+            //获取所有在场车辆
+            String result = GetCameraPreviewURL.GetTempCarInRecordsURL(tempCarInRecordVo.getPlateNo(), startTime, endTime, tempCarInRecordVo.getPageNo(), tempCarInRecordVo.getPageSize());
+            if (StringUtils.isNotBlank(result)) {
+                /**
+                 * {
+                 *     "code": "0",
+                 *     "msg": "success",
+                 *     "data": {
+                 *         "total": 1,
+                 *         "pageNo": 1,
+                 *         "pageSize": 15,
+                 *         "list": [
+                 *             {
+                 *                 "inRecordSyscode": "h45h45h45ghhn45tg245g45r",
+                 *                 "vehiclePicUri": "/pic?=d7ei703i10cd*73a-d5108a--22c6592ai2b4*=3d4id=",
+                 *                 "cardNo": "613453453",
+                 *                 "inTime": "2018-07-26T15:00:00+08:00",
+                 *                 "parkTime": "1天1小时1分钟",
+                 *                 "parkSyscode": "hju56jyt54h4h245g2345g345fg",
+                 *                 "parkName": "停车库1",
+                 *                 "plateNoPicUri": "/pic?=d7ei703i10cd*73a-d5108a--22c592ai2b4*=3",
+                 *                 "aswSyscode": "g45ghertg34fh4hy245tgy234tg5",
+                 *                 "plateNo": "浙A12345"
+                 *             }
+                 *         ]
+                 *     }
+                 * }
+                 */
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                String code = jsonObject.getString("code");
+                //定义返回值
+                if ("0".equals(code)) {
+                    String data = jsonObject.getString("data");
+                    JSONObject jsonObjectData = JSONObject.parseObject(data);
+                    JSONArray list = jsonObjectData.getJSONArray("list");
+                    if (list != null && list.size() > 0) {
+                        for (int i = 0; i < list.size(); i++) {
+                            JSONObject jsonObjectTempCarInRecord = list.getJSONObject(i);
+                            String plateNoTempCarInRecord = jsonObjectTempCarInRecord.getString("plateNo");
+                            boolean contains = chargeList.contains(plateNoTempCarInRecord);
+                            if (contains) {
+                                TempCarInRecordVo tempCarInRecord = new TempCarInRecordVo();
+                                tempCarInRecord.setPlateNo(plateNoTempCarInRecord);
+                                tempCarInRecord.setParkTime(jsonObjectTempCarInRecord.getString("parkTime"));
+                                tempCarInRecord.setInTime(zDate(jsonObjectTempCarInRecord.getString("inTime")));
+                                tempCarInRecordList.add(tempCarInRecord);
+                            }
+                        }
                     }
                 }
             }
@@ -190,6 +198,9 @@ public class ParkLotController extends BaseController {
             pageNoCharge = 1 + pageNoCharge;
             //查询出所有未过期的固定车
             String resultCharge = GetCameraPreviewURL.GetChargeURL(plateNo, "2018-07-26T15:00:00+08:00", timestamp, String.valueOf(pageNoCharge), "1000");
+            if (StringUtils.isBlank(resultCharge)){
+                return plateNoList;
+            }
             JSONObject jsonObjectCharge = JSONObject.parseObject(resultCharge);
             String codeCharge = jsonObjectCharge.getString("code");
             if ("0".equals(codeCharge)) {