server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -154,12 +154,6 @@ // è¶ æ¶é¢è¦é ç½® public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING"; // FTPæä»¶æå¡å¨èµæºè®¿é®å°å //æå°é¢çº¦æå public static final String PLATFORM_BOOKING_TIPS = "PLATFORM_BOOKING_TIPS"; //æå°å¯¼è§å¾ public static final String PLATFORM_GUIDEMAP = "PLATFORM_GUIDEMAP"; public static String getRandom6Num( ) { Random random = new Random(); StringBuilder sb = new StringBuilder(); server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -4,8 +4,8 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatCarstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatWorkstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.model.ApiResponse; import com.doumee.dao.business.model.Device; @@ -108,15 +108,15 @@ return ApiResponse.success(null); } @ApiOperation("ãæµ·åº·ãæå°å·¥ä½ç¶æäºä»¶æ¨é") @PostMapping("/platform/workstatus") public ApiResponse workstatus(@RequestBody EventPlatWorkstatusRequest param, HttpServletResponse response) { hkSyncPushService.dealWorkstatusEvent(param,response); @PostMapping("/push/platform/workstatus") public ApiResponse pushPlatformStatus(@RequestBody EventPlatformRequest param, HttpServletResponse response) { hkSyncPushService.dealPlatformStatusEvent(param,response); return ApiResponse.success(null); } @ApiOperation("ãæµ·åº·ãæå°è½¦è¾ç¶æäºä»¶æ¨é") @PostMapping("/platform/carstatus") public ApiResponse carstatus(@RequestBody EventPlatCarstatusRequest param, HttpServletResponse response) { hkSyncPushService.dealCarstatusEvent(param,response); @PostMapping("/push/platform/carstatus") public ApiResponse pushPlatformCarStatus(@RequestBody EventPlatformCarsRequest param, HttpServletResponse response) { hkSyncPushService.dealPlatformCarsEvent(param,response); return ApiResponse.success(null); } } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -7,6 +7,8 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.model.ApiResponse; @@ -130,6 +132,20 @@ String result = hkSyncPushService.dealParkEvent(param,response); return ApiResponse.success(result); } @ApiOperation("ãæµ·åº·ãæå°å·¥ä½ç¶æäºä»¶è®¢é æ¨é对æ¥å¤çæ¥å£") @PostMapping("/push/platform/workstatus") @LoginNoRequired public ApiResponse pushPlatformStatus(@RequestBody EventPlatformRequest param, HttpServletResponse response ){ String result = hkSyncPushService.dealPlatformStatusEvent(param,response); return ApiResponse.success(result); } @ApiOperation("ãæµ·åº·ãæå°è½¦è¾ç¶æäºä»¶è®¢é æ¨é对æ¥å¤çæ¥å£") @PostMapping("/push/platform/carstatus") @LoginNoRequired public ApiResponse pushPlatformCarStatus(@RequestBody EventPlatformCarsRequest param, HttpServletResponse response ){ String result = hkSyncPushService.dealPlatformCarsEvent(param,response); return ApiResponse.success(result); } @PreventRepeat @ApiOperation("ãæµ·åº·ãåæ¶è®¢é äºä»¶") @PostMapping("/cancelEventSub") server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -34,6 +34,19 @@ return ApiResponse.success(new WaterByMonthResponse()); } @PreventRepeat @ApiOperation("ãç¨æ°´éãè¿12个æç¨æ°´éä¿¡æ¯å表") @PostMapping("/water/lastMonthsDataList") @LoginNoRequired public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsWaterList( ) { return ApiResponse.success(new ArrayList<>()); } @ApiOperation("ãç¨æ°éãè¿12个æç¨æ°éä¿¡æ¯å表") @PostMapping("/gas/lastMonthsDataList") @LoginNoRequired public ApiResponse<List<PlatformLastMonthListResponse>> lastMonthsGasList () { return ApiResponse.success(new ArrayList<>()); } @PreventRepeat @ApiOperation("ãç¨æ°éãæ¬æã䏿åå»å¹´åæ") @PostMapping("/gas/dataByMonth") @LoginNoRequired @@ -48,31 +61,31 @@ return ApiResponse.success(new PlatformOrderNumByDateResponse()); } @PreventRepeat @ApiOperation("ãæå°ãæå°ä¸ªç¶ææ°éç»è®¡") @ApiOperation("ãæå°ãæå°åç¶ææ°éç»è®¡") @PostMapping("/platform/totalNumByStatus") @LoginNoRequired public ApiResponse<PlatformNumByStatusResponse> totalNumByStatus(@RequestBody PlatformNumByStatusRequest param) { public ApiResponse<PlatformNumByStatusResponse> totalNumByStatus( ) { return ApiResponse.success(new PlatformNumByStatusResponse()); } @PreventRepeat @ApiOperation("ãæå°ãæå°å½åä½ä¸ä¿¡æ¯å表") @PostMapping("/platform/workingDataList") @LoginNoRequired public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList(@RequestBody PlatformDataListRequest param) { public ApiResponse<List<PlatformDataListResponse>> platformWorkingDataList( ) { return ApiResponse.success(new ArrayList<>()); } @PreventRepeat @ApiOperation("ãæå°ãæå°ä½ä¸è¯¦æ ä¿¡æ¯") @PostMapping("/platform/workDataInfo") @LoginNoRequired public ApiResponse<PlatformDataInfoResponse> platformWorkingDataList(@RequestBody PlatformDataInfoRequest param) { public ApiResponse<PlatformDataInfoResponse> platformWorkingDataInfo(@RequestBody PlatformDataInfoRequest param) { return ApiResponse.success(new PlatformDataInfoResponse()); } @PreventRepeat @ApiOperation("ãæå°ãå½å车è¾ç¶ææ°éç»è®¡") @PostMapping("/platform/carStatusNum") @LoginNoRequired public ApiResponse<CarNumByStatusResponse> carStatusNum(@RequestBody CarNumByStatusRequest param) { public ApiResponse<CarNumByStatusResponse> carStatusNum( ) { return ApiResponse.success(new CarNumByStatusResponse()); } @@ -87,7 +100,7 @@ @ApiOperation("ãæå°ãæééåå表éå") @PostMapping("/platform/queueList") @LoginNoRequired public ApiResponse< PlatformQueuingListResponse> carLogsList(@RequestBody PlatformQueuingListRequest param) { public ApiResponse< PlatformQueuingListResponse> queueList( ) { return ApiResponse.success(new PlatformQueuingListResponse()); } @@ -95,7 +108,7 @@ @ApiOperation("ãæå°ãé¢è¦äºä»¶éåå表") @PostMapping("/platform/warningEventList") @LoginNoRequired public ApiResponse<List<CarLogsListResponse>> carLogsList(@RequestBody PlatformWarnEventListRequest param) { public ApiResponse<List<CarLogsListResponse>> warningEventList( ) { return ApiResponse.success(new ArrayList<>()); } } server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -52,7 +52,8 @@ .apiInfo(this.getApiInfo()).groupName("default") .host(host) .select() .apis( basePackage("com.doumee.cloud;com.doumee.api.common")) // .apis( basePackage("com.doumee.cloud.openapi;com.doumee.api.common")) .apis( basePackage("com.doumee.cloud.openapi;")) // 设置éè¦è¢«æ«æçç±»ï¼è¿é设置为添å äº@Api注解çç±» // .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) .paths(PathSelectors.any()) server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventImageInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,11 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventImageInfoRequest { private String resourcesContentType;//: "binary", private String resourcesContent;//: "backgroundImage" } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformAttrInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,14 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.math.BigDecimal; @Data public class EventPlatformAttrInfoRequest { private String cameraIndexCode;//: "90a3caf18fb449339405099a816c3b2d", private String deviceIndexCode;//: "5a939a9cf1ee4e268eac6671ec3527ef", private String imageServerCode;//: "bfe11307-3286-49ca-b9ee-9efb34b3f555", private String picServerIndexCode;//: "bfe11307-3286-49ca-b9ee-9efb34b3f555" } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsDataRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventPlatformCarsDataRequest { private List<EventPlatformCarsStatusInfoRequest> HPVehicleStatus;// private List<EventPlatformAttrInfoRequest> targetAttrs;// private String dataType;//HPVehicleStatus private String sendTime;//2017-04-22T15:39:01.000+08:00 private String dateTime;//2004-05-03T17:30:08.000+08:00 private String ipAddress;//172.6.64.7 private String ipv6Address;//null private Integer portNo;//private;// 80, private String protocol;//HTTP private String macAddress;//01:17:24:45:D9:F4 private Integer channelID;//private ;//String : 1, private Integer activePostCount;//private String : 1, private String eventType;//HPVehicleStatus private String eventState;//active private String eventDescription;//handingPlatform vehicle status private String channelName;//ABC private String deviceID;//test0123 private String eventId;//205F7A23-BF3F-C346-A02E-08DAF55EEA15 } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventPlatformCarsInfoRequest { private String eventId;// String äºä»¶å¯ä¸æ è¯ æ¯ 64 private String srcIndex;// String äºä»¶æºç¼å·ï¼ç©çè®¾å¤æ¯èµæºç¼å· æ¯ 64 private String dateTime;// private String srcType;// String äºä»¶æºç±»å æ¯ 16 private Integer eventType ;//Number äºä»¶ç±»å æ¯ private String srcName;// String äºä»¶æºåç§° å¦ 64 private Integer status ;//Number äºä»¶ç¶æ æ¯ 0-ç¬æ¶1-å¼å§2-忢3-äºä»¶èå²4-äºä»¶èå¨ç»ææ´æ°5-弿¥å¾çä¸ä¼ private Integer timeout ;//Number èå²è¶ æ¶æ¶é´ æ¯ åä½ï¼ç§ private String happenTime ;//String äºä»¶åçæ¶é´ï¼è®¾å¤æ¶é´ï¼ æ¯ 64 private String srcParentIndex ;//String äºä»¶åççäºä»¶æºç¶è®¾å¤ç¼å· å¦ 64 private List<EventPlatformCarsDataRequest> data; } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsParamRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventPlatformCarsParamRequest { private String sendTime;// P String äºä»¶ä»æ¥æ¶è ï¼ç¨åºå¤çåï¼ååºçæ¶é´ æ¯ 32 äºä»¶åéæ¶é´ private String ability;// P String äºä»¶ç±»å« æ¯ 64 æ è¯å车åºäºä»¶ private List<String> uids;// private List<String> clients;// private Integer dataProcInterval;// private List<EventPlatformCarsInfoRequest> events;// P Events[] äºä»¶ä¿¡æ¯ æ¯ ä¸é } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsRequest.javacopy from server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatCarstatusRequest.java copy to server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsRequest.java
Îļþ´Ó server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatCarstatusRequest.java ¸´ÖÆ @@ -3,11 +3,11 @@ import lombok.Data; @Data public class EventPlatCarstatusRequest { public class EventPlatformCarsRequest { // private String parkIndexCodes ;// string False å车åºå¯ä¸æ è¯éå å¤ä¸ªå¼ä½¿ç¨è±æéå·åéï¼ä¸è¶ è¿1000个 private String method ;// String æ¹æ³åï¼ç¨äºæ è¯æ¥æç¨é æ¯ 16 äºä»¶åºå®OnEventNotify private EventParkParamRequest params ;// Params äºä»¶åæ°ä¿¡æ¯ æ¯ ä¸é å ·ä½åæ°ä¿¡æ¯ private EventPlatformCarsParamRequest params ;// Params äºä»¶åæ°ä¿¡æ¯ æ¯ ä¸é å ·ä½åæ°ä¿¡æ¯ } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformCarsStatusInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.math.BigDecimal; @Data public class EventPlatformCarsStatusInfoRequest { private Integer HPNo;// 1,车éå· private Integer plateScore;//: 80车çè¯å private String motionStatus;//'leave',è¿å¨ç¶æ enter#è¿å ¥,leave#ç¦»å¼ private String plateNo;//'A12345',车çå· private String vehicleDoorStatus;//'open',车é¨ç¶æÂ open-å¼é¨ï¼close-å ³é¨ private String stockStatus;//'rear',è½¦å¤´è½¦å°¾ç¶æÂ Â front#车头,rear#车尾 private EventImageInfoRequest BackgroundImage;//æå°èæ¯å¤§å¾ private EventImageInfoRequest PlatePicture;//车çå¾ } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformDataRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data public class EventPlatformDataRequest { private List<EventPlatformStatusInfoRequest> HPWorkingStatus;// private List<EventPlatformAttrInfoRequest> targetAttrs;// private Integer activePostCount;//1, private Integer channelID;//1, private String dataProcInterval;// 3private String , private String dataType;// HPWorkingStatusprivate String , private String dateTime;// 2021-07-16T18:57:22.000+08:00private String , private String deviceID;// 88private String , private String eventDescription;// handingPlatform working statusprivate String , private String eventState;// activeprivate String , private String eventType;// HPWorkingStatusprivate String , private String ipAddress;// 10.18.99.179private String , private String macAddress;// 58:50:ed:6d:f2:73private String , private String picUploadInterval;// 0private String , private String portNo;//8000, private String recvTime;// 2021-07-16T18:56:18.645+08:00private String , private String sendTime;// 2021-07-16T18:56:18.648+08:00private String , } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventPlatformInfoRequest { private String eventId;// String äºä»¶å¯ä¸æ è¯ æ¯ 64 private String srcIndex;// String äºä»¶æºç¼å·ï¼ç©çè®¾å¤æ¯èµæºç¼å· æ¯ 64 private String dateTime;// private String srcType;// String äºä»¶æºç±»å æ¯ 16 private Integer eventType ;//Number äºä»¶ç±»å æ¯ private String srcName;// String äºä»¶æºåç§° å¦ 64 private Integer status ;//Number äºä»¶ç¶æ æ¯ 0-ç¬æ¶1-å¼å§2-忢3-äºä»¶èå²4-äºä»¶èå¨ç»ææ´æ°5-弿¥å¾çä¸ä¼ private Integer timeout ;//Number èå²è¶ æ¶æ¶é´ æ¯ åä½ï¼ç§ private String happenTime ;//String äºä»¶åçæ¶é´ï¼è®¾å¤æ¶é´ï¼ æ¯ 64 private String srcParentIndex ;//String äºä»¶åççäºä»¶æºç¶è®¾å¤ç¼å· å¦ 64 private List<EventPlatformDataRequest> data; } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformParamRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,17 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.util.List; @Data public class EventPlatformParamRequest { private String sendTime;// P String äºä»¶ä»æ¥æ¶è ï¼ç¨åºå¤çåï¼ååºçæ¶é´ æ¯ 32 äºä»¶åéæ¶é´ private String ability;// P String äºä»¶ç±»å« æ¯ 64 æ è¯å车åºäºä»¶ private List<String> uids;// private List<String> clients;// private Integer dataProcInterval;// private List<EventPlatformInfoRequest> events;// P Events[] äºä»¶ä¿¡æ¯ æ¯ ä¸é } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformRequest.java
ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatCarstatusRequest.java ÐÞ¸Ä @@ -3,11 +3,11 @@ import lombok.Data; @Data public class EventPlatCarstatusRequest { public class EventPlatformRequest { // private String parkIndexCodes ;// string False å车åºå¯ä¸æ è¯éå å¤ä¸ªå¼ä½¿ç¨è±æéå·åéï¼ä¸è¶ è¿1000个 private String method ;// String æ¹æ³åï¼ç¨äºæ è¯æ¥æç¨é æ¯ 16 äºä»¶åºå®OnEventNotify private EventParkParamRequest params ;// Params äºä»¶åæ°ä¿¡æ¯ æ¯ ä¸é å ·ä½åæ°ä¿¡æ¯ private EventPlatformParamRequest params ;// Params äºä»¶åæ°ä¿¡æ¯ æ¯ ä¸é å ·ä½åæ°ä¿¡æ¯ } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventPlatformStatusInfoRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,18 @@ package com.doumee.core.haikang.model.param.request.event.parks; import lombok.Data; import java.math.BigDecimal; @Data public class EventPlatformStatusInfoRequest { private Integer HPNo;// 1,车é车éå· private Integer operationPeopleNum;// 0,人æ°ç»è®¡ private String operationStatus;// no ,ä½ä¸ç¶æ loading-è£ è´§ï¼ unloading-å¸è´§ private String parkingSpaceStatus;// 车ä½ç¶æ noæ 车 normaæ£å¸¸æè½¦ private String plateNo;// ,车çå· private Integer rate;// 0,è£ è½½ç private String vehicleDoorStatus;// open,车é¨ç¶æ open-å¼é¨ï¼close-å ³é¨ private BigDecimal plateScore;// 90车çè¯å } server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/request/PlatformDataInfoRequest.java
@@ -11,7 +11,7 @@ * @create 2023/12/7 11:19 */ @Data @ApiModel("ãæå°ãæå°å½åä½ä¸ä¿¡æ¯å表请æ±åæ°") @ApiModel("ãæå°ãæå°å½åä½ä¸ä¿¡æ¯è¯¦æ 请æ±åæ°") public class PlatformDataInfoRequest { @ApiModelProperty(value = "å®é²å¹³å°æå°ä¸»é®", example = "1") private String id; server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/request/PlatformNumByStatusRequest.java
@@ -13,7 +13,7 @@ * @create 2023/12/7 11:19 */ @Data @ApiModel("ãæå°ãæå¤©ç»è®¡è¿å请æ±åæ°") @ApiModel("ãæå°ãæå°åç¶ææ°éç»è®¡è¯·æ±åæ°") public class PlatformNumByStatusRequest { } server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformLastMonthListResponse.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package com.doumee.dao.openapi.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * Created by IntelliJ IDEA. * * @Author : Rk * @create 2023/12/7 11:19 */ @Data @ApiModel("ãæå°ãè¿12个æä¿¡æ¯å表") public class PlatformLastMonthListResponse { @ApiModelProperty(value = "æ¶é´ æ ¼å¼ï¼yyyy-MM", example = "2024-12") private String timeInfo; @ApiModelProperty(value = "ç¨é", example = "1") private BigDecimal num; } server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformNumByStatusResponse.java
@@ -11,7 +11,7 @@ * @create 2023/12/7 11:19 */ @Data @ApiModel("ãæå°ãæç¶æç»è®¡æå°æ°é") @ApiModel("ãæå°ãæå°åç¶ææ°éç»è®¡è¿ååæ°") public class PlatformNumByStatusResponse { @ApiModelProperty(value = "使ç¨ä¸æ°é", example = "1") private int usingNum; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -2,9 +2,7 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatCarstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatWorkstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.*; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse; @@ -90,13 +88,13 @@ void syncMemberDelData(); String getServiceUrl(HKGetServiceLoginUrlRequest param); void dealWorkstatusEvent(EventPlatWorkstatusRequest param, HttpServletResponse response); void dealCarstatusEvent(EventPlatCarstatusRequest param, HttpServletResponse response); String syncHkLed(Device param); String syncHkBroadcast(Device param); String dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response); String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response); String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -6,9 +6,7 @@ import com.doumee.core.haikang.model.param.BaseResponse; import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatCarstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventPlatWorkstatusRequest; import com.doumee.core.haikang.model.param.request.event.parks.*; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.haikang.model.param.respose.AppointmentInfoResponse; @@ -55,12 +53,6 @@ } @Override public void dealWorkstatusEvent(EventPlatWorkstatusRequest param, HttpServletResponse response){ } @Override public void dealCarstatusEvent(EventPlatCarstatusRequest param, HttpServletResponse response){ } @Override // @Async public String syncDoors(DoorsListRequest param){ return null; @@ -95,6 +87,15 @@ public String dealVisitEventIccm(EventVisitIccmRequest param, HttpServletResponse response){ return null; } @Override public String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response){ return null; } @Override public String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response){ return null; } @Override public String dealAcsEvent(EventAcsRequest param, HttpServletResponse response){ return null; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -9,8 +9,7 @@ import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkInfoRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; import com.doumee.core.haikang.model.param.request.event.parks.*; import com.doumee.core.haikang.model.param.request.event.visit.*; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; @@ -66,6 +65,12 @@ private VisitsJoinMapper visitsMapper; @Autowired private RetentionMapper retentionMapper; @Autowired private PlatformMapper platformMapper; @Autowired private PlatformDeviceMapper platformDeviceMapper; private PlatformJobMapper platformJobMapper; private PlatformLogMapper platformLogMapper; /** * 海康é¨ç¦äºä»¶æ¨é * @param param @@ -308,6 +313,7 @@ return null; } /** * 海康访客äºä»¶æ¨é * @param param @@ -769,5 +775,179 @@ interfaceLogMapper.insert(hkMonitoryLogDO); } /** * å¤çæå°å·¥ä½ç¶æäºä»¶è®¢é 忍鿰æ®é»è¾é»è¾ * @param param * @param response * @return */ @Override public String dealPlatformStatusEvent(EventPlatformRequest param, HttpServletResponse response){ log.info("ãæµ·åº·æå°å·¥ä½ç¶æäºä»¶æ¨éã========å¼å§=========ï¼\n"+JSONObject.toJSONString(param)); String result = null; try { if(param == null || param.getParams() == null || param.getParams().getEvents()==null){ return null; } //é¨ç¦äºä»¶éå List<EventPlatformInfoRequest> events = param.getParams().getEvents(); List<Platform> list = new ArrayList<>(); for(EventPlatformInfoRequest request : events){ List<EventPlatformDataRequest> dataList = request.getData(); if(dataList ==null || dataList.size()==0){ continue; } Integer workStatus = 0; for(EventPlatformDataRequest data : dataList){ if( data.getHPWorkingStatus() ==null || data.getHPWorkingStatus().size() ==0){ continue;//å¦ä½æ¨éç¶æéå为空ï¼ä¸å¤çè·³è¿ } PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda() .eq(PlatformDevice::getDeviceId,request.getSrcIndex()) .eq(PlatformDevice::getIsdeleted,Constants.ZERO) .last("limit 1")); if(model ==null){ continue;//çæ§ç¹æªåæ¥ï¼è·³è¿å¤ç } //å车é车è¾ç¶æ for(EventPlatformStatusInfoRequest status : data.getHPWorkingStatus()){ } break;//åªå¤ç第ä¸ä¸ªæ°æ®ç¶æ } } result = "æå"; log.error("ãæµ·åº·æå°å·¥ä½ç¶æäºä»¶æ¨éã========æå======="); }catch (Exception e) { result = "失败"+e.getMessage(); log.error("ãæµ·åº·æå°å·¥ä½ç¶æäºä»¶æ¨éã========失败=======ï¼\n" + e.getMessage()); }finally { saveInterfaceLog(param,"/business/hksync/push/platform/workstatus",result,false);//ä¸è®¡æ¥å¿ } return null; } /** * å¤çæå°è½¦è¾ç¶æäºä»¶è®¢é 忍鿰æ®é»è¾é»è¾ * @param param * @param response * @return */ @Override public String dealPlatformCarsEvent(EventPlatformCarsRequest param, HttpServletResponse response){ log.info("ãæµ·åº·æå°è½¦è¾ç¶æäºä»¶æ¨éã========å¼å§=========ï¼\n"+JSONObject.toJSONString(param)); String result = null; try { if(param == null || param.getParams() == null || param.getParams().getEvents()==null){ return null; } //é¨ç¦äºä»¶éå List<EventPlatformCarsInfoRequest> events = param.getParams().getEvents(); for(EventPlatformCarsInfoRequest request : events){ if( request.getData() ==null || request.getData().size()==0){ continue; } Integer workStatus = 0; for(EventPlatformCarsDataRequest data : request.getData()){ if( data.getHPVehicleStatus() ==null || data.getHPVehicleStatus().size() ==0){ continue;//å¦ä½æ¨éç¶æéå为空ï¼ä¸å¤çè·³è¿ } PlatformDevice model = platformDeviceMapper.selectOne(new QueryWrapper<PlatformDevice>().lambda() .eq(PlatformDevice::getDeviceId,request.getSrcIndex()) .eq(PlatformDevice::getIsdeleted,Constants.ZERO) .last("limit 1")); if(model ==null){ continue;//çæ§ç¹æªåæ¥ï¼è·³è¿å¤ç } //å车é车è¾ç¶æ for(EventPlatformCarsStatusInfoRequest status : data.getHPVehicleStatus()){ if(StringUtils.isBlank(status.getPlateNo())){ continue;//å¦æè½¦è¾ä¿¡æ¯ä¸ºç©ºï¼ä¸å¤çç´æ¥è·³è¿ } PlatformJob job = platformJobMapper.selectOne(new QueryWrapper<PlatformJob>().lambda() .eq(StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeFront,status.getPlateNo() )//å车çå· .eq(!StringUtils.equals(status.getStockStatus(),"front"),PlatformJob::getCarCodeBack,status.getPlateNo() )//å车çå· .eq(PlatformJob::getIsdeleted,Constants.ZERO ) .last("limit 1 ")); PlatformJob update = new PlatformJob(); update.setId(job.getId()); update.setEditDate(new Date()); if(StringUtils.equals(status.getMotionStatus(),"leave")){ //妿æ¯è½¦è¾ç¦»å¼ if(job ==null && !Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ continue;//å¦ææ²¡æ¥å°å¯¹åºçä½ä¸æè ä½ä¸å¹¶éä½ä¸ä¸ï¼ä¸åä¸å¡å¤ç } //å¦ææ¯æ£å¨ä½ä¸çç¶æï¼æ è®°ä½ä¸å·²å®æ update.setStatus(Constants.PlatformJobStatus.DONE.getKey());//ä½ä¸å·²å®æ update.setDoneDate(update.getEditDate()); }else if(StringUtils.equals(status.getMotionStatus(),"enter")){ //妿æ¯è½¦è¾è¿å ¥ if(job ==null || !Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){ //说æè½¦è¾è¿éæå° æè è¿æªå«å·ç¶æï¼åèµ·è¦å dealCarsInErrorPlatformBiz(job,status); } update.setStatus(Constants.PlatformJobStatus.WORKING.getKey());//å¼å§ä½ä¸ }else{ continue;//å ¶ä»ç¶æä¸å¤çï¼è·³è¿ } platformJobMapper.updateById(update);//æ´æ°ä½ä¸ç¶æ dealPlatformJobLogBiz(update,status);//è®°å½ä½ä¸æ¥å¿ } break;//åªå¤ç第ä¸ä¸ªæ°æ®ç¶æ } } result = "æå"; log.error("ãæµ·åº·æå°è½¦è¾ç¶æäºä»¶æ¨éã========æå======="); }catch (Exception e) { result = "失败"+e.getMessage(); log.error("ãæµ·åº·æå°è½¦è¾ç¶æäºä»¶æ¨éã========失败=======ï¼\n" + e.getMessage()); }finally { saveInterfaceLog(param,"/business/hksync/push/platform/workstatus",result,false);//ä¸è®¡æ¥å¿ } return null; } /** * è®°å½æå°ä½ä¸æ¥å¿ * @param job * @param status */ private void dealPlatformJobLogBiz(PlatformJob job,EventPlatformCarsStatusInfoRequest status) { PlatformLog log = new PlatformLog(); log.setIsdeleted(Constants.ZERO); log.setCreateDate(new Date()); log.setEditDate(log.getCreateDate()); log.setJobId(job.getId()); log.setObjId(job.getId()+""); if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){ //妿æ¯ä½ä¸å®æ // log.setObjType(Constants.LOg); //æ¥è¯¢æå䏿¬¡å¼å§ä½ä¸çæ¥å¿ PlatformLog lastBeginPlatform = platformLogMapper.selectOne(new QueryWrapper<PlatformLog>().lambda() .eq(PlatformLog::getIsdeleted,Constants.ZERO) .eq(PlatformLog::getObjType,Constants.PlatformJobStatus.WORKING.getKey()) .eq(PlatformLog::getJobId,job.getJobId()) .orderByDesc(PlatformLog::getCreateDate) .last(" limit 1"); }else{ //妿æ¯ä½ä¸ä¸ log.setParam1(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); // log.setObjType(Constants.Jobl); } platformLogMapper.insert(log); } /** * å¤ç车è¾è¿å ¥é误æå°ä¸å¡é»è¾ * @param model (æå°è®¾å¤å ³èä¿¡æ¯ï¼ * @param status */ private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) { //TODO-----------------å¤ç车è¾è¿å ¥é误æå°ä¸å¡é»è¾ } }