document/º£¿µapi.docxBinary files differ
ycl-common/src/main/java/constant/ApiConstants.java
@@ -10,6 +10,7 @@ public final static Integer UYSuccessCode = 200; public final static Integer PageNo = 1; public final static Integer PageSize = 20000; public final static Integer HKPageSize = 5000; //请æ±åæ°dataType-å¡å£è¿è½¦ public final static Integer HK_DataType_CAR = 1; //请æ±åæ°dataType-äººè¸æ°æ® ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class AttrRecognitionParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class AttrRecognitionParam extends BaseParam{ /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/BaseParam.java
New file @@ -0,0 +1,19 @@ package com.ycl.platform.domain.param.HK; import lombok.Data; import lombok.experimental.Accessors; @Data public class BaseParam { /** * å页 * å¿ å¡« */ private Integer pageNo; /** * å页 * å¿ å¡« */ private Integer pageSize; } ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
@@ -14,19 +14,7 @@ @Data @Accessors(chain = true) public class CarDetectParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class CarDetectParam extends BaseParam{ /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
@@ -14,19 +14,8 @@ @Data @Accessors(chain = true) public class CodeByAreaParam { public class CodeByAreaParam extends BaseParam{ /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; /** * 1.ééè®¾å¤ 2.å¡å£ ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
@@ -14,19 +14,7 @@ @Data @Accessors(chain = true) public class CoordinateByAreaParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class CoordinateByAreaParam extends BaseParam{ /** * 1.ééè®¾å¤ 2.å¡å£ ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class CrossDetailParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class CrossDetailParam extends BaseParam{ /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class DataIntegrityMonitoringParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class DataIntegrityMonitoringParam extends BaseParam{ /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
@@ -14,19 +14,7 @@ @Data @Accessors(chain = true) public class FaceDetectParam { /** * å页 * å¿ å¡« */ private Integer pageNo; /** * å页 * å¿ å¡« */ private Integer pageSize; public class FaceDetectParam extends BaseParam{ /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class FaceDeviceInspectionParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class FaceDeviceInspectionParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class FaceDeviceSamplingParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class FaceDeviceSamplingParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/HKLoginParam.java
File was deleted ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitorResourceParam.java
@@ -11,7 +11,7 @@ */ @Data @Accessors(chain = true) public class MonitorResourceParam { public class MonitorResourceParam{ /** * çæµèµæºåç§°ãæ¨¡ç³æ¥è¯¢ ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
@@ -15,19 +15,8 @@ @Data @Accessors(chain = true) public class MonitoringDetailParam { public class MonitoringDetailParam extends BaseParam{ /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class PicAccessParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class PicAccessParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class SnapshotDataMonitorParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class SnapshotDataMonitorParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class SnapshotDelayMonitorParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class SnapshotDelayMonitorParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
@@ -15,19 +15,7 @@ @Data @Accessors(chain = true) public class VehicleDeviceInspectionParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class VehicleDeviceInspectionParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
@@ -15,20 +15,7 @@ @Data @Accessors(chain = true) public class VehicleDeviceSamplingParam { /** * å页 * å¿ å¡« */ private Integer pageNO; /** * å页 * å¿ å¡« */ private Integer pageSize; public class VehicleDeviceSamplingParam extends BaseParam { /** * æ¥æï¼éè¦åªå¤©çå¼å¸¸æ°æ®ãæ ¼å¼ï¼yyyy-mm-dd * å¿ å¡« ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
@@ -4,15 +4,18 @@ import com.alibaba.fastjson2.JSONObject; import com.hikvision.artemis.sdk.ArtemisHttpUtil; import com.hikvision.artemis.sdk.config.ArtemisConfig; import com.ycl.platform.domain.param.HK.BaseParam; import com.ycl.platform.domain.param.HK.FaceDetectParam; import com.ycl.utils.DateUtils; import constant.ApiConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.jar.JarEntry; /** * @authorï¼xp @@ -29,7 +32,7 @@ * @param resultType ååºç»ææ¥æ¶ç±» * @return è°ç¨ç»æ */ public static <T> List<T> sendAPI(String apiUrl, Object params, Class<T> resultType) { public static <T> List<T> sendAPI(String apiUrl, BaseParam params, Class<T> resultType) { // STEP1ï¼è®¾ç½®å¹³å°åæ°ï¼æ ¹æ®å®é æ åµ,设置host appkey appsecret ä¸ä¸ªåæ°. ArtemisConfig.host = "51.92.65.49"; // å¹³å°çipç«¯å£ @@ -53,22 +56,33 @@ // STEP5ï¼ç»è£ 请æ±åæ° String body = JSON.toJSONString(params); log.info("请æ±åæ°:{}",body); // STEP6ï¼è°ç¨æ¥å£ String result = null;// post请æ±application/jsonç±»ååæ° try { List<T> dataList = new ArrayList<>(); for (int i = 0; i < 10; i++) { result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null); } catch (Exception e) { log.error("æ¥å£ï¼ã{}ãï¼è°ç¨å¤±è´¥",apiUrl); e.printStackTrace(); JSONObject jsonObject = JSONObject.parseObject(result); if(jsonObject.getString("code") == null || !ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))){ log.error("请æ±å¤±è´¥{}",result); dataList = null; break; } List<T> resultList = HkApiUtil.getDataList(JSONObject.parseObject(result), resultType); if(CollectionUtils.isEmpty(resultList) || resultList.size()<ApiConstants.HKPageSize) { dataList.addAll(resultList); break; }else { dataList.addAll(resultList); params.setPageNo(params.getPageNo()+1); } } return HkApiUtil.getDataList(JSONObject.parseObject(result), resultType); return dataList; } //è§£ææ°æ® private static <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass) { if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) { log.info("æ°æ®æ ¼å¼"+jsonObject); JSONObject data = jsonObject.getJSONObject("data"); if (data == null) { return null; ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -123,6 +123,7 @@ SysConfig important = configMapper.checkConfigKeyUnique("important.wordkorder.time"); SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time"); for (WorkOrder workOrder : waitAddList) { //TODOï¼point为空 YwPoint point = pointMapping.get(workOrder.getSerialNumber()); workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5)); workOrder.setUnitId(Math.toIntExact(point.getUnitId())); ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -44,7 +44,10 @@ public void vehicleDeviceInspectionTask() { log.info("å¼å§æ§è¡è½¦è¾è®¾å¤å ¨æ£ææ çæµç»ææ°æ®åæ¥"); VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); param.setDataType(ApiConstants.HK_DataType_CAR); List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class); if (!CollectionUtils.isEmpty(list)) { //妿åå¨ä¹åçæ°æ®å å é¤ @@ -62,7 +65,9 @@ public void faceDeviceInspectionTask() { log.info("å¼å§æ§è¡äººè¸è®¾å¤å ¨æ£ææ çæµç»ææ°æ®åæ¥"); FaceDeviceInspectionParam param = new FaceDeviceInspectionParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class); if (!CollectionUtils.isEmpty(list)) { //妿åå¨ä¹åçæ°æ®å å é¤ @@ -83,7 +88,10 @@ log.info("å¼å§æ§è¡æææ°æ®éæ£æµç»ææ°æ®åæ¥"); /** è½¦è¾æ°æ® */ SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam(); carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR); carParam.setPageNo(ApiConstants.PageNo); carParam.setPageSize(ApiConstants.HKPageSize); carParam.setDate(DateUtils.getDate()); carParam.setDataType(ApiConstants.HK_DataType_CAR); List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class); if (!CollectionUtils.isEmpty(carList)) { //妿ä»å¤©åå¨ä¹åçæ°æ®å å é¤ @@ -98,7 +106,10 @@ /** äººè¸æ°æ® */ SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam(); faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE); faceParam.setPageNo(ApiConstants.PageNo); faceParam.setPageSize(ApiConstants.HKPageSize); faceParam.setDate(DateUtils.getDate()); faceParam.setDataType(ApiConstants.HK_DataType_FACE); List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class); if (!CollectionUtils.isEmpty(faceList)) { //妿ä»å¤©åå¨ä¹åçæ°æ®å å é¤ @@ -119,7 +130,9 @@ log.info("å¼å§æ§è¡éé设å¤å±æ§çæµç»ææ°æ®åæ¥"); //人è¸å¡å£ä¿¡æ¯ééåç¡®ç MonitoringDetailParam param = new MonitoringDetailParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class); if (!CollectionUtils.isEmpty(faceList)) { //妿ä»å¤©åå¨ä¹åçæ°æ®å å é¤ @@ -138,7 +151,9 @@ log.info("å¼å§æ§è¡å¡å£å±æ§çæµç»ææ°æ®åæ¥"); //车è¾å¡å£ä¿¡æ¯ééåç¡®ç CrossDetailParam param = new CrossDetailParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class); if (!CollectionUtils.isEmpty(faceList)) { //妿ä»å¤©åå¨ä¹åçæ°æ®å å é¤ @@ -157,7 +172,10 @@ log.info("å¼å§æ§è¡æ°æ®å®æ´æ§çæµç»ææ°æ®åæ¥"); //车è¾å¡å£è®¾å¤æææ°æ®å®æ´æ§ DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); param.setDataType(ApiConstants.HK_DataType_CAR); List<DataIntegrityMonitoringResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class); if (!CollectionUtils.isEmpty(faceList)) { @@ -177,7 +195,10 @@ log.info("å¼å§æ§è¡å±æ§è¯å«åç¡®çæµç»ææ°æ®åæ¥"); //车è¾å¡å£è®¾å¤æææ°æ®åç¡®æ§ AttrRecognitionParam param = new AttrRecognitionParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); param.setDataType(ApiConstants.HK_DataType_CAR); List<AttrRecognitionMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class); if (!CollectionUtils.isEmpty(faceList)) { @@ -199,7 +220,10 @@ //车è¾å¡å£è®¾å¤æææ°æ®ä¸ä¼ åæ¶æ§ /** è½¦è¾æ°æ® */ SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam(); carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR); carParam.setPageNo(ApiConstants.PageNo); carParam.setPageSize(ApiConstants.HKPageSize); carParam.setDate(DateUtils.getDate()); carParam.setDataType(ApiConstants.HK_DataType_CAR); List<SnapshotDelayMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class); if (!CollectionUtils.isEmpty(carList)) { @@ -215,7 +239,10 @@ /** äººè¸æ°æ® */ SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam(); faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE); faceParam.setPageNo(ApiConstants.PageNo); faceParam.setPageSize(ApiConstants.HKPageSize); faceParam.setDate(DateUtils.getDate()); faceParam.setDataType(ApiConstants.HK_DataType_FACE); List<SnapshotDelayMonitorParam> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorParam.class); if (!CollectionUtils.isEmpty(faceList)) { @@ -237,7 +264,10 @@ log.info("å¼å§æ§è¡å¾ç访é®çæµç»ææ°æ®åæ¥"); //车è¾å¡å£ä¿¡æ¯ééåç¡®çã车è¾å¡å£è®¾å¤urlå¯ç¨æ§ PicAccessParam param = new PicAccessParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); param.setDataType(ApiConstants.HK_DataType_CAR); List<PicAccessResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class); if (!CollectionUtils.isEmpty(faceList)) { @@ -256,7 +286,10 @@ log.info("å¼å§æ§è¡è½¦è¾è®¾å¤æ½æ£ææ çæµç»ææ°æ®åæ¥"); //车è¾å¡å£ä¿¡æ¯ééåç¡®çã车è¾å¡å£è®¾å¤urlå¯ç¨æ§ VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); param.setDataType(ApiConstants.HK_DataType_CAR); List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class); if (!CollectionUtils.isEmpty(faceList)) { @@ -276,7 +309,9 @@ public void faceDeviceSamplingTask() { log.info("å¼å§æ§è¡äººè¸è®¾å¤æ½æ£ææ çæµç»ææ°æ®åæ¥"); FaceDeviceSamplingParam param = new FaceDeviceSamplingParam(); param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()); param.setPageNo(ApiConstants.PageNo); param.setPageSize(ApiConstants.HKPageSize); param.setDate(DateUtils.getDate()); List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class); if (!CollectionUtils.isEmpty(faceList)) { ycl-server/src/main/resources/activiti.cfg.xml
File was deleted