Liu Haoyu / vehicle-simple

Commit fddd467384e19fca8d14cb27ad8423d92aceb7d6

Authored by Liu Haoyu
1 parent 40c853a1

去掉设备相关内容;

Inline Side-by-side
Showing 40 changed files with 86 additions and 784 deletions
src/main/java/com/objecteye/controller/HumanVehicleAssociationController.java
  View file @fddd467
@@ -29,9 +29,9 @@ public class HumanVehicleAssociationController { @@ -29,9 +29,9 @@ public class HumanVehicleAssociationController {
29 29
30 @ApiOperation("以人搜车") 30 @ApiOperation("以人搜车")
31 @RequestMapping(value = "/hvAssociation/searchVehicleFromHuman", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) 31 @RequestMapping(value = "/hvAssociation/searchVehicleFromHuman", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
32 - public CommonResult searchVehicleFromHuman(@RequestParam Long starttime, @RequestParam Long endtime, @RequestParam Float thresholds, @RequestParam int[] customspass, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile) { 32 + public CommonResult searchVehicleFromHuman(@RequestParam Long starttime, @RequestParam Long endtime, @RequestParam Float thresholds, @RequestParam int currentpage, @RequestParam int pagevolume, MultipartFile picfile) {
33 try { 33 try {
34 - PageResult pageResult = humanVehicleAssociationService.searchVehicleFromHuman(starttime, endtime, thresholds, customspass, currentpage, pagevolume, picfile); 34 + PageResult pageResult = humanVehicleAssociationService.searchVehicleFromHuman(starttime, endtime, thresholds, currentpage, pagevolume, picfile);
35 if (pageResult == null || pageResult.getRow().size() == 0) { 35 if (pageResult == null || pageResult.getRow().size() == 0) {
36 return CommonResult.success(201, "没有符合要求的数据", null); 36 return CommonResult.success(201, "没有符合要求的数据", null);
37 } 37 }
@@ -47,7 +47,7 @@ public class HumanVehicleAssociationController { @@ -47,7 +47,7 @@ public class HumanVehicleAssociationController {
47 @RequestMapping(value = "/hvAssociation/searchPeopleFromHphm", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) 47 @RequestMapping(value = "/hvAssociation/searchPeopleFromHphm", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
48 public CommonResult searchPeopleFromHphm(@RequestBody SearchPeopleOfHphmRequest searchPeopleOfHphmRequest) { 48 public CommonResult searchPeopleFromHphm(@RequestBody SearchPeopleOfHphmRequest searchPeopleOfHphmRequest) {
49 try { 49 try {
50 - SearchPeopleOfhphmResult searchPeopleOfhphmResult = humanVehicleAssociationService.searchPeopleFromHphm(searchPeopleOfHphmRequest.getStarttime(), searchPeopleOfHphmRequest.getEndtime(), searchPeopleOfHphmRequest.getCustomspass(), searchPeopleOfHphmRequest.getCurrentpage(), 50 + SearchPeopleOfhphmResult searchPeopleOfhphmResult = humanVehicleAssociationService.searchPeopleFromHphm(searchPeopleOfHphmRequest.getStarttime(), searchPeopleOfHphmRequest.getEndtime(), searchPeopleOfHphmRequest.getCurrentpage(),
51 searchPeopleOfHphmRequest.getPagevolume(), searchPeopleOfHphmRequest.getHphm()); 51 searchPeopleOfHphmRequest.getPagevolume(), searchPeopleOfHphmRequest.getHphm());
52 List<SearchPeopleOfHphmInfo> row = searchPeopleOfhphmResult.getRow(); 52 List<SearchPeopleOfHphmInfo> row = searchPeopleOfhphmResult.getRow();
53 if (row == null || row.size() == 0) { 53 if (row == null || row.size() == 0) {
src/main/java/com/objecteye/controller/LocusOrbitController.java
  View file @fddd467
@@ -78,7 +78,6 @@ public class LocusOrbitController { @@ -78,7 +78,6 @@ public class LocusOrbitController {
78 * 轨迹分析接口(图片搜索) 78 * 轨迹分析接口(图片搜索)
79 * 79 *
80 * @param gcxh 车辆序号 80 * @param gcxh 车辆序号
81 - * @param customsPass 地区id, 设备id, 自行判断是地区的还是设备的  
82 * @param startTime 起始时间戳 81 * @param startTime 起始时间戳
83 * @param endTime 结束时间戳 82 * @param endTime 结束时间戳
84 * @param multipartFile 文件信息 83 * @param multipartFile 文件信息
@@ -87,8 +86,8 @@ public class LocusOrbitController { @@ -87,8 +86,8 @@ public class LocusOrbitController {
87 @PostMapping("locusOrbitAnalysisByFile") 86 @PostMapping("locusOrbitAnalysisByFile")
88 @ResponseBody 87 @ResponseBody
89 @ApiOperation("轨迹分析接口") 88 @ApiOperation("轨迹分析接口")
90 - public CommonResult locusOrbitByPlateNumber(int gcxh, Integer customsPass, Long startTime, Long endTime, MultipartFile multipartFile) {  
91 - LocusOrbitQueryParams queryParams = new LocusOrbitQueryParams(customsPass, startTime, endTime, null); 89 + public CommonResult locusOrbitByPlateNumber(int gcxh, Long startTime, Long endTime, MultipartFile multipartFile) {
  90 + LocusOrbitQueryParams queryParams = new LocusOrbitQueryParams(startTime, endTime, null);
92 List<LocusOrbitResultParams> resultList = locusOrbitService.locusOrbitByPlateNumber(gcxh, queryParams, multipartFile); 91 List<LocusOrbitResultParams> resultList = locusOrbitService.locusOrbitByPlateNumber(gcxh, queryParams, multipartFile);
93 return resultList.size() > 0 ? CommonResult.success(resultList) : CommonResult.success(201, "没有符合要求的值", new ArrayList<>()); 92 return resultList.size() > 0 ? CommonResult.success(resultList) : CommonResult.success(201, "没有符合要求的值", new ArrayList<>());
94 } 93 }
src/main/java/com/objecteye/controller/SpecialtyVehicleController.java
  View file @fddd467
@@ -61,8 +61,8 @@ public class SpecialtyVehicleController { @@ -61,8 +61,8 @@ public class SpecialtyVehicleController {
61 @RequestMapping("/slagCar/findByPic") 61 @RequestMapping("/slagCar/findByPic")
62 public JSONObject findByPic(@RequestParam int number, @RequestParam double threshold, @RequestParam int currentpage, 62 public JSONObject findByPic(@RequestParam int number, @RequestParam double threshold, @RequestParam int currentpage,
63 @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime, 63 @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime,
64 - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException {  
65 - return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, customspass, 2); 64 + @RequestParam Long endtime) throws InterruptedException {
  65 + return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, 2);
66 } 66 }
67 67
68 /** 68 /**
@@ -114,8 +114,8 @@ public class SpecialtyVehicleController { @@ -114,8 +114,8 @@ public class SpecialtyVehicleController {
114 @RequestMapping("/chemistryCar/findByPic") 114 @RequestMapping("/chemistryCar/findByPic")
115 public JSONObject chemistryFindByPic(@RequestParam int number, @RequestParam Double threshold, @RequestParam int currentpage, 115 public JSONObject chemistryFindByPic(@RequestParam int number, @RequestParam Double threshold, @RequestParam int currentpage,
116 @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime, 116 @RequestParam int pagevolume, MultipartFile picfile, @RequestParam Long starttime,
117 - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException {  
118 - return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, customspass, 1); 117 + @RequestParam Long endtime) throws InterruptedException {
  118 + return specialtyServices.findByPic(number, threshold, currentpage, pagevolume, picfile, starttime, endtime, 1);
119 119
120 } 120 }
121 121
src/main/java/com/objecteye/controller/VehicleCurrencyController.java
  View file @fddd467
@@ -52,16 +52,15 @@ public class VehicleCurrencyController { @@ -52,16 +52,15 @@ public class VehicleCurrencyController {
52 * @param picfile 52 * @param picfile
53 * @param starttime 53 * @param starttime
54 * @param endtime 54 * @param endtime
55 - * @param customspass  
56 * @return 55 * @return
57 */ 56 */
58 @RequestMapping("/car/findByPic") 57 @RequestMapping("/car/findByPic")
59 public CommonResult<PicVehicleDataResult> findByPic(@RequestParam int number, @RequestParam double threshold, 58 public CommonResult<PicVehicleDataResult> findByPic(@RequestParam int number, @RequestParam double threshold,
60 @RequestParam int currentpage, @RequestParam int pagevolume, 59 @RequestParam int currentpage, @RequestParam int pagevolume,
61 MultipartFile picfile, @RequestParam Long starttime, 60 MultipartFile picfile, @RequestParam Long starttime,
62 - @RequestParam Long endtime, @RequestParam int[] customspass) throws InterruptedException { 61 + @RequestParam Long endtime) throws InterruptedException {
63 return vehicleCurrencyService.findVehicleByPic(number, threshold, currentpage, pagevolume, picfile, starttime, 62 return vehicleCurrencyService.findVehicleByPic(number, threshold, currentpage, pagevolume, picfile, starttime,
64 - endtime, customspass); 63 + endtime);
65 } 64 }
66 65
67 /** 66 /**
src/main/java/com/objecteye/dao/MongoTemplates.java
  View file @fddd467
@@ -61,7 +61,6 @@ public class MongoTemplates { @@ -61,7 +61,6 @@ public class MongoTemplates {
61 Long starttime = vehicleCondition.getStarttime(); 61 Long starttime = vehicleCondition.getStarttime();
62 Long endtime = vehicleCondition.getEndtime(); 62 Long endtime = vehicleCondition.getEndtime();
63 int[] condition = vehicleCondition.getCondition(); 63 int[] condition = vehicleCondition.getCondition();
64 - int[] customspass = vehicleCondition.getCustomspass();  
65 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 64 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
66 65
67 //特殊品类检索 66 //特殊品类检索
@@ -131,17 +130,14 @@ public class MongoTemplates { @@ -131,17 +130,14 @@ public class MongoTemplates {
131 130
132 //按时间进行排序 131 //按时间进行排序
133 query.with(new Sort(Sort.Direction.DESC, "pictime")); 132 query.with(new Sort(Sort.Direction.DESC, "pictime"));
134 -  
135 -// 分页 133 + // 分页
136 query.skip((currentpage - 1) * pagevolume).limit(pagevolume); 134 query.skip((currentpage - 1) * pagevolume).limit(pagevolume);
137 135
138 vehicleTable = mongoTemplate.find(query, JSONObject.class, "rabbitMQVehicle"); 136 vehicleTable = mongoTemplate.find(query, JSONObject.class, "rabbitMQVehicle");
139 137
140 JSONObject data = new JSONObject(); 138 JSONObject data = new JSONObject();
141 JSONArray array = new JSONArray(); 139 JSONArray array = new JSONArray();
142 - int size = vehicleTable.size();  
143 - for (int i = 0; i < size; i++) {  
144 - JSONObject json = vehicleTable.get(i); 140 + for (JSONObject json : vehicleTable) {
145 String id = json.containsKey("_id") ? json.getString("_id") : null; 141 String id = json.containsKey("_id") ? json.getString("_id") : null;
146 String hphm_new = json.containsKey("vehicle_plate_hphm") ? json.getString("vehicle_plate_hphm") : null; 142 String hphm_new = json.containsKey("vehicle_plate_hphm") ? json.getString("vehicle_plate_hphm") : null;
147 String equipmentName = json.containsKey("equipmentName") ? json.getString("equipmentName") : null; 143 String equipmentName = json.containsKey("equipmentName") ? json.getString("equipmentName") : null;
@@ -154,16 +150,8 @@ public class MongoTemplates { @@ -154,16 +150,8 @@ public class MongoTemplates {
154 json.put("phototime", pictime); 150 json.put("phototime", pictime);
155 json.put("recordid", recordid); 151 json.put("recordid", recordid);
156 152
157 - //修改原有的picurl的值  
158 - String picurl = json.getString("picurl");  
159 -// JSONArray vehicle_detect_syRectParam = json.getJSONArray("vehicle_detect_syRectParam");  
160 -// 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));  
161 -// json.put("picurl",base64); //此处添加的是全景图的base64  
162 -// json.put("picurl",picurl); //此处添加的是全景图的url  
163 -  
164 //添加snapshoturl的值 153 //添加snapshoturl的值
165 String snapshoturl = json.getString("snapshoturl"); 154 String snapshoturl = json.getString("snapshoturl");
166 -// json.put("snapshoturl",snapshoturl);  
167 json.put("picurl", snapshoturl); //此处将原来的全景图url换成了快照图绝对路径 155 json.put("picurl", snapshoturl); //此处将原来的全景图url换成了快照图绝对路径
168 156
169 array.add(json); 157 array.add(json);
@@ -216,7 +204,6 @@ public class MongoTemplates { @@ -216,7 +204,6 @@ public class MongoTemplates {
216 Long starttime = vehicleCondition.getStarttime(); 204 Long starttime = vehicleCondition.getStarttime();
217 Long endtime = vehicleCondition.getEndtime(); 205 Long endtime = vehicleCondition.getEndtime();
218 int[] condition = vehicleCondition.getCondition(); 206 int[] condition = vehicleCondition.getCondition();
219 - int[] customspass = vehicleCondition.getCustomspass();  
220 207
221 //模糊号牌检索 208 //模糊号牌检索
222 if (hphm != null && hphm.length() > 0) { 209 if (hphm != null && hphm.length() > 0) {
src/main/java/com/objecteye/entity/LocusOrbitQueryParams.java
  View file @fddd467
@@ -19,11 +19,6 @@ public class LocusOrbitQueryParams implements Serializable { @@ -19,11 +19,6 @@ public class LocusOrbitQueryParams implements Serializable {
19 private static final long serialVersionUID = -8007831938659574791L; 19 private static final long serialVersionUID = -8007831938659574791L;
20 20
21 /** 21 /**
22 - * 地区id, 设备id, 自行判断是地区的还是设备的  
23 - */  
24 - private Integer customsPass;  
25 -  
26 - /**  
27 * 时间区间- 起始时间戳 22 * 时间区间- 起始时间戳
28 */ 23 */
29 private Long startTime; 24 private Long startTime;
src/main/java/com/objecteye/entity/MonitorMainTableQueryInfo.java
  View file @fddd467
@@ -38,10 +38,6 @@ public class MonitorMainTableQueryInfo implements Serializable { @@ -38,10 +38,6 @@ public class MonitorMainTableQueryInfo implements Serializable {
38 */ 38 */
39 private Integer pagevolume; 39 private Integer pagevolume;
40 /** 40 /**
41 - * 设备id  
42 - */  
43 - private Integer customsPass;  
44 - /**  
45 * 车牌号 41 * 车牌号
46 */ 42 */
47 private String plateNumber; 43 private String plateNumber;
src/main/java/com/objecteye/entity/PersonMsg.java
  View file @fddd467
@@ -16,8 +16,6 @@ public class PersonMsg implements Serializable { @@ -16,8 +16,6 @@ public class PersonMsg implements Serializable {
16 16
17 private String id; 17 private String id;
18 18
19 - private Integer deviceId;  
20 -  
21 private String imageUrl; 19 private String imageUrl;
22 20
23 private long captureTime; 21 private long captureTime;
src/main/java/com/objecteye/entity/PlateAlarmMsg.java
  View file @fddd467
@@ -21,15 +21,7 @@ public class PlateAlarmMsg implements Serializable { @@ -21,15 +21,7 @@ public class PlateAlarmMsg implements Serializable {
21 /** 21 /**
22 * 布控任务id 22 * 布控任务id
23 */ 23 */
24 - private Integer deployId;  
25 - /**  
26 - * 设备id  
27 - */  
28 - private int deviceId;  
29 - /**  
30 - * 设备名称  
31 - */  
32 - private String equipmentName; 24 + private String deployId;
33 /** 25 /**
34 * 经度 26 * 经度
35 */ 27 */
@@ -75,8 +67,6 @@ public class PlateAlarmMsg implements Serializable { @@ -75,8 +67,6 @@ public class PlateAlarmMsg implements Serializable {
75 this.id = builder.id; 67 this.id = builder.id;
76 this.baseId = builder.baseId; 68 this.baseId = builder.baseId;
77 this.deployId = builder.deployId; 69 this.deployId = builder.deployId;
78 - this.deviceId = builder.deviceId;  
79 - this.equipmentName = builder.equipmentName;  
80 this.longitude = builder.longitude; 70 this.longitude = builder.longitude;
81 this.latitude = builder.latitude; 71 this.latitude = builder.latitude;
82 this.libUrl = builder.libUrl; 72 this.libUrl = builder.libUrl;
@@ -100,15 +90,7 @@ public class PlateAlarmMsg implements Serializable { @@ -100,15 +90,7 @@ public class PlateAlarmMsg implements Serializable {
100 /** 90 /**
101 * 布控任务id 91 * 布控任务id
102 */ 92 */
103 - private Integer deployId;  
104 - /**  
105 - * 设备id  
106 - */  
107 - private int deviceId;  
108 - /**  
109 - * 设备名称  
110 - */  
111 - private String equipmentName; 93 + private String deployId;
112 /** 94 /**
113 * 经度 95 * 经度
114 */ 96 */
@@ -160,21 +142,11 @@ public class PlateAlarmMsg implements Serializable { @@ -160,21 +142,11 @@ public class PlateAlarmMsg implements Serializable {
160 return this; 142 return this;
161 } 143 }
162 144
163 - public Builder deployId(Integer deployId) { 145 + public Builder deployId(String deployId) {
164 this.deployId = deployId; 146 this.deployId = deployId;
165 return this; 147 return this;
166 } 148 }
167 149
168 - public Builder deviceId(int deviceId) {  
169 - this.deviceId = deviceId;  
170 - return this;  
171 - }  
172 -  
173 - public Builder equipmentName(String equipmentName) {  
174 - this.equipmentName = equipmentName;  
175 - return this;  
176 - }  
177 -  
178 public Builder longitude(String longitude) { 150 public Builder longitude(String longitude) {
179 this.longitude = longitude; 151 this.longitude = longitude;
180 return this; 152 return this;
src/main/java/com/objecteye/entity/SyVehicleForbidenTask.java
  View file @fddd467
@@ -30,9 +30,6 @@ public class SyVehicleForbidenTask implements Serializable { @@ -30,9 +30,6 @@ public class SyVehicleForbidenTask implements Serializable {
30 @ApiModelProperty(value = "生效区域id") 30 @ApiModelProperty(value = "生效区域id")
31 private String areaId; 31 private String areaId;
32 32
33 - @ApiModelProperty(value = "区域id对应的设备id")  
34 - private String deviceId;  
35 -  
36 @ApiModelProperty(value = "禁行车辆种类") 33 @ApiModelProperty(value = "禁行车辆种类")
37 private String vehicleType; 34 private String vehicleType;
38 35
src/main/java/com/objecteye/entity/UploadVehicleResult.java
  View file @fddd467
@@ -17,6 +17,8 @@ import java.io.Serializable; @@ -17,6 +17,8 @@ import java.io.Serializable;
17 @Data 17 @Data
18 public class UploadVehicleResult implements Serializable { 18 public class UploadVehicleResult implements Serializable {
19 19
  20 + private static final long serialVersionUID = 2874367705571176380L;
  21 +
20 private String id; 22 private String id;
21 //单车辆全部分析结果 23 //单车辆全部分析结果
22 private VpInfoParam[] info; 24 private VpInfoParam[] info;
@@ -25,8 +27,6 @@ public class UploadVehicleResult implements Serializable { @@ -25,8 +27,6 @@ public class UploadVehicleResult implements Serializable {
25 //数量 27 //数量
26 private int count; 28 private int count;
27 29
28 - private int deviceId;  
29 -  
30 private String imageUrl; 30 private String imageUrl;
31 31
32 private long captureTime; 32 private long captureTime;
@@ -37,11 +37,10 @@ public class UploadVehicleResult implements Serializable { @@ -37,11 +37,10 @@ public class UploadVehicleResult implements Serializable {
37 37
38 private String latitude; 38 private String latitude;
39 39
40 - public void set(VpInfoParam[] info, String picName, int count, int deviceId, String imageUrl, long captureTime, String equipmentName, String longitude, String latitude) { 40 + public void set(VpInfoParam[] info, String picName, int count, String imageUrl, long captureTime, String equipmentName, String longitude, String latitude) {
41 this.info = info; 41 this.info = info;
42 this.picName = picName; 42 this.picName = picName;
43 this.count = count; 43 this.count = count;
44 - this.deviceId = deviceId;  
45 this.imageUrl = imageUrl; 44 this.imageUrl = imageUrl;
46 this.captureTime = captureTime; 45 this.captureTime = captureTime;
47 this.equipmentName = equipmentName; 46 this.equipmentName = equipmentName;
src/main/java/com/objecteye/entity/VehicleDetailMsg.java
  View file @fddd467
@@ -11,10 +11,6 @@ public class VehicleDetailMsg { @@ -11,10 +11,6 @@ public class VehicleDetailMsg {
11 11
12 private String id; 12 private String id;
13 /** 13 /**
14 - * 设备号码  
15 - */  
16 - private int deviceId;  
17 - /**  
18 * 抓拍时间 14 * 抓拍时间
19 */ 15 */
20 private long captureTime; 16 private long captureTime;
src/main/java/com/objecteye/entity/VehicleSimpleResult.java
  View file @fddd467
@@ -40,8 +40,4 @@ public class VehicleSimpleResult implements Serializable { @@ -40,8 +40,4 @@ public class VehicleSimpleResult implements Serializable {
40 * 人像地址 40 * 人像地址
41 */ 41 */
42 private String personUrl; 42 private String personUrl;
43 - /**  
44 - * 设备名称  
45 - */  
46 - private String equipmentName;  
47 } 43 }
src/main/java/com/objecteye/entity/VehicleViolationsForbidenTaskQueryParams.java
  View file @fddd467
@@ -27,9 +27,6 @@ public class VehicleViolationsForbidenTaskQueryParams implements Serializable { @@ -27,9 +27,6 @@ public class VehicleViolationsForbidenTaskQueryParams implements Serializable {
27 @ApiModelProperty("过滤任务结束时间") 27 @ApiModelProperty("过滤任务结束时间")
28 private Long endTime; 28 private Long endTime;
29 29
30 - @ApiModelProperty("区域id")  
31 - private String customsPass;  
32 -  
33 @ApiModelProperty("车类") 30 @ApiModelProperty("车类")
34 private String type; 31 private String type;
35 32
src/main/java/com/objecteye/entity/VvehicleFilePlateNumberQueryResult.java
  View file @fddd467
@@ -44,9 +44,6 @@ public class VvehicleFilePlateNumberQueryResult implements Serializable { @@ -44,9 +44,6 @@ public class VvehicleFilePlateNumberQueryResult implements Serializable {
44 @ApiModelProperty("纬度") 44 @ApiModelProperty("纬度")
45 private String latitude; 45 private String latitude;
46 46
47 - @ApiModelProperty("设备名称")  
48 - private String equipmentName;  
49 -  
50 @ApiModelProperty("抓拍时间") 47 @ApiModelProperty("抓拍时间")
51 private String pictime; 48 private String pictime;
52 } 49 }
53 \ No newline at end of file 50 \ No newline at end of file
src/main/java/com/objecteye/pojo/PicVehicleRow.java
  View file @fddd467
@@ -27,7 +27,5 @@ public class PicVehicleRow implements Serializable { @@ -27,7 +27,5 @@ public class PicVehicleRow implements Serializable {
27 27
28 private String similar; 28 private String similar;
29 29
30 - private String site;  
31 -  
32 private String phototime; 30 private String phototime;
33 } 31 }
src/main/java/com/objecteye/pojo/RabbitMQVehicle.java
  View file @fddd467
@@ -21,12 +21,9 @@ public class RabbitMQVehicle { @@ -21,12 +21,9 @@ public class RabbitMQVehicle {
21 * 在档案中的位置 21 * 在档案中的位置
22 */ 22 */
23 private int count; 23 private int count;
24 - /**  
25 - * 设备id  
26 - */  
27 - private int deviceid;  
28 - private String equipmentName; 24 +
29 private String longitude; 25 private String longitude;
  26 +
30 private String latitude; 27 private String latitude;
31 /** 28 /**
32 * 图片的路径 29 * 图片的路径
@@ -121,7 +118,7 @@ public class RabbitMQVehicle { @@ -121,7 +118,7 @@ public class RabbitMQVehicle {
121 */ 118 */
122 private String snapshoturl; 119 private String snapshoturl;
123 120
124 - public RabbitMQVehicle(int count, int deviceid, String equipmentName, String longitude, String latitude, String picurl, int recordid, 121 + public RabbitMQVehicle(int count, String longitude, String latitude, String picurl, int recordid,
125 Long pictime, int flag, int tag, String personid, int[] vehicleplaterect, double vehicleplatedetectscore, int vehicleplatetype, 122 Long pictime, int flag, int tag, String personid, int[] vehicleplaterect, double vehicleplatedetectscore, int vehicleplatetype,
126 double vehicle_plate_numScore, double vehicle_color_score, int vehicle_color_index, double vehicle_detect_score, 123 double vehicle_plate_numScore, double vehicle_color_score, int vehicle_color_index, double vehicle_detect_score,
127 int[] vehicle_detect_syRectParam, double vehicle_win_score, int[] vehicle_win_syRectParam, int vehicle_special_type, 124 int[] vehicle_detect_syRectParam, double vehicle_win_score, int[] vehicle_win_syRectParam, int vehicle_special_type,
@@ -138,8 +135,6 @@ public class RabbitMQVehicle { @@ -138,8 +135,6 @@ public class RabbitMQVehicle {
138 PendantParams[] vehicle_pendant_Params, PlatePlateNumParams[] vehicle_plate_plateNumParams, String vehicle_plate_hphm, 135 PendantParams[] vehicle_pendant_Params, PlatePlateNumParams[] vehicle_plate_plateNumParams, String vehicle_plate_hphm,
139 Integer vehicle_pendant_detect_njbnumber, Integer vehicle_pendant_detect_gjexis, Integer vehicle_pendant_detect_zybexis, String personUrl, String snapshoturl) { 136 Integer vehicle_pendant_detect_njbnumber, Integer vehicle_pendant_detect_gjexis, Integer vehicle_pendant_detect_zybexis, String personUrl, String snapshoturl) {
140 this.count = count; 137 this.count = count;
141 - this.deviceid = deviceid;  
142 - this.equipmentName = equipmentName;  
143 this.longitude = longitude; 138 this.longitude = longitude;
144 this.latitude = latitude; 139 this.latitude = latitude;
145 this.picurl = picurl; 140 this.picurl = picurl;
src/main/java/com/objecteye/pojo/RabbitMQVehicle.java.bak deleted
View file @40c853a
1 -package com.objecteye.pojo;  
2 -  
3 -import org.springframework.stereotype.Component;  
4 -  
5 -@Component  
6 -public class RabbitMQVehicle1 {  
7 - private String id; //车辆id  
8 - private int count;//在档案中的位置  
9 - private int deviceid; //设备id  
10 - private String equipmentName;  
11 - private String longitude;  
12 - private String latitude;  
13 - private String picurl; //图片的路径  
14 - private int recordid; //车辆档案id  
15 - private Long pictime; //抓拍时间  
16 - private int flag; //是否报警  
17 - private int tag; //是否确认  
18 - private String personid; //人像id  
19 - private int[] vehicleplaterect; //车牌位置  
20 - private double vehicleplatedetectscore; //车牌检测分数  
21 - private int vehicleplatetype; //车牌类型  
22 - private double vehicle_plate_numScore;  
23 - private double vehicle_color_score;  
24 - private int vehicle_color_index;  
25 - private double vehicle_detect_score;  
26 - private int[] vehicle_detect_syRectParam;  
27 - private double vehicle_win_score;  
28 - private int[] vehicle_win_syRectParam;  
29 - private int vehicle_special_type;  
30 - private double vehicle_special_score;  
31 - private double vehicle_illegal_driver_smoke_confidence;  
32 - private int vehicle_illegal_driver_smoke_status;  
33 - private double vehicle_illegal_driver_belt_confidence;  
34 - private int vehicle_illegal_driver_belt_status;  
35 - private double vehicle_illegal_driver_phone_confidence;  
36 - private int vehicle_illegal_driver_phone_status;  
37 - private double vehicle_illegal_driver_person_confidence;  
38 - private int vehicle_illegal_driver_person_status;  
39 - private double vehicle_illegal_copilot_smoke_confidence;  
40 - private int vehicle_illegal_copilot_smoke_status;  
41 - private double vehicle_illegal_copilot_belt_confidence;  
42 - private int vehicle_illegal_copilot_belt_status;  
43 - private double vehicle_illegal_copilot_phone_confidence;  
44 - private int vehicle_illegal_copilot_phone_status;  
45 - private double vehicle_illegal_copilot_person_confidence;  
46 - private int vehicle_illegal_copilot_person_status;  
47 - private String vehicle_recg_issue_year;  
48 - private String vehicle_recg_brand;  
49 - private String vehicle_recg_type;  
50 - private String vehicle_recg_subbrand;  
51 - private String vehicle_recg_freight_ton; //吨数  
52 - private double vehicle_recg_name_score;  
53 - private int vehicle_pendant_count;  
54 - private double[] vehicle_fea_feature;  
55 - private PendantParams[] vehicle_pendant_Params;  
56 - private PlatePlateNumParams[] vehicle_plate_plateNumParams;  
57 - private String vehicle_plate_hphm;  
58 -  
59 - public RabbitMQVehicle1() {}  
60 -  
61 - 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) {  
62 - this.id = id;  
63 - this.count = count;  
64 - this.deviceid = deviceid;  
65 - this.equipmentName = equipmentName;  
66 - this.longitude = longitude;  
67 - this.latitude = latitude;  
68 - this.picurl = picurl;  
69 - this.recordid = recordid;  
70 - this.pictime = pictime;  
71 - this.flag = flag;  
72 - this.tag = tag;  
73 - this.personid = personid;  
74 - this.vehicleplaterect = vehicleplaterect;  
75 - this.vehicleplatedetectscore = vehicleplatedetectscore;  
76 - this.vehicleplatetype = vehicleplatetype;  
77 - this.vehicle_plate_numScore = vehicle_plate_numScore;  
78 - this.vehicle_color_score = vehicle_color_score;  
79 - this.vehicle_color_index = vehicle_color_index;  
80 - this.vehicle_detect_score = vehicle_detect_score;  
81 - this.vehicle_detect_syRectParam = vehicle_detect_syRectParam;  
82 - this.vehicle_win_score = vehicle_win_score;  
83 - this.vehicle_win_syRectParam = vehicle_win_syRectParam;  
84 - this.vehicle_special_type = vehicle_special_type;  
85 - this.vehicle_special_score = vehicle_special_score;  
86 - this.vehicle_illegal_driver_smoke_confidence = vehicle_illegal_driver_smoke_confidence;  
87 - this.vehicle_illegal_driver_smoke_status = vehicle_illegal_driver_smoke_status;  
88 - this.vehicle_illegal_driver_belt_confidence = vehicle_illegal_driver_belt_confidence;  
89 - this.vehicle_illegal_driver_belt_status = vehicle_illegal_driver_belt_status;  
90 - this.vehicle_illegal_driver_phone_confidence = vehicle_illegal_driver_phone_confidence;  
91 - this.vehicle_illegal_driver_phone_status = vehicle_illegal_driver_phone_status;  
92 - this.vehicle_illegal_driver_person_confidence = vehicle_illegal_driver_person_confidence;  
93 - this.vehicle_illegal_driver_person_status = vehicle_illegal_driver_person_status;  
94 - this.vehicle_illegal_copilot_smoke_confidence = vehicle_illegal_copilot_smoke_confidence;  
95 - this.vehicle_illegal_copilot_smoke_status = vehicle_illegal_copilot_smoke_status;  
96 - this.vehicle_illegal_copilot_belt_confidence = vehicle_illegal_copilot_belt_confidence;  
97 - this.vehicle_illegal_copilot_belt_status = vehicle_illegal_copilot_belt_status;  
98 - this.vehicle_illegal_copilot_phone_confidence = vehicle_illegal_copilot_phone_confidence;  
99 - this.vehicle_illegal_copilot_phone_status = vehicle_illegal_copilot_phone_status;  
100 - this.vehicle_illegal_copilot_person_confidence = vehicle_illegal_copilot_person_confidence;  
101 - this.vehicle_illegal_copilot_person_status = vehicle_illegal_copilot_person_status;  
102 - this.vehicle_recg_issue_year = vehicle_recg_issue_year;  
103 - this.vehicle_recg_brand = vehicle_recg_brand;  
104 - this.vehicle_recg_type = vehicle_recg_type;  
105 - this.vehicle_recg_subbrand = vehicle_recg_subbrand;  
106 - this.vehicle_recg_freight_ton = vehicle_recg_freight_ton;  
107 - this.vehicle_recg_name_score = vehicle_recg_name_score;  
108 - this.vehicle_pendant_count = vehicle_pendant_count;  
109 - this.vehicle_fea_feature = vehicle_fea_feature;  
110 - this.vehicle_pendant_Params = vehicle_pendant_Params;  
111 - this.vehicle_plate_plateNumParams = vehicle_plate_plateNumParams;  
112 - this.vehicle_plate_hphm = vehicle_plate_hphm;  
113 - }  
114 -  
115 - public String getId() {  
116 - return id;  
117 - }  
118 -  
119 - public void setId(String id) {  
120 - this.id = id;  
121 - }  
122 -  
123 - public int getCount() {  
124 - return count;  
125 - }  
126 -  
127 - public void setCount(int count) {  
128 - this.count = count;  
129 - }  
130 -  
131 - public int getDeviceid() {  
132 - return deviceid;  
133 - }  
134 -  
135 - public void setDeviceid(int deviceid) {  
136 - this.deviceid = deviceid;  
137 - }  
138 -  
139 - public String getEquipmentName() {  
140 - return equipmentName;  
141 - }  
142 -  
143 - public void setEquipmentName(String equipmentName) {  
144 - this.equipmentName = equipmentName;  
145 - }  
146 -  
147 - public String getLongitude() {  
148 - return longitude;  
149 - }  
150 -  
151 - public void setLongitude(String longitude) {  
152 - this.longitude = longitude;  
153 - }  
154 -  
155 - public String getLatitude() {  
156 - return latitude;  
157 - }  
158 -  
159 - public void setLatitude(String latitude) {  
160 - this.latitude = latitude;  
161 - }  
162 -  
163 - public String getPicurl() {  
164 - return picurl;  
165 - }  
166 -  
167 - public void setPicurl(String picurl) {  
168 - this.picurl = picurl;  
169 - }  
170 -  
171 - public int getRecordid() {  
172 - return recordid;  
173 - }  
174 -  
175 - public void setRecordid(int recordid) {  
176 - this.recordid = recordid;  
177 - }  
178 -  
179 - public Long getPictime() {  
180 - return pictime;  
181 - }  
182 -  
183 - public void setPictime(Long pictime) {  
184 - this.pictime = pictime;  
185 - }  
186 -  
187 - public int getFlag() {  
188 - return flag;  
189 - }  
190 -  
191 - public void setFlag(int flag) {  
192 - this.flag = flag;  
193 - }  
194 -  
195 - public int getTag() {  
196 - return tag;  
197 - }  
198 -  
199 - public void setTag(int tag) {  
200 - this.tag = tag;  
201 - }  
202 -  
203 - public String getPersonid() {  
204 - return personid;  
205 - }  
206 -  
207 - public void setPersonid(String personid) {  
208 - this.personid = personid;  
209 - }  
210 -  
211 - public int[] getVehicleplaterect() {  
212 - return vehicleplaterect;  
213 - }  
214 -  
215 - public void setVehicleplaterect(int[] vehicleplaterect) {  
216 - this.vehicleplaterect = vehicleplaterect;  
217 - }  
218 -  
219 - public double getVehicleplatedetectscore() {  
220 - return vehicleplatedetectscore;  
221 - }  
222 -  
223 - public void setVehicleplatedetectscore(double vehicleplatedetectscore) {  
224 - this.vehicleplatedetectscore = vehicleplatedetectscore;  
225 - }  
226 -  
227 - public int getVehicleplatetype() {  
228 - return vehicleplatetype;  
229 - }  
230 -  
231 - public void setVehicleplatetype(int vehicleplatetype) {  
232 - this.vehicleplatetype = vehicleplatetype;  
233 - }  
234 -  
235 - public double getVehicle_plate_numScore() {  
236 - return vehicle_plate_numScore;  
237 - }  
238 -  
239 - public void setVehicle_plate_numScore(double vehicle_plate_numScore) {  
240 - this.vehicle_plate_numScore = vehicle_plate_numScore;  
241 - }  
242 -  
243 - public double getVehicle_color_score() {  
244 - return vehicle_color_score;  
245 - }  
246 -  
247 - public void setVehicle_color_score(double vehicle_color_score) {  
248 - this.vehicle_color_score = vehicle_color_score;  
249 - }  
250 -  
251 - public int getVehicle_color_index() {  
252 - return vehicle_color_index;  
253 - }  
254 -  
255 - public void setVehicle_color_index(int vehicle_color_index) {  
256 - this.vehicle_color_index = vehicle_color_index;  
257 - }  
258 -  
259 - public double getVehicle_detect_score() {  
260 - return vehicle_detect_score;  
261 - }  
262 -  
263 - public void setVehicle_detect_score(double vehicle_detect_score) {  
264 - this.vehicle_detect_score = vehicle_detect_score;  
265 - }  
266 -  
267 - public int[] getVehicle_detect_syRectParam() {  
268 - return vehicle_detect_syRectParam;  
269 - }  
270 -  
271 - public void setVehicle_detect_syRectParam(int[] vehicle_detect_syRectParam) {  
272 - this.vehicle_detect_syRectParam = vehicle_detect_syRectParam;  
273 - }  
274 -  
275 - public double getVehicle_win_score() {  
276 - return vehicle_win_score;  
277 - }  
278 -  
279 - public void setVehicle_win_score(double vehicle_win_score) {  
280 - this.vehicle_win_score = vehicle_win_score;  
281 - }  
282 -  
283 - public int[] getVehicle_win_syRectParam() {  
284 - return vehicle_win_syRectParam;  
285 - }  
286 -  
287 - public void setVehicle_win_syRectParam(int[] vehicle_win_syRectParam) {  
288 - this.vehicle_win_syRectParam = vehicle_win_syRectParam;  
289 - }  
290 -  
291 - public int getVehicle_special_type() {  
292 - return vehicle_special_type;  
293 - }  
294 -  
295 - public void setVehicle_special_type(int vehicle_special_type) {  
296 - this.vehicle_special_type = vehicle_special_type;  
297 - }  
298 -  
299 - public double getVehicle_special_score() {  
300 - return vehicle_special_score;  
301 - }  
302 -  
303 - public void setVehicle_special_score(double vehicle_special_score) {  
304 - this.vehicle_special_score = vehicle_special_score;  
305 - }  
306 -  
307 - public double getVehicle_illegal_driver_smoke_confidence() {  
308 - return vehicle_illegal_driver_smoke_confidence;  
309 - }  
310 -  
311 - public void setVehicle_illegal_driver_smoke_confidence(double vehicle_illegal_driver_smoke_confidence) {  
312 - this.vehicle_illegal_driver_smoke_confidence = vehicle_illegal_driver_smoke_confidence;  
313 - }  
314 -  
315 - public int getVehicle_illegal_driver_smoke_status() {  
316 - return vehicle_illegal_driver_smoke_status;  
317 - }  
318 -  
319 - public void setVehicle_illegal_driver_smoke_status(int vehicle_illegal_driver_smoke_status) {  
320 - this.vehicle_illegal_driver_smoke_status = vehicle_illegal_driver_smoke_status;  
321 - }  
322 -  
323 - public double getVehicle_illegal_driver_belt_confidence() {  
324 - return vehicle_illegal_driver_belt_confidence;  
325 - }  
326 -  
327 - public void setVehicle_illegal_driver_belt_confidence(double vehicle_illegal_driver_belt_confidence) {  
328 - this.vehicle_illegal_driver_belt_confidence = vehicle_illegal_driver_belt_confidence;  
329 - }  
330 -  
331 - public int getVehicle_illegal_driver_belt_status() {  
332 - return vehicle_illegal_driver_belt_status;  
333 - }  
334 -  
335 - public void setVehicle_illegal_driver_belt_status(int vehicle_illegal_driver_belt_status) {  
336 - this.vehicle_illegal_driver_belt_status = vehicle_illegal_driver_belt_status;  
337 - }  
338 -  
339 - public double getVehicle_illegal_driver_phone_confidence() {  
340 - return vehicle_illegal_driver_phone_confidence;  
341 - }  
342 -  
343 - public void setVehicle_illegal_driver_phone_confidence(double vehicle_illegal_driver_phone_confidence) {  
344 - this.vehicle_illegal_driver_phone_confidence = vehicle_illegal_driver_phone_confidence;  
345 - }  
346 -  
347 - public int getVehicle_illegal_driver_phone_status() {  
348 - return vehicle_illegal_driver_phone_status;  
349 - }  
350 -  
351 - public void setVehicle_illegal_driver_phone_status(int vehicle_illegal_driver_phone_status) {  
352 - this.vehicle_illegal_driver_phone_status = vehicle_illegal_driver_phone_status;  
353 - }  
354 -  
355 - public double getVehicle_illegal_driver_person_confidence() {  
356 - return vehicle_illegal_driver_person_confidence;  
357 - }  
358 -  
359 - public void setVehicle_illegal_driver_person_confidence(double vehicle_illegal_driver_person_confidence) {  
360 - this.vehicle_illegal_driver_person_confidence = vehicle_illegal_driver_person_confidence;  
361 - }  
362 -  
363 - public int getVehicle_illegal_driver_person_status() {  
364 - return vehicle_illegal_driver_person_status;  
365 - }  
366 -  
367 - public void setVehicle_illegal_driver_person_status(int vehicle_illegal_driver_person_status) {  
368 - this.vehicle_illegal_driver_person_status = vehicle_illegal_driver_person_status;  
369 - }  
370 -  
371 - public double getVehicle_illegal_copilot_smoke_confidence() {  
372 - return vehicle_illegal_copilot_smoke_confidence;  
373 - }  
374 -  
375 - public void setVehicle_illegal_copilot_smoke_confidence(double vehicle_illegal_copilot_smoke_confidence) {  
376 - this.vehicle_illegal_copilot_smoke_confidence = vehicle_illegal_copilot_smoke_confidence;  
377 - }  
378 -  
379 - public int getVehicle_illegal_copilot_smoke_status() {  
380 - return vehicle_illegal_copilot_smoke_status;  
381 - }  
382 -  
383 - public void setVehicle_illegal_copilot_smoke_status(int vehicle_illegal_copilot_smoke_status) {  
384 - this.vehicle_illegal_copilot_smoke_status = vehicle_illegal_copilot_smoke_status;  
385 - }  
386 -  
387 - public double getVehicle_illegal_copilot_belt_confidence() {  
388 - return vehicle_illegal_copilot_belt_confidence;  
389 - }  
390 -  
391 - public void setVehicle_illegal_copilot_belt_confidence(double vehicle_illegal_copilot_belt_confidence) {  
392 - this.vehicle_illegal_copilot_belt_confidence = vehicle_illegal_copilot_belt_confidence;  
393 - }  
394 -  
395 - public int getVehicle_illegal_copilot_belt_status() {  
396 - return vehicle_illegal_copilot_belt_status;  
397 - }  
398 -  
399 - public void setVehicle_illegal_copilot_belt_status(int vehicle_illegal_copilot_belt_status) {  
400 - this.vehicle_illegal_copilot_belt_status = vehicle_illegal_copilot_belt_status;  
401 - }  
402 -  
403 - public double getVehicle_illegal_copilot_phone_confidence() {  
404 - return vehicle_illegal_copilot_phone_confidence;  
405 - }  
406 -  
407 - public void setVehicle_illegal_copilot_phone_confidence(double vehicle_illegal_copilot_phone_confidence) {  
408 - this.vehicle_illegal_copilot_phone_confidence = vehicle_illegal_copilot_phone_confidence;  
409 - }  
410 -  
411 - public int getVehicle_illegal_copilot_phone_status() {  
412 - return vehicle_illegal_copilot_phone_status;  
413 - }  
414 -  
415 - public void setVehicle_illegal_copilot_phone_status(int vehicle_illegal_copilot_phone_status) {  
416 - this.vehicle_illegal_copilot_phone_status = vehicle_illegal_copilot_phone_status;  
417 - }  
418 -  
419 - public double getVehicle_illegal_copilot_person_confidence() {  
420 - return vehicle_illegal_copilot_person_confidence;  
421 - }  
422 -  
423 - public void setVehicle_illegal_copilot_person_confidence(double vehicle_illegal_copilot_person_confidence) {  
424 - this.vehicle_illegal_copilot_person_confidence = vehicle_illegal_copilot_person_confidence;  
425 - }  
426 -  
427 - public int getVehicle_illegal_copilot_person_status() {  
428 - return vehicle_illegal_copilot_person_status;  
429 - }  
430 -  
431 - public void setVehicle_illegal_copilot_person_status(int vehicle_illegal_copilot_person_status) {  
432 - this.vehicle_illegal_copilot_person_status = vehicle_illegal_copilot_person_status;  
433 - }  
434 -  
435 - public String getVehicle_recg_issue_year() {  
436 - return vehicle_recg_issue_year;  
437 - }  
438 -  
439 - public void setVehicle_recg_issue_year(String vehicle_recg_issue_year) {  
440 - this.vehicle_recg_issue_year = vehicle_recg_issue_year;  
441 - }  
442 -  
443 - public String getVehicle_recg_brand() {  
444 - return vehicle_recg_brand;  
445 - }  
446 -  
447 - public void setVehicle_recg_brand(String vehicle_recg_brand) {  
448 - this.vehicle_recg_brand = vehicle_recg_brand;  
449 - }  
450 -  
451 - public String getVehicle_recg_type() {  
452 - return vehicle_recg_type;  
453 - }  
454 -  
455 - public void setVehicle_recg_type(String vehicle_recg_type) {  
456 - this.vehicle_recg_type = vehicle_recg_type;  
457 - }  
458 -  
459 - public String getVehicle_recg_subbrand() {  
460 - return vehicle_recg_subbrand;  
461 - }  
462 -  
463 - public void setVehicle_recg_subbrand(String vehicle_recg_subbrand) {  
464 - this.vehicle_recg_subbrand = vehicle_recg_subbrand;  
465 - }  
466 -  
467 - public String getVehicle_recg_freight_ton() {  
468 - return vehicle_recg_freight_ton;  
469 - }  
470 -  
471 - public void setVehicle_recg_freight_ton(String vehicle_recg_freight_ton) {  
472 - this.vehicle_recg_freight_ton = vehicle_recg_freight_ton;  
473 - }  
474 -  
475 - public double getVehicle_recg_name_score() {  
476 - return vehicle_recg_name_score;  
477 - }  
478 -  
479 - public void setVehicle_recg_name_score(double vehicle_recg_name_score) {  
480 - this.vehicle_recg_name_score = vehicle_recg_name_score;  
481 - }  
482 -  
483 - public int getVehicle_pendant_count() {  
484 - return vehicle_pendant_count;  
485 - }  
486 -  
487 - public void setVehicle_pendant_count(int vehicle_pendant_count) {  
488 - this.vehicle_pendant_count = vehicle_pendant_count;  
489 - }  
490 -  
491 - public double[] getVehicle_fea_feature() {  
492 - return vehicle_fea_feature;  
493 - }  
494 -  
495 - public void setVehicle_fea_feature(double[] vehicle_fea_feature) {  
496 - this.vehicle_fea_feature = vehicle_fea_feature;  
497 - }  
498 -  
499 - public PendantParams[] getVehicle_pendant_Params() {  
500 - return vehicle_pendant_Params;  
501 - }  
502 -  
503 - public void setVehicle_pendant_Params(PendantParams[] vehicle_pendant_Params) {  
504 - this.vehicle_pendant_Params = vehicle_pendant_Params;  
505 - }  
506 -  
507 - public PlatePlateNumParams[] getVehicle_plate_plateNumParams() {  
508 - return vehicle_plate_plateNumParams;  
509 - }  
510 -  
511 - public void setVehicle_plate_plateNumParams(PlatePlateNumParams[] vehicle_plate_plateNumParams) {  
512 - this.vehicle_plate_plateNumParams = vehicle_plate_plateNumParams;  
513 - }  
514 -  
515 - public String getVehicle_plate_hphm() {  
516 - return vehicle_plate_hphm;  
517 - }  
518 -  
519 - public void setVehicle_plate_hphm(String vehicle_plate_hphm) {  
520 - this.vehicle_plate_hphm = vehicle_plate_hphm;  
521 - }  
522 -}  
src/main/java/com/objecteye/pojo/RabbitMqVehicleViolation.java
  View file @fddd467
@@ -30,16 +30,16 @@ public class RabbitMqVehicleViolation implements Serializable { @@ -30,16 +30,16 @@ public class RabbitMqVehicleViolation implements Serializable {
30 */ 30 */
31 private String baseId; 31 private String baseId;
32 /** 32 /**
33 - * 设备id  
34 - */  
35 - private int deviceid;  
36 - /**  
37 * 抓拍时间 33 * 抓拍时间
38 */ 34 */
39 private Long pictime; 35 private Long pictime;
  36 +
40 private int vehicle_special_type; 37 private int vehicle_special_type;
  38 +
41 private double vehicle_special_score; 39 private double vehicle_special_score;
  40 +
42 private String vehicle_plate_hphm; 41 private String vehicle_plate_hphm;
  42 +
43 private String personUrl; 43 private String personUrl;
44 /** 44 /**
45 * 额外添加的snapshotUrl 45 * 额外添加的snapshotUrl
src/main/java/com/objecteye/pojo/SearchPeopleOfHphmInfo.java
  View file @fddd467
@@ -15,8 +15,6 @@ public class SearchPeopleOfHphmInfo { @@ -15,8 +15,6 @@ public class SearchPeopleOfHphmInfo {
15 15
16 private String picTime; 16 private String picTime;
17 17
18 - private String equipmentName;  
19 -  
20 private String hphm; 18 private String hphm;
21 19
22 private String personUrl; 20 private String personUrl;
src/main/java/com/objecteye/pojo/SearchPeopleOfHphmRequest.java
  View file @fddd467
@@ -23,8 +23,6 @@ public class SearchPeopleOfHphmRequest implements Serializable { @@ -23,8 +23,6 @@ public class SearchPeopleOfHphmRequest implements Serializable {
23 23
24 private Long endtime; 24 private Long endtime;
25 25
26 - private int[] customspass;  
27 -  
28 private String hphm; 26 private String hphm;
29 27
30 } 28 }
src/main/java/com/objecteye/pojo/SearchVehicleFromPeopleInfo.java
  View file @fddd467
@@ -15,8 +15,6 @@ public class SearchVehicleFromPeopleInfo { @@ -15,8 +15,6 @@ public class SearchVehicleFromPeopleInfo {
15 15
16 private String picTime; 16 private String picTime;
17 17
18 - private String equipmentName;  
19 -  
20 private String hphm; 18 private String hphm;
21 19
22 private double driverSimilar; 20 private double driverSimilar;
src/main/java/com/objecteye/pojo/VehicleCondition.java
  View file @fddd467
@@ -35,8 +35,6 @@ public class VehicleCondition implements Serializable { @@ -35,8 +35,6 @@ public class VehicleCondition implements Serializable {
35 35
36 private Long endtime; 36 private Long endtime;
37 37
38 - private int[] customspass;  
39 -  
40 private Integer vehicleSpecialType; 38 private Integer vehicleSpecialType;
41 /** 39 /**
42 * 车颜色 40 * 车颜色
src/main/java/com/objecteye/pojo/VehicleCurrencyReques.java
  View file @fddd467
@@ -53,7 +53,5 @@ public class VehicleCurrencyReques implements Serializable { @@ -53,7 +53,5 @@ public class VehicleCurrencyReques implements Serializable {
53 53
54 private Long endTime; 54 private Long endTime;
55 55
56 - private int[] customspass;  
57 -  
58 56
59 } 57 }
src/main/java/com/objecteye/pojo/VehicleMongo.java
  View file @fddd467
@@ -9,8 +9,6 @@ public class VehicleMongo { @@ -9,8 +9,6 @@ public class VehicleMongo {
9 9
10 private String vehicleid; 10 private String vehicleid;
11 11
12 - private Integer deviceid;  
13 -  
14 private String picurl; 12 private String picurl;
15 13
16 private Integer vehiclerecordfieid; 14 private Integer vehiclerecordfieid;
src/main/java/com/objecteye/service/HumanVehicleAssociationService.java
  View file @fddd467
@@ -16,7 +16,7 @@ public interface HumanVehicleAssociationService { @@ -16,7 +16,7 @@ public interface HumanVehicleAssociationService {
16 * 16 *
17 * @return 17 * @return
18 */ 18 */
19 - PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int[] customspass, int currentpage, int pagevolume, MultipartFile picfile); 19 + PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int currentpage, int pagevolume, MultipartFile picfile);
20 20
21 /** 21 /**
22 * 在mongodb中通过retrieveKey获取车辆信息 22 * 在mongodb中通过retrieveKey获取车辆信息
@@ -33,14 +33,14 @@ public interface HumanVehicleAssociationService { @@ -33,14 +33,14 @@ public interface HumanVehicleAssociationService {
33 * @param hphm 33 * @param hphm
34 * @return 34 * @return
35 */ 35 */
36 - SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, int[] customspass, Integer currentpage, Integer pagevolume, String hphm); 36 + SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, Integer currentpage, Integer pagevolume, String hphm);
37 37
38 /** 38 /**
39 * 通过车辆号牌获取到车辆信息 39 * 通过车辆号牌获取到车辆信息
40 * 40 *
41 * @return 41 * @return
42 */ 42 */
43 - List<RabbitMQVehicle> findByHphm(Long starttime, Long endtime, int[] customspass, String hphm, int currentPage, int pageSize); 43 + List<RabbitMQVehicle> findByHphm(Long starttime, Long endtime, String hphm, int currentPage, int pageSize);
44 44
45 /** 45 /**
46 * 通过retrieveKey获取到人信息 46 * 通过retrieveKey获取到人信息
src/main/java/com/objecteye/service/SpecialtyServices.java
  View file @fddd467
@@ -26,7 +26,7 @@ public interface SpecialtyServices { @@ -26,7 +26,7 @@ public interface SpecialtyServices {
26 * 26 *
27 * @return 27 * @return
28 */ 28 */
29 - 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; 29 + JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, Integer vehicle_special_type_number) throws InterruptedException;
30 30
31 31
32 /** 32 /**
@@ -44,7 +44,7 @@ public interface SpecialtyServices { @@ -44,7 +44,7 @@ public interface SpecialtyServices {
44 * @return 44 * @return
45 */ 45 */
46 @RequestMapping("/chemistryCar/findByPic") 46 @RequestMapping("/chemistryCar/findByPic")
47 - VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime, int[] customspass); 47 + VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime);
48 48
49 /** 49 /**
50 * 通过图片返回每辆车的坐标 50 * 通过图片返回每辆车的坐标
src/main/java/com/objecteye/service/VehicleCurrencyService.java
  View file @fddd467
@@ -25,7 +25,7 @@ public interface VehicleCurrencyService { @@ -25,7 +25,7 @@ public interface VehicleCurrencyService {
25 * 25 *
26 * @return 26 * @return
27 */ 27 */
28 - CommonResult<PicVehicleDataResult> findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass) throws InterruptedException; 28 + CommonResult<PicVehicleDataResult> findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime) throws InterruptedException;
29 29
30 30
31 /** 31 /**
src/main/java/com/objecteye/service/impl/DeployServiceImpl.java
  View file @fddd467
@@ -412,9 +412,9 @@ public class DeployServiceImpl implements DeployService { @@ -412,9 +412,9 @@ public class DeployServiceImpl implements DeployService {
412 Aggregation.project("deployId", "count") 412 Aggregation.project("deployId", "count")
413 ); 413 );
414 AggregationResults<JSONObject> aggregationResults = mongoTemplate.aggregate(aggregation, "plateAlarmMsg", JSONObject.class); 414 AggregationResults<JSONObject> aggregationResults = mongoTemplate.aggregate(aggregation, "plateAlarmMsg", JSONObject.class);
415 - List<JSONObject> deviceIdsWarningNumberList = aggregationResults.getMappedResults(); 415 + List<JSONObject> deployIdsWarningNumberList = aggregationResults.getMappedResults();
416 Map<String, Long> resultMap = new HashMap<>(16); 416 Map<String, Long> resultMap = new HashMap<>(16);
417 - for (JSONObject jsonObject : deviceIdsWarningNumberList) { 417 + for (JSONObject jsonObject : deployIdsWarningNumberList) {
418 if (jsonObject == null) { 418 if (jsonObject == null) {
419 continue; 419 continue;
420 } 420 }
@@ -603,7 +603,6 @@ public class DeployServiceImpl implements DeployService { @@ -603,7 +603,6 @@ public class DeployServiceImpl implements DeployService {
603 for (PlateAlarmMsg plateAlarmMsg : plateAlarmMsgs) { 603 for (PlateAlarmMsg plateAlarmMsg : plateAlarmMsgs) {
604 MonitorMainTableResultInfo monitorMainTableResultInfo = new MonitorMainTableResultInfo(); 604 MonitorMainTableResultInfo monitorMainTableResultInfo = new MonitorMainTableResultInfo();
605 if (null != plateAlarmMsg) { 605 if (null != plateAlarmMsg) {
606 - monitorMainTableResultInfo.setAddress(plateAlarmMsg.getEquipmentName());  
607 monitorMainTableResultInfo.setPlateNumber(plateAlarmMsg.getPlateNum()); 606 monitorMainTableResultInfo.setPlateNumber(plateAlarmMsg.getPlateNum());
608 monitorMainTableResultInfo.setSnapshotUrl(plateAlarmMsg.getSnapshotUrl()); 607 monitorMainTableResultInfo.setSnapshotUrl(plateAlarmMsg.getSnapshotUrl());
609 monitorMainTableResultInfo.setPicTime(plateAlarmMsg.getAlarmTime()); 608 monitorMainTableResultInfo.setPicTime(plateAlarmMsg.getAlarmTime());
@@ -636,11 +635,10 @@ public class DeployServiceImpl implements DeployService { @@ -636,11 +635,10 @@ public class DeployServiceImpl implements DeployService {
636 */ 635 */
637 @Override 636 @Override
638 public void rabbitMqMsgListener(RabbitMQVehicle rabbitMqVehicle) { 637 public void rabbitMqMsgListener(RabbitMQVehicle rabbitMqVehicle) {
639 - int deviceId = rabbitMqVehicle.getDeviceid();  
640 // 设备id - 布控任务 638 // 设备id - 布控任务
641 - List<Integer> integers = (List<Integer>) redisTemplate.opsForHash().get(GlobalUtil.IPWITHDEPLOYLIST, deviceId);  
642 - if (null != integers) {  
643 - for (Integer deployId : integers) { 639 + List<String> deployIds = getAllDeployTaskStatusEqualsTo0();
  640 + if (null != deployIds) {
  641 + for (String deployId : deployIds) {
644 // 获取布控类型 642 // 获取布控类型
645 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId); 643 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId);
646 if (null != deployType) { 644 if (null != deployType) {
@@ -656,14 +654,22 @@ public class DeployServiceImpl implements DeployService { @@ -656,14 +654,22 @@ public class DeployServiceImpl implements DeployService {
656 } 654 }
657 } 655 }
658 656
  657 + /**
  658 + * 获取所有未删除并且处于激活状态的任务主键
  659 + *
  660 + * @return 结果集
  661 + */
  662 + List<String> getAllDeployTaskStatusEqualsTo0() {
  663 + return mongoTemplate.find(Query.query(Criteria.where("status").is(0).and("isDelete").is(0)), SyDeploy.class)
  664 + .stream().map(SyDeploy::getId).collect(Collectors.toList());
  665 + }
  666 +
659 @Override 667 @Override
660 public void rabbitMqMsgListener(PersonMsg personMsg) { 668 public void rabbitMqMsgListener(PersonMsg personMsg) {
661 - int deviceId = personMsg.getDeviceId();  
662 -  
663 // 设备id - 布控任务 669 // 设备id - 布控任务
664 - List<Integer> integers = (List<Integer>) redisTemplate.opsForHash().get(GlobalUtil.IPWITHDEPLOYLIST, deviceId); 670 + List<String> integers = getAllDeployTaskStatusEqualsTo0();
665 if (null != integers) { 671 if (null != integers) {
666 - for (Integer deployId : integers) { 672 + for (String deployId : integers) {
667 // 获取布控类型 673 // 获取布控类型
668 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId); 674 Integer deployType = (Integer) redisTemplate.opsForHash().get(GlobalUtil.DEPLOY_TYPE, deployId);
669 if (null != deployType) { 675 if (null != deployType) {
@@ -700,9 +706,7 @@ public class DeployServiceImpl implements DeployService { @@ -700,9 +706,7 @@ public class DeployServiceImpl implements DeployService {
700 * @param rabbitMqVehicle 消息体 706 * @param rabbitMqVehicle 消息体
701 * @param deployId 布控任务id 707 * @param deployId 布控任务id
702 */ 708 */
703 - private void rabbitMqMsgPlateNumberHandler(RabbitMQVehicle rabbitMqVehicle, Integer deployId) {  
704 - int deviceId = rabbitMqVehicle.getDeviceid();  
705 - String equipmentName = rabbitMqVehicle.getEquipmentName(); 709 + private void rabbitMqMsgPlateNumberHandler(RabbitMQVehicle rabbitMqVehicle, String deployId) {
706 String latitude = rabbitMqVehicle.getLatitude(); 710 String latitude = rabbitMqVehicle.getLatitude();
707 String longitude = rabbitMqVehicle.getLongitude(); 711 String longitude = rabbitMqVehicle.getLongitude();
708 String snapshotUrl = rabbitMqVehicle.getSnapshoturl(); 712 String snapshotUrl = rabbitMqVehicle.getSnapshoturl();
@@ -717,7 +721,7 @@ public class DeployServiceImpl implements DeployService { @@ -717,7 +721,7 @@ public class DeployServiceImpl implements DeployService {
717 Integer status = (Integer) redisTemplate.opsForHash().get(deployId + "|" + GlobalUtil.DEPLOY_PLATE_NUM, vehiclePlateHphm); 721 Integer status = (Integer) redisTemplate.opsForHash().get(deployId + "|" + GlobalUtil.DEPLOY_PLATE_NUM, vehiclePlateHphm);
718 if (status != null && 0 == status) { 722 if (status != null && 0 == status) {
719 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) 723 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId)
720 - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) 724 + .longitude(longitude).latitude(latitude)
721 .picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) 725 .picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl)
722 .plateNum(vehiclePlateHphm).alarmType(0).build(); 726 .plateNum(vehiclePlateHphm).alarmType(0).build();
723 } 727 }
@@ -746,9 +750,7 @@ public class DeployServiceImpl implements DeployService { @@ -746,9 +750,7 @@ public class DeployServiceImpl implements DeployService {
746 * @param rabbitMqVehicle 消息体 750 * @param rabbitMqVehicle 消息体
747 * @param deployId 布控任务id 751 * @param deployId 布控任务id
748 */ 752 */
749 - private void rabbitMqMsgVehicleHandler(RabbitMQVehicle rabbitMqVehicle, Integer deployId) {  
750 - int deviceId = rabbitMqVehicle.getDeviceid();  
751 - String equipmentName = rabbitMqVehicle.getEquipmentName(); 753 + private void rabbitMqMsgVehicleHandler(RabbitMQVehicle rabbitMqVehicle, String deployId) {
752 String latitude = rabbitMqVehicle.getLatitude(); 754 String latitude = rabbitMqVehicle.getLatitude();
753 String longitude = rabbitMqVehicle.getLongitude(); 755 String longitude = rabbitMqVehicle.getLongitude();
754 String snapshotUrl = rabbitMqVehicle.getSnapshoturl(); 756 String snapshotUrl = rabbitMqVehicle.getSnapshoturl();
@@ -773,7 +775,7 @@ public class DeployServiceImpl implements DeployService { @@ -773,7 +775,7 @@ public class DeployServiceImpl implements DeployService {
773 String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", vehicleIdStr); 775 String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", vehicleIdStr);
774 //将数据储存到mongo中 776 //将数据储存到mongo中
775 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) 777 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId)
776 - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) 778 + .longitude(longitude).latitude(latitude)
777 .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) 779 .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl)
778 .plateNum(vehiclePlateHphm).alarmType(1).similarity(v).libId(vehicleIdStr).build(); 780 .plateNum(vehiclePlateHphm).alarmType(1).similarity(v).libId(vehicleIdStr).build();
779 } 781 }
@@ -814,7 +816,7 @@ public class DeployServiceImpl implements DeployService { @@ -814,7 +816,7 @@ public class DeployServiceImpl implements DeployService {
814 if (max >= (float) redisTemplate.opsForHash().get(GlobalUtil.DEPLOYTHRESLD, deployId)) { 816 if (max >= (float) redisTemplate.opsForHash().get(GlobalUtil.DEPLOYTHRESLD, deployId)) {
815 String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", key); 817 String vehicleUrl = (String) redisTemplate.opsForHash().get("vehicleUrl", key);
816 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId) 818 plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(rabbitMqVehicle.getId()).deployId(deployId)
817 - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude) 819 + .longitude(longitude).latitude(latitude)
818 .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl) 820 .libUrl(vehicleUrl).picTime(pictime).alarmTime(DateUtil.now()).snapshotUrl(snapshotUrl)
819 .alarmType(1).similarity(max).build(); 821 .alarmType(1).similarity(max).build();
820 } 822 }
@@ -842,10 +844,8 @@ public class DeployServiceImpl implements DeployService { @@ -842,10 +844,8 @@ public class DeployServiceImpl implements DeployService {
842 * @param personMsg 消息体 844 * @param personMsg 消息体
843 * @param deployId 任务id 845 * @param deployId 任务id
844 */ 846 */
845 - public void rabbitMqPersonHandler(PersonMsg personMsg, Integer deployId) { 847 + public void rabbitMqPersonHandler(PersonMsg personMsg, String deployId) {
846 float[] fea = personMsg.getFea(); 848 float[] fea = personMsg.getFea();
847 - int deviceId = personMsg.getDeviceId();  
848 - String equipmentName = personMsg.getEquipmentName();  
849 String longitude = personMsg.getLongitude(); 849 String longitude = personMsg.getLongitude();
850 String latitude = personMsg.getLatitude(); 850 String latitude = personMsg.getLatitude();
851 String url = personMsg.getUrl(); 851 String url = personMsg.getUrl();
@@ -863,11 +863,9 @@ public class DeployServiceImpl implements DeployService { @@ -863,11 +863,9 @@ public class DeployServiceImpl implements DeployService {
863 String code = responseParamPerson.getCode(); 863 String code = responseParamPerson.getCode();
864 if ("0".equals(code)) { 864 if ("0".equals(code)) {
865 List<PersonIdAndScore> result = responseParamPerson.getResult(); 865 List<PersonIdAndScore> result = responseParamPerson.getResult();
866 -  
867 if (result != null && result.size() > 0) { 866 if (result != null && result.size() > 0) {
868 - int size = result.size();  
869 - for (int i = 0; i < size; i++) {  
870 - String retrieveKey = result.get(i).getRetrieveKey(); 867 + for (PersonIdAndScore personIdAndScore : result) {
  868 + String retrieveKey = personIdAndScore.getRetrieveKey();
871 log.debug("retrieveKey: " + retrieveKey); 869 log.debug("retrieveKey: " + retrieveKey);
872 String[] split = retrieveKey.split("&"); 870 String[] split = retrieveKey.split("&");
873 String key = deployId + "|" + split[1]; 871 String key = deployId + "|" + split[1];
@@ -875,17 +873,14 @@ public class DeployServiceImpl implements DeployService { @@ -875,17 +873,14 @@ public class DeployServiceImpl implements DeployService {
875 if (deployLib.contains(split[1])) { 873 if (deployLib.contains(split[1])) {
876 Object staus = redisTemplate.opsForHash().get(key, Integer.parseInt(split[0])); 874 Object staus = redisTemplate.opsForHash().get(key, Integer.parseInt(split[0]));
877 if (staus != null && Integer.parseInt(staus.toString()) == 0) { 875 if (staus != null && Integer.parseInt(staus.toString()) == 0) {
878 - float score = Float.parseFloat(result.get(i).getScore()); 876 + float score = Float.parseFloat(personIdAndScore.getScore());
879 PlateAlarmMsg plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(personMsg.getPersonId()) 877 PlateAlarmMsg plateAlarmMsg = PlateAlarmMsg.builder().id(null).baseId(personMsg.getPersonId())
880 - .deployId(deployId)  
881 - .deviceId(deviceId).equipmentName(equipmentName).longitude(longitude).latitude(latitude).libId(split[0]) 878 + .deployId(deployId).longitude(longitude).latitude(latitude).libId(split[0])
882 .libUrl(split[2]).picTime(captureTime).alarmTime(DateUtil.now()).snapshotUrl(url) 879 .libUrl(split[2]).picTime(captureTime).alarmTime(DateUtil.now()).snapshotUrl(url)
883 .plateNum(null).alarmType(2).similarity(score).build(); 880 .plateNum(null).alarmType(2).similarity(score).build();
884 log.debug("plateAlarmMsg: " + plateAlarmMsg.toString()); 881 log.debug("plateAlarmMsg: " + plateAlarmMsg.toString());
885 plateAlarmMsgProducer(plateAlarmMsg); 882 plateAlarmMsgProducer(plateAlarmMsg);
886 break; 883 break;
887 - } else if (staus != null && Integer.parseInt(staus.toString()) == 1) {  
888 - continue;  
889 } 884 }
890 } 885 }
891 } 886 }
src/main/java/com/objecteye/service/impl/HumanVehicleAssociationServiceImpl.java
  View file @fddd467
@@ -55,7 +55,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati @@ -55,7 +55,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati
55 * @return 55 * @return
56 */ 56 */
57 @Override 57 @Override
58 - public PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int[] customspass, int currentpage, int pagevolume, MultipartFile picfile) { 58 + public PageResult searchVehicleFromHuman(Long starttime, Long endtime, Float thresholds, int currentpage, int pagevolume, MultipartFile picfile) {
59 if (null == picfile || picfile.equals("undefined")) { 59 if (null == picfile || picfile.equals("undefined")) {
60 return null; 60 return null;
61 } 61 }
@@ -136,7 +136,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati @@ -136,7 +136,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati
136 if (retrieveKeyDbResultMap.containsKey(rabbitMqVehicle.getPersonid())) { 136 if (retrieveKeyDbResultMap.containsKey(rabbitMqVehicle.getPersonid())) {
137 SearchDataFromRetrieveDbResult searchDataFromRetrieveDbResult = retrieveKeyDbResultMap.get(rabbitMqVehicle.getPersonid()); 137 SearchDataFromRetrieveDbResult searchDataFromRetrieveDbResult = retrieveKeyDbResultMap.get(rabbitMqVehicle.getPersonid());
138 SearchVehicleFromPeopleInfo searchVehicleFromPeopleSingle = new SearchVehicleFromPeopleInfo(rabbitMqVehicle.getId(), 138 SearchVehicleFromPeopleInfo searchVehicleFromPeopleSingle = new SearchVehicleFromPeopleInfo(rabbitMqVehicle.getId(),
139 - simpleDateFormat.format(new Date(rabbitMqVehicle.getPictime())), rabbitMqVehicle.getEquipmentName(), 139 + simpleDateFormat.format(new Date(rabbitMqVehicle.getPictime())),
140 rabbitMqVehicle.getVehicle_plate_hphm(), searchDataFromRetrieveDbResult.getScore(), rabbitMqVehicle.getPicurl(), rabbitMqVehicle.getPersonUrl()); 140 rabbitMqVehicle.getVehicle_plate_hphm(), searchDataFromRetrieveDbResult.getScore(), rabbitMqVehicle.getPicurl(), rabbitMqVehicle.getPersonUrl());
141 searchVehicleFromPeopleInfos.add(searchVehicleFromPeopleSingle); 141 searchVehicleFromPeopleInfos.add(searchVehicleFromPeopleSingle);
142 } 142 }
@@ -156,13 +156,13 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati @@ -156,13 +156,13 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati
156 * @return 156 * @return
157 */ 157 */
158 @Override 158 @Override
159 - public SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, int[] customspass, Integer currentpage, Integer pagevolume, String hphm) { 159 + public SearchPeopleOfhphmResult searchPeopleFromHphm(Long starttime, Long endtime, Integer currentpage, Integer pagevolume, String hphm) {
160 SearchPeopleOfhphmResult searchPeopleOfhphmResult = new SearchPeopleOfhphmResult(); 160 SearchPeopleOfhphmResult searchPeopleOfhphmResult = new SearchPeopleOfhphmResult();
161 List<SearchPeopleOfHphmInfo> list = null; 161 List<SearchPeopleOfHphmInfo> list = null;
162 if (!"".equals(hphm)) { 162 if (!"".equals(hphm)) {
163 list = new ArrayList<SearchPeopleOfHphmInfo>(); 163 list = new ArrayList<SearchPeopleOfHphmInfo>();
164 //首先根据车辆号牌查询到相关的车辆 164 //首先根据车辆号牌查询到相关的车辆
165 - List<RabbitMQVehicle> byHphm = findByHphm(starttime, endtime, customspass, hphm, currentpage, pagevolume); 165 + List<RabbitMQVehicle> byHphm = findByHphm(starttime, endtime, hphm, currentpage, pagevolume);
166 for (RabbitMQVehicle rmqv : byHphm) { 166 for (RabbitMQVehicle rmqv : byHphm) {
167 Long pictime = rmqv.getPictime(); 167 Long pictime = rmqv.getPictime();
168 168
@@ -172,7 +172,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati @@ -172,7 +172,7 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati
172 172
173 if (pictime <= endtime && pictime >= starttime) { 173 if (pictime <= endtime && pictime >= starttime) {
174 SearchPeopleOfHphmInfo searchPeopleOfHphmInfo = new SearchPeopleOfHphmInfo(rmqv.getId(), 174 SearchPeopleOfHphmInfo searchPeopleOfHphmInfo = new SearchPeopleOfHphmInfo(rmqv.getId(),
175 - simpleDateFormat.format(new Date(rmqv.getPictime())), rmqv.getEquipmentName(), 175 + simpleDateFormat.format(new Date(rmqv.getPictime())),
176 rmqv.getVehicle_plate_hphm(), rmqv.getPersonUrl()); 176 rmqv.getVehicle_plate_hphm(), rmqv.getPersonUrl());
177 list.add(searchPeopleOfHphmInfo); 177 list.add(searchPeopleOfHphmInfo);
178 } 178 }
@@ -205,13 +205,11 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati @@ -205,13 +205,11 @@ public class HumanVehicleAssociationServiceImpl implements HumanVehicleAssociati
205 * @return 205 * @return
206 */ 206 */
207 @Override 207 @Override
208 - public List<RabbitMQVehicle> findByHphm(Long starttime, Long endtime, int[] customspass, String hphm, int currentPage, int pageSize) { 208 + public List<RabbitMQVehicle> findByHphm(Long starttime, Long endtime, String hphm, int currentPage, int pageSize) {
209 Query query = new Query(); 209 Query query = new Query();
210 - query.with(new Sort(new Sort.Order(Sort.Direction.DESC, "pictime"))); 210 + query.with(Sort.by(Sort.Order.desc("pictime")));
211 int skip = (currentPage - 1) * pageSize; 211 int skip = (currentPage - 1) * pageSize;
212 -  
213 query.addCriteria(new Criteria().andOperator(Criteria.where("vehicle_plate_hphm").is(hphm), Criteria.where("personUrl").ne(null))); 212 query.addCriteria(new Criteria().andOperator(Criteria.where("vehicle_plate_hphm").is(hphm), Criteria.where("personUrl").ne(null)));
214 -  
215 query.skip(skip); 213 query.skip(skip);
216 query.limit(pageSize); 214 query.limit(pageSize);
217 return mongoTemplate.find(query, RabbitMQVehicle.class); 215 return mongoTemplate.find(query, RabbitMQVehicle.class);
src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java
  View file @fddd467
@@ -177,7 +177,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService { @@ -177,7 +177,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService {
177 locusOrbitResultParams.setPictime(DateUtil.format(new Date(currentPictime), "yyyy-MM-dd HH:mm:ss")); 177 locusOrbitResultParams.setPictime(DateUtil.format(new Date(currentPictime), "yyyy-MM-dd HH:mm:ss"));
178 locusOrbitResultParams.setLongitude(rabbitMqVehicle.getLongitude()); 178 locusOrbitResultParams.setLongitude(rabbitMqVehicle.getLongitude());
179 locusOrbitResultParams.setLatitude(rabbitMqVehicle.getLatitude()); 179 locusOrbitResultParams.setLatitude(rabbitMqVehicle.getLatitude());
180 - locusOrbitResultParams.setEquipmentName(rabbitMqVehicle.getEquipmentName());  
181 locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl()); 180 locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl());
182 resultList.add(locusOrbitResultParams); 181 resultList.add(locusOrbitResultParams);
183 } 182 }
@@ -233,7 +232,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService { @@ -233,7 +232,6 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService {
233 if (null != rabbitMqVehicle) { 232 if (null != rabbitMqVehicle) {
234 locusOrbitResultParams.setId(rabbitMqVehicle.getId()); 233 locusOrbitResultParams.setId(rabbitMqVehicle.getId());
235 locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl()); 234 locusOrbitResultParams.setSnapshotUrl(rabbitMqVehicle.getSnapshoturl());
236 - locusOrbitResultParams.setEquipmentName(rabbitMqVehicle.getEquipmentName());  
237 locusOrbitResultParams.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm()); 235 locusOrbitResultParams.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm());
238 locusOrbitResultParams.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss")); 236 locusOrbitResultParams.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss"));
239 } 237 }
src/main/java/com/objecteye/service/impl/SpecialtyServicesImpl.java
  View file @fddd467
@@ -47,8 +47,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -47,8 +47,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
47 private VehicleDetailsUtils vehicleDetailsUtils; 47 private VehicleDetailsUtils vehicleDetailsUtils;
48 @Autowired 48 @Autowired
49 private RedisTemplate redisTemplate; 49 private RedisTemplate redisTemplate;
50 - @Autowired  
51 - private RelationMappingUtil relationMappingUtil;  
52 50
53 private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 51 private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
54 52
@@ -59,7 +57,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -59,7 +57,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
59 } 57 }
60 58
61 @Override 59 @Override
62 - 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 { 60 + public JSONObject findByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, Integer vehicle_special_type_number) throws InterruptedException {
63 //封装结果的对象 61 //封装结果的对象
64 JSONObject result = new JSONObject(); 62 JSONObject result = new JSONObject();
65 if (picfile == null) { 63 if (picfile == null) {
@@ -79,7 +77,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -79,7 +77,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
79 RabbitMQVehicle rabbitMqVehicle = rabbitMqVehicles.get(number); 77 RabbitMQVehicle rabbitMqVehicle = rabbitMqVehicles.get(number);
80 //先过滤条件 78 //先过滤条件
81 List<RabbitMQVehicle> vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(), 79 List<RabbitMQVehicle> vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(),
82 - null, starttime, endtime, customspass, vehicle_special_type_number, rabbitMqVehicle.getVehicle_color_index(), 80 + null, starttime, endtime, vehicle_special_type_number, rabbitMqVehicle.getVehicle_color_index(),
83 rabbitMqVehicle.getVehicle_recg_issue_year(), rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(), 81 rabbitMqVehicle.getVehicle_recg_issue_year(), rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(),
84 rabbitMqVehicle.getVehicle_recg_subbrand())); 82 rabbitMqVehicle.getVehicle_recg_subbrand()));
85 //获取该车辆的特征信息 83 //获取该车辆的特征信息
@@ -151,8 +149,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -151,8 +149,6 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
151 RabbitMQVehicle rabbitMqVehicle1 = next.getRabbitMQVehicle(); 149 RabbitMQVehicle rabbitMqVehicle1 = next.getRabbitMQVehicle();
152 rowData.put("id", rabbitMqVehicle1.getId()); 150 rowData.put("id", rabbitMqVehicle1.getId());
153 rowData.put("hphm", rabbitMqVehicle1.getVehicle_plate_hphm()); 151 rowData.put("hphm", rabbitMqVehicle1.getVehicle_plate_hphm());
154 - //获取设备id，然后通过设备id查询到设备的名称  
155 - rowData.put("site", rabbitMqVehicle1.getEquipmentName());  
156 rowData.put("phototime", simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime()))); 152 rowData.put("phototime", simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime())));
157 rowData.put("recordid", rabbitMqVehicle1.getRecordid()); 153 rowData.put("recordid", rabbitMqVehicle1.getRecordid());
158 // 新方法，如果不需要四舍五入，可以使用RoundingMode.DOWN 154 // 新方法，如果不需要四舍五入，可以使用RoundingMode.DOWN
@@ -195,7 +191,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -195,7 +191,7 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
195 } 191 }
196 192
197 @Override 193 @Override
198 - public VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime, int[] customspass) { 194 + public VehicleInfoRes chemistryFindByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, String starttime, String endtime) {
199 195
200 return null; 196 return null;
201 } 197 }
@@ -406,12 +402,12 @@ public class SpecialtyServicesImpl implements SpecialtyServices { @@ -406,12 +402,12 @@ public class SpecialtyServicesImpl implements SpecialtyServices {
406 int index = vehicle_color_res.getIndex(); 402 int index = vehicle_color_res.getIndex();
407 float score = vehicle_color_res.getScore(); 403 float score = vehicle_color_res.getScore();
408 if (score >= 0.7) { 404 if (score >= 0.7) {
409 - String vehicleColor = relationMappingUtil.getVehicleColor(index); 405 + String vehicleColor = RelationMappingUtil.getVehicleColor(index);
410 resultMsg.setVehicle_color(vehicleColor); 406 resultMsg.setVehicle_color(vehicleColor);
411 } else { 407 } else {
412 resultMsg.setVehicle_color("检测失败"); 408 resultMsg.setVehicle_color("检测失败");
413 } 409 }
414 - StringBuffer sb = new StringBuffer(); 410 + StringBuilder sb = new StringBuilder();
415 VehicleRecognizeResultParam vehicle_recg_res = vehicleInfoParam.getVehicle_recg_res(); 411 VehicleRecognizeResultParam vehicle_recg_res = vehicleInfoParam.getVehicle_recg_res();
416 float name_score = vehicle_recg_res.getName_score(); 412 float name_score = vehicle_recg_res.getName_score();
417 if (name_score < 0.7) { 413 if (name_score < 0.7) {
src/main/java/com/objecteye/service/impl/VehicleCurrencyServiceImpl.java
  View file @fddd467
@@ -206,7 +206,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { @@ -206,7 +206,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService {
206 } 206 }
207 207
208 @Override 208 @Override
209 - public CommonResult<PicVehicleDataResult> findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime, int[] customspass) throws InterruptedException { 209 + public CommonResult<PicVehicleDataResult> findVehicleByPic(int number, double threshold, int currentpage, int pagevolume, MultipartFile picfile, Long starttime, Long endtime) throws InterruptedException {
210 //封装结果的对象 210 //封装结果的对象
211 if (picfile == null) { 211 if (picfile == null) {
212 return CommonResult.success(201, "图片为空", null); 212 return CommonResult.success(201, "图片为空", null);
@@ -223,7 +223,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { @@ -223,7 +223,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService {
223 RabbitMQVehicle rabbitMqVehicle = rabbitMQVehicles.get(number); 223 RabbitMQVehicle rabbitMqVehicle = rabbitMQVehicles.get(number);
224 224
225 List<RabbitMQVehicle> vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(), 225 List<RabbitMQVehicle> vehcieListBy = mongoTemplates.getVehcieListBy(new VehicleCondition(0, 0, rabbitMqVehicle.getVehicle_plate_hphm(),
226 - null, starttime, endtime, customspass, null, rabbitMqVehicle.getVehicle_color_index(), rabbitMqVehicle.getVehicle_recg_issue_year(), 226 + null, starttime, endtime, null, rabbitMqVehicle.getVehicle_color_index(), rabbitMqVehicle.getVehicle_recg_issue_year(),
227 rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(), rabbitMqVehicle.getVehicle_recg_subbrand())); 227 rabbitMqVehicle.getVehicle_recg_brand(), rabbitMqVehicle.getVehicle_recg_type(), rabbitMqVehicle.getVehicle_recg_subbrand()));
228 228
229 //获取该车辆的特征信息 229 //获取该车辆的特征信息
@@ -303,7 +303,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService { @@ -303,7 +303,7 @@ public class VehicleCurrencyServiceImpl implements VehicleCurrencyService {
303 303
304 //因为需要将快照图的值给picurl所以需要下面的返回方式 304 //因为需要将快照图的值给picurl所以需要下面的返回方式
305 PicVehicleRow picVehicleRow = new PicVehicleRow(rabbitMqVehicle1.getId(), rabbitMqVehicle1.getRecordid(), rabbitMqVehicle1.getVehicle_plate_hphm(), 305 PicVehicleRow picVehicleRow = new PicVehicleRow(rabbitMqVehicle1.getId(), rabbitMqVehicle1.getRecordid(), rabbitMqVehicle1.getVehicle_plate_hphm(),
306 - snapshoturl, picurl, bg, rabbitMqVehicle1.getEquipmentName(), 306 + snapshoturl, picurl, bg,
307 simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime()))); 307 simpleDateFormat.format(new Date(rabbitMqVehicle1.getPictime())));
308 308
309 picVehicleRows.add(picVehicleRow); 309 picVehicleRows.add(picVehicleRow);
src/main/java/com/objecteye/service/impl/VehicleFileServiceImpl.java
  View file @fddd467
@@ -307,7 +307,6 @@ public class VehicleFileServiceImpl implements IVehicleFileService { @@ -307,7 +307,6 @@ public class VehicleFileServiceImpl implements IVehicleFileService {
307 } 307 }
308 String style = String.join("-", styleList); 308 String style = String.join("-", styleList);
309 tempResult.setStyle(style); 309 tempResult.setStyle(style);
310 - tempResult.setEquipmentName(rabbitMqVehicle.getEquipmentName());  
311 tempResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), dateFormat)); 310 tempResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), dateFormat));
312 tempResult.setId(rabbitMqVehicle.getId()); 311 tempResult.setId(rabbitMqVehicle.getId());
313 resultList.add(tempResult); 312 resultList.add(tempResult);
src/main/java/com/objecteye/service/impl/VehicleViolationsServiceImpl.java
  View file @fddd467
@@ -8,7 +8,6 @@ import com.objecteye.entity.*; @@ -8,7 +8,6 @@ import com.objecteye.entity.*;
8 import com.objecteye.pojo.RabbitMQVehicle; 8 import com.objecteye.pojo.RabbitMQVehicle;
9 import com.objecteye.pojo.RabbitMqVehicleViolation; 9 import com.objecteye.pojo.RabbitMqVehicleViolation;
10 import com.objecteye.service.IVehicleViolationsService; 10 import com.objecteye.service.IVehicleViolationsService;
11 -import com.objecteye.utils.GlobalUtil;  
12 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.data.mongodb.core.MongoTemplate; 12 import org.springframework.data.mongodb.core.MongoTemplate;
14 import org.springframework.data.mongodb.core.aggregation.Aggregation; 13 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -57,31 +56,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -57,31 +56,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
57 private final double ILLEGAL_CONFIRM_LIMMIT = 0.9; 56 private final double ILLEGAL_CONFIRM_LIMMIT = 0.9;
58 57
59 /** 58 /**
60 - * 同步还在激活状态的任务到redis  
61 - */  
62 - private void syncForbiddenTask() {  
63 - List<SyVehicleForbidenTask> forbiddenTasks = mongoTemplate.find(Query.query(Criteria.where("status").ne(0)), SyVehicleForbidenTask.class);  
64 - Map<String, List<SyVehicleForbidenTask>> deviceIdTaskMap = new HashMap<>();  
65 - for (SyVehicleForbidenTask forbiddenTask : forbiddenTasks) {  
66 - if (null == forbiddenTask || null == forbiddenTask.getDeviceId() || "".equals(forbiddenTask.getDeviceId())) {  
67 - continue;  
68 - }  
69 - String[] deviceIdArr = forbiddenTask.getDeviceId().split(",");  
70 - for (String deviceId : deviceIdArr) {  
71 - List<SyVehicleForbidenTask> tempTasks = new ArrayList<>();  
72 - if (deviceIdTaskMap.containsKey(deviceId)) {  
73 - tempTasks = deviceIdTaskMap.get(deviceId);  
74 - }  
75 - tempTasks.add(forbiddenTask);  
76 - deviceIdTaskMap.put(deviceId, tempTasks);  
77 - }  
78 -  
79 - }  
80 - redisTemplate.delete(GlobalUtil.FORBIDDEN_TASK);  
81 - redisTemplate.opsForHash().putAll(GlobalUtil.FORBIDDEN_TASK, deviceIdTaskMap);  
82 - }  
83 -  
84 - /**  
85 * 禁行任务查询接口 59 * 禁行任务查询接口
86 * 60 *
87 * @param currentpage 页码 61 * @param currentpage 页码
@@ -168,7 +142,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -168,7 +142,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
168 syVehicleForbidenTask.setStatus(1); 142 syVehicleForbidenTask.setStatus(1);
169 } 143 }
170 mongoTemplate.insert(syVehicleForbidenTask); 144 mongoTemplate.insert(syVehicleForbidenTask);
171 - syncForbiddenTask();  
172 return 1; 145 return 1;
173 } 146 }
174 147
@@ -181,7 +154,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -181,7 +154,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
181 @Override 154 @Override
182 public int forbiddenTaskUpdate(SyVehicleForbidenTask syVehicleForbidenTask) { 155 public int forbiddenTaskUpdate(SyVehicleForbidenTask syVehicleForbidenTask) {
183 mongoTemplate.save(syVehicleForbidenTask); 156 mongoTemplate.save(syVehicleForbidenTask);
184 - syncForbiddenTask();  
185 return 1; 157 return 1;
186 } 158 }
187 159
@@ -204,7 +176,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -204,7 +176,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
204 mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), SyVehicleForbidenTask.class); 176 mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), SyVehicleForbidenTask.class);
205 effectNum++; 177 effectNum++;
206 } 178 }
207 - syncForbiddenTask();  
208 return effectNum; 179 return effectNum;
209 } 180 }
210 181
@@ -221,11 +192,10 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -221,11 +192,10 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
221 // 非特殊车辆 192 // 非特殊车辆
222 if (specialScore >= SPECIAL_VEHICLE_TYPE_LOWER_SCORS) { 193 if (specialScore >= SPECIAL_VEHICLE_TYPE_LOWER_SCORS) {
223 // 特殊车辆处理 194 // 特殊车辆处理
224 - int deviceId = rabbitMqVehicleViolation.getDeviceid();  
225 int specialType = rabbitMqVehicleViolation.getVehicle_special_type(); 195 int specialType = rabbitMqVehicleViolation.getVehicle_special_type();
226 // 对激活的任务做判断 196 // 对激活的任务做判断
227 - List<SyVehicleForbidenTask> availableForbiddenTasks = (List<SyVehicleForbidenTask>) redisTemplate.opsForHash().get(GlobalUtil.FORBIDDEN_TASK, String.valueOf(deviceId));  
228 - if (null != availableForbiddenTasks && availableForbiddenTasks.size() != 0) { 197 + List<SyVehicleForbidenTask> availableForbiddenTasks = mongoTemplate.find(Query.query(Criteria.where("status").ne(0)), SyVehicleForbidenTask.class);
  198 + if (availableForbiddenTasks.size() != 0) {
229 // 检测是否违规, 违规一次即跳出循环 199 // 检测是否违规, 违规一次即跳出循环
230 for (SyVehicleForbidenTask forbiddenTask : availableForbiddenTasks) { 200 for (SyVehicleForbidenTask forbiddenTask : availableForbiddenTasks) {
231 List<String> vehicleType = Arrays.stream(forbiddenTask.getVehicleType().split(",")).collect(Collectors.toList()); 201 List<String> vehicleType = Arrays.stream(forbiddenTask.getVehicleType().split(",")).collect(Collectors.toList());
@@ -376,7 +346,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -376,7 +346,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
376 vehicleSimpleResult.setPersonUrl(rabbitMqVehicleViolation.getPersonUrl()); 346 vehicleSimpleResult.setPersonUrl(rabbitMqVehicleViolation.getPersonUrl());
377 vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicleViolation.getPictime()), "yyyy-MM-dd HH:mm:ss")); 347 vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicleViolation.getPictime()), "yyyy-MM-dd HH:mm:ss"));
378 vehicleSimpleResult.setPlateNumber(rabbitMqVehicleViolation.getVehicle_plate_hphm()); 348 vehicleSimpleResult.setPlateNumber(rabbitMqVehicleViolation.getVehicle_plate_hphm());
379 - vehicleSimpleResult.setEquipmentName(rabbitMqVehicleViolation.getEquipmentName() == null ? "" : rabbitMqVehicleViolation.getEquipmentName());  
380 resultList.add(vehicleSimpleResult); 349 resultList.add(vehicleSimpleResult);
381 } 350 }
382 long total = mongoTemplate.count(query, RabbitMqVehicleViolation.class); 351 long total = mongoTemplate.count(query, RabbitMqVehicleViolation.class);
@@ -397,7 +366,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService { @@ -397,7 +366,6 @@ public class VehicleViolationsServiceImpl implements IVehicleViolationsService {
397 vehicleSimpleResult.setPersonUrl(rabbitMqVehicle.getPersonUrl()); 366 vehicleSimpleResult.setPersonUrl(rabbitMqVehicle.getPersonUrl());
398 vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss")); 367 vehicleSimpleResult.setPictime(DateUtil.format(new Date(rabbitMqVehicle.getPictime()), "yyyy-MM-dd HH:mm:ss"));
399 vehicleSimpleResult.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm()); 368 vehicleSimpleResult.setPlateNumber(rabbitMqVehicle.getVehicle_plate_hphm());
400 - vehicleSimpleResult.setEquipmentName(rabbitMqVehicle.getEquipmentName());  
401 resultList.add(vehicleSimpleResult); 369 resultList.add(vehicleSimpleResult);
402 } 370 }
403 long total = mongoTemplate.count(query, RabbitMQVehicle.class); 371 long total = mongoTemplate.count(query, RabbitMQVehicle.class);
src/main/java/com/objecteye/utils/GlobalUtil.java
  View file @fddd467
@@ -48,11 +48,6 @@ public class GlobalUtil { @@ -48,11 +48,6 @@ public class GlobalUtil {
48 public final static String VEHICLE_FEATURE = "vehicleFeature"; 48 public final static String VEHICLE_FEATURE = "vehicleFeature";
49 49
50 /** 50 /**
51 - * redis中保存违规信息的主键  
52 - */  
53 - public final static String FORBIDDEN_TASK = "forbidden_task";  
54 -  
55 - /**  
56 * 布控报警模块 -redis key值-任务开始时间 51 * 布控报警模块 -redis key值-任务开始时间
57 */ 52 */
58 public final static String DEPLOYID_STATRTIME = "deployIdAndStartTime"; 53 public final static String DEPLOYID_STATRTIME = "deployIdAndStartTime";
src/main/java/com/objecteye/utils/RabbbitmqConsumer.java
  View file @fddd467
@@ -40,13 +40,8 @@ public class RabbbitmqConsumer { @@ -40,13 +40,8 @@ public class RabbbitmqConsumer {
40 public void receive_store(String msg, Message message, Channel channel) { 40 public void receive_store(String msg, Message message, Channel channel) {
41 try { 41 try {
42 List<RabbitMQVehicle> rabbitMQVehicles = rabbitMQVehicleTools.encapsulationRabbitVehicle(msg); 42 List<RabbitMQVehicle> rabbitMQVehicles = rabbitMQVehicleTools.encapsulationRabbitVehicle(msg);
43 -  
44 if (rabbitMQVehicles != null && rabbitMQVehicles.size() > 0) { 43 if (rabbitMQVehicles != null && rabbitMQVehicles.size() > 0) {
45 -  
46 - int size = rabbitMQVehicles.size();  
47 -  
48 - for (int i = 0; i < size; i++) {  
49 - RabbitMQVehicle rabbitMQVehicle = rabbitMQVehicles.get(i); 44 + for (RabbitMQVehicle rabbitMQVehicle : rabbitMQVehicles) {
50 if (rabbitMQVehicle == null) { 45 if (rabbitMQVehicle == null) {
51 continue; 46 continue;
52 } 47 }
@@ -67,8 +62,8 @@ public class RabbbitmqConsumer { @@ -67,8 +62,8 @@ public class RabbbitmqConsumer {
67 if (vehicle_plate_numScore > 0.9) { 62 if (vehicle_plate_numScore > 0.9) {
68 redisTemplate.opsForHash().put("vehicleFilePlateNumber", vehicle_plate_hphm, s); 63 redisTemplate.opsForHash().put("vehicleFilePlateNumber", vehicle_plate_hphm, s);
69 } 64 }
70 -// rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.alarm", s);  
71 -// rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.forbidden", s); 65 + rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.alarm", s);
  66 + rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.forbidden", s);
72 } 67 }
73 } 68 }
74 } catch (Exception e) { 69 } catch (Exception e) {
src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java
  View file @fddd467
@@ -34,8 +34,6 @@ public class RabbitMQVehicleTools { @@ -34,8 +34,6 @@ public class RabbitMQVehicleTools {
34 @Autowired 34 @Autowired
35 private RedisTemplate redisTemplate; 35 private RedisTemplate redisTemplate;
36 @Autowired 36 @Autowired
37 - private RelationMappingUtil relationMappingUtil;  
38 - @Autowired  
39 private VehicleDetailsUtils vehicleDetailsUtils; 37 private VehicleDetailsUtils vehicleDetailsUtils;
40 @Autowired 38 @Autowired
41 private MongoTemplate mongoTemplate; 39 private MongoTemplate mongoTemplate;
@@ -113,7 +111,7 @@ public class RabbitMQVehicleTools { @@ -113,7 +111,7 @@ public class RabbitMQVehicleTools {
113 111
114 GlobalUtil.generateImage(mattingData, path); 112 GlobalUtil.generateImage(mattingData, path);
115 113
116 - PersonMsg personMsg = new PersonMsg(null, null, snapshoturl, captureTime, null, null, null, url, retrieveKey, fea); 114 + PersonMsg personMsg = new PersonMsg(null, snapshoturl, captureTime, null, null, null, url, retrieveKey, fea);
117 PersonMsg save = mongoTemplate.save(personMsg); 115 PersonMsg save = mongoTemplate.save(personMsg);
118 String s = JSON.toJSONString(save); 116 String s = JSON.toJSONString(save);
119 rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.person", s); 117 rabbitTemplate.convertAndSend(RabbitmqConfig.EXCHANGE_TOPICS_INFORM, "inform.person", s);
@@ -135,8 +133,6 @@ public class RabbitMQVehicleTools { @@ -135,8 +133,6 @@ public class RabbitMQVehicleTools {
135 boolean infoIsExit = jsonObject.containsKey("info"); 133 boolean infoIsExit = jsonObject.containsKey("info");
136 if (infoIsExit) { 134 if (infoIsExit) {
137 long captureTime = jsonObject.containsKey("captureTime") ? jsonObject.getLong("captureTime") : System.currentTimeMillis(); 135 long captureTime = jsonObject.containsKey("captureTime") ? jsonObject.getLong("captureTime") : System.currentTimeMillis();
138 - Integer devicedid = jsonObject.containsKey("deviceId") ? jsonObject.getInteger("deviceId") : null;  
139 - String equipName = jsonObject.containsKey("equipmentName") ? jsonObject.getString("equipmentName") : null;  
140 String longitude = jsonObject.containsKey("longitude") ? jsonObject.getString("longitude") : null; 136 String longitude = jsonObject.containsKey("longitude") ? jsonObject.getString("longitude") : null;
141 String latitude = jsonObject.containsKey("latitude") ? jsonObject.getString("latitude") : null; 137 String latitude = jsonObject.containsKey("latitude") ? jsonObject.getString("latitude") : null;
142 String picurl = jsonObject.containsKey("imageUrl") ? jsonObject.getString("imageUrl") : null; 138 String picurl = jsonObject.containsKey("imageUrl") ? jsonObject.getString("imageUrl") : null;
@@ -144,16 +140,6 @@ public class RabbitMQVehicleTools { @@ -144,16 +140,6 @@ public class RabbitMQVehicleTools {
144 for (int i = 0; i < infoArr.size(); i++) { 140 for (int i = 0; i < infoArr.size(); i++) {
145 //获取到单辆车的信息 141 //获取到单辆车的信息
146 JSONObject infoObj = infoArr.getJSONObject(i); 142 JSONObject infoObj = infoArr.getJSONObject(i);
147 - if (devicedid != null) {  
148 - Object totalCar = redisTemplate.opsForHash().get("totalVehicles", devicedid);  
149 - if (totalCar != null) {  
150 - Integer count1 = Integer.valueOf(totalCar.toString());  
151 - count++;  
152 - redisTemplate.opsForHash().put("totalCar", devicedid, count1);  
153 - } else {  
154 - redisTemplate.opsForHash().put("totalCar", devicedid, 1);  
155 - }  
156 - }  
157 143
158 //封装建模 144 //封装建模
159 RabbitMQVehicle rabbitMQVehicle = sdkToOnlyVehicle(infoObj); 145 RabbitMQVehicle rabbitMQVehicle = sdkToOnlyVehicle(infoObj);
@@ -171,14 +157,8 @@ public class RabbitMQVehicleTools { @@ -171,14 +157,8 @@ public class RabbitMQVehicleTools {
171 } 157 }
172 } 158 }
173 159
174 - if (devicedid != null) {  
175 - rabbitMQVehicle.setDeviceid(devicedid);  
176 - rabbitMQVehicle.setEquipmentName(equipName);  
177 - rabbitMQVehicle.setLongitude(longitude);  
178 - rabbitMQVehicle.setLatitude(latitude);  
179 - } else {  
180 - rabbitMQVehicle.setDeviceid(0);  
181 - } 160 + rabbitMQVehicle.setLongitude(longitude);
  161 + rabbitMQVehicle.setLatitude(latitude);
182 rabbitMQVehicle.setPictime(captureTime); 162 rabbitMQVehicle.setPictime(captureTime);
183 163
184 rabbitMQVehicles.add(rabbitMQVehicle); 164 rabbitMQVehicles.add(rabbitMQVehicle);
@@ -208,8 +188,6 @@ public class RabbitMQVehicleTools { @@ -208,8 +188,6 @@ public class RabbitMQVehicleTools {
208 188
209 // id; //车辆id 189 // id; //车辆id
210 rabbitMQInfo.setId(rabbitMQVehicle.getId()); 190 rabbitMQInfo.setId(rabbitMQVehicle.getId());
211 - // equipmentName; //设备名称  
212 - rabbitMQInfo.setEquipmentName(rabbitMQVehicle.getEquipmentName());  
213 // longitude; //经度 191 // longitude; //经度
214 rabbitMQInfo.setLongitude(rabbitMQVehicle.getLongitude()); 192 rabbitMQInfo.setLongitude(rabbitMQVehicle.getLongitude());
215 // latitude; //纬度 193 // latitude; //纬度
@@ -239,7 +217,7 @@ public class RabbitMQVehicleTools { @@ -239,7 +217,7 @@ public class RabbitMQVehicleTools {
239 rabbitMQInfo.setPersonid(rabbitMQVehicle.getPersonid()); 217 rabbitMQInfo.setPersonid(rabbitMQVehicle.getPersonid());
240 // vehicleplatetype; //车牌类型 218 // vehicleplatetype; //车牌类型
241 int vehicleplatetype = rabbitMQVehicle.getVehicleplatetype(); 219 int vehicleplatetype = rabbitMQVehicle.getVehicleplatetype();
242 - String vehiclePlateTypeName = relationMappingUtil.getVehiclePlateType(vehicleplatetype); 220 + String vehiclePlateTypeName = RelationMappingUtil.getVehiclePlateType(vehicleplatetype);
243 rabbitMQInfo.setVehicleplatetype(vehiclePlateTypeName); 221 rabbitMQInfo.setVehicleplatetype(vehiclePlateTypeName);
244 222
245 // vehicle_plate_numScore; //号牌可信度 223 // vehicle_plate_numScore; //号牌可信度
@@ -250,11 +228,11 @@ public class RabbitMQVehicleTools { @@ -250,11 +228,11 @@ public class RabbitMQVehicleTools {
250 228
251 // vehicle_color_index; //车辆颜色; 229 // vehicle_color_index; //车辆颜色;
252 int vehicle_color_index = rabbitMQVehicle.getVehicle_color_index(); 230 int vehicle_color_index = rabbitMQVehicle.getVehicle_color_index();
253 - String vehicleColor = relationMappingUtil.getVehicleColor(vehicle_color_index); 231 + String vehicleColor = RelationMappingUtil.getVehicleColor(vehicle_color_index);
254 rabbitMQInfo.setVehicle_color_index(vehicleColor); 232 rabbitMQInfo.setVehicle_color_index(vehicleColor);
255 // vehicle_special_type; //特殊品类车类型 233 // vehicle_special_type; //特殊品类车类型
256 int vehicle_special_type = rabbitMQVehicle.getVehicle_special_type(); 234 int vehicle_special_type = rabbitMQVehicle.getVehicle_special_type();
257 - String vehicleSpecialType = relationMappingUtil.getVehicleSpecialType(vehicle_special_type); 235 + String vehicleSpecialType = RelationMappingUtil.getVehicleSpecialType(vehicle_special_type);
258 rabbitMQInfo.setVehicle_special_type(vehicleSpecialType); 236 rabbitMQInfo.setVehicle_special_type(vehicleSpecialType);
259 237
260 238
@@ -511,8 +489,6 @@ public class RabbitMQVehicleTools { @@ -511,8 +489,6 @@ public class RabbitMQVehicleTools {
511 489
512 public RabbitMQVehicle sdkToOnlyVehicle(JSONObject vehicleSingleInfo) { 490 public RabbitMQVehicle sdkToOnlyVehicle(JSONObject vehicleSingleInfo) {
513 int count = 0;//在档案中的位置 491 int count = 0;//在档案中的位置
514 - int deviceid = 0; //设备id  
515 - String equipName = nullStatus;  
516 String longitude = nullStatus; 492 String longitude = nullStatus;
517 String latitude = nullStatus; 493 String latitude = nullStatus;
518 String picurl = nullStatus; //图片的路径 494 String picurl = nullStatus; //图片的路径
@@ -792,7 +768,7 @@ public class RabbitMQVehicleTools { @@ -792,7 +768,7 @@ public class RabbitMQVehicleTools {
792 //vehicle_pendant_detect_zybexis; //是否存在遮阳板 0表示不存在 1表示存在 768 //vehicle_pendant_detect_zybexis; //是否存在遮阳板 0表示不存在 1表示存在
793 769
794 770
795 - 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); 771 + 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);
796 772
797 } 773 }
798 return rabbitMQVehicle; 774 return rabbitMQVehicle;
src/main/java/com/objecteye/websocket/MyWebSocketHandler.java
  View file @fddd467
@@ -148,8 +148,6 @@ public class MyWebSocketHandler extends TextWebSocketHandler { @@ -148,8 +148,6 @@ public class MyWebSocketHandler extends TextWebSocketHandler {
148 PlateAlarmMsg plateAlarmMsg = JSON.parseObject(deployAlarmMsg.toString(), PlateAlarmMsg.class); 148 PlateAlarmMsg plateAlarmMsg = JSON.parseObject(deployAlarmMsg.toString(), PlateAlarmMsg.class);
149 String alarmTime = plateAlarmMsg.getAlarmTime(); 149 String alarmTime = plateAlarmMsg.getAlarmTime();
150 deployMsg.setAlarmTime(alarmTime); 150 deployMsg.setAlarmTime(alarmTime);
151 - String equipmentName = plateAlarmMsg.getEquipmentName();  
152 - deployMsg.setAlarmPlace(equipmentName);  
153 Integer alarmType = plateAlarmMsg.getAlarmType(); 151 Integer alarmType = plateAlarmMsg.getAlarmType();
154 deployMsg.setDeployType(alarmType); 152 deployMsg.setDeployType(alarmType);
155 String snapshotUrl = plateAlarmMsg.getSnapshotUrl(); 153 String snapshotUrl = plateAlarmMsg.getSnapshotUrl();
src/main/java/com/objecteye/websocket/SdkToVehicleDetail.java
  View file @fddd467
@@ -112,9 +112,6 @@ public class SdkToVehicleDetail { @@ -112,9 +112,6 @@ public class SdkToVehicleDetail {
112 String dateString = dateFormat.format(date); 112 String dateString = dateFormat.format(date);
113 vehicleDetails.setPictime(dateString); 113 vehicleDetails.setPictime(dateString);
114 114
115 - //设备相关信息  
116 - String equipmentName = captureRedis.getEquipmentName();  
117 - vehicleDetails.setEquipmentName(equipmentName);  
118 String longitude = captureRedis.getLongitude(); 115 String longitude = captureRedis.getLongitude();
119 vehicleDetails.setLongitude(longitude); 116 vehicleDetails.setLongitude(longitude);
120 String latitude = captureRedis.getLatitude(); 117 String latitude = captureRedis.getLatitude();