bug修改

src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java

@@ -95,6 +95,16 @@ public class AsyncHikvision {
             hikvisionCall.addCarInfoFromHttp(carInfo);
         } catch (Exception e) {
             log.error("海康：", e);
+            sendNoticeForCar(carInfo, e, "添加");
+        }
+    }
+
+    private void sendNoticeForCar(CarInfo carInfo, Exception e, String action) {
+        if (SecurityUtils.getUser().getUserId() != null) {
+            String title = action + "车辆到海康isc失败";
+            String type = "24";
+            String msg = "同步失败，车牌号：" + carInfo.getCarNumber() + "。失败原因：" + e.getMessage();
+            noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, type);
         }
     }
 
@@ -104,6 +114,7 @@ public class AsyncHikvision {
             hikvisionCall.editCarInfoForHikvision(carInfo);
         } catch (Exception e) {
             log.error("海康：", e);
+            sendNoticeForCar(carInfo, e, "编辑");
         }
     }
 
@@ -113,6 +124,7 @@ public class AsyncHikvision {
             hikvisionCall.deleteCarInfoForHikvision(carInfo);
         } catch (Exception e) {
             log.error("海康：", e);
+            sendNoticeForCar(carInfo, e, "删除");
         }
     }
 

src/main/java/com/zhgd/xmgl/call/HikvisionCall.java

@@ -53,7 +53,7 @@ import java.util.concurrent.CompletableFuture;
 @RestController
 @RequestMapping("/xmgl/hikvision")
 public class HikvisionCall {
-    private static String FIXED_CAR_GROUP_NAME = "固定车永久通行";
+    private static String FIXED_CAR_GROUP_NAME = "业主车辆";
 
     @Value("${upload.image.url.prefix:}")
     private String imageUrlPrefix;
@@ -1248,8 +1248,7 @@ public class HikvisionCall {
      * @param carInfo
      * @param project
      */
-    private void deleteReservationCarInfo(CarInfo carInfo, Project project) {
+    private void deleteReservationCarInfo(CarInfo carInfo, Project project) throws Exception {
-        try {
         final String ARTEMIS_PATH = "/artemis";
         final String path = ARTEMIS_PATH + "/api/pms/v1/parkingSpace/reservations/deletion";
         String host = "https://" + project.getArtemisConfigHost();
@@ -1264,10 +1263,6 @@ public class HikvisionCall {
                 sendNoticeForCarInfo("取消车位预约到海康isc", rs, carInfo);
             }
         }
-        } catch (Exception e) {
-            log.error("error：", e);
-        }
-
     }
 
     /**
@@ -1647,8 +1642,7 @@ public class HikvisionCall {
      * @param project
      * @param carInfo
      */
-    public void ifReservationCar(Project project, CarInfo carInfo) {
+    public void ifReservationCar(Project project, CarInfo carInfo) throws Exception {
-        try {
         //删除预约车辆
         deleteReservationCarInfo(carInfo, project);
 
@@ -1656,9 +1650,6 @@ public class HikvisionCall {
         if (Objects.equals(carInfo.getCarModuleType(), 2)) {
             reservationCarFromHttp(project, carInfo);
         }
-        } catch (Exception e) {
-            log.error("error：", e);
-        }
     }
 
     private void reservationCarFromHttp(Project project, CarInfo carInfo) throws Exception {
@@ -1666,15 +1657,12 @@ public class HikvisionCall {
         final String path = ARTEMIS_PATH + "/api/pms/v2/parkingSpace/reservations/addition";
         String host = "https://" + project.getArtemisConfigHost();
         ParkReservation parkReservation = getParkReservation(project, carInfo);
-        if (parkReservation != null) {
         String rs = HikvisionUtil.doPost(host, path, JSON.toJSONString(parkReservation), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
         sendNoticeForCarInfo("添加预约车辆到海康isc", rs, carInfo);
     }
-    }
 
     private ParkReservation getParkReservation(Project project, CarInfo carInfo) throws Exception {
         String parkIndexCode = getProjectParkCode(project);
-        if (StringUtils.isNotBlank(parkIndexCode)) {
         WorkerInfo workerInfo = workerInfoMapper.selectById(carInfo.getDriverWorkerId());
         ParkReservation parkReservation = new ParkReservation();
         parkReservation.setParkSyscode(parkIndexCode);
@@ -1689,8 +1677,6 @@ public class HikvisionCall {
         parkReservation.setEndTime(DateUtil.format(carInfo.getReserveEndTime(), "yyyy-MM-dd'T'HH:mm:ss") + "+08:00");
         return parkReservation;
     }
-        return null;
-    }
 
     /**
      * 获取项目名称的停车场的parkIndexCode，没有一样名字的就取第一个停车场
@@ -1709,8 +1695,9 @@ public class HikvisionCall {
             }
             //没有一样名字的就取第一个停车场
             return parkList.getJSONObject(0).getString("parkIndexCode");
+        } else {
+            throw new OpenAlertException("未查询到停车场信息");
         }
-        return null;
     }
 
     /**