Skip to content

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

[update] control提取通用mapper

parent 452b98b3
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 173 deletions
signal-control-service/src/main/java/net/wanji/web/controller/SignalCommandController.java
View file @ a0e43a4d
......@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiOperation;
import net.wanji.common.annotation.aspect.AspectLog;
import net.wanji.common.enums.BaseEnum;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.feign.pojo.vo.*;
import net.wanji.databus.vo.*;
import net.wanji.web.service.FeignProxyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
......
signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java
View file @ a0e43a4d
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
import net.wanji.common.annotation.aspect.AspectLog;
import net.wanji.common.enums.BaseEnum;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.databus.vo.CrossDeviceStatusInfoOutVO;
import net.wanji.web.service.SituationDetectionService;
import net.wanji.web.vo.situationDetection.*;
import org.springframework.beans.factory.annotation.Autowired;
......
signal-control-service/src/main/java/net/wanji/web/controller/TBaseCrossInfoController.java
View file @ a0e43a4d
......@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiOperation;
import net.wanji.common.annotation.aspect.AspectLog;
import net.wanji.common.enums.BaseEnum;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.web.service.TBaseCrossInfoService;
import net.wanji.databus.vo.CrossInfoVO;
import net.wanji.web.service.CrossInfoService;
import net.wanji.web.vo.BaseCrossInfoVO;
import net.wanji.web.vo.CrossInfoVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
......@@ -29,7 +29,7 @@ import java.util.List;
public class TBaseCrossInfoController {
@Autowired
private TBaseCrossInfoService crossInfoService;
private CrossInfoService crossInfoService;
@AspectLog(description = "信号路口基础信息", operationType = BaseEnum.OperationTypeEnum.QUERY)
@ApiOperation(value = "路网管理-路口管理-查询", notes = "路网管理-路口管理-查询")
......
signal-control-service/src/main/java/net/wanji/web/mapper/TBaseCrossInfoMapper.java deleted 100644 → 0
View file @ 452b98b3
package net.wanji.web.mapper;
import net.wanji.web.entity.TBaseCrossInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.wanji.web.po.CrossInfoPO;
import net.wanji.web.vo.CrossInfoVO;
import net.wanji.web.vo.situationDetection.CrossDeviceStatusInfoOutVO;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 路口基础表 Mapper 接口
* </p>
*
* @author wj
* @since 2022-11-28
*/
@Repository
public interface TBaseCrossInfoMapper extends BaseMapper<TBaseCrossInfo> {
int deleteByPrimaryKey(String id);
@Override
int insert(TBaseCrossInfo record);
int insertSelective(TBaseCrossInfo record);
TBaseCrossInfo selectByPrimaryKey(String id);
int updateByPrimaryKeySelective(TBaseCrossInfo record);
int updateByPrimaryKey(TBaseCrossInfo record);
List<CrossInfoPO> selectAll(CrossInfoVO crossInfoVO);
Integer countSelectAll(CrossInfoVO crossInfoVO);
List<CrossDeviceStatusInfoOutVO> listCrossDeviceStatusInfo();
}
signal-control-service/src/main/java/net/wanji/web/service/TBaseCrossInfoService.java → signal-control-service/src/main/java/net/wanji/web/service/CrossInfoService.java
View file @ a0e43a4d
......@@ -2,17 +2,17 @@ package net.wanji.web.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.databus.dao.mapper.CrossInfoMapper;
import net.wanji.databus.po.CrossInfoPO;
import net.wanji.databus.po.TBaseCrossInfo;
import net.wanji.databus.vo.CrossInfoVO;
import net.wanji.web.common.enums.CrossTypeEnum;
import net.wanji.web.common.util.IdWorker;
import net.wanji.web.entity.TBaseAreaInfo;
import net.wanji.web.entity.TBaseCrossInfo;
import net.wanji.web.mapper.TBaseAreaInfoMapper;
import net.wanji.web.mapper.TBaseCrossInfoMapper;
import net.wanji.web.po.AreaTreePO;
import net.wanji.web.po.CrossInfoPO;
import net.wanji.web.po.PageResultPO;
import net.wanji.web.vo.BaseCrossInfoVO;
import net.wanji.web.vo.CrossInfoVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -33,10 +33,10 @@ import java.util.stream.Collectors;
* @since 2022-11-28
*/
@Service
public class TBaseCrossInfoService {
public class CrossInfoService {
@Autowired
private TBaseCrossInfoMapper crossInfoMapper;
private CrossInfoMapper crossInfoMapper;
@Autowired
private TBaseAreaInfoMapper areaInfoMapper;
......
signal-control-service/src/main/java/net/wanji/web/service/FeignProxyService.java
View file @ a0e43a4d
package net.wanji.web.service;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.feign.pojo.vo.*;
import net.wanji.databus.vo.*;
import javax.servlet.http.HttpServletRequest;
/**
......
signal-control-service/src/main/java/net/wanji/web/service/SituationDetectionService.java
View file @ a0e43a4d
package net.wanji.web.service;
import net.wanji.web.entity.TBaseCrossInfo;
import net.wanji.databus.po.CrossInfoPO;
import net.wanji.databus.vo.CrossDeviceStatusInfoOutVO;
import net.wanji.web.vo.situationDetection.*;
import java.text.ParseException;
......@@ -33,7 +34,7 @@ public interface SituationDetectionService {
List<CrossDeviceStatusInfoOutVO> crossDeviceStatusInfo();
TBaseCrossInfo selectCrossInfoById(String signalId);
CrossInfoPO selectCrossInfoById(String signalId);
List<JurisdictionAreaTreeVO> jurisdictionTree(Integer areaId) throws Exception;
......
signal-control-service/src/main/java/net/wanji/web/service/impl/FeignProxyServiceImpl.java
View file @ a0e43a4d
......@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import net.wanji.common.enums.ControlModeEnum;
import net.wanji.common.framework.Constants;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.feign.pojo.vo.*;
import net.wanji.databus.vo.*;
import net.wanji.feign.service.UtcFeignClients;
import net.wanji.web.mapper.ControlHistMapper;
import net.wanji.web.service.FeignProxyService;
......
signal-control-service/src/main/java/net/wanji/web/service/impl/PlanSendServiceImpl.java
View file @ a0e43a4d
......@@ -7,32 +7,11 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.wanji.common.dto.CrossIdDTO;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.feign.pojo.vo.ControlCommandVO;
import net.wanji.feign.pojo.vo.CrossIdVO;
import net.wanji.feign.pojo.vo.LockControlVO;
import net.wanji.feign.pojo.vo.ScheduleSendVO;
import net.wanji.feign.pojo.vo.SchemeSendVO;
import net.wanji.databus.vo.*;
import net.wanji.feign.service.UtcFeignClients;
import net.wanji.web.dto.CrossIdAndPhaseIdsDTO;
import net.wanji.web.dto.CrossIdAndTimeDTO;
import net.wanji.web.dto.RunningPlanDTO;
import net.wanji.web.dto.SaveSchemeConfigDTO;
import net.wanji.web.dto.ScheduleIdDTO;
import net.wanji.web.dto.SchemeIdDTO;
import net.wanji.web.mapper.scheme.CrossLaneLightsMapper;
import net.wanji.web.mapper.scheme.CrossLightsMapper;
import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
import net.wanji.web.mapper.scheme.CrossPhaseMapper;
import net.wanji.web.mapper.scheme.CrossPlanMapper;
import net.wanji.web.mapper.scheme.CrossSchedulesMapper;
import net.wanji.web.mapper.scheme.CrossSchedulesPlanMapper;
import net.wanji.web.mapper.scheme.CrossSchemeMapper;
import net.wanji.web.po.scheme.CrossLightsPO;
import net.wanji.web.po.scheme.CrossPhasePO;
import net.wanji.web.po.scheme.CrossPlanPO;
import net.wanji.web.po.scheme.CrossSchedulesPO;
import net.wanji.web.po.scheme.CrossSchedulesPlanPO;
import net.wanji.web.po.scheme.CrossSchemePO;
import net.wanji.web.dto.*;
import net.wanji.web.mapper.scheme.*;
import net.wanji.web.po.scheme.*;
import net.wanji.web.service.PlanSendService;
import net.wanji.web.service.scheme.impl.RunningPlanServiceImpl;
import net.wanji.web.service.scheme.impl.SchemeConfigServiceImpl;
......@@ -44,15 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotNull;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.*;
import java.util.stream.Collectors;
/**
......
signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java
View file @ a0e43a4d
......@@ -12,10 +12,10 @@ import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.common.utils.tool.BeanListUtils;
import net.wanji.common.utils.tool.BeanMapUtils;
import net.wanji.common.utils.tool.CrossUtil;
import net.wanji.feign.pojo.vo.CrossInfoOutVo;
import net.wanji.feign.pojo.vo.CrossInfoVO;
import net.wanji.feign.pojo.vo.ManufacturerInfoOutVO;
import net.wanji.feign.pojo.vo.ManufacturerVO;
import net.wanji.databus.dao.mapper.CrossInfoMapper;
import net.wanji.databus.po.CrossInfoPO;
import net.wanji.databus.po.TBaseCrossInfo;
import net.wanji.databus.vo.*;
import net.wanji.feign.service.UtcFeignClients;
import net.wanji.web.common.enums.ControlHistEnum;
import net.wanji.web.common.enums.CrossAlarmEnum;
......@@ -27,7 +27,6 @@ import net.wanji.web.entity.*;
import net.wanji.web.mapper.*;
import net.wanji.web.po.*;
import net.wanji.web.service.SituationDetectionService;
import net.wanji.web.service.TBaseCrossInfoService;
import net.wanji.web.vo.situationDetection.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
......@@ -57,9 +56,8 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
private final GreenwaveRealtimeMapper greenwaveRealtimeMapper;
private final AllDeviceStatusMapper allDeviceStatusMapper;
private final GreenwaveCrossMapper greenwaveCrossMapper;
private final TBaseCrossInfoMapper tBaseCrossInfoMapper;
private final CrossInfoMapper tBaseCrossInfoMapper;
private final TBaseAreaInfoMapper tBaseAreaInfoMapper;
private final TBaseCrossInfoService tBaseCrossInfoService;
private final TBaseAreaCrossMapper tBaseAreaCrossMapper;
private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
private final UtcFeignClients utcFeignClients;
......@@ -404,7 +402,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
}
@Override
public TBaseCrossInfo selectCrossInfoById(String signalId) {
public CrossInfoPO selectCrossInfoById(String signalId) {
return tBaseCrossInfoMapper.selectById(signalId);
}
......
signal-control-service/src/main/java/net/wanji/web/service/impl/SpecialServiceServiceImpl.java
View file @ a0e43a4d
......@@ -3,12 +3,13 @@ package net.wanji.web.service.impl;
import cn.hutool.http.HttpUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.wanji.databus.dao.mapper.CrossInfoMapper;
import net.wanji.web.common.enums.CrossPhasePlanTurnTypeEnum;
import net.wanji.web.common.enums.CrossDirEnum;
import net.wanji.web.common.enums.SpecialServiceCrossTurnEnum;
import net.wanji.web.common.exception.CrossRelationException;
import net.wanji.common.utils.tool.CrossUtil;
import net.wanji.web.entity.TBaseCrossInfo;
import net.wanji.databus.po.TBaseCrossInfo;
import net.wanji.web.mapper.*;
import net.wanji.web.po.*;
import net.wanji.web.service.SpecialServiceService;
......@@ -36,7 +37,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
CustomRidInfoMapper customRidInfoMapper;
@Autowired
TBaseCrossInfoMapper tBaseCrossInfoMapper;
CrossInfoMapper tBaseCrossInfoMapper;
@Autowired
CrossDirTurnMapper crossDirTurnMapper;
......
signal-control-service/src/main/java/net/wanji/web/task/CommonEventWarnTask.java
View file @ a0e43a4d
......@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.databus.po.CrossInfoPO;
import net.wanji.feign.service.UtcFeignClients;
import net.wanji.web.common.util.StringUtils;
import net.wanji.web.entity.TBaseCrossInfo;
import net.wanji.web.entity.TDeviceStatusInfo;
import net.wanji.web.mapper.TDeviceStatusMapper;
import net.wanji.web.service.SituationDetectionService;
......@@ -129,7 +129,7 @@ public class CommonEventWarnTask {
String coordinate = "";
int faultTypeDB = 0;
if (StringUtils.isNotEmpty(crossId)) {
TBaseCrossInfo tBaseCrossInfo = situationDetectionService.selectCrossInfoById(crossId);
CrossInfoPO tBaseCrossInfo = situationDetectionService.selectCrossInfoById(crossId);
if (Objects.nonNull(tBaseCrossInfo)) {
coordinate = tBaseCrossInfo.getLocation();
}
......
signal-control-service/src/main/java/net/wanji/web/vo/CrossInfoVO.java deleted 100644 → 0
View file @ 452b98b3
package net.wanji.web.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wj
* @date 2022/11/28 9:42:39
*/
@Data
@ApiModel(value = "CrossInfoVO", description = "查询路口管理输入参数")
public class CrossInfoVO {
/**
* 路口名称
*/
@ApiModelProperty(value = "路口名称", required = true)
private String name;
/**
* 行政区划代码
*/
@ApiModelProperty(value = "行政区划代码", required = true)
private Integer areaCode;
/**
* 行政区划名称
*/
@ApiModelProperty(value = "行政区划名称", required = true)
private String areaName;
/**
* 是否信控路口：1是；0否
*/
@ApiModelProperty(value = "是否信控路口：1是；0否", required = true)
private Integer isSignal;
/**
* 是否启动优化：1是；0否
*/
@ApiModelProperty(value = "是否启动优化：1是；0否", required = true)
private Integer isStart;
/**
* 是否下发方案：1是；0否
*/
@ApiModelProperty(value = "是否下发方案：1是；0否", required = true)
private Integer isSend;
@ApiModelProperty(value = "当前页")
private Integer pageNum;
@ApiModelProperty(value = "每页的数量")
private Integer pageSize;
}
signal-control-service/src/main/java/net/wanji/web/po/CrossInfoPO.java → wj-databus/src/main/java/net/wanji/databus/po/CrossInfoPO.java
View file @ a0e43a4d
package net.wanji.web.po;
package net.wanji.databus.po;
import lombok.Getter;
import lombok.Setter;
......
signal-control-service/src/main/java/net/wanji/web/entity/TBaseCrossInfo.java → wj-databus/src/main/java/net/wanji/databus/po/TBaseCrossInfo.java
View file @ a0e43a4d
package net.wanji.web.entity;
package net.wanji.databus.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
......@@ -7,7 +7,6 @@ import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
......
signal-control-service/src/main/java/net/wanji/web/vo/situationDetection/CrossDeviceStatusInfoOutVO.java → wj-databus/src/main/java/net/wanji/databus/vo/CrossDeviceStatusInfoOutVO.java
View file @ a0e43a4d
package net.wanji.web.vo.situationDetection;
package net.wanji.databus.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
signal-control-service/src/main/resources/mapper/TBaseCrossInfoMapper.xml → wj-databus/src/main/resources/mapper/TBaseCrossInfoMapper.xml
View file @ a0e43a4d
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="net.wanji.web.mapper.TBaseCrossInfoMapper">
<resultMap id="BaseResultMap" type="net.wanji.web.entity.TBaseCrossInfo">
<mapper namespace="net.wanji.databus.dao.mapper.TBaseCrossInfoMapper">
<resultMap id="BaseResultMap" type="net.wanji.databus.po.TBaseCrossInfo">
<id column="id" property="id" jdbcType="CHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="type" property="type" jdbcType="TINYINT"/>
......@@ -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.web.po.CrossInfoPO">
<resultMap id="SelectAllMap" type="net.wanji.databus.po.CrossInfoPO">
<id column="id" property="id" jdbcType="CHAR"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="type" property="type" jdbcType="TINYINT"/>
......@@ -44,7 +44,7 @@
from t_base_cross_info
where id = #{id,jdbcType=CHAR}
</delete>
<insert id="insert" parameterType="net.wanji.web.entity.TBaseCrossInfo">
<insert id="insert" parameterType="net.wanji.databus.po.TBaseCrossInfo">
insert into t_base_cross_info (id, name, type,
level, area_code, location,
is_signal, is_start, is_send,
......@@ -54,7 +54,7 @@
#{isSignal,jdbcType=TINYINT}, #{isStart,jdbcType=TINYINT}, #{isSend,jdbcType=TINYINT},
#{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="net.wanji.web.entity.TBaseCrossInfo">
<insert id="insertSelective" parameterType="net.wanji.databus.po.TBaseCrossInfo">
insert into t_base_cross_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -127,7 +127,7 @@
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="net.wanji.web.entity.TBaseCrossInfo">
<update id="updateByPrimaryKeySelective" parameterType="net.wanji.databus.po.TBaseCrossInfo">
update t_base_cross_info
<set>
<if test="name != null">
......@@ -163,7 +163,7 @@
</set>
where id = #{id,jdbcType=CHAR}
</update>
<update id="updateByPrimaryKey" parameterType="net.wanji.web.entity.TBaseCrossInfo">
<update id="updateByPrimaryKey" parameterType="net.wanji.databus.po.TBaseCrossInfo">
update t_base_cross_info
set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=TINYINT},
......@@ -177,7 +177,7 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=CHAR}
</update>
<select id="selectAll" parameterType="net.wanji.web.vo.CrossInfoVO" resultMap="SelectAllMap">
<select id="selectAll" parameterType="net.wanji.databus.vo.CrossInfoVO" resultMap="SelectAllMap">
<bind name="startNum" value="(pageNum - 1) * pageSize"/>
select c.id,c.name,c.type,c.level,c.area_code,a.name
area_name,c.location,c.is_signal,c.is_start,c.is_send,c.gmt_create,c.gmt_modified
......@@ -207,7 +207,7 @@
limit #{startNum}, #{pageSize}
</if>
</select>
<select id="countSelectAll" parameterType="net.wanji.web.vo.CrossInfoVO" resultType="integer">
<select id="countSelectAll" parameterType="net.wanji.databus.vo.CrossInfoVO" resultType="integer">
select count(1)
from t_base_cross_info c
left join t_base_area_info a on c.area_code=a.code
......@@ -234,7 +234,7 @@
</select>
<resultMap id="listCrossDeviceStatusInfoMap"
type="net.wanji.web.vo.situationDetection.CrossDeviceStatusInfoOutVO">
type="net.wanji.databus.vo.CrossDeviceStatusInfoOutVO">
<result property="crossId" column="id"/>
<result property="crossName" column="name"/>
<result property="location" column="location"/>
......
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