diff --git a/src/main/java/com/objecteye/controller/HumanVehicleAssociationController.java b/src/main/java/com/objecteye/controller/HumanVehicleAssociationController.java index 95f394c..76c1997 100644 --- a/src/main/java/com/objecteye/controller/HumanVehicleAssociationController.java +++ b/src/main/java/com/objecteye/controller/HumanVehicleAssociationController.java @@ -29,9 +29,9 @@ public class HumanVehicleAssociationController { @ApiOperation("以人搜车") @RequestMapping(value = "/hvAssociation/searchVehicleFromHuman", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public CommonResult searchVehicleFromHuman(@RequestParam Long starttime, @RequestParam Long endtime, @RequestParam Float thresholds, @RequestParam int[] customspass, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile) { + public CommonResult searchVehicleFromHuman(@RequestParam Long starttime, @RequestParam Long endtime, @RequestParam Float thresholds, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile) { try { - PageResult pageResult = humanVehicleAssociationService.searchVehicleFromHuman(starttime, endtime, thresholds, customspass, currentpage, pagevolume, picfile); + PageResult pageResult = humanVehicleAssociationService.searchVehicleFromHuman(starttime, endtime, thresholds, currentpage, pagevolume, picfile); if (pageResult == null || pageResult.getRow().size() == 0) { return CommonResult.success(201, "没有符合要求的数据", null); } @@ -47,7 +47,7 @@ public class HumanVehicleAssociationController { @RequestMapping(value = "/hvAssociation/searchPeopleFromHphm", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public CommonResult searchPeopleFromHphm(@RequestBody SearchPeopleOfHphmRequest searchPeopleOfHphmRequest) { try { - SearchPeopleOfhphmResult searchPeopleOfhphmResult = humanVehicleAssociationService.searchPeopleFromHphm(searchPeopleOfHphmRequest.getStarttime(), searchPeopleOfHphmRequest.getEndtime(), searchPeopleOfHphmRequest.getCustomspass(), searchPeopleOfHphmRequest.getCurrentpage(), + SearchPeopleOfhphmResult searchPeopleOfhphmResult = humanVehicleAssociationService.searchPeopleFromHphm(searchPeopleOfHphmRequest.getStarttime(), searchPeopleOfHphmRequest.getEndtime(), searchPeopleOfHphmRequest.getCurrentpage(), searchPeopleOfHphmRequest.getPagevolume(), searchPeopleOfHphmRequest.getHphm()); List row = searchPeopleOfhphmResult.getRow(); if (row == null || row.size() == 0) { diff --git a/src/main/java/com/objecteye/controller/LocusOrbitController.java b/src/main/java/com/objecteye/controller/LocusOrbitController.java index a427d0d..fcb5f48 100644 --- a/src/main/java/com/objecteye/controller/LocusOrbitController.java +++ b/src/main/java/com/objecteye/controller/LocusOrbitController.java @@ -78,7 +78,6 @@ public class LocusOrbitController { * 轨迹分析接口(图片搜索) * * @param gcxh 车辆序号 - * @param customsPass 地区id, 设备id, 自行判断是地区的还是设备的 * @param startTime 起始时间戳 * @param endTime 结束时间戳 * @param multipartFile 文件信息 @@ -87,8 +86,8 @@ public class LocusOrbitController { @PostMapping("locusOrbitAnalysisByFile") @ResponseBody @ApiOperation("轨迹分析接口") - public CommonResult locusOrbitByPlateNumber(int gcxh, Integer customsPass, Long startTime, Long endTime, MultipartFile multipartFile) { - LocusOrbitQueryParams queryParams = new LocusOrbitQueryParams(customsPass, startTime, endTime, null); + public CommonResult locusOrbitByPlateNumber(int gcxh, Long startTime, Long endTime, MultipartFile multipartFile) { + LocusOrbitQueryParams queryParams = new LocusOrbitQueryParams(startTime, endTime, null); List resultList = locusOrbitService.locusOrbitByPlateNumber(gcxh, queryParams, multipartFile); return resultList.size() > 0 ? CommonResult.success(resultList) : CommonResult.success(201, "没有符合要求的值", new ArrayList<>()); } diff --git a/src/main/java/com/objecteye/controller/SpecialtyVehicleController.java b/src/main/java/com/objecteye/controller/SpecialtyVehicleController.java index fee749b..d79b9ff 100644 --- a/src/main/java/com/objecteye/controller/SpecialtyVehicleController.java +++ b/src/main/java/com/objecteye/controller/SpecialtyVehicleController.java @@ -61,8 +61,8 @@ public class SpecialtyVehicleController { @RequestMapping("/slagCar/findByPic") public JSONObject findByPic(@RequestParam int number, @RequestParam double threshold, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime, - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException { - return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, customspass, 2); + @RequestParam Long endtime) throws InterruptedException { + return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, 2); } /** @@ -114,8 +114,8 @@ public class SpecialtyVehicleController { @RequestMapping("/chemistryCar/findByPic") public JSONObject chemistryFindByPic(@RequestParam int number, @RequestParam Double threshold, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime, - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException { - return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, customspass, 1); + @RequestParam Long endtime) throws InterruptedException { + return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, 1); } diff --git a/src/main/java/com/objecteye/controller/VehicleCurrencyController.java b/src/main/java/com/objecteye/controller/VehicleCurrencyController.java index 2cb615d..532f629 100644 --- a/src/main/java/com/objecteye/controller/VehicleCurrencyController.java +++ b/src/main/java/com/objecteye/controller/VehicleCurrencyController.java @@ -52,16 +52,15 @@ public class VehicleCurrencyController { * @param picfile * @param starttime * @param endtime - * @param customspass * @return */ @RequestMapping("/car/findByPic") public CommonResult findByPic(@RequestParam int number, @RequestParam double threshold, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime, - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException { + @RequestParam Long endtime) throws InterruptedException { return vehicleCurrencyService.findVehicleByPic(number, threshold, currentpage, pagevolume, picfile, starttime, - endtime, customspass); + endtime); } /** diff --git a/src/main/java/com/objecteye/dao/MongoTemplates.java b/src/main/java/com/objecteye/dao/MongoTemplates.java index f49f18d..cfc2b47 100644 --- a/src/main/java/com/objecteye/dao/MongoTemplates.java +++ b/src/main/java/com/objecteye/dao/MongoTemplates.java @@ -61,7 +61,6 @@ public class MongoTemplates { Long starttime = vehicleCondition.getStarttime(); Long endtime = vehicleCondition.getEndtime(); int[] condition = vehicleCondition.getCondition(); - int[] customspass = vehicleCondition.getCustomspass(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //特殊品类检索 @@ -131,17 +130,14 @@ public class MongoTemplates { //按时间进行排序 query.with(new Sort(Sort.Direction.DESC, "pictime")); - -// 分页 + // 分页 query.skip((currentpage - 1) * pagevolume).limit(pagevolume); vehicleTable = mongoTemplate.find(query, JSONObject.class, "rabbitMQVehicle"); JSONObject data = new JSONObject(); JSONArray array = new JSONArray(); - int size = vehicleTable.size(); - for (int i = 0; i < size; i++) { - JSONObject json = vehicleTable.get(i); + for (JSONObject json : vehicleTable) { String id = json.containsKey("_id") ? json.getString("_id") : null; String hphm_new = json.containsKey("vehicle_plate_hphm") ? json.getString("vehicle_plate_hphm") : null; String equipmentName = json.containsKey("equipmentName") ? json.getString("equipmentName") : null; @@ -154,16 +150,8 @@ public class MongoTemplates { json.put("phototime", pictime); json.put("recordid", recordid); - //修改原有的picurl的值 - String picurl = json.getString("picurl"); -// JSONArray vehicle_detect_syRectParam = json.getJSONArray("vehicle_detect_syRectParam"); -// String base64 =vehicleDetailsUtils.picToSnapshot(picurl, vehicle_detect_syRectParam.getInteger(1), vehicle_detect_syRectParam.getInteger(2), vehicle_detect_syRectParam.getInteger(3), vehicle_detect_syRectParam.getInteger(0)); -// json.put("picurl",base64); //此处添加的是全景图的base64 -// json.put("picurl",picurl); //此处添加的是全景图的url - //添加snapshoturl的值 String snapshoturl = json.getString("snapshoturl"); -// json.put("snapshoturl",snapshoturl); json.put("picurl", snapshoturl); //此处将原来的全景图url换成了快照图绝对路径 array.add(json); @@ -216,7 +204,6 @@ public class MongoTemplates { Long starttime = vehicleCondition.getStarttime(); Long endtime = vehicleCondition.getEndtime(); int[] condition = vehicleCondition.getCondition(); - int[] customspass = vehicleCondition.getCustomspass(); //模糊号牌检索 if (hphm != null && hphm.length() > 0) { diff --git a/src/main/java/com/objecteye/entity/LocusOrbitQueryParams.java b/src/main/java/com/objecteye/entity/LocusOrbitQueryParams.java index 5ba018c..4214f80 100644 --- a/src/main/java/com/objecteye/entity/LocusOrbitQueryParams.java +++ b/src/main/java/com/objecteye/entity/LocusOrbitQueryParams.java @@ -19,11 +19,6 @@ public class LocusOrbitQueryParams implements Serializable { private static final long serialVersionUID = -8007831938659574791L; /** - * 地区id, 设备id, 自行判断是地区的还是设备的 - */ - private Integer customsPass; - - /** * 时间区间- 起始时间戳 */ private Long startTime; diff --git a/src/main/java/com/objecteye/entity/MonitorMainTableQueryInfo.java b/src/main/java/com/objecteye/entity/MonitorMainTableQueryInfo.java index 1057fb3..919327d 100644 --- a/src/main/java/com/objecteye/entity/MonitorMainTableQueryInfo.java +++ b/src/main/java/com/objecteye/entity/MonitorMainTableQueryInfo.java @@ -38,10 +38,6 @@ public class MonitorMainTableQueryInfo implements Serializable { */ private Integer pagevolume; /** - * 设备id - */ - private Integer customsPass; - /** * 车牌号 */ private String plateNumber; diff --git a/src/main/java/com/objecteye/entity/PersonMsg.java b/src/main/java/com/objecteye/entity/PersonMsg.java index ebaca07..3131253 100644 --- a/src/main/java/com/objecteye/entity/PersonMsg.java +++ b/src/main/java/com/objecteye/entity/PersonMsg.java @@ -16,8 +16,6 @@ public class PersonMsg implements Serializable { private String id; - private Integer deviceId; - private String imageUrl; private long captureTime; diff --git a/src/main/java/com/objecteye/entity/PlateAlarmMsg.java b/src/main/java/com/objecteye/entity/PlateAlarmMsg.java index da3b7ea..098e27c 100644 --- a/src/main/java/com/objecteye/entity/PlateAlarmMsg.java +++ b/src/main/java/com/objecteye/entity/PlateAlarmMsg.java @@ -21,15 +21,7 @@ public class PlateAlarmMsg implements Serializable { /** * 布控任务id */ - private Integer deployId; - /** - * 设备id - */ - private int deviceId; - /** - * 设备名称 - */ - private String equipmentName; + private String deployId; /** * 经度 */ @@ -75,8 +67,6 @@ public class PlateAlarmMsg implements Serializable { this.id = builder.id; this.baseId = builder.baseId; this.deployId = builder.deployId; - this.deviceId = builder.deviceId; - this.equipmentName = builder.equipmentName; this.longitude = builder.longitude; this.latitude = builder.latitude; this.libUrl = builder.libUrl; @@ -100,15 +90,7 @@ public class PlateAlarmMsg implements Serializable { /** * 布控任务id */ - private Integer deployId; - /** - * 设备id - */ - private int deviceId; - /** - * 设备名称 - */ - private String equipmentName; + private String deployId; /** * 经度 */ @@ -160,21 +142,11 @@ public class PlateAlarmMsg implements Serializable { return this; } - public Builder deployId(Integer deployId) { + public Builder deployId(String deployId) { this.deployId = deployId; return this; } - public Builder deviceId(int deviceId) { - this.deviceId = deviceId; - return this; - } - - public Builder equipmentName(String equipmentName) { - this.equipmentName = equipmentName; - return this; - } - public Builder longitude(String longitude) { this.longitude = longitude; return this; diff --git a/src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java b/src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java index 313cb18..8972202 100644 --- a/src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java +++ b/src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java @@ -30,9 +30,6 @@ public class SyVehicleForbidenTask implements Serializable { @ApiModelProperty(value = "生效区域id") private String areaId; - @ApiModelProperty(value = "区域id对应的设备id") - private String deviceId; - @ApiModelProperty(value = "禁行车辆种类") private String vehicleType; diff --git a/src/main/java/com/objecteye/entity/UploadVehicleResult.java b/src/main/java/com/objecteye/entity/UploadVehicleResult.java index c4035fc..2bd6cd4 100644 --- a/src/main/java/com/objecteye/entity/UploadVehicleResult.java +++ b/src/main/java/com/objecteye/entity/UploadVehicleResult.java @@ -17,6 +17,8 @@ import java.io.Serializable; @Data public class UploadVehicleResult implements Serializable { + private static final long serialVersionUID = 2874367705571176380L; + private String id; //单车辆全部分析结果 private VpInfoParam[] info; @@ -25,8 +27,6 @@ public class UploadVehicleResult implements Serializable { //数量 private int count; - private int deviceId; - private String imageUrl; private long captureTime; @@ -37,11 +37,10 @@ public class UploadVehicleResult implements Serializable { private String latitude; - public void set(VpInfoParam[] info, String picName, int count, int deviceId, String imageUrl, long captureTime, String equipmentName, String longitude, String latitude) { + public void set(VpInfoParam[] info, String picName, int count, String imageUrl, long captureTime, String equipmentName, String longitude, String latitude) { this.info = info; this.picName = picName; this.count = count; - this.deviceId = deviceId; this.imageUrl = imageUrl; this.captureTime = captureTime; this.equipmentName = equipmentName; diff --git a/src/main/java/com/objecteye/entity/VehicleDetailMsg.java b/src/main/java/com/objecteye/entity/VehicleDetailMsg.java index d340c9a..73a532d 100644 --- a/src/main/java/com/objecteye/entity/VehicleDetailMsg.java +++ b/src/main/java/com/objecteye/entity/VehicleDetailMsg.java @@ -11,10 +11,6 @@ public class VehicleDetailMsg { private String id; /** - * 设备号码 - */ - private int deviceId; - /** * 抓拍时间 */ private long captureTime; diff --git a/src/main/java/com/objecteye/entity/VehicleSimpleResult.java b/src/main/java/com/objecteye/entity/VehicleSimpleResult.java index 7a5b00a..f69958c 100644 --- a/src/main/java/com/objecteye/entity/VehicleSimpleResult.java +++ b/src/main/java/com/objecteye/entity/VehicleSimpleResult.java @@ -40,8 +40,4 @@ public class VehicleSimpleResult implements Serializable { * 人像地址 */ private String personUrl; - /** - * 设备名称 - */ - private String equipmentName; } diff --git a/src/main/java/com/objecteye/entity/VehicleViolationsForbidenTaskQueryParams.java b/src/main/java/com/objecteye/entity/VehicleViolationsForbidenTaskQueryParams.java index bdb8532..0bc8fbd 100644 --- a/src/main/java/com/objecteye/entity/VehicleViolationsForbidenTaskQueryParams.java +++ b/src/main/java/com/objecteye/entity/VehicleViolationsForbidenTaskQueryParams.java @@ -27,9 +27,6 @@ public class VehicleViolationsForbidenTaskQueryParams implements Serializable { @ApiModelProperty("过滤任务结束时间") private Long endTime; - @ApiModelProperty("区域id") - private String customsPass; - @ApiModelProperty("车类") private String type; diff --git a/src/main/java/com/objecteye/entity/VvehicleFilePlateNumberQueryResult.java b/src/main/java/com/objecteye/entity/VvehicleFilePlateNumberQueryResult.java index 68af690..5ea218b 100644 --- a/src/main/java/com/objecteye/entity/VvehicleFilePlateNumberQueryResult.java +++ b/src/main/java/com/objecteye/entity/VvehicleFilePlateNumberQueryResult.java @@ -44,9 +44,6 @@ public class VvehicleFilePlateNumberQueryResult implements Serializable { @ApiModelProperty("纬度") private String latitude; - @ApiModelProperty("设备名称") - private String equipmentName; - @ApiModelProperty("抓拍时间") private String pictime; } \ No newline at end of file diff --git a/src/main/java/com/objecteye/pojo/PicVehicleRow.java b/src/main/java/com/objecteye/pojo/PicVehicleRow.java index 9fd969e..6f1b1e2 100644 --- a/src/main/java/com/objecteye/pojo/PicVehicleRow.java +++ b/src/main/java/com/objecteye/pojo/PicVehicleRow.java @@ -27,7 +27,5 @@ public class PicVehicleRow implements Serializable { private String similar; - private String site; - private String phototime; } diff --git a/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java b/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java index 0b4e0fc..6b1e9be 100644 --- a/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java +++ b/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java @@ -21,12 +21,9 @@ public class RabbitMQVehicle { * 在档案中的位置 */ private int count; - /** - * 设备id - */ - private int deviceid; - private String equipmentName; + private String longitude; + private String latitude; /** * 图片的路径 @@ -121,7 +118,7 @@ public class RabbitMQVehicle { */ private String snapshoturl; - public RabbitMQVehicle(int count, int deviceid, String equipmentName, String longitude, String latitude, String picurl, int recordid, + public RabbitMQVehicle(int count, String longitude, String latitude, String picurl, int recordid, Long pictime, int flag, int tag, String personid, int[] vehicleplaterect, double vehicleplatedetectscore, int vehicleplatetype, double vehicle_plate_numScore, double vehicle_color_score, int vehicle_color_index, double vehicle_detect_score, int[] vehicle_detect_syRectParam, double vehicle_win_score, int[] vehicle_win_syRectParam, int vehicle_special_type, @@ -138,8 +135,6 @@ public class RabbitMQVehicle { PendantParams[] vehicle_pendant_Params, PlatePlateNumParams[] vehicle_plate_plateNumParams, String vehicle_plate_hphm, Integer vehicle_pendant_detect_njbnumber, Integer vehicle_pendant_detect_gjexis, Integer vehicle_pendant_detect_zybexis, String personUrl, String snapshoturl) { this.count = count; - this.deviceid = deviceid; - this.equipmentName = equipmentName; this.longitude = longitude; this.latitude = latitude; this.picurl = picurl; diff --git a/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java.bak b/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java.bak deleted file mode 100644 index 97d487e..0000000 --- a/src/main/java/com/objecteye/pojo/RabbitMQVehicle.java.bak +++ /dev/null @@ -1,522 +0,0 @@ -package com.objecteye.pojo; - -import org.springframework.stereotype.Component; - -@Component -public class RabbitMQVehicle1 { - private String id; //车辆id - private int count;//在档案中的位置 - private int deviceid; //设备id - private String equipmentName; - private String longitude; - private String latitude; - private String picurl; //图片的路径 - private int recordid; //车辆档案id - private Long pictime; //抓拍时间 - private int flag; //是否报警 - private int tag; //是否确认 - private String personid; //人像id - private int[] vehicleplaterect; //车牌位置 - private double vehicleplatedetectscore; //车牌检测分数 - private int vehicleplatetype; //车牌类型 - private double vehicle_plate_numScore; - private double vehicle_color_score; - private int vehicle_color_index; - private double vehicle_detect_score; - private int[] vehicle_detect_syRectParam; - private double vehicle_win_score; - private int[] vehicle_win_syRectParam; - private int vehicle_special_type; - private double vehicle_special_score; - private double vehicle_illegal_driver_smoke_confidence; - private int vehicle_illegal_driver_smoke_status; - private double vehicle_illegal_driver_belt_confidence; - private int vehicle_illegal_driver_belt_status; - private double vehicle_illegal_driver_phone_confidence; - private int vehicle_illegal_driver_phone_status; - private double vehicle_illegal_driver_person_confidence; - private int vehicle_illegal_driver_person_status; - private double vehicle_illegal_copilot_smoke_confidence; - private int vehicle_illegal_copilot_smoke_status; - private double vehicle_illegal_copilot_belt_confidence; - private int vehicle_illegal_copilot_belt_status; - private double vehicle_illegal_copilot_phone_confidence; - private int vehicle_illegal_copilot_phone_status; - private double vehicle_illegal_copilot_person_confidence; - private int vehicle_illegal_copilot_person_status; - private String vehicle_recg_issue_year; - private String vehicle_recg_brand; - private String vehicle_recg_type; - private String vehicle_recg_subbrand; - private String vehicle_recg_freight_ton; //吨数 - private double vehicle_recg_name_score; - private int vehicle_pendant_count; - private double[] vehicle_fea_feature; - private PendantParams[] vehicle_pendant_Params; - private PlatePlateNumParams[] vehicle_plate_plateNumParams; - private String vehicle_plate_hphm; - - public RabbitMQVehicle1() {} - - public RabbitMQVehicle1(String id, int count, int deviceid, String equipmentName, String longitude, String latitude, String picurl, int recordid, Long pictime, int flag, int tag, String personid, int[] vehicleplaterect, double vehicleplatedetectscore, int vehicleplatetype, double vehicle_plate_numScore, double vehicle_color_score, int vehicle_color_index, double vehicle_detect_score, int[] vehicle_detect_syRectParam, double vehicle_win_score, int[] vehicle_win_syRectParam, int vehicle_special_type, double vehicle_special_score, double vehicle_illegal_driver_smoke_confidence, int vehicle_illegal_driver_smoke_status, double vehicle_illegal_driver_belt_confidence, int vehicle_illegal_driver_belt_status, double vehicle_illegal_driver_phone_confidence, int vehicle_illegal_driver_phone_status, double vehicle_illegal_driver_person_confidence, int vehicle_illegal_driver_person_status, double vehicle_illegal_copilot_smoke_confidence, int vehicle_illegal_copilot_smoke_status, double vehicle_illegal_copilot_belt_confidence, int vehicle_illegal_copilot_belt_status, double vehicle_illegal_copilot_phone_confidence, int vehicle_illegal_copilot_phone_status, double vehicle_illegal_copilot_person_confidence, int vehicle_illegal_copilot_person_status, String vehicle_recg_issue_year, String vehicle_recg_brand, String vehicle_recg_type, String vehicle_recg_subbrand, String vehicle_recg_freight_ton, double vehicle_recg_name_score, int vehicle_pendant_count, double[] vehicle_fea_feature, PendantParams[] vehicle_pendant_Params, PlatePlateNumParams[] vehicle_plate_plateNumParams, String vehicle_plate_hphm) { - this.id = id; - this.count = count; - this.deviceid = deviceid; - this.equipmentName = equipmentName; - this.longitude = longitude; - this.latitude = latitude; - this.picurl = picurl; - this.recordid = recordid; - this.pictime = pictime; - this.flag = flag; - this.tag = tag; - this.personid = personid; - this.vehicleplaterect = vehicleplaterect; - this.vehicleplatedetectscore = vehicleplatedetectscore; - this.vehicleplatetype = vehicleplatetype; - this.vehicle_plate_numScore = vehicle_plate_numScore; - this.vehicle_color_score = vehicle_color_score; - this.vehicle_color_index = vehicle_color_index; - this.vehicle_detect_score = vehicle_detect_score; - this.vehicle_detect_syRectParam = vehicle_detect_syRectParam; - this.vehicle_win_score = vehicle_win_score; - this.vehicle_win_syRectParam = vehicle_win_syRectParam; - this.vehicle_special_type = vehicle_special_type; - this.vehicle_special_score = vehicle_special_score; - this.vehicle_illegal_driver_smoke_confidence = vehicle_illegal_driver_smoke_confidence; - this.vehicle_illegal_driver_smoke_status = vehicle_illegal_driver_smoke_status; - this.vehicle_illegal_driver_belt_confidence = vehicle_illegal_driver_belt_confidence; - this.vehicle_illegal_driver_belt_status = vehicle_illegal_driver_belt_status; - this.vehicle_illegal_driver_phone_confidence = vehicle_illegal_driver_phone_confidence; - this.vehicle_illegal_driver_phone_status = vehicle_illegal_driver_phone_status; - this.vehicle_illegal_driver_person_confidence = vehicle_illegal_driver_person_confidence; - this.vehicle_illegal_driver_person_status = vehicle_illegal_driver_person_status; - this.vehicle_illegal_copilot_smoke_confidence = vehicle_illegal_copilot_smoke_confidence; - this.vehicle_illegal_copilot_smoke_status = vehicle_illegal_copilot_smoke_status; - this.vehicle_illegal_copilot_belt_confidence = vehicle_illegal_copilot_belt_confidence; - this.vehicle_illegal_copilot_belt_status = vehicle_illegal_copilot_belt_status; - this.vehicle_illegal_copilot_phone_confidence = vehicle_illegal_copilot_phone_confidence; - this.vehicle_illegal_copilot_phone_status = vehicle_illegal_copilot_phone_status; - this.vehicle_illegal_copilot_person_confidence = vehicle_illegal_copilot_person_confidence; - this.vehicle_illegal_copilot_person_status = vehicle_illegal_copilot_person_status; - this.vehicle_recg_issue_year = vehicle_recg_issue_year; - this.vehicle_recg_brand = vehicle_recg_brand; - this.vehicle_recg_type = vehicle_recg_type; - this.vehicle_recg_subbrand = vehicle_recg_subbrand; - this.vehicle_recg_freight_ton = vehicle_recg_freight_ton; - this.vehicle_recg_name_score = vehicle_recg_name_score; - this.vehicle_pendant_count = vehicle_pendant_count; - this.vehicle_fea_feature = vehicle_fea_feature; - this.vehicle_pendant_Params = vehicle_pendant_Params; - this.vehicle_plate_plateNumParams = vehicle_plate_plateNumParams; - this.vehicle_plate_hphm = vehicle_plate_hphm; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public int getDeviceid() { - return deviceid; - } - - public void setDeviceid(int deviceid) { - this.deviceid = deviceid; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - public String getLatitude() { - return latitude; - } - - public void setLatitude(String latitude) { - this.latitude = latitude; - } - - public String getPicurl() { - return picurl; - } - - public void setPicurl(String picurl) { - this.picurl = picurl; - } - - public int getRecordid() { - return recordid; - } - - public void setRecordid(int recordid) { - this.recordid = recordid; - } - - public Long getPictime() { - return pictime; - } - - public void setPictime(Long pictime) { - this.pictime = pictime; - } - - public int getFlag() { - return flag; - } - - public void setFlag(int flag) { - this.flag = flag; - } - - public int getTag() { - return tag; - } - - public void setTag(int tag) { - this.tag = tag; - } - - public String getPersonid() { - return personid; - } - - public void setPersonid(String personid) { - this.personid = personid; - } - - public int[] getVehicleplaterect() { - return vehicleplaterect; - } - - public void setVehicleplaterect(int[] vehicleplaterect) { - this.vehicleplaterect = vehicleplaterect; - } - - public double getVehicleplatedetectscore() { - return vehicleplatedetectscore; - } - - public void setVehicleplatedetectscore(double vehicleplatedetectscore) { - this.vehicleplatedetectscore = vehicleplatedetectscore; - } - - public int getVehicleplatetype() { - return vehicleplatetype; - } - - public void setVehicleplatetype(int vehicleplatetype) { - this.vehicleplatetype = vehicleplatetype; - } - - public double getVehicle_plate_numScore() { - return vehicle_plate_numScore; - } - - public void setVehicle_plate_numScore(double vehicle_plate_numScore) { - this.vehicle_plate_numScore = vehicle_plate_numScore; - } - - public double getVehicle_color_score() { - return vehicle_color_score; - } - - public void setVehicle_color_score(double vehicle_color_score) { - this.vehicle_color_score = vehicle_color_score; - } - - public int getVehicle_color_index() { - return vehicle_color_index; - } - - public void setVehicle_color_index(int vehicle_color_index) { - this.vehicle_color_index = vehicle_color_index; - } - - public double getVehicle_detect_score() { - return vehicle_detect_score; - } - - public void setVehicle_detect_score(double vehicle_detect_score) { - this.vehicle_detect_score = vehicle_detect_score; - } - - public int[] getVehicle_detect_syRectParam() { - return vehicle_detect_syRectParam; - } - - public void setVehicle_detect_syRectParam(int[] vehicle_detect_syRectParam) { - this.vehicle_detect_syRectParam = vehicle_detect_syRectParam; - } - - public double getVehicle_win_score() { - return vehicle_win_score; - } - - public void setVehicle_win_score(double vehicle_win_score) { - this.vehicle_win_score = vehicle_win_score; - } - - public int[] getVehicle_win_syRectParam() { - return vehicle_win_syRectParam; - } - - public void setVehicle_win_syRectParam(int[] vehicle_win_syRectParam) { - this.vehicle_win_syRectParam = vehicle_win_syRectParam; - } - - public int getVehicle_special_type() { - return vehicle_special_type; - } - - public void setVehicle_special_type(int vehicle_special_type) { - this.vehicle_special_type = vehicle_special_type; - } - - public double getVehicle_special_score() { - return vehicle_special_score; - } - - public void setVehicle_special_score(double vehicle_special_score) { - this.vehicle_special_score = vehicle_special_score; - } - - public double getVehicle_illegal_driver_smoke_confidence() { - return vehicle_illegal_driver_smoke_confidence; - } - - public void setVehicle_illegal_driver_smoke_confidence(double vehicle_illegal_driver_smoke_confidence) { - this.vehicle_illegal_driver_smoke_confidence = vehicle_illegal_driver_smoke_confidence; - } - - public int getVehicle_illegal_driver_smoke_status() { - return vehicle_illegal_driver_smoke_status; - } - - public void setVehicle_illegal_driver_smoke_status(int vehicle_illegal_driver_smoke_status) { - this.vehicle_illegal_driver_smoke_status = vehicle_illegal_driver_smoke_status; - } - - public double getVehicle_illegal_driver_belt_confidence() { - return vehicle_illegal_driver_belt_confidence; - } - - public void setVehicle_illegal_driver_belt_confidence(double vehicle_illegal_driver_belt_confidence) { - this.vehicle_illegal_driver_belt_confidence = vehicle_illegal_driver_belt_confidence; - } - - public int getVehicle_illegal_driver_belt_status() { - return vehicle_illegal_driver_belt_status; - } - - public void setVehicle_illegal_driver_belt_status(int vehicle_illegal_driver_belt_status) { - this.vehicle_illegal_driver_belt_status = vehicle_illegal_driver_belt_status; - } - - public double getVehicle_illegal_driver_phone_confidence() { - return vehicle_illegal_driver_phone_confidence; - } - - public void setVehicle_illegal_driver_phone_confidence(double vehicle_illegal_driver_phone_confidence) { - this.vehicle_illegal_driver_phone_confidence = vehicle_illegal_driver_phone_confidence; - } - - public int getVehicle_illegal_driver_phone_status() { - return vehicle_illegal_driver_phone_status; - } - - public void setVehicle_illegal_driver_phone_status(int vehicle_illegal_driver_phone_status) { - this.vehicle_illegal_driver_phone_status = vehicle_illegal_driver_phone_status; - } - - public double getVehicle_illegal_driver_person_confidence() { - return vehicle_illegal_driver_person_confidence; - } - - public void setVehicle_illegal_driver_person_confidence(double vehicle_illegal_driver_person_confidence) { - this.vehicle_illegal_driver_person_confidence = vehicle_illegal_driver_person_confidence; - } - - public int getVehicle_illegal_driver_person_status() { - return vehicle_illegal_driver_person_status; - } - - public void setVehicle_illegal_driver_person_status(int vehicle_illegal_driver_person_status) { - this.vehicle_illegal_driver_person_status = vehicle_illegal_driver_person_status; - } - - public double getVehicle_illegal_copilot_smoke_confidence() { - return vehicle_illegal_copilot_smoke_confidence; - } - - public void setVehicle_illegal_copilot_smoke_confidence(double vehicle_illegal_copilot_smoke_confidence) { - this.vehicle_illegal_copilot_smoke_confidence = vehicle_illegal_copilot_smoke_confidence; - } - - public int getVehicle_illegal_copilot_smoke_status() { - return vehicle_illegal_copilot_smoke_status; - } - - public void setVehicle_illegal_copilot_smoke_status(int vehicle_illegal_copilot_smoke_status) { - this.vehicle_illegal_copilot_smoke_status = vehicle_illegal_copilot_smoke_status; - } - - public double getVehicle_illegal_copilot_belt_confidence() { - return vehicle_illegal_copilot_belt_confidence; - } - - public void setVehicle_illegal_copilot_belt_confidence(double vehicle_illegal_copilot_belt_confidence) { - this.vehicle_illegal_copilot_belt_confidence = vehicle_illegal_copilot_belt_confidence; - } - - public int getVehicle_illegal_copilot_belt_status() { - return vehicle_illegal_copilot_belt_status; - } - - public void setVehicle_illegal_copilot_belt_status(int vehicle_illegal_copilot_belt_status) { - this.vehicle_illegal_copilot_belt_status = vehicle_illegal_copilot_belt_status; - } - - public double getVehicle_illegal_copilot_phone_confidence() { - return vehicle_illegal_copilot_phone_confidence; - } - - public void setVehicle_illegal_copilot_phone_confidence(double vehicle_illegal_copilot_phone_confidence) { - this.vehicle_illegal_copilot_phone_confidence = vehicle_illegal_copilot_phone_confidence; - } - - public int getVehicle_illegal_copilot_phone_status() { - return vehicle_illegal_copilot_phone_status; - } - - public void setVehicle_illegal_copilot_phone_status(int vehicle_illegal_copilot_phone_status) { - this.vehicle_illegal_copilot_phone_status = vehicle_illegal_copilot_phone_status; - } - - public double getVehicle_illegal_copilot_person_confidence() { - return vehicle_illegal_copilot_person_confidence; - } - - public void setVehicle_illegal_copilot_person_confidence(double vehicle_illegal_copilot_person_confidence) { - this.vehicle_illegal_copilot_person_confidence = vehicle_illegal_copilot_person_confidence; - } - - public int getVehicle_illegal_copilot_person_status() { - return vehicle_illegal_copilot_person_status; - } - - public void setVehicle_illegal_copilot_person_status(int vehicle_illegal_copilot_person_status) { - this.vehicle_illegal_copilot_person_status = vehicle_illegal_copilot_person_status; - } - - public String getVehicle_recg_issue_year() { - return vehicle_recg_issue_year; - } - - public void setVehicle_recg_issue_year(String vehicle_recg_issue_year) { - this.vehicle_recg_issue_year = vehicle_recg_issue_year; - } - - public String getVehicle_recg_brand() { - return vehicle_recg_brand; - } - - public void setVehicle_recg_brand(String vehicle_recg_brand) { - this.vehicle_recg_brand = vehicle_recg_brand; - } - - public String getVehicle_recg_type() { - return vehicle_recg_type; - } - - public void setVehicle_recg_type(String vehicle_recg_type) { - this.vehicle_recg_type = vehicle_recg_type; - } - - public String getVehicle_recg_subbrand() { - return vehicle_recg_subbrand; - } - - public void setVehicle_recg_subbrand(String vehicle_recg_subbrand) { - this.vehicle_recg_subbrand = vehicle_recg_subbrand; - } - - public String getVehicle_recg_freight_ton() { - return vehicle_recg_freight_ton; - } - - public void setVehicle_recg_freight_ton(String vehicle_recg_freight_ton) { - this.vehicle_recg_freight_ton = vehicle_recg_freight_ton; - } - - public double getVehicle_recg_name_score() { - return vehicle_recg_name_score; - } - - public void setVehicle_recg_name_score(double vehicle_recg_name_score) { - this.vehicle_recg_name_score = vehicle_recg_name_score; - } - - public int getVehicle_pendant_count() { - return vehicle_pendant_count; - } - - public void setVehicle_pendant_count(int vehicle_pendant_count) { - this.vehicle_pendant_count = vehicle_pendant_count; - } - - public double[] getVehicle_fea_feature() { - return vehicle_fea_feature; - } - - public void setVehicle_fea_feature(double[] vehicle_fea_feature) { - this.vehicle_fea_feature = vehicle_fea_feature; - } - - public PendantParams[] getVehicle_pendant_Params() { - return vehicle_pendant_Params; - } - - public void setVehicle_pendant_Params(PendantParams[] vehicle_pendant_Params) { - this.vehicle_pendant_Params = vehicle_pendant_Params; - } - - public PlatePlateNumParams[] getVehicle_plate_plateNumParams() { - return vehicle_plate_plateNumParams; - } - - public void setVehicle_plate_plateNumParams(PlatePlateNumParams[] vehicle_plate_plateNumParams) { - this.vehicle_plate_plateNumParams = vehicle_plate_plateNumParams; - } - - public String getVehicle_plate_hphm() { - return vehicle_plate_hphm; - } - - public void setVehicle_plate_hphm(String vehicle_plate_hphm) { - this.vehicle_plate_hphm = vehicle_plate_hphm; - } -} diff --git a/src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java b/src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java index babc408..3217993 100644 --- a/src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java +++ b/src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java @@ -30,16 +30,16 @@ public class RabbitMqVehicleViolation implements Serializable { */ private String baseId; /** - * 设备id - */ - private int deviceid; - /** * 抓拍时间 */ private Long pictime; + private int vehicle_special_type; + private double vehicle_special_score; + private String vehicle_plate_hphm; + private String personUrl; /** * 额外添加的snapshotUrl diff --git a/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmInfo.java b/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmInfo.java index 84af7db..0c9d930 100644 --- a/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmInfo.java +++ b/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmInfo.java @@ -15,8 +15,6 @@ public class SearchPeopleOfHphmInfo { private String picTime; - private String equipmentName; - private String hphm; private String personUrl; diff --git a/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmRequest.java b/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmRequest.java index 1be4004..16b2e45 100644 --- a/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmRequest.java +++ b/src/main/java/com/objecteye/pojo/SearchPeopleOfHphmRequest.java @@ -23,8 +23,6 @@ public class SearchPeopleOfHphmRequest implements Serializable { private Long endtime; - private int[] customspass; - private String hphm; } diff --git a/src/main/java/com/objecteye/pojo/SearchVehicleFromPeopleInfo.java b/src/main/java/com/objecteye/pojo/SearchVehicleFromPeopleInfo.java index 830d3e7..48fa5b7 100644 --- a/src/main/java/com/objecteye/pojo/SearchVehicleFromPeopleInfo.java +++ b/src/main/java/com/objecteye/pojo/SearchVehicleFromPeopleInfo.java @@ -15,8 +15,6 @@ public class SearchVehicleFromPeopleInfo { private String picTime; - private String equipmentName; - private String hphm; private double driverSimilar; diff --git a/src/main/java/com/objecteye/pojo/VehicleCondition.java b/src/main/java/com/objecteye/pojo/VehicleCondition.java index 1d28bba..1f7e1af 100644 --- a/src/main/java/com/objecteye/pojo/VehicleCondition.java +++ b/src/main/java/com/objecteye/pojo/VehicleCondition.java @@ -35,8 +35,6 @@ public class VehicleCondition implements Serializable { private Long endtime; - private int[] customspass; - private Integer vehicleSpecialType; /** * 车颜色 diff --git a/src/main/java/com/objecteye/pojo/VehicleCurrencyReques.java b/src/main/java/com/objecteye/pojo/VehicleCurrencyReques.java index 8908bca..a06ccf6 100644 --- a/src/main/java/com/objecteye/pojo/VehicleCurrencyReques.java +++ b/src/main/java/com/objecteye/pojo/VehicleCurrencyReques.java @@ -53,7 +53,5 @@ public class VehicleCurrencyReques implements Serializable { private Long endTime; - private int[] customspass; - } diff --git a/src/main/java/com/objecteye/pojo/VehicleMongo.java b/src/main/java/com/objecteye/pojo/VehicleMongo.java index 157717f..f0ca8bd 100644 --- a/src/main/java/com/objecteye/pojo/VehicleMongo.java +++ b/src/main/java/com/objecteye/pojo/VehicleMongo.java @@ -9,8 +9,6 @@ public class VehicleMongo { private String vehicleid; - private Integer deviceid; - private String picurl; private Integer vehiclerecordfieid; diff --git a/src/main/java/com/objecteye/service/HumanVehicleAssociationService.java b/src/main/java/com/objecteye/service/HumanVehicleAssociationService.java index add84a6..cfdd872 100644 --- a/src/main/java/com/objecteye/service/HumanVehicleAssociationService.java +++ b/src/main/java/com/objecteye/service/HumanVehicleAssociationService.java @@ -16,7 +16,7 @@ public interface HumanVehicleAssociationService { * * @return */ - PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int[] customspass, int currentpage, int pagevolume, MultipartFile picfile); + PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int currentpage, int pagevolume, MultipartFile picfile); /** * 在mongodb中通过retrieveKey获取车辆信息 @@ -33,14 +33,14 @@ public interface HumanVehicleAssociationService { * @param hphm * @return */ - SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, int[] customspass, Integer currentpage, Integer pagevolume, String hphm); + SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, Integer currentpage, Integer pagevolume, String hphm); /** * 通过车辆号牌获取到车辆信息 * * @return */ - List findByHphm(Long starttime, Long endtime, int[] customspass, String hphm, int currentPage, int pageSize); + List findByHphm(Long starttime, Long endtime, String hphm, int currentPage, int pageSize); /** * 通过retrieveKey获取到人信息 diff --git a/src/main/java/com/objecteye/service/SpecialtyServices.java b/src/main/java/com/objecteye/service/SpecialtyServices.java index 0bd0e43..3a6bc6f 100644 --- a/src/main/java/com/objecteye/service/SpecialtyServices.java +++ b/src/main/java/com/objecteye/service/SpecialtyServices.java @@ -26,7 +26,7 @@ public interface SpecialtyServices { * * @return */ - JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass, Integer vehicle_special_type_number) throws InterruptedException; + JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, Integer vehicle_special_type_number) throws InterruptedException; /** @@ -44,7 +44,7 @@ public interface SpecialtyServices { * @return */ @RequestMapping("/chemistryCar/findByPic") - VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime, int[] customspass); + VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime); /** * 通过图片返回每辆车的坐标 diff --git a/src/main/java/com/objecteye/service/VehicleCurrencyService.java b/src/main/java/com/objecteye/service/VehicleCurrencyService.java index 7be12db..268ca2b 100644 --- a/src/main/java/com/objecteye/service/VehicleCurrencyService.java +++ b/src/main/java/com/objecteye/service/VehicleCurrencyService.java @@ -25,7 +25,7 @@ public interface VehicleCurrencyService { * * @return */ - CommonResult findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass) throws InterruptedException; + CommonResult findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime) throws InterruptedException; /** diff --git a/src/main/java/com/objecteye/service/impl/DeployServiceImpl.java b/src/main/java/com/objecteye/service/impl/DeployServiceImpl.java index 9b45ee6..607b940 100644 --- a/src/main/java/com/objecteye/service/impl/DeployServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/DeployServiceImpl.java @@ -412,9 +412,9 @@ public class DeployServiceImpl implements DeployService { Aggregation.project("deployId", "count") ); AggregationResults aggregationResults = mongoTemplate.aggregate(aggregation, "plateAlarmMsg", JSONObject.class); - List deviceIdsWarningNumberList = aggregationResults.getMappedResults(); + List deployIdsWarningNumberList = aggregationResults.getMappedResults(); Map resultMap = new HashMap<>(16); - for (JSONObject jsonObject : deviceIdsWarningNumberList) { + for (JSONObject jsonObject : deployIdsWarningNumberList) { if (jsonObject == null) { continue; } @@ -603,7 +603,6 @@ public class DeployServiceImpl implements DeployService { for (PlateAlarmMsg plateAlarmMsg : plateAlarmMsgs) { MonitorMainTableResultInfo monitorMainTableResultInfo = new MonitorMainTableResultInfo(); if (null != plateAlarmMsg) { - monitorMainTableResultInfo.setAddress(plateAlarmMsg.getEquipmentName()); monitorMainTableResultInfo.setPlateNumber(plateAlarmMsg.getPlateNum()); monitorMainTableResultInfo.setSnapshotUrl(plateAlarmMsg.getSnapshotUrl()); monitorMainTableResultInfo.setPicTime(plateAlarmMsg.getAlarmTime()); @@ -636,11 +635,10 @@ public class DeployServiceImpl implements DeployService { */ @Override public void rabbitMqMsgListener(RabbitMQVehicle rabbitMqVehicle) { - int deviceId = rabbitMqVehicle.getDeviceid(); // 设备id - 布控任务 - List integers = (List) redisTemplate.opsForHash().get(GlobalUtil.IPWITHDEPLOYLIST, deviceId); - if (null != integers) { - for (Integer deployId : integers) { + List deployIds = getAllDeployTaskStatusEqualsTo0(); + if (null != deployIds) { + for (String deployId : deployIds) { // 获取布控类型 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId); if (null != deployType) { @@ -656,14 +654,22 @@ public class DeployServiceImpl implements DeployService { } } + /** + * 获取所有未删除并且处于激活状态的任务主键 + * + * @return 结果集 + */ + List getAllDeployTaskStatusEqualsTo0() { + return mongoTemplate.find(Query.query(Criteria.where("status").is(0).and("isDelete").is(0)), SyDeploy.class) + .stream().map(SyDeploy::getId).collect(Collectors.toList()); + } + @Override public void rabbitMqMsgListener(PersonMsg personMsg) { - int deviceId = personMsg.getDeviceId(); - // 设备id - 布控任务 - List integers = (List) redisTemplate.opsForHash().get(GlobalUtil.IPWITHDEPLOYLIST, deviceId); + List integers = getAllDeployTaskStatusEqualsTo0(); if (null != integers) { - for (Integer deployId : integers) { + for (String deployId : integers) { // 获取布控类型 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId); if (null != deployType) { @@ -700,9 +706,7 @@ public class DeployServiceImpl implements DeployService { * @param rabbitMqVehicle 消息体 * @param deployId 布控任务id */ - private void rabbitMqMsgPlateNumberHandler(RabbitMQVehicle rabbitMqVehicle, Integer deployId) { - int deviceId = rabbitMqVehicle.getDeviceid(); - String equipmentName = rabbitMqVehicle.getEquipmentName(); + private void rabbitMqMsgPlateNumberHandler(RabbitMQVehicle rabbitMqVehicle, String deployId) { String latitude = rabbitMqVehicle.getLatitude(); String longitude = rabbitMqVehicle.getLongitude(); String snapshotUrl = rabbitMqVehicle.getSnapshoturl(); @@ -717,7 +721,7 @@ public class DeployServiceImpl implements DeployService { Integer status = (Integer) redisTemplate.opsForHash().get(deployId + "|" + GlobalUtil.DEPLOY_PLATE_NUM, vehiclePlateHphm); if (status != null && 0 == status) { plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) + .longitude(longitude).latitude(latitude) .picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) .plateNum(vehiclePlateHphm).alarmType(0).build(); } @@ -746,9 +750,7 @@ public class DeployServiceImpl implements DeployService { * @param rabbitMqVehicle 消息体 * @param deployId 布控任务id */ - private void rabbitMqMsgVehicleHandler(RabbitMQVehicle rabbitMqVehicle, Integer deployId) { - int deviceId = rabbitMqVehicle.getDeviceid(); - String equipmentName = rabbitMqVehicle.getEquipmentName(); + private void rabbitMqMsgVehicleHandler(RabbitMQVehicle rabbitMqVehicle, String deployId) { String latitude = rabbitMqVehicle.getLatitude(); String longitude = rabbitMqVehicle.getLongitude(); String snapshotUrl = rabbitMqVehicle.getSnapshoturl(); @@ -773,7 +775,7 @@ public class DeployServiceImpl implements DeployService { String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", vehicleIdStr); //将数据储存到mongo中 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) + .longitude(longitude).latitude(latitude) .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) .plateNum(vehiclePlateHphm).alarmType(1).similarity(v).libId(vehicleIdStr).build(); } @@ -814,7 +816,7 @@ public class DeployServiceImpl implements DeployService { if (max >= (float) redisTemplate.opsForHash().get(GlobalUtil.DEPLOYTHRESLD, deployId)) { String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", key); plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) + .longitude(longitude).latitude(latitude) .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) .alarmType(1).similarity(max).build(); } @@ -842,10 +844,8 @@ public class DeployServiceImpl implements DeployService { * @param personMsg 消息体 * @param deployId 任务id */ - public void rabbitMqPersonHandler(PersonMsg personMsg, Integer deployId) { + public void rabbitMqPersonHandler(PersonMsg personMsg, String deployId) { float[] fea = personMsg.getFea(); - int deviceId = personMsg.getDeviceId(); - String equipmentName = personMsg.getEquipmentName(); String longitude = personMsg.getLongitude(); String latitude = personMsg.getLatitude(); String url = personMsg.getUrl(); @@ -863,11 +863,9 @@ public class DeployServiceImpl implements DeployService { String code = responseParamPerson.getCode(); if ("0".equals(code)) { List result = responseParamPerson.getResult(); - if (result != null && result.size() > 0) { - int size = result.size(); - for (int i = 0; i < size; i++) { - String retrieveKey = result.get(i).getRetrieveKey(); + for (PersonIdAndScore personIdAndScore : result) { + String retrieveKey = personIdAndScore.getRetrieveKey(); log.debug("retrieveKey: " + retrieveKey); String[] split = retrieveKey.split("&"); String key = deployId + "|" + split[1]; @@ -875,17 +873,14 @@ public class DeployServiceImpl implements DeployService { if (deployLib.contains(split[1])) { Object staus = redisTemplate.opsForHash().get(key, Integer.parseInt(split[0])); if (staus != null && Integer.parseInt(staus.toString()) == 0) { - float score = Float.parseFloat(result.get(i).getScore()); + float score = Float.parseFloat(personIdAndScore.getScore()); PlateAlarmMsg plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(personMsg.getPersonId()) - .deployId(deployId) - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude).libId(split[0]) + .deployId(deployId).longitude(longitude).latitude(latitude).libId(split[0]) .libUrl(split[2]).picTime(captureTime).alarmTime(DateUtil.now()).snapshotUrl(url) .plateNum(null).alarmType(2).similarity(score).build(); log.debug("plateAlarmMsg: " + plateAlarmMsg.toString()); plateAlarmMsgProducer(plateAlarmMsg); break; - } else if (staus != null && Integer.parseInt(staus.toString()) == 1) { - continue; } } } diff --git a/src/main/java/com/objecteye/service/impl/HumanVehicleAssociationServiceImpl.java b/src/main/java/com/objecteye/service/impl/HumanVehicleAssociationServiceImpl.java index f4d29f7..400219e 100644 --- a/src/main/java/com/objecteye/service/impl/HumanVehicleAssociationServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/HumanVehicleAssociationServiceImpl.java @@ -55,7 +55,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati * @return */ @Override - public PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int[] customspass, int currentpage, int pagevolume, MultipartFile picfile) { + public PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int currentpage, int pagevolume, MultipartFile picfile) { if (null == picfile || picfile.equals("undefined")) { return null; } @@ -136,7 +136,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati if (retrieveKeyDbResultMap.containsKey(rabbitMqVehicle.getPersonid())) { SearchDataFromRetrieveDbResult searchDataFromRetrieveDbResult = retrieveKeyDbResultMap.get(rabbitMqVehicle.getPersonid()); SearchVehicleFromPeopleInfo searchVehicleFromPeopleSingle = new SearchVehicleFromPeopleInfo(rabbitMqVehicle.getId(), - simpleDateFormat.format(new Date(rabbitMqVehicle.getPictime())), rabbitMqVehicle.getEquipmentName(), + simpleDateFormat.format(new Date(rabbitMqVehicle.getPictime())), rabbitMqVehicle.getVehicle_plate_hphm(), searchDataFromRetrieveDbResult.getScore(), rabbitMqVehicle.getPicurl(), rabbitMqVehicle.getPersonUrl()); searchVehicleFromPeopleInfos.add(searchVehicleFromPeopleSingle); } @@ -156,13 +156,13 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati * @return */ @Override - public SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, int[] customspass, Integer currentpage, Integer pagevolume, String hphm) { + public SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, Integer currentpage, Integer pagevolume, String hphm) { SearchPeopleOfhphmResult searchPeopleOfhphmResult = new SearchPeopleOfhphmResult(); List list = null; if (!"".equals(hphm)) { list = new ArrayList(); //首先根据车辆号牌查询到相关的车辆 - List byHphm = findByHphm(starttime, endtime, customspass, hphm, currentpage, pagevolume); + List byHphm = findByHphm(starttime, endtime, hphm, currentpage, pagevolume); for (RabbitMQVehicle rmqv : byHphm) { Long pictime = rmqv.getPictime(); @@ -172,7 +172,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati if (pictime <= endtime && pictime >= starttime) { SearchPeopleOfHphmInfo searchPeopleOfHphmInfo = new SearchPeopleOfHphmInfo(rmqv.getId(), - simpleDateFormat.format(new Date(rmqv.getPictime())), rmqv.getEquipmentName(), + simpleDateFormat.format(new Date(rmqv.getPictime())), rmqv.getVehicle_plate_hphm(), rmqv.getPersonUrl()); list.add(searchPeopleOfHphmInfo); } @@ -205,13 +205,11 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati * @return */ @Override - public List findByHphm(Long starttime, Long endtime, int[] customspass, String hphm, int currentPage, int pageSize) { + public List findByHphm(Long starttime, Long endtime, String hphm, int currentPage, int pageSize) { Query query = new Query(); - query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "pictime"))); + query.with(Sort.by(Sort.Order.desc("pictime"))); int skip = (currentPage - 1) * pageSize; - query.addCriteria(new Criteria().andOperator(Criteria.where("vehicle_plate_hphm").is(hphm), Criteria.where("personUrl").ne(null))); - query.skip(skip); query.limit(pageSize); return mongoTemplate.find(query, RabbitMQVehicle.class); diff --git a/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java b/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java index 7c14ba3..8b56bdf 100644 --- a/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java @@ -177,7 +177,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService { locusOrbitResultParams.setPictime(DateUtil.format(new Date(currentPictime), "yyyy-MM-dd HH:mm:ss")); locusOrbitResultParams.setLongitude(rabbitMqVehicle.getLongitude()); locusOrbitResultParams.setLatitude(rabbitMqVehicle.getLatitude()); - locusOrbitResultParams.setEquipmentName(rabbitMqVehicle.getEquipmentName()); locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl()); resultList.add(locusOrbitResultParams); } @@ -233,7 +232,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService { if (null != rabbitMqVehicle) { locusOrbitResultParams.setId(rabbitMqVehicle.getId()); locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl()); - locusOrbitResultParams.setEquipmentName(rabbitMqVehicle.getEquipmentName()); locusOrbitResultParams.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm()); locusOrbitResultParams.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss")); } diff --git a/src/main/java/com/objecteye/service/impl/SpecialtyServicesImpl.java b/src/main/java/com/objecteye/service/impl/SpecialtyServicesImpl.java index 63052a0..9486b80 100644 --- a/src/main/java/com/objecteye/service/impl/SpecialtyServicesImpl.java +++ b/src/main/java/com/objecteye/service/impl/SpecialtyServicesImpl.java @@ -47,8 +47,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices { private VehicleDetailsUtils vehicleDetailsUtils; @Autowired private RedisTemplate redisTemplate; - @Autowired - private RelationMappingUtil relationMappingUtil; private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -59,7 +57,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { } @Override - public JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass, Integer vehicle_special_type_number) throws InterruptedException { + public JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, Integer vehicle_special_type_number) throws InterruptedException { //封装结果的对象 JSONObject result = new JSONObject(); if (picfile == null) { @@ -79,7 +77,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { RabbitMQVehicle rabbitMqVehicle = rabbitMqVehicles.get(number); //先过滤条件 List vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(), - null, starttime, endtime, customspass, vehicle_special_type_number, rabbitMqVehicle.getVehicle_color_index(), + null, starttime, endtime, vehicle_special_type_number, rabbitMqVehicle.getVehicle_color_index(), rabbitMqVehicle.getVehicle_recg_issue_year(), rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(), rabbitMqVehicle.getVehicle_recg_subbrand())); //获取该车辆的特征信息 @@ -151,8 +149,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices { RabbitMQVehicle rabbitMqVehicle1 = next.getRabbitMQVehicle(); rowData.put("id", rabbitMqVehicle1.getId()); rowData.put("hphm", rabbitMqVehicle1.getVehicle_plate_hphm()); - //获取设备id，然后通过设备id查询到设备的名称 - rowData.put("site", rabbitMqVehicle1.getEquipmentName()); rowData.put("phototime", simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime()))); rowData.put("recordid", rabbitMqVehicle1.getRecordid()); // 新方法，如果不需要四舍五入，可以使用RoundingMode.DOWN @@ -195,7 +191,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { } @Override - public VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime, int[] customspass) { + public VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime) { return null; } @@ -406,12 +402,12 @@ public class SpecialtyServicesImpl implements SpecialtyServices { int index = vehicle_color_res.getIndex(); float score = vehicle_color_res.getScore(); if (score >= 0.7) { - String vehicleColor = relationMappingUtil.getVehicleColor(index); + String vehicleColor = RelationMappingUtil.getVehicleColor(index); resultMsg.setVehicle_color(vehicleColor); } else { resultMsg.setVehicle_color("检测失败"); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); VehicleRecognizeResultParam vehicle_recg_res = vehicleInfoParam.getVehicle_recg_res(); float name_score = vehicle_recg_res.getName_score(); if (name_score < 0.7) { diff --git a/src/main/java/com/objecteye/service/impl/VehicleCurrencyServiceImpl.java b/src/main/java/com/objecteye/service/impl/VehicleCurrencyServiceImpl.java index f55ee3a..cdb5034 100644 --- a/src/main/java/com/objecteye/service/impl/VehicleCurrencyServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/VehicleCurrencyServiceImpl.java @@ -206,7 +206,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { } @Override - public CommonResult findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass) throws InterruptedException { + public CommonResult findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime) throws InterruptedException { //封装结果的对象 if (picfile == null) { return CommonResult.success(201, "图片为空", null); @@ -223,7 +223,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { RabbitMQVehicle rabbitMqVehicle = rabbitMQVehicles.get(number); List vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(), - null, starttime, endtime, customspass, null, rabbitMqVehicle.getVehicle_color_index(), rabbitMqVehicle.getVehicle_recg_issue_year(), + null, starttime, endtime, null, rabbitMqVehicle.getVehicle_color_index(), rabbitMqVehicle.getVehicle_recg_issue_year(), rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(), rabbitMqVehicle.getVehicle_recg_subbrand())); //获取该车辆的特征信息 @@ -303,7 +303,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { //因为需要将快照图的值给picurl所以需要下面的返回方式 PicVehicleRow picVehicleRow = new PicVehicleRow(rabbitMqVehicle1.getId(), rabbitMqVehicle1.getRecordid(), rabbitMqVehicle1.getVehicle_plate_hphm(), - snapshoturl, picurl, bg, rabbitMqVehicle1.getEquipmentName(), + snapshoturl, picurl, bg, simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime()))); picVehicleRows.add(picVehicleRow); diff --git a/src/main/java/com/objecteye/service/impl/VehicleFileServiceImpl.java b/src/main/java/com/objecteye/service/impl/VehicleFileServiceImpl.java index c85c1fe..fd4729a 100644 --- a/src/main/java/com/objecteye/service/impl/VehicleFileServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/VehicleFileServiceImpl.java @@ -307,7 +307,6 @@ public class VehicleFileServiceImpl implements IVehicleFileService { } String style = String.join("-", styleList); tempResult.setStyle(style); - tempResult.setEquipmentName(rabbitMqVehicle.getEquipmentName()); tempResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), dateFormat)); tempResult.setId(rabbitMqVehicle.getId()); resultList.add(tempResult); diff --git a/src/main/java/com/objecteye/service/impl/VehicleViolationsServiceImpl.java b/src/main/java/com/objecteye/service/impl/VehicleViolationsServiceImpl.java index ae83045..70f010e 100644 --- a/src/main/java/com/objecteye/service/impl/VehicleViolationsServiceImpl.java +++ b/src/main/java/com/objecteye/service/impl/VehicleViolationsServiceImpl.java @@ -8,7 +8,6 @@ import com.objecteye.entity.*; import com.objecteye.pojo.RabbitMQVehicle; import com.objecteye.pojo.RabbitMqVehicleViolation; import com.objecteye.service.IVehicleViolationsService; -import com.objecteye.utils.GlobalUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.aggregation.Aggregation; @@ -57,31 +56,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { private final double ILLEGAL_CONFIRM_LIMMIT = 0.9; /** - * 同步还在激活状态的任务到redis - */ - private void syncForbiddenTask() { - List forbiddenTasks = mongoTemplate.find(Query.query(Criteria.where("status").ne(0)), SyVehicleForbidenTask.class); - Map> deviceIdTaskMap = new HashMap<>(); - for (SyVehicleForbidenTask forbiddenTask : forbiddenTasks) { - if (null == forbiddenTask || null == forbiddenTask.getDeviceId() || "".equals(forbiddenTask.getDeviceId())) { - continue; - } - String[] deviceIdArr = forbiddenTask.getDeviceId().split(","); - for (String deviceId : deviceIdArr) { - List tempTasks = new ArrayList<>(); - if (deviceIdTaskMap.containsKey(deviceId)) { - tempTasks = deviceIdTaskMap.get(deviceId); - } - tempTasks.add(forbiddenTask); - deviceIdTaskMap.put(deviceId, tempTasks); - } - - } - redisTemplate.delete(GlobalUtil.FORBIDDEN_TASK); - redisTemplate.opsForHash().putAll(GlobalUtil.FORBIDDEN_TASK, deviceIdTaskMap); - } - - /** * 禁行任务查询接口 * * @param currentpage 页码 @@ -168,7 +142,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { syVehicleForbidenTask.setStatus(1); } mongoTemplate.insert(syVehicleForbidenTask); - syncForbiddenTask(); return 1; } @@ -181,7 +154,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @Override public int forbiddenTaskUpdate(SyVehicleForbidenTask syVehicleForbidenTask) { mongoTemplate.save(syVehicleForbidenTask); - syncForbiddenTask(); return 1; } @@ -204,7 +176,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), SyVehicleForbidenTask.class); effectNum++; } - syncForbiddenTask(); return effectNum; } @@ -221,11 +192,10 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { // 非特殊车辆 if (specialScore >= SPECIAL_VEHICLE_TYPE_LOWER_SCORS) { // 特殊车辆处理 - int deviceId = rabbitMqVehicleViolation.getDeviceid(); int specialType = rabbitMqVehicleViolation.getVehicle_special_type(); // 对激活的任务做判断 - List availableForbiddenTasks = (List) redisTemplate.opsForHash().get(GlobalUtil.FORBIDDEN_TASK, String.valueOf(deviceId)); - if (null != availableForbiddenTasks && availableForbiddenTasks.size() != 0) { + List availableForbiddenTasks = mongoTemplate.find(Query.query(Criteria.where("status").ne(0)), SyVehicleForbidenTask.class); + if (availableForbiddenTasks.size() != 0) { // 检测是否违规, 违规一次即跳出循环 for (SyVehicleForbidenTask forbiddenTask : availableForbiddenTasks) { List vehicleType = Arrays.stream(forbiddenTask.getVehicleType().split(",")).collect(Collectors.toList()); @@ -376,7 +346,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { vehicleSimpleResult.setPersonUrl(rabbitMqVehicleViolation.getPersonUrl()); vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicleViolation.getPictime()), "yyyy-MM-dd HH:mm:ss")); vehicleSimpleResult.setPlateNumber(rabbitMqVehicleViolation.getVehicle_plate_hphm()); - vehicleSimpleResult.setEquipmentName(rabbitMqVehicleViolation.getEquipmentName() == null ? "" : rabbitMqVehicleViolation.getEquipmentName()); resultList.add(vehicleSimpleResult); } long total = mongoTemplate.count(query, RabbitMqVehicleViolation.class); @@ -397,7 +366,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { vehicleSimpleResult.setPersonUrl(rabbitMqVehicle.getPersonUrl()); vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss")); vehicleSimpleResult.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm()); - vehicleSimpleResult.setEquipmentName(rabbitMqVehicle.getEquipmentName()); resultList.add(vehicleSimpleResult); } long total = mongoTemplate.count(query, RabbitMQVehicle.class); diff --git a/src/main/java/com/objecteye/utils/GlobalUtil.java b/src/main/java/com/objecteye/utils/GlobalUtil.java index a4a4776..70b2fa7 100644 --- a/src/main/java/com/objecteye/utils/GlobalUtil.java +++ b/src/main/java/com/objecteye/utils/GlobalUtil.java @@ -48,11 +48,6 @@ public class GlobalUtil { public final static String VEHICLE_FEATURE = "vehicleFeature"; /** - * redis中保存违规信息的主键 - */ - public final static String FORBIDDEN_TASK = "forbidden_task"; - - /** * 布控报警模块 -redis key值-任务开始时间 */ public final static String DEPLOYID_STATRTIME = "deployIdAndStartTime"; diff --git a/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java b/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java index 7ded3c9..01fcf1e 100644 --- a/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java +++ b/src/main/java/com/objecteye/utils/RabbbitmqConsumer.java @@ -40,13 +40,8 @@ public class RabbbitmqConsumer { public void receive_store(String msg, Message message, Channel channel) { try { List rabbitMQVehicles = rabbitMQVehicleTools.encapsulationRabbitVehicle(msg); - if (rabbitMQVehicles != null && rabbitMQVehicles.size() > 0) { - - int size = rabbitMQVehicles.size(); - - for (int i = 0; i < size; i++) { - RabbitMQVehicle rabbitMQVehicle = rabbitMQVehicles.get(i); + for (RabbitMQVehicle rabbitMQVehicle : rabbitMQVehicles) { if (rabbitMQVehicle == null) { continue; } @@ -67,8 +62,8 @@ public class RabbbitmqConsumer { if (vehicle_plate_numScore > 0.9) { redisTemplate.opsForHash().put("vehicleFilePlateNumber", vehicle_plate_hphm, s); } -// rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.alarm", s); -// rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.forbidden", s); + rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.alarm", s); + rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.forbidden", s); } } } catch (Exception e) { diff --git a/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java b/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java index 26b9144..72840e6 100644 --- a/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java +++ b/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java @@ -34,8 +34,6 @@ public class RabbitMQVehicleTools { @Autowired private RedisTemplate redisTemplate; @Autowired - private RelationMappingUtil relationMappingUtil; - @Autowired private VehicleDetailsUtils vehicleDetailsUtils; @Autowired private MongoTemplate mongoTemplate; @@ -113,7 +111,7 @@ public class RabbitMQVehicleTools { GlobalUtil.generateImage(mattingData, path); - PersonMsg personMsg = new PersonMsg(null, null, snapshoturl, captureTime, null, null, null, url, retrieveKey, fea); + PersonMsg personMsg = new PersonMsg(null, snapshoturl, captureTime, null, null, null, url, retrieveKey, fea); PersonMsg save = mongoTemplate.save(personMsg); String s = JSON.toJSONString(save); rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.person", s); @@ -135,8 +133,6 @@ public class RabbitMQVehicleTools { boolean infoIsExit = jsonObject.containsKey("info"); if (infoIsExit) { long captureTime = jsonObject.containsKey("captureTime") ? jsonObject.getLong("captureTime") : System.currentTimeMillis(); - Integer devicedid = jsonObject.containsKey("deviceId") ? jsonObject.getInteger("deviceId") : null; - String equipName = jsonObject.containsKey("equipmentName") ? jsonObject.getString("equipmentName") : null; String longitude = jsonObject.containsKey("longitude") ? jsonObject.getString("longitude") : null; String latitude = jsonObject.containsKey("latitude") ? jsonObject.getString("latitude") : null; String picurl = jsonObject.containsKey("imageUrl") ? jsonObject.getString("imageUrl") : null; @@ -144,16 +140,6 @@ public class RabbitMQVehicleTools { for (int i = 0; i < infoArr.size(); i++) { //获取到单辆车的信息 JSONObject infoObj = infoArr.getJSONObject(i); - if (devicedid != null) { - Object totalCar = redisTemplate.opsForHash().get("totalVehicles", devicedid); - if (totalCar != null) { - Integer count1 = Integer.valueOf(totalCar.toString()); - count++; - redisTemplate.opsForHash().put("totalCar", devicedid, count1); - } else { - redisTemplate.opsForHash().put("totalCar", devicedid, 1); - } - } //封装建模 RabbitMQVehicle rabbitMQVehicle = sdkToOnlyVehicle(infoObj); @@ -171,14 +157,8 @@ public class RabbitMQVehicleTools { } } - if (devicedid != null) { - rabbitMQVehicle.setDeviceid(devicedid); - rabbitMQVehicle.setEquipmentName(equipName); - rabbitMQVehicle.setLongitude(longitude); - rabbitMQVehicle.setLatitude(latitude); - } else { - rabbitMQVehicle.setDeviceid(0); - } + rabbitMQVehicle.setLongitude(longitude); + rabbitMQVehicle.setLatitude(latitude); rabbitMQVehicle.setPictime(captureTime); rabbitMQVehicles.add(rabbitMQVehicle); @@ -208,8 +188,6 @@ public class RabbitMQVehicleTools { // id; //车辆id rabbitMQInfo.setId(rabbitMQVehicle.getId()); - // equipmentName; //设备名称 - rabbitMQInfo.setEquipmentName(rabbitMQVehicle.getEquipmentName()); // longitude; //经度 rabbitMQInfo.setLongitude(rabbitMQVehicle.getLongitude()); // latitude; //纬度 @@ -239,7 +217,7 @@ public class RabbitMQVehicleTools { rabbitMQInfo.setPersonid(rabbitMQVehicle.getPersonid()); // vehicleplatetype; //车牌类型 int vehicleplatetype = rabbitMQVehicle.getVehicleplatetype(); - String vehiclePlateTypeName = relationMappingUtil.getVehiclePlateType(vehicleplatetype); + String vehiclePlateTypeName = RelationMappingUtil.getVehiclePlateType(vehicleplatetype); rabbitMQInfo.setVehicleplatetype(vehiclePlateTypeName); // vehicle_plate_numScore; //号牌可信度 @@ -250,11 +228,11 @@ public class RabbitMQVehicleTools { // vehicle_color_index; //车辆颜色; int vehicle_color_index = rabbitMQVehicle.getVehicle_color_index(); - String vehicleColor = relationMappingUtil.getVehicleColor(vehicle_color_index); + String vehicleColor = RelationMappingUtil.getVehicleColor(vehicle_color_index); rabbitMQInfo.setVehicle_color_index(vehicleColor); // vehicle_special_type; //特殊品类车类型 int vehicle_special_type = rabbitMQVehicle.getVehicle_special_type(); - String vehicleSpecialType = relationMappingUtil.getVehicleSpecialType(vehicle_special_type); + String vehicleSpecialType = RelationMappingUtil.getVehicleSpecialType(vehicle_special_type); rabbitMQInfo.setVehicle_special_type(vehicleSpecialType); @@ -511,8 +489,6 @@ public class RabbitMQVehicleTools { public RabbitMQVehicle sdkToOnlyVehicle(JSONObject vehicleSingleInfo) { int count = 0;//在档案中的位置 - int deviceid = 0; //设备id - String equipName = nullStatus; String longitude = nullStatus; String latitude = nullStatus; String picurl = nullStatus; //图片的路径 @@ -792,7 +768,7 @@ public class RabbitMQVehicleTools { //vehicle_pendant_detect_zybexis; //是否存在遮阳板 0表示不存在 1表示存在 - rabbitMQVehicle = new RabbitMQVehicle(count, deviceid, equipName, longitude, latitude, picurl, recordid, pictime, flag, tag, personid, vehicle_plate_rect, vehicle_plate_detectScore, vehicle_plate_type, vehicle_plate_numScore, vehicle_color_score, vehicle_color_index, vehicle_detect_score, vehicle_detect_syrectparam, vehicle_win_score, vehicle_win_syrectparam, vehicle_special_type, vehicle_special_score, vehicle_illegal_driver_smoke_confidence, vehicle_illegal_driver_smoke_status, vehicle_illegal_driver_belt_confidence, vehicle_illegal_driver_belt_status, vehicle_illegal_driver_phone_confidence, vehicle_illegal_driver_phone_status, vehicle_illegal_driver_person_confidence, vehicle_illegal_driver_person_status, vehicle_illegal_copilot_smoke_confidence, vehicle_illegal_copilot_smoke_status, vehicle_illegal_copilot_belt_confidence, vehicle_illegal_copilot_belt_status, vehicle_illegal_copilot_phone_confidence, vehicle_illegal_copilot_phone_status, vehicle_illegal_copilot_person_confidence, vehicle_illegal_copilot_person_status, vehicle_recg_issue_year, vehicle_recg_brand, vehicle_recg_type, vehicle_recg_subbrand, vehicle_recg_freight_ton, vehicle_recg_name_score, vehicle_pendant_count, vehicle_fea_feature, vehicle_pendant_Params, vehicle_plate_plateNumParams, vehicle_plate_hphm, vehicle_pendant_detect_njbnumber, vehicle_pendant_detect_gjexis, vehicle_pendant_detect_zybexis, null, snapshoturl); + rabbitMQVehicle = new RabbitMQVehicle(count, longitude, latitude, picurl, recordid, pictime, flag, tag, personid, vehicle_plate_rect, vehicle_plate_detectScore, vehicle_plate_type, vehicle_plate_numScore, vehicle_color_score, vehicle_color_index, vehicle_detect_score, vehicle_detect_syrectparam, vehicle_win_score, vehicle_win_syrectparam, vehicle_special_type, vehicle_special_score, vehicle_illegal_driver_smoke_confidence, vehicle_illegal_driver_smoke_status, vehicle_illegal_driver_belt_confidence, vehicle_illegal_driver_belt_status, vehicle_illegal_driver_phone_confidence, vehicle_illegal_driver_phone_status, vehicle_illegal_driver_person_confidence, vehicle_illegal_driver_person_status, vehicle_illegal_copilot_smoke_confidence, vehicle_illegal_copilot_smoke_status, vehicle_illegal_copilot_belt_confidence, vehicle_illegal_copilot_belt_status, vehicle_illegal_copilot_phone_confidence, vehicle_illegal_copilot_phone_status, vehicle_illegal_copilot_person_confidence, vehicle_illegal_copilot_person_status, vehicle_recg_issue_year, vehicle_recg_brand, vehicle_recg_type, vehicle_recg_subbrand, vehicle_recg_freight_ton, vehicle_recg_name_score, vehicle_pendant_count, vehicle_fea_feature, vehicle_pendant_Params, vehicle_plate_plateNumParams, vehicle_plate_hphm, vehicle_pendant_detect_njbnumber, vehicle_pendant_detect_gjexis, vehicle_pendant_detect_zybexis, null, snapshoturl); } return rabbitMQVehicle; diff --git a/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java b/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java index 2ea4ba9..f80b82a 100644 --- a/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java +++ b/src/main/java/com/objecteye/websocket/MyWebSocketHandler.java @@ -148,8 +148,6 @@ public class MyWebSocketHandler extends TextWebSocketHandler { PlateAlarmMsg plateAlarmMsg = JSON.parseObject(deployAlarmMsg.toString(), PlateAlarmMsg.class); String alarmTime = plateAlarmMsg.getAlarmTime(); deployMsg.setAlarmTime(alarmTime); - String equipmentName = plateAlarmMsg.getEquipmentName(); - deployMsg.setAlarmPlace(equipmentName); Integer alarmType = plateAlarmMsg.getAlarmType(); deployMsg.setDeployType(alarmType); String snapshotUrl = plateAlarmMsg.getSnapshotUrl(); diff --git a/src/main/java/com/objecteye/websocket/SdkToVehicleDetail.java b/src/main/java/com/objecteye/websocket/SdkToVehicleDetail.java index 8e7266c..4440c76 100644 --- a/src/main/java/com/objecteye/websocket/SdkToVehicleDetail.java +++ b/src/main/java/com/objecteye/websocket/SdkToVehicleDetail.java @@ -112,9 +112,6 @@ public class SdkToVehicleDetail { String dateString = dateFormat.format(date); vehicleDetails.setPictime(dateString); - //设备相关信息 - String equipmentName = captureRedis.getEquipmentName(); - vehicleDetails.setEquipmentName(equipmentName); String longitude = captureRedis.getLongitude(); vehicleDetails.setLongitude(longitude); String latitude = captureRedis.getLatitude();