diff --git a/shapelight-admin/src/main/java/net/shapelight/common/config/TomcatConfig.java b/shapelight-admin/src/main/java/net/shapelight/common/config/TomcatConfig.java new file mode 100644 index 0000000..44f00c8 --- /dev/null +++ b/shapelight-admin/src/main/java/net/shapelight/common/config/TomcatConfig.java @@ -0,0 +1,31 @@ +package net.shapelight.common.config; + + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import org.apache.catalina.connector.Connector; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; + +@Configuration +public class TomcatConfig { + +// @Value("${server.http.port}") +// private int httpPort; + + @Value("${http.port}") + private Integer port; + + @Bean + public ServletWebServerFactory servletContainer() { + TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); + // 配置http + Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); + connector.setPort(port); + + tomcat.addAdditionalTomcatConnectors(connector); // 添加http + return tomcat; + } +} diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java index 1a71f89..0903068 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java @@ -9,6 +9,13 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import net.shapelight.common.utils.R; +import net.shapelight.modules.ten.entity.TenCarEntity; +import net.shapelight.modules.ten.entity.TenPackRecordEntity; +import net.shapelight.modules.ten.entity.TenRecordEntity; +import net.shapelight.modules.ten.service.TenCarService; +import net.shapelight.modules.ten.service.TenPackRecordService; +import net.shapelight.modules.ten.service.TenRecordService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -22,24 +29,99 @@ import java.util.Map; @Slf4j public class CarOpenApi { + @Autowired + private TenCarService tenCarService; + @Autowired + private TenPackRecordService tenPackRecordService; + @PostMapping("/getMsg/{cellId}") @ApiOperation(value = "获取Msg") @ApiImplicitParams({ - @ApiImplicitParam(name="sn",value = "设备SN",paramType = "query",dataType = "String",required = true), + @ApiImplicitParam(name = "sn", value = "设备SN", paramType = "query", dataType = "String", required = true), }) - public R getMsg(@PathVariable("cellId") Long cellId,@RequestParam Map params){ + public R getMsg(@PathVariable("cellId") Long cellId, @RequestParam Map params) { - JSONObject msgJson = JSONObject.parseObject((String)params.get("Msg")); - switch ((Integer) msgJson.get("command")){ - case 1://1-主动上传进出记录， - break; - case 13://13-主动上传车辆信息 - break; - case 19://19-主动上传本地修改车辆信息 - break; - case 20://20-主动上传本地注销车辆信息 + JSONObject msgJson = JSONObject.parseObject((String) params.get("Msg")); + int cmd = msgJson.getInteger("command"); + /* + Msg='{"workstationid":1, + "message":"", + "VLP":"粤B66666", + "position":"0","method":"","username":"test", + "Ctypename":"月租车","model":"MAGOTAN","balance":"0.05", + "registertime":"2017-05-25","status":1,"vehiclename":"张三", + "parkid":1, "vehiclenumber":"1234567890123456789012", + "certificate":"12345678901234567","Vtypename":"小型车", + "result":0,"cardsn":"12","telephone":"13800000000", + "Vtype":1,"address":"深圳市龙华区民治街道","receivablefee":"0.00", + "password":"d41d8cd98f00b204e9800998ecf8427e","endtime": + "2017-06-24","command":13,"deposit":"0","mode":0,"color":"黑色","code":0, + "recordid":0,"Ctype":2,"starttime":"2017-05-25","actualfee":"0.00"}' + */ + if (cmd == 13 || cmd == 19 || cmd == 20) { + TenCarEntity car = new TenCarEntity(); + car.setCellId(cellId); + car.setVlp(msgJson.getString("VLP")); + car.setVehicleName(msgJson.getString("vehiclename")); + car.setCertificate(msgJson.getString("certificate")); + car.setColor(msgJson.getString("color")); + car.setCTypeName(msgJson.getString("Ctypename")); + car.setVTypeName(msgJson.getString("Vtypename")); + car.setRegisterTime(msgJson.getDate("registertime")); + car.setStartTime(msgJson.getDate("starttime")); + car.setEndTime(msgJson.getDate("endtime")); + car.setParkName(msgJson.getString("parkname")); + car.setTelephone(msgJson.getString("telephone")); + tenCarService.saveOrUpdate(car); + } + /* + Msg= '{"outtime":"2017-04-19 23:21:45","workstationid":1, + VLP":"粤B12345"," username ":"test","method":"","Ctypename":"临时车","channeltype":0, + "operator":"管理员","inpicture1":"","direction":0,"password":"d41d8cd98f00b204e9800998ecf8427e", + "parkid":1,"inVLP":"","remainspace":100,"outchannel":2,"Vtypename":"小型车","cardsn":"116021386901", + "inchannelname":"停车场入口","outchannelname":"停车场入口","Vtype":1,"receivablefee":"5.00","command":1, + "outpicture":"","inchannel":1,"totalspace":100,"intime":"2017-04-19 23:21:45","mode":0,"code":1, + "recordid":70,"Ctype":3,"inpicture":"","actualfee":"5.00","consumefee":"0.00", + "consumetime":"2017-04-19 23:21:45","consumecode":"0","consumename":""} ' + */ + else if (cmd == 1 || cmd == 2) { //识别记录 + TenPackRecordEntity record = new TenPackRecordEntity(); - } + record.setParkId(msgJson.getString("parkid")); + record.setRecordId(msgJson.getString("recordid")); + + record.setCellId(cellId); + record.setVlp(msgJson.getString("VLP")); + record.setCTypeName(msgJson.getString("Ctypename")); + record.setVTypeName(msgJson.getString("Vtypename")); + record.setOperator(msgJson.getString("operator")); + record.setDirection(msgJson.getInteger("direction")); + if (cmd ==1) { + record.setInChannelName(msgJson.getString("inchannelname")); + record.setInTime(msgJson.getDate("intime")); + record.setInPicture(msgJson.getString("inpicture")); + record.setInPictureBase64(msgJson.getString("inpicturedata")); + record.setInPicturePlate(msgJson.getString("inpicture1")); + record.setInPicturePlateBase64(msgJson.getString("inpicturedata1")); + + } + record.setOutChannelName(msgJson.getString("outchannelname")); + record.setOutTime(msgJson.getDate("outtime")); + record.setOutPicture(msgJson.getString("outpicture")); + record.setOutPictureBase64(msgJson.getString("outpicturedata")); + record.setOutPicturePlate(msgJson.getString("outpicture1")); + record.setOutPicturePlateBase64(msgJson.getString("outpicturedata1")); + + record.setInVlp(msgJson.getString("inVLP")); + record.setParkName(msgJson.getString("parkname")); + + record.setReceivableFee(msgJson.getString("receivablefee")); + record.setActualFee(msgJson.getString("actualfee")); + + tenPackRecordService.saveOrUpdateByRecordId(record); + + + } return R.ok(); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/dev/controller/DeviceController.java b/shapelight-admin/src/main/java/net/shapelight/modules/dev/controller/DeviceController.java index c2e4056..081f222 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/dev/controller/DeviceController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/dev/controller/DeviceController.java @@ -315,6 +315,8 @@ public class DeviceController { @ApiImplicitParam(name="recordFaceStr",value = "识别照片base64",paramType = "query",dataType = "String",required = true), }) public R upRecord(@RequestBody TenRecordEntity record){ + //log.error("识别记录："+record.getDeviceSn()+"-"+record.getMemberId()+"-"+record.getRecordTime()); + TenDeviceEntity dev = tenDeviceService.findBySn(record.getDeviceSn()); if (dev==null) { return R.error("设备未绑定"); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java index cfd9fd6..2c180ec 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java @@ -73,45 +73,45 @@ public class TenPackRecordController extends AbstractController { /** * 信息 */ - @GetMapping("/info/{recordId}/{cellId}") - @RequiresPermissions("ten:packrecord") -// @ApiOperation(value = "查询单个记录") - public R info(@PathVariable("recordId") Long recordId,@PathVariable("cellId") Long cellId){ - TenPackRecordEntity tenPackRecord = tenPackRecordService.getById(recordId,cellId); - - return R.ok().put("data", tenPackRecord); - } +// @GetMapping("/info/{recordId}/{cellId}") +// @RequiresPermissions("ten:packrecord") +//// @ApiOperation(value = "查询单个记录") +// public R info(@PathVariable("recordId") Long recordId,@PathVariable("cellId") Long cellId){ +// TenPackRecordEntity tenPackRecord = tenPackRecordService.getById(recordId,cellId); +// +// return R.ok().put("data", tenPackRecord); +// } /** * 保存 */ - @PostMapping("/save") - @RequiresPermissions("ten:packrecord") - public R save(@RequestBody TenPackRecordEntity tenPackRecord){ - tenPackRecordService.save(tenPackRecord); - - return R.ok(); - } +// @PostMapping("/save") +// @RequiresPermissions("ten:packrecord") +// public R save(@RequestBody TenPackRecordEntity tenPackRecord){ +// tenPackRecordService.save(tenPackRecord); +// +// return R.ok(); +// } /** * 修改 */ - @PostMapping("/update") - @RequiresPermissions("ten:packrecord") - public R update(@RequestBody TenPackRecordEntity tenPackRecord){ - tenPackRecordService.updateById(tenPackRecord); - - return R.ok(); - } +// @PostMapping("/update") +// @RequiresPermissions("ten:packrecord") +// public R update(@RequestBody TenPackRecordEntity tenPackRecord){ +// tenPackRecordService.updateById(tenPackRecord); +// +// return R.ok(); +// } /** * 删除 */ - @PostMapping("/delete") - @RequiresPermissions("ten:packrecord") - public R delete(@RequestBody Long[] recordIds){ -// tenPackRecordService.removeByIds(Arrays.asList(recordIds)); - return R.ok(); - } +// @PostMapping("/delete") +// @RequiresPermissions("ten:packrecord") +// public R delete(@RequestBody Long[] recordIds){ +//// tenPackRecordService.removeByIds(Arrays.asList(recordIds)); +// return R.ok(); +// } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenCarDao.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenCarDao.java index b7ce97b..d363fc1 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenCarDao.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenCarDao.java @@ -22,6 +22,7 @@ public interface TenCarDao { // int logicDeleteById(@Param("carId")Long roomId,@Param("cellId")Long cellId); int updateById(TenCarEntity entity); TenCarEntity selectById(@Param("carId")Long id, @Param("cellId")Long cellId); + TenCarEntity selectByVlp(@Param("vlp")String vlp, @Param("cellId")Long cellId); IPage findPageAll(Page page, @Param("cellIds") List cellIds, @Param("params") Map params); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPackRecordDao.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPackRecordDao.java index 3f0b24e..52dcad4 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPackRecordDao.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPackRecordDao.java @@ -18,10 +18,10 @@ import java.util.Map; public interface TenPackRecordDao { int insert(TenPackRecordEntity tenPackRecordEntity); - int deleteById(@Param("recordId")Long id, @Param("cellId")Long cellId); - // int logicDeleteById(@Param("carId")Long roomId,@Param("cellId")Long cellId); +// int deleteById(@Param("recordId")Long id, @Param("cellId")Long cellId); +// int logicDeleteById(@Param("carId")Long roomId,@Param("cellId")Long cellId); int updateById(TenPackRecordEntity entity); - TenPackRecordEntity selectById(@Param("recordId")Long id, @Param("cellId")Long cellId); + TenPackRecordEntity selectByRecordIdAndPackId(@Param("recordId")String recordId, @Param("parkId")String parkId,@Param("cellId")Long cellId); IPage findPageAll(Page page, @Param("cellIds") List cellIds, @Param("params") Map params); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCarEntity.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCarEntity.java index 619b043..41b8b06 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCarEntity.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCarEntity.java @@ -7,10 +7,103 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +// +///** +// * 车辆表 +// * +// */ +//@Data +////@TableName("ten_car") +//public class TenCarEntity implements Serializable { +// private static final long serialVersionUID = 1L; +// +// /** +// * id +// */ +// @TableId +// @ApiModelProperty("ID") +// private Long carId; +// /** +// * 车牌号 +// */ +// @ApiModelProperty("车牌号") +// private String plate; +// /** +// * 关联人员 +// */ +// @ApiModelProperty("住户ID") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long personId; +// /** +// * 联系电话 +// */ +// @ApiModelProperty("联系电话") +// private String linkMobile; +// /** +// * 品牌 +// */ +// @ApiModelProperty("品牌") +// private String brand; +// /** +// * 子品牌 +// */ +// @ApiModelProperty("子品牌") +// private String brandSub; +// /** +// * 停车类型1月租车2临时车 +// */ +// @ApiModelProperty("停车类型1月租车2临时车") +// private Integer parkType; +// /** +// * 备注 +// */ +// @ApiModelProperty("备注") +// private String remark; +// /** +// * 2蓝牌88新能源 +// */ +// @ApiModelProperty("2蓝牌88新能源") +// private Integer plateType; +// /** +// * 1蓝2白3黑4黄5其他6绿7绿黄 +// */ +// @ApiModelProperty("1蓝2白3黑4黄5其他6绿7绿黄") +// private Integer plateColor; +// /** +// * 5小型汽车7普通二轮摩托车9其他 +// */ +// @ApiModelProperty("5小型汽车7普通二轮摩托车9其他") +// private Integer carType; +// /** +// * 1白2灰3黄10黑 +// */ +// @ApiModelProperty("1白2灰3黄10黑") +// private Integer carColor; +// /** +// * 图片 +// */ +// @ApiModelProperty("图片") +// private String picture; +// /** +// * 小区id +// */ +// @JsonSerialize(using = ToStringSerializer.class) +// @ApiModelProperty("小区id") +// private Long cellId; +// +// @TableField(exist=false) +// @ApiModelProperty("住户") +// private TenPersonEntity person; +// +//} +// +// +// /** * 车辆表 @@ -31,63 +124,75 @@ public class TenCarEntity implements Serializable { * 车牌号 */ @ApiModelProperty("车牌号") - private String plate; - /** - * 关联人员 - */ - @ApiModelProperty("住户ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long personId; - /** - * 联系电话 - */ - @ApiModelProperty("联系电话") - private String linkMobile; - /** - * 品牌 - */ - @ApiModelProperty("品牌") - private String brand; - /** - * 子品牌 - */ - @ApiModelProperty("子品牌") - private String brandSub; - /** - * 停车类型1月租车2临时车 - */ - @ApiModelProperty("停车类型1月租车2临时车") - private Integer parkType; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String remark; - /** - * 2蓝牌88新能源 - */ - @ApiModelProperty("2蓝牌88新能源") - private Integer plateType; - /** - * 1蓝2白3黑4黄5其他6绿7绿黄 - */ - @ApiModelProperty("1蓝2白3黑4黄5其他6绿7绿黄") - private Integer plateColor; - /** - * 5小型汽车7普通二轮摩托车9其他 - */ - @ApiModelProperty("5小型汽车7普通二轮摩托车9其他") - private Integer carType; - /** - * 1白2灰3黄10黑 - */ - @ApiModelProperty("1白2灰3黄10黑") - private Integer carColor; + private String vlp; /** * 图片 */ @ApiModelProperty("图片") private String picture; + /** + * 车辆类别 + */ + @ApiModelProperty("车辆类别") + private String cTypeName; + /** + * 车辆类型 + */ + @ApiModelProperty("车辆类型") + private String vTypeName; + /** + * 车主姓名 + */ + @ApiModelProperty("车主姓名") + private String vehicleName; + /** + * 车主证件号 + */ + @ApiModelProperty("车主证件号") + private String certificate; + /** + * 车主电话 + */ + @ApiModelProperty("车主电话") + private String telephone; + /** + * 注册时间 + */ + @ApiModelProperty("注册时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date registerTime; + /** + * 注销时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("注销时间") + private Date refundTime; + /** + * 车辆颜色 + */ + @ApiModelProperty("车辆颜色") + private String color; + /** + * 停车场名称 + */ + @ApiModelProperty("停车场名称") + private String parkName; + /** + * 开始时间 + */ + @ApiModelProperty("开始时间") + private Date startTime; + /** + * 结束时间 + */ + @ApiModelProperty("结束时间") + private Date endTime; + /** + * 关联人员 + */ + @ApiModelProperty("关联人员") + @JsonSerialize(using = ToStringSerializer.class) + private Long personId; /** * 小区id */ @@ -99,4 +204,9 @@ public class TenCarEntity implements Serializable { @ApiModelProperty("住户") private TenPersonEntity person; + + @ApiModelProperty("小区名称") + private String cellName; + } + diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPackRecordEntity.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPackRecordEntity.java index 3bc4199..7a14350 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPackRecordEntity.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPackRecordEntity.java @@ -1,16 +1,115 @@ package net.shapelight.modules.ten.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; +///** +// * 停车记录表 +// * +// */ +//@Data +////@TableName("ten_pack_record") +//public class TenPackRecordEntity implements Serializable { +// private static final long serialVersionUID = 1L; +// +// /** +// * id +// */ +// @TableId +// @ApiModelProperty("id") +// private Long recordId; +// /** +// * 工作人员id +// */ +// @ApiModelProperty("工作人员id") +// private Integer workerId; +// /** +// * 车id +// */ +// @ApiModelProperty("车id") +// private Long carId; +// /** +// * 入场车牌号 +// */ +// @ApiModelProperty("入场车牌号") +// private String inPlate; +// /** +// * 入场时间 +// */ +// @ApiModelProperty("入场时间") +// private Date inTime; +// /** +// * 入场闸机id +// */ +// @ApiModelProperty("入场闸机id") +// private Long inGateId; +// /** +// * 入场照片 +// */ +// @ApiModelProperty("入场照片") +// private String inPicture; +// /** +// * 出场车牌号 +// */ +// @ApiModelProperty("出场车牌号") +// private String outPlate; +// /** +// * 出场时间 +// */ +// @ApiModelProperty("出场时间") +// private Date outTime; +// /** +// * 出场闸机id +// */ +// @ApiModelProperty("出场闸机id") +// private Long outGateId; +// /** +// * 出场照片 +// */ +// @ApiModelProperty("出场照片") +// private String outPicture; +// /** +// * 收费时间 +// */ +// @ApiModelProperty("收费时间") +// private Date collectionTime; +// /** +// * 应收金额（分） +// */ +// @ApiModelProperty("应收金额（分）") +// private Integer receivableAmount; +// /** +// * 实收金额（分） +// */ +// @ApiModelProperty("实收金额（分）") +// private Integer collectAmount; +// /** +// * 备注 +// */ +// @ApiModelProperty("备注") +// private String mark; +// /** +// * 小区id +// */ +// @JsonSerialize(using = ToStringSerializer.class) +// @ApiModelProperty("小区id") +// private Long cellId; + + + + + /** * 停车记录表 * @@ -21,86 +120,128 @@ public class TenPackRecordEntity implements Serializable { private static final long serialVersionUID = 1L; /** - * id + * 记录id */ @TableId - @ApiModelProperty("id") - private Long recordId; + @ApiModelProperty("记录id") + private String recordId; /** - * 工作人员id + * 车厂编号 */ - @ApiModelProperty("工作人员id") - private Integer workerId; + @TableId + @ApiModelProperty("车厂") + private String parkId; /** - * 车id + * 车牌号 */ - @ApiModelProperty("车id") - private Long carId; + @ApiModelProperty("车牌号") + private String vlp; /** - * 入场车牌号 + * 车辆类型 */ - @ApiModelProperty("入场车牌号") - private String inPlate; + @ApiModelProperty("车辆类型") + private String vTypeName; /** - * 入场时间 + * 车辆类别 */ - @ApiModelProperty("入场时间") - private Date inTime; + @ApiModelProperty("车辆类别") + private String cTypeName; /** - * 入场闸机id + * 停车场名称 */ - @ApiModelProperty("入场闸机id") - private Long inGateId; + @ApiModelProperty("停车场名称") + private String parkName; /** - * 入场照片 + * 0-进场，1-出场 */ - @ApiModelProperty("入场照片") + @ApiModelProperty("0-进场，1-出场") + private Integer direction; + /** + * 进场通道名称 + */ + @ApiModelProperty("进场通道名称") + private String inChannelName; + /** + * 进场全景图 + */ + @ApiModelProperty("进场全景图") private String inPicture; /** - * 出场车牌号 + * 进场车牌图 */ - @ApiModelProperty("出场车牌号") - private String outPlate; + @ApiModelProperty("进场车牌图") + private String inPicturePlate; + /** + * 进场时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("进场时间") + private Date inTime; + /** + * 出场通道名称 + */ + @ApiModelProperty("出场通道名称") + private String outChannelName; + /** + * 出场全景图 + */ + @ApiModelProperty("出场全景图") + private String outPicture; + /** + * 出场车牌图 + */ + + @ApiModelProperty("出场车牌图") + private String outPicturePlate; /** * 出场时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("出场时间") private Date outTime; /** - * 出场闸机id + * 进场识别错误车牌 */ - @ApiModelProperty("出场闸机id") - private Long outGateId; + @ApiModelProperty("进场识别错误车牌") + private String inVlp; /** - * 出场照片 + * 应收 */ - @ApiModelProperty("出场照片") - private String outPicture; + @ApiModelProperty("应收") + private String receivableFee; /** - * 收费时间 + * 实收 */ - @ApiModelProperty("收费时间") - private Date collectionTime; + @ApiModelProperty("实收") + private String actualFee; /** - * 应收金额（分） + * 操作员 */ - @ApiModelProperty("应收金额（分）") - private Integer receivableAmount; - /** - * 实收金额（分） - */ - @ApiModelProperty("实收金额（分）") - private Integer collectAmount; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String mark; + @ApiModelProperty("操作员") + private String operator; /** * 小区id */ - @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty("小区id") + @JsonSerialize(using = ToStringSerializer.class) private Long cellId; + + @TableField(exist = false) + private String inPictureBase64; + @TableField(exist = false) + private String inPicturePlateBase64; + @TableField(exist = false) + private String outPictureBase64; + @TableField(exist = false) + private String outPicturePlateBase64; + + /** + * 小区名称 + */ + @ApiModelProperty("小区名称") + private String cellName; + + } + diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenCarService.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenCarService.java index ac24955..e089f78 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenCarService.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenCarService.java @@ -24,5 +24,8 @@ public interface TenCarService { boolean updateById(TenCarEntity entity); TenCarEntity getById(Long id,Long cellId); + TenCarEntity getByVlp(String vlp,Long cellId); + + boolean saveOrUpdate(TenCarEntity entity); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java index 0ddd7f3..80a1022 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java @@ -16,15 +16,17 @@ public interface TenPackRecordService { PageUtils queryPage(Map params); - boolean save(TenPackRecordEntity entity); +// boolean save(TenPackRecordEntity entity); - boolean removeById(Long roomId,Long cellId); +// boolean removeById(Long roomId,Long cellId); +// +// boolean removeByIdList(List> idList); - boolean removeByIdList(List> idList); +// boolean updateById(TenPackRecordEntity entity); - boolean updateById(TenPackRecordEntity entity); +// TenPackRecordEntity getById(Long id,Long cellId); - TenPackRecordEntity getById(Long id,Long cellId); + boolean saveOrUpdateByRecordId(TenPackRecordEntity entity); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCarServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCarServiceImpl.java index 67f6fed..370afaa 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCarServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCarServiceImpl.java @@ -76,6 +76,11 @@ public class TenCarServiceImpl implements TenCarService { return tenCarDao.selectById(id,cellId); } + @Override + public TenCarEntity getByVlp(String vlp, Long cellId) { + return tenCarDao.selectByVlp(vlp,cellId); + } + @Override public PageUtils queryPage(Map params) { List cellIds = new ArrayList<>(); @@ -98,15 +103,26 @@ public class TenCarServiceImpl implements TenCarService { pageParam.setSize(Long.parseLong((String)params.get("limit"))); // IPage page = tenBuildDao.findPageAll(pageParam,cellId); IPage page = tenCarDao.findPageAll(pageParam,cellIds,params); -// for(TenCarEntity car: page.getRecords()){ + for(TenCarEntity car: page.getRecords()){ // if(car.getPersonId()!=null){ // TenPersonEntity person = tenPersonService.getById(car.getPersonId(),car.getCellId()); // car.setPerson(person); // } -// } + car.setCellName(tenCellService.getCellName(car.getCellId().toString())); + } return new PageUtils(page); } - + @Override + public boolean saveOrUpdate(TenCarEntity entity) { + TenCarEntity car = getByVlp(entity.getVlp(),entity.getCellId()); + if (car ==null) { + this.save(entity); + }else{ + entity.setCarId(car.getCarId()); + this.updateById(entity); + } + return true; + } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPackRecordServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPackRecordServiceImpl.java index 00d313d..c530302 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPackRecordServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPackRecordServiceImpl.java @@ -1,24 +1,32 @@ package net.shapelight.modules.ten.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.minio.MinioClient; +import io.minio.PutObjectOptions; +import net.shapelight.common.config.GlobalValue; +import net.shapelight.common.config.MinioConfig; +import net.shapelight.common.utils.*; import net.shapelight.modules.ten.entity.TenCellEntity; import net.shapelight.modules.ten.service.TenCellService; +import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import net.shapelight.common.utils.PageUtils; -import net.shapelight.common.utils.Query; import net.shapelight.modules.ten.dao.TenPackRecordDao; import net.shapelight.modules.ten.entity.TenPackRecordEntity; import net.shapelight.modules.ten.service.TenPackRecordService; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Base64Utils; @Service("tenPackRecordService") @@ -29,51 +37,153 @@ public class TenPackRecordServiceImpl implements TenPackRecordService { private TenPackRecordDao tenPackRecordDao; @Autowired private TenCellService tenCellService; + @Autowired + private GlobalValue globalValue; + @Autowired + private MinioClient minioClient; + @Autowired + private MinioConfig minioConfig; + +// @Override +// public boolean save(TenPackRecordEntity entity) { +// int flag = tenPackRecordDao.insert(entity); +// if(flag==1){ +// return true; +// } +// return false; +// } + +// @Override +// public boolean removeById(Long carId, Long cellId) { +// int flag = tenPackRecordDao.deleteById(carId, cellId); +// if(flag==1){ +// return true; +// } +// return false; +// } + +// @Override +// @Transactional(rollbackFor = Exception.class) +// public boolean removeByIdList(List> roomIdList) { +// for(Map param: roomIdList){ +// Long roomId = Long.parseLong(param.get("carId")); +// Long cellId = Long.parseLong(param.get("cellId")); +// tenPackRecordDao.deleteById(roomId, cellId); +// } +// return true; +// } + + +// @Override +// public boolean updateById(TenPackRecordEntity entity) { +// int flag = tenPackRecordDao.updateById(entity); +// if(flag==1){ +// return true; +// } +// return false; +// } + +// @Override +// public TenPackRecordEntity getById(Long id, Long cellId) { +// return tenPackRecordDao.selectById(id,cellId); +// } + @Override - public boolean save(TenPackRecordEntity entity) { - int flag = tenPackRecordDao.insert(entity); - if(flag==1){ - return true; + public boolean saveOrUpdateByRecordId(TenPackRecordEntity vo) { +// String recordId = vo.getRecordId(); +// String parkId = vo.getParkId(); + + + //1. 进场全景图片 + if(vo.getInPictureBase64()!=null && !vo.getInPictureBase64().isEmpty()){ + String inPictureName = globalValue.getImagesDir() + "/" + + vo.getCellId().toString() + "/car/" + DateUtils.format(new Date(),DateUtils.DATE_PATTERN)+"/"+ + vo.getInPicture(); + try { + InputStream inputStream = new ByteArrayInputStream(Base64Utils.decodeFromString(vo.getInPictureBase64())); + PutObjectOptions putObjectOptions = new PutObjectOptions(inputStream.available(), -1); + putObjectOptions.setContentType("image/jpeg"); + minioClient.putObject( + minioConfig.getBucketName(), inPictureName, inputStream, putObjectOptions); + inputStream.close(); + vo.setInPicture(inPictureName); + } catch (Exception e) { + e.printStackTrace(); + } } + + + //2. 进场车牌图片 + if(vo.getInPicturePlateBase64()!=null && !vo.getInPicturePlateBase64().isEmpty()){ + + String inPicturePlateName = globalValue.getImagesDir() + "/" + + vo.getCellId().toString() + "/car/" + DateUtils.format(new Date(),DateUtils.DATE_PATTERN)+"/"+ + vo.getInPicturePlate(); + try { + InputStream inputStream = new ByteArrayInputStream(Base64Utils.decodeFromString(vo.getInPicturePlateBase64())); + PutObjectOptions putObjectOptions = new PutObjectOptions(inputStream.available(), -1); + putObjectOptions.setContentType("image/jpeg"); + minioClient.putObject( + minioConfig.getBucketName(), inPicturePlateName, inputStream, putObjectOptions); + inputStream.close(); + vo.setInPicturePlate(inPicturePlateName); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + //3. 出场全景图片 + if(vo.getOutPictureBase64()!=null && !vo.getOutPictureBase64().isEmpty()){ + + String outPictureName = globalValue.getImagesDir() + "/" + + vo.getCellId().toString() + "/car/" + DateUtils.format(new Date(),DateUtils.DATE_PATTERN)+"/"+ + vo.getOutPicture(); + try { + InputStream inputStream = new ByteArrayInputStream(Base64Utils.decodeFromString(vo.getOutPictureBase64())); + PutObjectOptions putObjectOptions = new PutObjectOptions(inputStream.available(), -1); + putObjectOptions.setContentType("image/jpeg"); + minioClient.putObject( + minioConfig.getBucketName(), outPictureName, inputStream, putObjectOptions); + inputStream.close(); + vo.setOutPicture(outPictureName); + } catch (Exception e) { + e.printStackTrace(); + } + } + + //4. 出场车牌图片 + if(vo.getOutPicturePlateBase64()!=null && !vo.getOutPicturePlateBase64().isEmpty()){ + + String outPicturePlateName = globalValue.getImagesDir() + "/" + + vo.getCellId().toString() + "/car/" + DateUtils.format(new Date(),DateUtils.DATE_PATTERN)+"/"+ + vo.getOutPicturePlate(); + try { + InputStream inputStream = new ByteArrayInputStream(Base64Utils.decodeFromString(vo.getOutPicturePlateBase64())); + PutObjectOptions putObjectOptions = new PutObjectOptions(inputStream.available(), -1); + putObjectOptions.setContentType("image/jpeg"); + minioClient.putObject( + minioConfig.getBucketName(), outPicturePlateName, inputStream, putObjectOptions); + inputStream.close(); + vo.setOutPicturePlate(outPicturePlateName); + } catch (Exception e) { + e.printStackTrace(); + } + } + + TenPackRecordEntity entity = tenPackRecordDao.selectByRecordIdAndPackId(vo.getRecordId(),vo.getParkId(),vo.getCellId()); + if(entity == null){ + tenPackRecordDao.insert(vo); + }else{ + tenPackRecordDao.updateById(vo); + } + + + return false; } - @Override - public boolean removeById(Long carId, Long cellId) { - int flag = tenPackRecordDao.deleteById(carId, cellId); - if(flag==1){ - return true; - } - return false; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public boolean removeByIdList(List> roomIdList) { - for(Map param: roomIdList){ - Long roomId = Long.parseLong(param.get("carId")); - Long cellId = Long.parseLong(param.get("cellId")); - tenPackRecordDao.deleteById(roomId, cellId); - } - return true; - } - - - @Override - public boolean updateById(TenPackRecordEntity entity) { - int flag = tenPackRecordDao.updateById(entity); - if(flag==1){ - return true; - } - return false; - } - - @Override - public TenPackRecordEntity getById(Long id, Long cellId) { - return tenPackRecordDao.selectById(id,cellId); - } - @Override public PageUtils queryPage(Map params) { List cellIds = new ArrayList<>(); @@ -96,6 +206,11 @@ public class TenPackRecordServiceImpl implements TenPackRecordService { pageParam.setSize(Long.parseLong((String)params.get("limit"))); // IPage page = tenBuildDao.findPageAll(pageParam,cellId); IPage page = tenPackRecordDao.findPageAll(pageParam,cellIds,params); + for(TenPackRecordEntity tenPackRecordEntity: page.getRecords()){ + String cellName = tenCellService.getCellName(tenPackRecordEntity.getCellId().toString()); + tenPackRecordEntity.setCellName(cellName); + + } return new PageUtils(page); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java index 29367c0..68a5487 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java @@ -779,6 +779,9 @@ public class TenPersonServiceImpl implements TenPersonService { @Override @CacheEvict(value = "TenPerson", key = "#entity.personId+'-'+#entity.cellId") public String updateById(TenPersonEntity entity) { + if(entity.getUsername()!=null && entity.getUsername().isEmpty()){ + entity.setUsername(null); + } TenPersonEntity oldPerson = tenPersonDao.selectById(entity.getPersonId(), entity.getCellId()); @@ -967,15 +970,15 @@ public class TenPersonServiceImpl implements TenPersonService { //现在也支持app登录 if (entity.getAppFlag() == Constant.APP_LOGIN_YES) { //修改的跟原来的不一样，需要重新验证用户名是否注册 - if (!entity.getUsername().equals(oldPerson.getUsername())) { - //1.验证用户名 - AppUserEntity appUser = appUserService.findByUsername(entity.getUsername()); - if (appUser != null) { - return "用户名已经注册"; - } - } else { - //修改app - } +// if (!entity.getUsername().equals(oldPerson.getUsername())) { +// //1.验证用户名 +// AppUserEntity appUser = appUserService.findByUsername(entity.getUsername()); +// if (appUser != null) { +// return "用户名已经注册"; +// } +// } else { +// //修改app +// } //修改的跟原来的不一样，需要重新验证新的手机号是否注册 if (!entity.getMobile().equals(oldPerson.getMobile())) { //2.验证手机号 diff --git a/shapelight-admin/src/main/resources/application.yml b/shapelight-admin/src/main/resources/application.yml index eb360d5..2f671f6 100644 --- a/shapelight-admin/src/main/resources/application.yml +++ b/shapelight-admin/src/main/resources/application.yml @@ -8,6 +8,8 @@ server: port: 8018 servlet: context-path: /cell +http: + port: 8019 # ssl: # key-store: classpath:4145009_c.shapelight.net.pfx # key-store-password: 8n8bU823 diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenCarDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenCarDao.xml index 995af85..00470f2 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenCarDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenCarDao.xml @@ -6,18 +6,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + @@ -29,42 +31,48 @@ car_id, - - plate, - - - person_id, - - - link_mobile, - - - brand, - - - brand_sub, - - - park_type, - - - remark, - - - plate_type, - - - plate_color, - - - car_type, - - - car_color, + + vlp, picture, + + c_type_name, + + + v_type_name, + + + vehicle_name, + + + certificate, + + + telephone, + + + register_time, + + + refund_time, + + + color, + + + park_name, + + + start_time, + + + end_time, + + + person_id, + cell_id, @@ -73,42 +81,48 @@ #{carId,jdbcType=BIGINT}, - - #{plate,jdbcType=VARCHAR}, - - - #{personId,jdbcType=BIGINT}, - - - #{linkMobile,jdbcType=VARCHAR}, - - - #{brand,jdbcType=VARCHAR}, - - - #{brandSub,jdbcType=VARCHAR}, - - - #{parkType,jdbcType=TINYINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{plateType,jdbcType=TINYINT}, - - - #{plateColor,jdbcType=TINYINT}, - - - #{carType,jdbcType=TINYINT}, - - - #{carColor,jdbcType=TINYINT}, + + #{vlp,jdbcType=VARCHAR}, #{picture,jdbcType=VARCHAR}, + + #{cTypeName,jdbcType=VARCHAR}, + + + #{vTypeName,jdbcType=VARCHAR}, + + + #{vehicleName,jdbcType=VARCHAR}, + + + #{certificate,jdbcType=VARCHAR}, + + + #{telephone,jdbcType=VARCHAR}, + + + #{registerTime,jdbcType=TIMESTAMP}, + + + #{refundTime,jdbcType=TIMESTAMP}, + + + #{color,jdbcType=VARCHAR}, + + + #{parkName,jdbcType=VARCHAR}, + + + #{startTime,jdbcType=TIMESTAMP}, + + + #{endTime,jdbcType=TIMESTAMP}, + + + #{personId,jdbcType=BIGINT}, + #{cellId,jdbcType=BIGINT}, @@ -126,42 +140,48 @@ car_id = #{carId,jdbcType=BIGINT}, - - plate = #{plate,jdbcType=VARCHAR}, - - - person_id = #{personId,jdbcType=BIGINT}, - - - link_mobile = #{linkMobile,jdbcType=VARCHAR}, - - - brand = #{brand,jdbcType=VARCHAR}, - - - brand_sub = #{brandSub,jdbcType=VARCHAR}, - - - park_type = #{parkType,jdbcType=TINYINT}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - plate_type = #{plateType,jdbcType=TINYINT}, - - - plate_color = #{plateColor,jdbcType=TINYINT}, - - - car_type = #{carType,jdbcType=TINYINT}, - - - car_color = #{carColor,jdbcType=TINYINT}, + + vlp = #{vlp,jdbcType=VARCHAR}, picture = #{picture,jdbcType=VARCHAR}, + + c_type_name = #{cTypeName,jdbcType=VARCHAR}, + + + v_type_name = #{vTypeName,jdbcType=VARCHAR}, + + + vehicle_name = #{vehicleName,jdbcType=VARCHAR}, + + + certificate = #{certificate,jdbcType=VARCHAR}, + + + telephone = #{telephone,jdbcType=VARCHAR}, + + + register_time = #{registerTime,jdbcType=TIMESTAMP}, + + + refund_time = #{refundTime,jdbcType=TIMESTAMP}, + + + color = #{color,jdbcType=VARCHAR}, + + + park_name = #{parkName,jdbcType=VARCHAR}, + + + start_time = #{startTime,jdbcType=TIMESTAMP}, + + + end_time = #{endTime,jdbcType=TIMESTAMP}, + + + person_id = #{personId,jdbcType=BIGINT}, + cell_id = #{cellId,jdbcType=BIGINT}, @@ -174,6 +194,11 @@ where car_id = #{carId,jdbcType=BIGINT} + + diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenPackRecordDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenPackRecordDao.xml index 64942e7..df5c450 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenPackRecordDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenPackRecordDao.xml @@ -6,20 +6,24 @@ - - - - - + + + + + + + - - - + + + - - - - + + + + + + @@ -31,47 +35,59 @@ record_id, - - worker_id, + + park_id, - - car_id, + + vlp, - - in_plate, + + v_type_name, - - in_time, + + c_type_name, - - in_gate_id, + + park_name, + + + direction, + + + in_channel_name, in_picture, - - out_plate, + + in_picture_plate, - - out_time, + + in_time, - - out_gate_id, + + out_channel_name, out_picture, - - collection_time, + + out_picture_plate, - - receivable_amount, + + out_time, - - collect_amount, + + in_vlp, - - mark, + + receivable_fee, + + + actual_fee, + + + operator, cell_id, @@ -79,49 +95,61 @@ - #{recordId,jdbcType=BIGINT}, + #{recordId,jdbcType=VARCHAR}, - - #{workerId,jdbcType=INTEGER}, + + #{parkId,jdbcType=VARCHAR}, - - #{carId,jdbcType=BIGINT}, + + #{vlp,jdbcType=VARCHAR}, - - #{inPlate,jdbcType=VARCHAR}, + + #{vTypeName,jdbcType=VARCHAR}, - - #{inTime,jdbcType=TIMESTAMP}, + + #{cTypeName,jdbcType=VARCHAR}, - - #{inGateId,jdbcType=BIGINT}, + + #{parkName,jdbcType=VARCHAR}, + + + #{direction,jdbcType=VARCHAR}, + + + #{inChannelName,jdbcType=VARCHAR}, #{inPicture,jdbcType=VARCHAR}, - - #{outPlate,jdbcType=VARCHAR}, + + #{inPicturePlate,jdbcType=VARCHAR}, - - #{outTime,jdbcType=TIMESTAMP}, + + #{inTime,jdbcType=TIMESTAMP}, - - #{outGateId,jdbcType=BIGINT}, + + #{outChannelName,jdbcType=VARCHAR}, #{outPicture,jdbcType=VARCHAR}, - - #{collectionTime,jdbcType=TIMESTAMP}, + + #{outPicturePlate,jdbcType=VARCHAR}, - - #{receivableAmount,jdbcType=INTEGER}, + + #{outTime,jdbcType=TIMESTAMP}, - - #{collectAmount,jdbcType=INTEGER}, + + #{inVlp,jdbcType=VARCHAR}, - - #{mark,jdbcType=VARCHAR}, + + #{receivableFee,jdbcType=VARCHAR}, + + + #{actualFee,jdbcType=VARCHAR}, + + + #{operator,jdbcType=VARCHAR}, #{cellId,jdbcType=BIGINT}, @@ -129,69 +157,81 @@ - - delete from ten_pack_record_${cellId} - where record_id = #{recordId,jdbcType=BIGINT} - + + + + update ten_pack_record_${cellId} - record_id = #{recordId,jdbcType=BIGINT}, + record_id = #{recordId,jdbcType=VARCHAR}, - - worker_id = #{workerId,jdbcType=INTEGER}, + + park_id = #{parkId,jdbcType=VARCHAR}, - - car_id = #{carId,jdbcType=BIGINT}, + + vlp = #{vlp,jdbcType=VARCHAR}, - - in_plate = #{inPlate,jdbcType=VARCHAR}, + + v_type_name = #{vTypeName,jdbcType=VARCHAR}, - - in_time = #{inTime,jdbcType=TIMESTAMP}, + + c_type_name = #{cTypeName,jdbcType=VARCHAR}, - - in_gate_id = #{inGateId,jdbcType=BIGINT}, + + park_name = #{parkName,jdbcType=VARCHAR}, + + + direction = #{direction,jdbcType=VARCHAR}, + + + in_channel_name = #{inChannelName,jdbcType=VARCHAR}, in_picture = #{inPicture,jdbcType=VARCHAR}, - - out_plate = #{outPlate,jdbcType=VARCHAR}, + + in_picture_plate = #{inPicturePlate,jdbcType=VARCHAR}, - - out_time = #{outTime,jdbcType=TIMESTAMP}, + + in_time = #{inTime,jdbcType=TIMESTAMP}, - - out_gate_id = #{outGateId,jdbcType=BIGINT}, + + out_channel_name = #{outChannelName,jdbcType=VARCHAR}, out_picture = #{outPicture,jdbcType=VARCHAR}, - - collection_time = #{collectionTime,jdbcType=TIMESTAMP}, + + out_picture_plate = #{outPicturePlate,jdbcType=VARCHAR}, - - receivable_amount = #{receivableAmount,jdbcType=INTEGER}, + + out_time = #{outTime,jdbcType=TIMESTAMP}, - - collect_amount = #{collectAmount,jdbcType=INTEGER}, + + in_vlp = #{inVlp,jdbcType=VARCHAR}, - - mark = #{mark,jdbcType=VARCHAR}, + + receivable_fee = #{receivableFee,jdbcType=VARCHAR}, + + + actual_fee = #{actualFee,jdbcType=VARCHAR}, + + + operator = #{operator,jdbcType=VARCHAR}, cell_id = #{cellId,jdbcType=BIGINT}, - where record_id = #{recordId,jdbcType=BIGINT} + where record_id = #{recordId,jdbcType=VARCHAR} - select * from ten_pack_record_${cellId} - where record_id = #{recordId,jdbcType=BIGINT} + where record_id = #{recordId} and park_id = #{parkId} diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml index f8e5ec1..076bffc 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml @@ -506,7 +506,7 @@