diff --git a/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java b/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java index 0ba266aa..a4f87c61 100644 --- a/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java +++ b/logistics/src/main/java/com/ccsens/logistics/Util/Constant.java @@ -32,4 +32,14 @@ public class Constant { * 无水 */ public static final String NO_WATER = "无水"; + + //车辆识别摄像头相关 + /** + * 心跳 + */ + public static final String HEART_BEAT = "heartbeat"; + /** + * 在线获取数据 + */ + public static final String ONLINE = "online"; } diff --git a/logistics/src/main/java/com/ccsens/logistics/api/CarIdentificationController.java b/logistics/src/main/java/com/ccsens/logistics/api/CarIdentificationController.java new file mode 100644 index 00000000..9ab42eed --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/api/CarIdentificationController.java @@ -0,0 +1,35 @@ +package com.ccsens.logistics.api; + +import com.alibaba.fastjson.JSONObject; + +import com.ccsens.logistics.service.ICarIdentificationService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @author 马 + */ +@Slf4j +@Api(tags = "车辆识别摄像头相关") +@RestController +@RequestMapping("/carIdentification") +public class CarIdentificationController { + @Resource + private ICarIdentificationService carIdentificationService; + + @ApiOperation(value = "车辆识别摄像头数据对接", notes = "mz:车辆识别摄像头数据对接") + @RequestMapping(value = "/addCarRecord", method = RequestMethod.POST ,produces = {"application/json;charset=UTF-8"}) + public JSONObject addCarRecord(HttpServletResponse httpServletResponse, @RequestParam Map param) { + log.info("车辆识别摄像头数据对接：{}",param); + JSONObject jsonObject = carIdentificationService.addCarInformation(httpServletResponse, param); + log.info("车辆识别摄像头数据对接:{}",jsonObject); + return jsonObject; + } +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarIdentificationDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarIdentificationDto.java new file mode 100644 index 00000000..b5c0bdbb --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarIdentificationDto.java @@ -0,0 +1,51 @@ +package com.ccsens.logistics.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class CarIdentificationDto { + @Data + @ApiModel("车辆识别摄像头提供的信息") + public static class AddCarInformation{ + @ApiModelProperty("online 表示正常在线传输结果,offline表示断网续传结果") + private String type; + @ApiModelProperty("协议模式") + private Integer mode; + @ApiModelProperty("车牌号码") + private String plate_num; + @ApiModelProperty("车牌底色") + private String plate_color; + @ApiModelProperty("虚假车牌信息,true为真牌,false为假牌") + private Boolean plate_val; + @ApiModelProperty("置信度，范围：0-28") + private Integer confidence; + @ApiModelProperty("车辆品牌") + private String car_logo; + @ApiModelProperty("车辆颜色") + private String car_color; + @ApiModelProperty("车辆类型") + private String vehicle_type; + @ApiModelProperty("车牌识别时间,时间戳:秒") + private Long start_time; + @ApiModelProperty("车场id") + private String park_id; + @ApiModelProperty("相机ip") + private String cam_ip; + @ApiModelProperty("出入口类型:in表示入口，out表示出口") + private String vdc_type; + @ApiModelProperty("是否白名单车辆:true表示白名单,false表示非白名单") + private String is_whitelist; + @ApiModelProperty("video 表示视频触发，hwtriger 表示地感触发swtriger 表示软触发") + private String triger_type; + @ApiModelProperty("全景图，BASE64 编码") + private String picture; + @ApiModelProperty("车牌特写图") + private String closeup_pic; + + } +} diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java index 91ab08b0..d1ff847d 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/dto/CarRecordDto.java @@ -16,7 +16,7 @@ public class CarRecordDto { @ApiModelProperty("记录时间") private Long recordTime; @ApiModelProperty("车型(0-小型车,1-中型车,2-大型车)") - private Byte carType; + private String carType; @ApiModelProperty("进出类型(0-进,1-出)") private Byte inOut; @ApiModelProperty("车牌号") diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecord.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecord.java index 89838737..77ce0fbe 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecord.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecord.java @@ -6,11 +6,11 @@ import java.util.Date; public class LogisticsCarRecord implements Serializable { private Long id; - private Byte carType; + private String carType; private String licensePlate; - private Byte plateType; + private String plateType; private String filesId; @@ -20,6 +20,12 @@ public class LogisticsCarRecord implements Serializable { private String carBrand; + private String picture; + + private String closeupPic; + + private String camId; + private Long warehouseId; private Long recordTime; @@ -40,12 +46,12 @@ public class LogisticsCarRecord implements Serializable { this.id = id; } - public Byte getCarType() { + public String getCarType() { return carType; } - public void setCarType(Byte carType) { - this.carType = carType; + public void setCarType(String carType) { + this.carType = carType == null ? null : carType.trim(); } public String getLicensePlate() { @@ -56,12 +62,12 @@ public class LogisticsCarRecord implements Serializable { this.licensePlate = licensePlate == null ? null : licensePlate.trim(); } - public Byte getPlateType() { + public String getPlateType() { return plateType; } - public void setPlateType(Byte plateType) { - this.plateType = plateType; + public void setPlateType(String plateType) { + this.plateType = plateType == null ? null : plateType.trim(); } public String getFilesId() { @@ -96,6 +102,30 @@ public class LogisticsCarRecord implements Serializable { this.carBrand = carBrand == null ? null : carBrand.trim(); } + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture == null ? null : picture.trim(); + } + + public String getCloseupPic() { + return closeupPic; + } + + public void setCloseupPic(String closeupPic) { + this.closeupPic = closeupPic == null ? null : closeupPic.trim(); + } + + public String getCamId() { + return camId; + } + + public void setCamId(String camId) { + this.camId = camId == null ? null : camId.trim(); + } + public Long getWarehouseId() { return warehouseId; } @@ -150,6 +180,9 @@ public class LogisticsCarRecord implements Serializable { sb.append(", carWeight=").append(carWeight); sb.append(", inOut=").append(inOut); sb.append(", carBrand=").append(carBrand); + sb.append(", picture=").append(picture); + sb.append(", closeupPic=").append(closeupPic); + sb.append(", camId=").append(camId); sb.append(", warehouseId=").append(warehouseId); sb.append(", recordTime=").append(recordTime); sb.append(", createdAt=").append(createdAt); diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecordExample.java b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecordExample.java index 15ba5033..b7093ba3 100644 --- a/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecordExample.java +++ b/logistics/src/main/java/com/ccsens/logistics/bean/po/LogisticsCarRecordExample.java @@ -175,52 +175,62 @@ public class LogisticsCarRecordExample { return (Criteria) this; } - public Criteria andCarTypeEqualTo(Byte value) { + public Criteria andCarTypeEqualTo(String value) { addCriterion("car_type =", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeNotEqualTo(Byte value) { + public Criteria andCarTypeNotEqualTo(String value) { addCriterion("car_type <>", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeGreaterThan(Byte value) { + public Criteria andCarTypeGreaterThan(String value) { addCriterion("car_type >", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andCarTypeGreaterThanOrEqualTo(String value) { addCriterion("car_type >=", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeLessThan(Byte value) { + public Criteria andCarTypeLessThan(String value) { addCriterion("car_type <", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeLessThanOrEqualTo(Byte value) { + public Criteria andCarTypeLessThanOrEqualTo(String value) { addCriterion("car_type <=", value, "carType"); return (Criteria) this; } - public Criteria andCarTypeIn(List values) { + public Criteria andCarTypeLike(String value) { + addCriterion("car_type like", value, "carType"); + return (Criteria) this; + } + + public Criteria andCarTypeNotLike(String value) { + addCriterion("car_type not like", value, "carType"); + return (Criteria) this; + } + + public Criteria andCarTypeIn(List values) { addCriterion("car_type in", values, "carType"); return (Criteria) this; } - public Criteria andCarTypeNotIn(List values) { + public Criteria andCarTypeNotIn(List values) { addCriterion("car_type not in", values, "carType"); return (Criteria) this; } - public Criteria andCarTypeBetween(Byte value1, Byte value2) { + public Criteria andCarTypeBetween(String value1, String value2) { addCriterion("car_type between", value1, value2, "carType"); return (Criteria) this; } - public Criteria andCarTypeNotBetween(Byte value1, Byte value2) { + public Criteria andCarTypeNotBetween(String value1, String value2) { addCriterion("car_type not between", value1, value2, "carType"); return (Criteria) this; } @@ -305,52 +315,62 @@ public class LogisticsCarRecordExample { return (Criteria) this; } - public Criteria andPlateTypeEqualTo(Byte value) { + public Criteria andPlateTypeEqualTo(String value) { addCriterion("plate_type =", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeNotEqualTo(Byte value) { + public Criteria andPlateTypeNotEqualTo(String value) { addCriterion("plate_type <>", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeGreaterThan(Byte value) { + public Criteria andPlateTypeGreaterThan(String value) { addCriterion("plate_type >", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andPlateTypeGreaterThanOrEqualTo(String value) { addCriterion("plate_type >=", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeLessThan(Byte value) { + public Criteria andPlateTypeLessThan(String value) { addCriterion("plate_type <", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeLessThanOrEqualTo(Byte value) { + public Criteria andPlateTypeLessThanOrEqualTo(String value) { addCriterion("plate_type <=", value, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeIn(List values) { + public Criteria andPlateTypeLike(String value) { + addCriterion("plate_type like", value, "plateType"); + return (Criteria) this; + } + + public Criteria andPlateTypeNotLike(String value) { + addCriterion("plate_type not like", value, "plateType"); + return (Criteria) this; + } + + public Criteria andPlateTypeIn(List values) { addCriterion("plate_type in", values, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeNotIn(List values) { + public Criteria andPlateTypeNotIn(List values) { addCriterion("plate_type not in", values, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeBetween(Byte value1, Byte value2) { + public Criteria andPlateTypeBetween(String value1, String value2) { addCriterion("plate_type between", value1, value2, "plateType"); return (Criteria) this; } - public Criteria andPlateTypeNotBetween(Byte value1, Byte value2) { + public Criteria andPlateTypeNotBetween(String value1, String value2) { addCriterion("plate_type not between", value1, value2, "plateType"); return (Criteria) this; } @@ -615,6 +635,216 @@ public class LogisticsCarRecordExample { return (Criteria) this; } + public Criteria andPictureIsNull() { + addCriterion("picture is null"); + return (Criteria) this; + } + + public Criteria andPictureIsNotNull() { + addCriterion("picture is not null"); + return (Criteria) this; + } + + public Criteria andPictureEqualTo(String value) { + addCriterion("picture =", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureNotEqualTo(String value) { + addCriterion("picture <>", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureGreaterThan(String value) { + addCriterion("picture >", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureGreaterThanOrEqualTo(String value) { + addCriterion("picture >=", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureLessThan(String value) { + addCriterion("picture <", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureLessThanOrEqualTo(String value) { + addCriterion("picture <=", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureLike(String value) { + addCriterion("picture like", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureNotLike(String value) { + addCriterion("picture not like", value, "picture"); + return (Criteria) this; + } + + public Criteria andPictureIn(List values) { + addCriterion("picture in", values, "picture"); + return (Criteria) this; + } + + public Criteria andPictureNotIn(List values) { + addCriterion("picture not in", values, "picture"); + return (Criteria) this; + } + + public Criteria andPictureBetween(String value1, String value2) { + addCriterion("picture between", value1, value2, "picture"); + return (Criteria) this; + } + + public Criteria andPictureNotBetween(String value1, String value2) { + addCriterion("picture not between", value1, value2, "picture"); + return (Criteria) this; + } + + public Criteria andCloseupPicIsNull() { + addCriterion("closeup_pic is null"); + return (Criteria) this; + } + + public Criteria andCloseupPicIsNotNull() { + addCriterion("closeup_pic is not null"); + return (Criteria) this; + } + + public Criteria andCloseupPicEqualTo(String value) { + addCriterion("closeup_pic =", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicNotEqualTo(String value) { + addCriterion("closeup_pic <>", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicGreaterThan(String value) { + addCriterion("closeup_pic >", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicGreaterThanOrEqualTo(String value) { + addCriterion("closeup_pic >=", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicLessThan(String value) { + addCriterion("closeup_pic <", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicLessThanOrEqualTo(String value) { + addCriterion("closeup_pic <=", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicLike(String value) { + addCriterion("closeup_pic like", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicNotLike(String value) { + addCriterion("closeup_pic not like", value, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicIn(List values) { + addCriterion("closeup_pic in", values, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicNotIn(List values) { + addCriterion("closeup_pic not in", values, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicBetween(String value1, String value2) { + addCriterion("closeup_pic between", value1, value2, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCloseupPicNotBetween(String value1, String value2) { + addCriterion("closeup_pic not between", value1, value2, "closeupPic"); + return (Criteria) this; + } + + public Criteria andCamIdIsNull() { + addCriterion("cam_id is null"); + return (Criteria) this; + } + + public Criteria andCamIdIsNotNull() { + addCriterion("cam_id is not null"); + return (Criteria) this; + } + + public Criteria andCamIdEqualTo(String value) { + addCriterion("cam_id =", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdNotEqualTo(String value) { + addCriterion("cam_id <>", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdGreaterThan(String value) { + addCriterion("cam_id >", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdGreaterThanOrEqualTo(String value) { + addCriterion("cam_id >=", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdLessThan(String value) { + addCriterion("cam_id <", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdLessThanOrEqualTo(String value) { + addCriterion("cam_id <=", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdLike(String value) { + addCriterion("cam_id like", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdNotLike(String value) { + addCriterion("cam_id not like", value, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdIn(List values) { + addCriterion("cam_id in", values, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdNotIn(List values) { + addCriterion("cam_id not in", values, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdBetween(String value1, String value2) { + addCriterion("cam_id between", value1, value2, "camId"); + return (Criteria) this; + } + + public Criteria andCamIdNotBetween(String value1, String value2) { + addCriterion("cam_id not between", value1, value2, "camId"); + return (Criteria) this; + } + public Criteria andWarehouseIdIsNull() { addCriterion("warehouse_id is null"); return (Criteria) this; diff --git a/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarIdentificationVo.java b/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarIdentificationVo.java new file mode 100644 index 00000000..6a67ca53 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/bean/vo/CarIdentificationVo.java @@ -0,0 +1,20 @@ +package com.ccsens.logistics.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author 马 + */ +@Data +public class CarIdentificationVo { + @Data + @ApiModel(value = "手动添加车辆记录") + public static class Answer{ + @ApiModelProperty("分组id") + private String error_num; + @ApiModelProperty("分组名称") + private String error_str; + } +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/CarIdentificationService.java b/logistics/src/main/java/com/ccsens/logistics/service/CarIdentificationService.java new file mode 100644 index 00000000..12c2d3c9 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/CarIdentificationService.java @@ -0,0 +1,80 @@ +package com.ccsens.logistics.service; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Snowflake; +import com.alibaba.fastjson.JSONObject; +import com.ccsens.logistics.bean.dto.CarIdentificationDto; +import com.ccsens.logistics.Util.Constant; +import com.ccsens.logistics.bean.po.LogisticsCarRecord; +import com.ccsens.logistics.persist.dao.LogisticsCarRecordDao; +import com.ccsens.util.Base64FileUtil; +import com.ccsens.util.PropUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @author 马 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class CarIdentificationService implements ICarIdentificationService{ + + @Resource + private LogisticsCarRecordDao carRecordDao; + @Resource + private Snowflake snowflake; + + @Override + public JSONObject addCarInformation(HttpServletResponse httpServletResponse, Map param) { + try { + System.out.println(param.get("type")); + JSONObject jsonObject = new JSONObject(); + switch (param.get("type")){ + case Constant.HEART_BEAT: + jsonObject.put("error_num","0"); + jsonObject.put("error_str","无"); + //设置响应头 + httpServletResponse.addHeader("Content-Length",String.valueOf(jsonObject.toJSONString().getBytes().length)); + return jsonObject; + case Constant.ONLINE: + LogisticsCarRecord carRecord = new LogisticsCarRecord(); + carRecord.setId(snowflake.nextId()); + carRecord.setInOut("in".equals(param.get("vdc_type"))?(byte)0:(byte)1); + carRecord.setCarType(param.get("vehicle_type")); + carRecord.setLicensePlate(param.get("plate_num")); + carRecord.setPlateType(param.get("plate_color")); + carRecord.setCamId(param.get("cam_id")); + carRecord.setRecordTime(Long.parseLong(param.get("start_time"))*1000); + String pictureBase64 = param.get("picture"); + + String newPictureBase64 = pictureBase64.replace(".", "=").replace("_", "/").replace("-", "+"); + + String pictureUrl = Base64FileUtil.base64ToFile("data:image/png;base64,"+newPictureBase64,PropUtil.path, "/file/" + DateUtil.today() + "/"); + + carRecord.setPicture(pictureUrl); + carRecordDao.insertSelective(carRecord); + jsonObject.put("error_num","0"); + jsonObject.put("error_str","无"); + //设置响应头 + httpServletResponse.addHeader("Content-Length",String.valueOf(jsonObject.toJSONString().getBytes().length)); + return jsonObject; + default: + break; + } + return new JSONObject(); + }catch (Exception e){ + log.info("车辆识别获取异常异常",e); + } + + return null; + } + + +} diff --git a/logistics/src/main/java/com/ccsens/logistics/service/ICarIdentificationService.java b/logistics/src/main/java/com/ccsens/logistics/service/ICarIdentificationService.java new file mode 100644 index 00000000..5bd54a43 --- /dev/null +++ b/logistics/src/main/java/com/ccsens/logistics/service/ICarIdentificationService.java @@ -0,0 +1,20 @@ +package com.ccsens.logistics.service; + +import com.alibaba.fastjson.JSONObject; + + +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @author 马 + */ +public interface ICarIdentificationService { + /** + * 车辆识别摄像头返回数据 + * @param httpServletResponse 响应 + * @param param 摄像头返回参数 + * @return 响应的json + */ + JSONObject addCarInformation(HttpServletResponse httpServletResponse, Map param); +} diff --git a/logistics/src/main/resources/application-dev.yml b/logistics/src/main/resources/application-dev.yml index 01305b20..ee424648 100644 --- a/logistics/src/main/resources/application-dev.yml +++ b/logistics/src/main/resources/application-dev.yml @@ -2,6 +2,9 @@ server: port: 7170 servlet: context-path: + #车辆识别摄像头请求数据过大,设置jetty,默认2m,现为9m + jetty: + max-http-post-size: 9000000 spring: application: name: logistics diff --git a/logistics/src/main/resources/application-prod.yml b/logistics/src/main/resources/application-prod.yml index e3339878..8bd07275 100644 --- a/logistics/src/main/resources/application-prod.yml +++ b/logistics/src/main/resources/application-prod.yml @@ -2,6 +2,9 @@ server: port: 7170 servlet: context-path: + #车辆识别摄像头请求数据过大,设置jetty,默认2m,现为9m + jetty: + max-http-post-size: 9000000 spring: application: name: logistics diff --git a/logistics/src/main/resources/application-test.yml b/logistics/src/main/resources/application-test.yml index 517e73f5..b01bb267 100644 --- a/logistics/src/main/resources/application-test.yml +++ b/logistics/src/main/resources/application-test.yml @@ -2,6 +2,9 @@ server: port: 7170 servlet: context-path: + #车辆识别摄像头请求数据过大,设置jetty,默认2m,现为9m + jetty: + max-http-post-size: 9000000 spring: application: name: logistics diff --git a/logistics/src/main/resources/application.yml b/logistics/src/main/resources/application.yml index ea3545e5..7e037ef8 100644 --- a/logistics/src/main/resources/application.yml +++ b/logistics/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common,util-prod + active: dev + include: common,util-dev diff --git a/logistics/src/main/resources/mapper_raw/LogisticsCarRecordMapper.xml b/logistics/src/main/resources/mapper_raw/LogisticsCarRecordMapper.xml index fc70fc1c..e0cde60c 100644 --- a/logistics/src/main/resources/mapper_raw/LogisticsCarRecordMapper.xml +++ b/logistics/src/main/resources/mapper_raw/LogisticsCarRecordMapper.xml @@ -3,13 +3,16 @@ - + - + + + + @@ -76,7 +79,8 @@ id, car_type, license_plate, plate_type, files_id, car_weight, in_out, car_brand, - warehouse_id, record_time, created_at, updated_at, rec_status + picture, closeup_pic, cam_id, warehouse_id, record_time, created_at, updated_at, + rec_status