stjdydayou 3 rokov pred
rodič
commit
d57bf1d856

+ 9 - 0
src/main/java/com/zhiqiyun/open/core/mapper/statistics/HyMonitorVehicleMapper.java

@@ -0,0 +1,9 @@
+package com.zhiqiyun.open.core.mapper.statistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorVehicle;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HyMonitorVehicleMapper extends BaseMapper<HyMonitorVehicle> {
+}

+ 51 - 0
src/main/java/com/zhiqiyun/open/core/models/statistics/HyMonitorVehicle.java

@@ -0,0 +1,51 @@
+package com.zhiqiyun.open.core.models.statistics;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+@TableName("hy_monitor_vehicle")
+public class HyMonitorVehicle {
+
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	private Long authId;
+
+	private Long mechanismId;
+
+	private String speedName;
+
+	private String vehicleCode;
+
+	private String sourceArea;
+
+	private Integer mechanismType;
+
+	private Integer inOrOut;
+
+	private String vehicleType;
+
+	/**
+	 * 创建者
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long creator;
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createDate;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	private Integer isDeleted;
+}
+

+ 7 - 0
src/main/java/com/zhiqiyun/open/core/service/HyMonitorVehicleService.java

@@ -0,0 +1,7 @@
+package com.zhiqiyun.open.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorVehicle;
+
+public interface HyMonitorVehicleService extends IService<HyMonitorVehicle> {
+}

+ 11 - 0
src/main/java/com/zhiqiyun/open/core/service/impl/HyMonitorVehicleServiceImpl.java

@@ -0,0 +1,11 @@
+package com.zhiqiyun.open.core.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhiqiyun.open.core.mapper.statistics.HyMonitorVehicleMapper;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorVehicle;
+import com.zhiqiyun.open.core.service.HyMonitorVehicleService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HyMonitorVehicleServiceImpl extends ServiceImpl<HyMonitorVehicleMapper, HyMonitorVehicle> implements HyMonitorVehicleService {
+}

+ 23 - 2
src/main/java/com/zhiqiyun/open/router/apis/MonitorApi.java

@@ -5,11 +5,14 @@ import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
 import com.zhiqiyun.open.core.models.statistics.HyMonitor;
 import com.zhiqiyun.open.core.models.statistics.HyMonitorConsume;
+import com.zhiqiyun.open.core.models.statistics.HyMonitorVehicle;
 import com.zhiqiyun.open.core.service.HyMonitorConsumeService;
 import com.zhiqiyun.open.core.service.HyMonitorService;
+import com.zhiqiyun.open.core.service.HyMonitorVehicleService;
 import com.zhiqiyun.open.core.service.SequenceService;
 import com.zhiqiyun.open.router.request.statistics.SaveHyMonitorConsumeRequest;
 import com.zhiqiyun.open.router.request.statistics.SaveHyMonitorRequest;
+import com.zhiqiyun.open.router.request.statistics.SaveHyMonitorVehicleRequest;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -25,11 +28,15 @@ public class MonitorApi {
 	@Autowired
 	private HyMonitorConsumeService hyMonitorConsumeService;
 
+
+	@Autowired
+	private HyMonitorVehicleService hyMonitorVehicleService;
+
 	@Autowired
 	private SequenceService sequenceService;
 
 	@ServiceMethod(method = "hy.monitor.add", title = "各机构客流量提交")
-	public OapResponse save(SaveHyMonitorRequest request) {
+	public OapResponse saveHyMonitor(SaveHyMonitorRequest request) {
 
 		HyMonitor entity = new HyMonitor();
 		BeanUtils.copyProperties(request, entity);
@@ -43,7 +50,7 @@ public class MonitorApi {
 	}
 
 	@ServiceMethod(method = "hy.monitor.consume.add", title = "各机构消费明细提交")
-	public OapResponse save(SaveHyMonitorConsumeRequest request) {
+	public OapResponse saveHyMonitorConsume(SaveHyMonitorConsumeRequest request) {
 
 		HyMonitorConsume entity = new HyMonitorConsume();
 		BeanUtils.copyProperties(request, entity);
@@ -55,4 +62,18 @@ public class MonitorApi {
 
 		return OapResponse.success().setBody(entity);
 	}
+
+	@ServiceMethod(method = "hy.monitor.vehicle.add", title = "各机构车流量提交")
+	public OapResponse saveHyMonitorVehicle(SaveHyMonitorVehicleRequest request) {
+
+		HyMonitorVehicle entity = new HyMonitorVehicle();
+		BeanUtils.copyProperties(request, entity);
+
+		entity.setCreateDate(DateUtil.current());
+		entity.setId(this.sequenceService.nextId());
+
+		this.hyMonitorVehicleService.save(entity);
+
+		return OapResponse.success().setBody(entity);
+	}
 }

+ 47 - 0
src/main/java/com/zhiqiyun/open/router/request/statistics/SaveHyMonitorVehicleRequest.java

@@ -0,0 +1,47 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SaveHyMonitorVehicleRequest extends AbstractOapRequest {
+
+	@ServiceParamField(describe = "认证ID")
+	private Long authId;
+
+	@ServiceParamField(describe = "机构ID")
+	private Long mechanismId;
+
+	@ServiceParamField(describe = "高速路口名称")
+	private String speedName;
+
+	@ServiceParamField(describe = "车牌号")
+	private String vehicleCode;
+
+	@ServiceParamField(describe = "来源地区")
+	private String sourceArea;
+
+	@ServiceParamField(describe = "机构类型1、景区2、文保场所3、高速收费站")
+	private Integer mechanismType;
+
+	@ServiceParamField(describe = "进或者出1、进2、出")
+	private Integer inOrOut;
+
+	@ServiceParamField(describe = "车辆类型")
+	private String vehicleType;
+
+	/**
+	 * 创建者
+	 */
+	@ServiceParamField(describe = "创建者")
+	private Long creator;
+
+	/**
+	 * 是否删除 0 否 1 是
+	 */
+	@ServiceParamField(describe = "是否删除 0 否 1 是")
+	private Integer isDeleted;
+}