Skip to content

T
traffic-signal-platform
Commit 19a822bf authored by duanruiming's avatar duanruiming
Browse files
Options

[update] 优化持久层

parent e63dbd8b
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 128 deletions
wj-databus/src/main/java/net/wanji/databus/dao/mapper/BaseCrossInfoMapper.java
View file @ 19a822bf
package net.wanji.databus.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.wanji.databus.po.CrossInfoPO;
import net.wanji.databus.po.BaseCrossInfoPO;
import net.wanji.databus.po.TBaseCrossInfo;
import net.wanji.databus.vo.CrossDeviceStatusInfoOutVO;
import net.wanji.databus.vo.CrossInfoVO;
......@@ -24,13 +24,13 @@ public interface BaseCrossInfoMapper extends BaseMapper<TBaseCrossInfo> {
*/
// List<CrossInfoPO> listCrossInfo(CrossQuery query);
List<CrossInfoPO> selectByCrossIds(List<String> ids);
List<BaseCrossInfoPO> selectByCrossIds(List<String> ids);
CrossInfoPO selectById(String crossId);
BaseCrossInfoPO selectById(String crossId);
List<CrossInfoPO> selectByName(String name);
List<BaseCrossInfoPO> selectByName(String name);
List<CrossInfoPO> selectAll();
List<BaseCrossInfoPO> selectAll();
int deleteByPrimaryKey(String id);
......@@ -45,7 +45,7 @@ public interface BaseCrossInfoMapper extends BaseMapper<TBaseCrossInfo> {
int updateByPrimaryKey(TBaseCrossInfo record);
List<CrossInfoPO> selectAll(CrossInfoVO crossInfoVO);
List<BaseCrossInfoPO> selectAll(CrossInfoVO crossInfoVO);
Integer countSelectAll(CrossInfoVO crossInfoVO);
......
signal-communication-service/src/main/java/net/wanji/com/mapper/TCrossInfoMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossInfoMapper.java
View file @ 19a822bf
package net.wanji.com.mapper;
package net.wanji.databus.dao.mapper;
import net.wanji.com.pojo.po.CrossInfoPO;
import net.wanji.databus.po.CrossInfoPO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -9,10 +9,10 @@ import java.util.List;
* @author duanruiming
* @date 2023/05/09 9:10
*/
public interface TCrossInfoMapper {
public interface CrossInfoMapper {
CrossInfoPO selectByPrimaryKey(@Param("key") String key);
void insertBatch(@Param("entities") List<CrossInfoPO> crossInfoPOList);
void insertBatch(@Param("entities") List<CrossInfoPO> CrossInfoPOList);
List<String> selectCrossCodesByIds(@Param("entities") List<String> crossIdList);
......@@ -22,15 +22,15 @@ public interface TCrossInfoMapper {
List<CrossInfoPO> selectByManufacturerId(@Param("manufacturerId") Integer manufacturerId);
List<CrossInfoPO> selectByOptionals(@Param("crossName") String crossName,
@Param("manufacturerId") Integer manufacturerId);
@Param("manufacturerId") Integer manufacturerId);
void insertOne(CrossInfoPO crossInfoPO);
void insertOne(CrossInfoPO CrossInfoPO);
void updateOne(CrossInfoPO crossInfoPO);
void updateOne(CrossInfoPO CrossInfoPO);
void deleteBatch(@Param("ids") List<String> ids);
void updateOneByCodeAndManufacturerId(CrossInfoPO crossInfoPO);
void updateOneByCodeAndManufacturerId(CrossInfoPO CrossInfoPO);
void deleteById(String id);
......
signal-communication-service/src/main/java/net/wanji/com/mapper/ManufacturerInfoMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/ManufacturerInfoMapper.java
View file @ 19a822bf
package net.wanji.com.mapper;
package net.wanji.databus.dao.mapper;
import net.wanji.com.pojo.po.ManufacturerInfoPO;
import net.wanji.databus.po.ManufacturerInfoPO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......
wj-databus/src/main/java/net/wanji/databus/po/BaseCrossInfoPO.java 0 → 100644
View file @ 19a822bf
package net.wanji.databus.po;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.Pattern;
import java.util.Date;
/**
* @author wuxiaokai
* @date 2022/11/28 9:42:39
*/
@Getter
@Setter
public class BaseCrossInfoPO {
/**
* 路口ID
*/
private String id;
/**
* 路口名称
*/
@Pattern(regexp = "^[\\u4E00-\\u9FA5\\w\\-]{0,20}$", message = "路口名称只能包含中文、英文、数字、下划线和中横线,0~20个字符")
private String name;
/**
* 路口类型
*/
private Integer type;
/**
* 路口级别
*/
private Integer level;
/**
* 行政区划代码
*/
private Integer areaCode;
/**
* 行政区划名称
*/
private String areaName;
/**
* 路口位置
*/
private String location;
/**
* 是否信控路口：1是；0否
*/
private Integer isSignal;
/**
* 是否启动优化：1是；0否
*/
private Integer isStart;
/**
* 是否下发方案：1是；0否
*/
private Integer isSend;
/**
* 创建时间
*/
private Date gmtCreate;
/**
* 修改时间
*/
private Date gmtModified;
}
wj-databus/src/main/java/net/wanji/databus/po/CrossInfoPO.java
View file @ 19a822bf
package net.wanji.databus.po;
import lombok.Getter;
import lombok.Setter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Pattern;
import java.util.Date;
/**
* @author wuxiaokai
* @date 2022/11/28 9:42:39
* @author Kent HAN
* @date 2022/11/15 10:48
*/
@Getter
@Setter
@Data
@JsonIgnoreProperties(value = {"gmtCreate", "gmtModified"})
public class CrossInfoPO {
/**
* 路口ID
*/
private String id;
/**
* 路口名称
*/
@Pattern(regexp = "^[\\u4E00-\\u9FA5\\w\\-]{0,20}$", message = "路口名称只能包含中文、英文、数字、下划线和中横线,0~20个字符")
private String name;
/**
* 路口类型
*/
private Integer type;
/**
* 路口级别
*/
private Integer level;
/**
* 行政区划代码
*/
private Integer areaCode;
/**
* 行政区划名称
*/
private String areaName;
/**
* 路口位置
*/
private String location;
/**
* 是否信控路口：1是；0否
*/
private Integer isSignal;
/**
* 是否启动优化：1是；0否
*/
private Integer isStart;
/**
* 是否下发方案：1是；0否
*/
private Integer isSend;
/**
* 创建时间
*/
private Date gmtCreate;
/**
* 修改时间
*/
private Date gmtModified;
@ApiModelProperty(value = "路口ID",notes = "")
private String id ;
/** 路口名称 */
@ApiModelProperty(value = "路口名称",notes = "")
private String name ;
/** 信号机编号 */
@ApiModelProperty(value = "信号机编号",notes = "")
private String code ;
/** 厂商ID */
@ApiModelProperty(value = "厂商ID",notes = "")
private Integer manufacturerId ;
/** 信号机IP */
@ApiModelProperty(value = "信号机IP",notes = "")
private String ip ;
/** 信号机端口 */
@ApiModelProperty(value = "信号机端口",notes = "")
private Integer port ;
/** 经纬度 */
@ApiModelProperty(value = "经纬度",notes = "")
private String location ;
/** 版本号 */
@ApiModelProperty(value = "版本号",notes = "")
private String version ;
/** 型号 */
@ApiModelProperty(value = "型号",notes = "")
private String model ;
/** 安装时间 */
@ApiModelProperty(value = "安装时间",notes = "")
private Date installTime ;
/** 创建时间 */
@ApiModelProperty(value = "创建时间",notes = "")
private Date gmtCreate ;
/** 修改时间 */
@ApiModelProperty(value = "修改时间",notes = "")
private Date gmtModified ;
}
signal-communication-service/src/main/java/net/wanji/com/pojo/po/BaseCrossInfo.java → wj-databus/src/main/java/net/wanji/databus/vo/BaseCrossInfo.java
View file @ 19a822bf
package net.wanji.com.pojo.po;
package net.wanji.databus.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
wj-databus/src/main/java/net/wanji/databus/vo/ControlCommandVO.java
View file @ 19a822bf
......@@ -4,10 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.*;
import java.util.List;
/**
* 控制指令VO
......@@ -16,20 +14,18 @@ import javax.validation.constraints.NotNull;
* @date 2022/11/15 15:05:57
*/
@Data
@ApiModel(value = "ControlCommandVO", description = "全红黄闪控制实体")
@ApiModel(value = "ControlCommandVO", description = "相位锁定实体类")
public class ControlCommandVO {
@ApiModelProperty(value = "路口编号", notes = "路口编号")
@NotBlank(message = "路口编号不能为空")
@NotBlank(message = "路口编号不可为空")
@Pattern(regexp = "^[A-Za-z0-9]{11}$", message = "路口编号只能包含英文、数字，必须11个字符")
private String crossCode;
/**
* 1 锁定; 0 取消
*/
@ApiModelProperty(value = "1是；0否")
@NotNull(message = "控制标识不可为空,1是；0否")
@Max(value = 1, message = "控制标识：1是；0否")
@Min(value = 0, message = "控制标识：1是；0否")
@NotNull(message = "控制类型不可为空,1是；0否")
@Max(value = 1, message = "控制类型：1是；0否")
@Min(value = 0, message = "控制类型：1是；0否")
private Integer command;
@ApiModelProperty(value = "1全红 2黄闪 3关灯")
......@@ -38,4 +34,8 @@ public class ControlCommandVO {
@ApiModelProperty(value = "持续时间")
private Integer duration;
@ApiModelProperty(value = "锁定相位列表", notes = "锁定相位列表, 可为空")
private List<Integer> phaseList;
}
signal-communication-service/src/main/java/net/wanji/com/pojo/vo/DetailCrossInfoVO.java → wj-databus/src/main/java/net/wanji/databus/vo/DetailCrossInfoVO.java
View file @ 19a822bf
package net.wanji.com.pojo.vo;
package net.wanji.databus.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.wanji.com.pojo.po.BaseCrossInfo;
import java.util.Date;
import java.util.List;
......
signal-communication-service/src/main/java/net/wanji/com/pojo/vo/LightsStatusVO.java → wj-databus/src/main/java/net/wanji/databus/vo/LightsStatusVO.java
View file @ 19a822bf
package net.wanji.com.pojo.vo;
package net.wanji.databus.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.wanji.com.pojo.po.BaseCrossInfo;
import net.wanji.com.pojo.po.SignalRunring;
import java.util.List;
import java.util.Map;
......
wj-databus/src/main/java/net/wanji/databus/vo/PhaseTimingSendVO.java
View file @ 19a822bf
......@@ -2,24 +2,32 @@ package net.wanji.databus.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.util.List;
@Data
@ApiModel(value = "PhaseTimingSendVO", description = "下发相位参数输入参数")
/**
* 下发相位参数VO
*
* @author wuxiaokai
* @date 2022/12/9 11:08:51
*/
@Setter
@Getter
@ApiModel(value = "下发相位参数输入参数", description = "下发相位参数输入参数")
public class PhaseTimingSendVO {
@ApiModelProperty(value = "路口编号", notes = "路口编号")
@NotBlank(message = "路口编号不能为空")
@NotBlank(message = "路口编号不可为空")
@Pattern(regexp = "^[A-Za-z0-9]{11}$", message = "路口编号只能包含英文、数字，必须11个字符")
private String crossCode;
@ApiModelProperty(value = "需要下发的相位列表", notes = "需要下发的相位列表")
@NotEmpty(message = "相位列表不能为空")
@NotEmpty(message = "相位列表不可为空")
private List<Phase> phaseList;
/**
......
wj-databus/src/main/java/net/wanji/databus/vo/PlanSendVO.java
View file @ 19a822bf
......@@ -7,6 +7,7 @@ import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.util.List;
/**
......@@ -17,14 +18,15 @@ import java.util.List;
*/
@Setter
@Getter
@ApiModel(value = "PhaseTimingSendVO", description = "信号机计划下发输入参数")
@ApiModel(value = "信号机计划下发输入参数", description = "信号机计划下发输入参数")
public class PlanSendVO {
@ApiModelProperty(value = "路口编号", notes = "路口编号")
@NotBlank(message = "路口编号不能为空")
@NotBlank(message = "路口编号不可为空")
@Pattern(regexp = "^[A-Za-z0-9]{11}$", message = "路口编号只能包含英文、数字，必须11个字符")
private String crossCode;
@ApiModelProperty(value = "计划列表", notes = "计划列表")
@NotEmpty(message = "计划列表不能为空")
@NotEmpty(message = "计划列表不可为空")
private List<Plan> planList;
@Setter
......
signal-communication-service/src/main/java/net/wanji/com/pojo/vo/RunningStatusVO.java → wj-databus/src/main/java/net/wanji/databus/vo/RunningStatusVO.java
View file @ 19a822bf
package net.wanji.com.pojo.vo;
package net.wanji.databus.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.wanji.com.pojo.po.BaseCrossInfo;
/**
* @author Kent HAN
......
wj-databus/src/main/java/net/wanji/databus/vo/ScheduleSendVO.java
View file @ 19a822bf
......@@ -2,28 +2,37 @@ package net.wanji.databus.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.util.List;
@Data
@ApiModel(value = "PhaseTimingSendVO", description = "信号机时间表下发输入参数")
/**
* 时间表下发VO
*
* @author wuxiaokai
* @date 2022/11/23 14:11:09
*/
@Setter
@Getter
@ApiModel(value = "信号机时间表下发输入参数", description = "信号机时间表下发输入参数")
public class ScheduleSendVO {
@ApiModelProperty(value = "路口编号", notes = "路口编号")
@NotBlank(message = "路口编号不能为空")
@NotBlank(message = "路口编号不可为空")
@Pattern(regexp = "^[A-Za-z0-9]{11}$", message = "路口编号只能包含英文、数字，必须11个字符")
private String crossCode;
@ApiModelProperty(value = "时间表", notes = "时间表")
@NotEmpty(message = "时间表不能为空")
@NotEmpty(message = "时间表不可为空")
private List<Schedule> schedules;
@Setter
@Getter
public static class Schedule {
/**
* 调度号
*/
......
wj-databus/src/main/java/net/wanji/databus/vo/SchemeSendVO.java
View file @ 19a822bf
......@@ -2,23 +2,31 @@ package net.wanji.databus.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@Data
@ApiModel(value = "PhaseTimingSendVO", description = "信号机方案下发输入参数")
/**
* 信号机方案下发VO
*
* @author wuxiaokai
* @date 2022/12/6 16:14:27
*/
@Setter
@Getter
@ApiModel(value = "信号机方案下发输入参数", description = "信号机方案下发输入参数")
public class SchemeSendVO {
@ApiModelProperty(value = "路口编号", notes = "路口编号")
@NotBlank(message = "路口编号不能为空")
@NotBlank(message = "路口编号不可为空")
@javax.validation.constraints.Pattern(regexp = "^[A-Za-z0-9]{11}$", message = "路口编号只能包含英文、数字，必须11个字符")
private String crossCode;
@ApiModelProperty(value = "方案列表", notes = "方案列表")
@NotEmpty(message = "方案列表不能为空")
@NotEmpty(message = "方案列表不可为空")
private List<Pattern> patternList;
/**
......
wj-databus/src/main/resources/mapper/BaseCrossInfoMapper.xml
View file @ 19a822bf
......@@ -14,7 +14,7 @@
<result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/>
<result column="gmt_modified" property="gmtModified" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap id="SelectAllMap" type="net.wanji.databus.po.CrossInfoPO">
<resultMap id="SelectAllMap" type="net.wanji.databus.po.BaseCrossInfoPO">
<id column="id" property="id" jdbcType="CHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="type" property="type" jdbcType="TINYINT"/>
......@@ -248,7 +248,7 @@
where d.type = 1 and c.is_signal = 1
</select>
<select id="selectByCrossIds" resultType="net.wanji.databus.po.CrossInfoPO">
<select id="selectByCrossIds" resultType="net.wanji.databus.po.BaseCrossInfoPO">
select <include refid="baseColumn"/>
from t_base_cross_info
where id in
......@@ -257,7 +257,7 @@
</foreach>
</select>
<select id="selectById" resultType="net.wanji.databus.po.CrossInfoPO">
<select id="selectById" resultType="net.wanji.databus.po.BaseCrossInfoPO">
select <include refid="baseColumn"/>
from t_base_cross_info
<where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment