[update] 优化持久层

signal-utc-service/pom.xml

@@ -41,6 +41,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.wanji</groupId>
+            <artifactId>wj-databus</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>

signal-utc-service/src/main/java/net/wanji/utc/controller/StaticInfoController.java

@@ -7,12 +7,12 @@ import io.swagger.annotations.ApiResponses;
 import net.wanji.common.annotation.aspect.AspectLog;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.utc.dto.CrossInfoDTO;
 import net.wanji.utc.dto.CrossSchedulesDTO;
 import net.wanji.utc.dto.PlanSectionDTO;
 import net.wanji.utc.dto.SchemePhaseLightsDTO;
 import net.wanji.utc.po.CrossInfoPO;
-import net.wanji.utc.po.CrossSchedulesPO;
 import net.wanji.utc.service.staticinfo.StaticInfoService;
 import net.wanji.utc.vo.PlanSectionVO;
 import net.wanji.utc.vo.SchemePhaseLightsVO;

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossLightsMapper.java

-package net.wanji.utc.mapper;
-
-import net.wanji.utc.po.CrossLightsPO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author Kent HAN
- * @date 2022/11/18 14:10
- */
-public interface CrossLightsMapper {
-    void deleteOne(@Param("crossId") String crossId,
-                   @Param("elementId") String elementId);
-
-    void insertOne(CrossLightsPO crossLightsPO);
-
-    List<CrossLightsPO> selectByCrossId(@Param("crossId") String crossId);
-
-    void deleteByCrossId(String crossId);
-}

signal-utc-service/src/main/java/net/wanji/utc/po/CrossPhasePO.java

-package net.wanji.utc.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Kent HAN
- * @date 2022/11/18 8:49
- */
-@Data
-public class CrossPhasePO {
-    /** 相位ID */
-    @ApiModelProperty(value = "相位ID",notes = "")
-    private Integer id ;
-    /** 相位号 */
-    @ApiModelProperty(value = "相位号",notes = "")
-    private String phaseNo;
-    /** 相位名称 */
-    @ApiModelProperty(value = "相位名称",notes = "")
-    private String name ;
-    /** 相位序号 */
-    @ApiModelProperty(value = "相位序号",notes = "")
-    private Integer sort ;
-    /** 路口ID */
-    @ApiModelProperty(value = "路口ID",notes = "")
-    private String crossId ;
-    /** 方案ID */
-    @ApiModelProperty(value = "方案ID",notes = "")
-    private Integer planId ;
-    /** 环号 */
-    @ApiModelProperty(value = "环号",notes = "")
-    private Integer ringNo ;
-    /** 控制模式：1定周期；2绿灯；3黄灯；4红灯；5关灯；6绿闪；7黄闪；8红闪 */
-    @ApiModelProperty(value = "控制模式：1定周期；2绿灯；3黄灯；4红灯；5关灯；6绿闪；7黄闪；8红闪",notes = "")
-    private Integer controlMode ;
-    /** 相位时间 */
-    @ApiModelProperty(value = "相位时间",notes = "")
-    private Integer phaseTime ;
-    /** 绿灯时间 */
-    @ApiModelProperty(value = "绿灯时间",notes = "")
-    private Integer greenTime ;
-    /** 绿闪时间 */
-    @ApiModelProperty(value = "绿闪时间",notes = "")
-    private Integer greenFlashTime ;
-    /** 行闪时间 */
-    @ApiModelProperty(value = "行闪时间",notes = "")
-    private Integer pedFlashTime ;
-    /** 黄灯时间 */
-    @ApiModelProperty(value = "黄灯时间",notes = "")
-    private Integer yellowTime ;
-    /** 红灯时间 */
-    @ApiModelProperty(value = "红灯时间",notes = "")
-    private Integer redTime ;
-    /** 最小绿灯时间 */
-    @ApiModelProperty(value = "最小绿灯时间",notes = "")
-    private Integer minGreenTime ;
-    /** 最大绿灯时间 */
-    @ApiModelProperty(value = "最大绿灯时间",notes = "")
-    private Integer maxGreenTime ;
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-utc-service/src/main/java/net/wanji/utc/po/CrossSchemePO.java

-package net.wanji.utc.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Kent HAN
- * @date 2022/11/16 16:09
- */
-@Data
-public class CrossSchemePO {
-    /** 方案ID */
-    @ApiModelProperty(value = "方案ID",notes = "")
-    private Integer id ;
-    /** 方案号 */
-    @ApiModelProperty(value = "方案号",notes = "")
-    private String schemeNo;
-    /** 方案名称 */
-    @ApiModelProperty(value = "方案名称",notes = "")
-    private String name ;
-    /** 路口ID */
-    @ApiModelProperty(value = "路口ID",notes = "")
-    private String crossId ;
-    /** 周期 */
-    @ApiModelProperty(value = "周期",notes = "")
-    private Integer cycle ;
-    /** 协调相位ID */
-    @ApiModelProperty(value = "协调相位ID",notes = "")
-    private Integer coordPhase ;
-    /** 相位差 */
-    @ApiModelProperty(value = "相位差",notes = "")
-    private Integer offset ;
-    /** 数据来源：1信号机；2平台 */
-    @ApiModelProperty(value = "数据来源：1信号机；2平台",notes = "")
-    private Integer source ;
-    /** 删除标识：1删除；0未删除 */
-    @ApiModelProperty(value = "删除标识：1删除；0未删除",notes = "")
-    private Integer isDeleted ;
-    /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(value = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java

@@ -2,10 +2,14 @@ package net.wanji.utc.service.control.impl;
 
 import lombok.RequiredArgsConstructor;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.dao.entity.*;
+import net.wanji.databus.dao.mapper.*;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.common.typeenum.DateStyle;
-import net.wanji.utc.mapper.*;
-import net.wanji.utc.po.*;
+import net.wanji.utc.mapper.CrossInfoMapper;
+import net.wanji.utc.mapper.ManufacturerInfoMapper;
+import net.wanji.utc.po.CrossInfoPO;
+import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 import net.wanji.utc.service.control.ControlCommandService;
 import net.wanji.utc.service.control.ControlCommandStrategyService;

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/HKControlCommandServiceImpl.java

@@ -8,6 +8,8 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.dao.entity.CrossPhasePO;
+import net.wanji.databus.dao.mapper.CrossPhaseMapper;
 import net.wanji.utc.common.baseentity.BaseCrossInfo;
 import net.wanji.utc.common.exception.ControlException;
 import net.wanji.utc.common.typeenum.BasicEnum;
@@ -17,10 +19,8 @@ import net.wanji.utc.dto.hk.DownloadPlanSpandsDTO;
 import net.wanji.utc.dto.hk.DownloadScheduleDTO;
 import net.wanji.utc.dto.hk.DownloadTimeSpandsDTO;
 import net.wanji.utc.mapper.CrossInfoMapper;
-import net.wanji.utc.mapper.CrossPhaseMapper;
 import net.wanji.utc.mapper.ManufacturerInfoMapper;
 import net.wanji.utc.po.CrossInfoPO;
-import net.wanji.utc.po.CrossPhasePO;
 import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 import net.wanji.utc.po.hk.response.HKResponse;

signal-utc-service/src/main/java/net/wanji/utc/service/runninginfo/impl/HkLightsStatusServiceImpl.java

@@ -7,13 +7,13 @@ import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.wanji.databus.dao.mapper.BaseCrossLightsMapper;
+import net.wanji.databus.po.BaseCrossLightsPO;
 import net.wanji.utc.common.baseentity.BaseCrossInfo;
 import net.wanji.utc.common.constant.Constants;
 import net.wanji.utc.mapper.CrossInfoMapper;
-import net.wanji.utc.mapper.CrossLightsMapper;
 import net.wanji.utc.mapper.ManufacturerInfoMapper;
 import net.wanji.utc.po.CrossInfoPO;
-import net.wanji.utc.po.CrossLightsPO;
 import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.po.hk.request.HKRequest;
 import net.wanji.utc.po.hk.request.RealTimeStateInfoQueryPO;
@@ -36,7 +36,7 @@ import java.util.*;
 @RequiredArgsConstructor
 public class HkLightsStatusServiceImpl implements HkLightsStatusService {
     private final ArtemisConfig artemisConfig;
-    private final CrossLightsMapper crossLightsMapper;
+    private final BaseCrossLightsMapper baseCrossLightsMapper;
     private final CrossInfoMapper crossInfoMapper;
     private final ManufacturerInfoMapper manufacturerInfoMapper;
 
@@ -93,7 +93,7 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
         List<LightsStatusVO> result = new ArrayList<>();
 
         CrossInfoPO crossInfoPO = crossInfoMapper.selectByPrimaryKey(crossId);
-        List<CrossLightsPO> crossLightsPOList = crossLightsMapper.selectByCrossId(crossId);
+        List<BaseCrossLightsPO> CrossLightsPOList = baseCrossLightsMapper.selectByCrossId(crossId);
 
         if (Objects.nonNull(crossInfoPO)) {
             String signalCode = crossInfoPO.getCode();
@@ -158,7 +158,7 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
                             Integer channelNo = channelStatePO.getChannelNo();
                             Integer state = channelStatePO.getState();
                             String color = transferHKLampGroup(state);
-                            for (CrossLightsPO po : crossLightsPOList) {
+                            for (BaseCrossLightsPO po : CrossLightsPOList) {
                                 if (StringUtils.equals(po.getLightsNo(), String.valueOf(channelNo))) {
                                     String direction = po.getDir().toString();
                                     String turn = po.getTurn().toString();
@@ -241,7 +241,7 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
 
                 String crossId = crossInfoMapper.selectIdByCodeAndManufacturerId(entity.getCode(),
                         manufacturerInfoPO.getId());
-                List<CrossLightsPO> crossLightsPOList = crossLightsMapper.selectByCrossId(crossId);
+                List<BaseCrossLightsPO> CrossLightsPOList = baseCrossLightsMapper.selectByCrossId(crossId);
 
                 if (Constants.HK_SUCCESS_CODE.equals(object.getInteger(Constants.HK_CODE_KEY))) {
                     JSONObject data = object.getJSONObject("data");
@@ -297,7 +297,7 @@ public class HkLightsStatusServiceImpl implements HkLightsStatusService {
                             JSONObject channelObj = channelState.getJSONObject(k);
                             int channelNo = channelObj.getIntValue("channelNo");
                             String color = transferHKLampGroup(channelObj.getIntValue("state"));
-                            for (CrossLightsPO po : crossLightsPOList) {
+                            for (BaseCrossLightsPO po : CrossLightsPOList) {
                                 if (StringUtils.equals(po.getLightsNo(), String.valueOf(channelNo))) {
                                     String direction = po.getDir().toString();
                                     String turn = po.getTurn().toString();

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/StaticInfoService.java

 package net.wanji.utc.service.staticinfo;
 
+import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.utc.dto.CrossInfoDTO;
 import net.wanji.utc.dto.CrossSchedulesDTO;
-import net.wanji.utc.po.CrossInfoPO;
 import net.wanji.utc.dto.PlanSectionDTO;
 import net.wanji.utc.dto.SchemePhaseLightsDTO;
-import net.wanji.utc.po.CrossSchedulesPO;
+import net.wanji.utc.po.CrossInfoPO;
 import net.wanji.utc.vo.PlanSectionVO;
 import net.wanji.utc.vo.SchemePhaseLightsVO;
 

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/WanJiCommonStaticInfoService.java

 package net.wanji.utc.service.staticinfo;
 
+import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.utc.common.Result;
-import net.wanji.utc.po.CrossSchedulesPO;
 import net.wanji.utc.service.rpc.RpcService;
 import net.wanji.utc.vo.PlanSectionVO;
 import net.wanji.utc.vo.SchemePhaseLightsVO;

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/HkCrossSchedulesServiceImpl.java

@@ -7,13 +7,13 @@ import com.alibaba.fastjson.TypeReference;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.RequiredArgsConstructor;
+import net.wanji.databus.dao.entity.CrossSchedulesPO;
+import net.wanji.databus.dao.mapper.CrossPlanMapper;
+import net.wanji.databus.dao.mapper.CrossSchedulesMapper;
 import net.wanji.utc.common.constant.Constants;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.mapper.CrossInfoMapper;
-import net.wanji.utc.mapper.CrossPlanMapper;
-import net.wanji.utc.mapper.CrossSchedulesMapper;
 import net.wanji.utc.mapper.ManufacturerInfoMapper;
-import net.wanji.utc.po.CrossSchedulesPO;
 import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.po.hk.response.DatePO;
 import net.wanji.utc.po.hk.response.HKResponse;

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/HkPlanSectionServiceImpl.java

@@ -5,14 +5,14 @@ import com.alibaba.fastjson.TypeReference;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.RequiredArgsConstructor;
+import net.wanji.databus.dao.entity.CrossPlanPO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
+import net.wanji.databus.dao.entity.CrossSectionPO;
+import net.wanji.databus.dao.mapper.CrossPlanMapper;
+import net.wanji.databus.dao.mapper.CrossSchemeMapper;
+import net.wanji.databus.dao.mapper.CrossSectionMapper;
 import net.wanji.utc.common.constant.Constants;
 import net.wanji.utc.common.typeenum.HkPlanSectionControlTypeEnum;
-import net.wanji.utc.mapper.CrossPlanMapper;
-import net.wanji.utc.mapper.CrossSchemeMapper;
-import net.wanji.utc.mapper.CrossSectionMapper;
-import net.wanji.utc.po.CrossPlanPO;
-import net.wanji.utc.po.CrossSchemePO;
-import net.wanji.utc.po.CrossSectionPO;
 import net.wanji.utc.po.hk.request.PlanSectionInfoQueryPO;
 import net.wanji.utc.po.hk.response.HKResponse;
 import net.wanji.utc.po.hk.response.PlanPO;

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/HkSchemePhaseLightsServiceImpl.java

@@ -6,11 +6,19 @@ import com.alibaba.fastjson.JSONObject;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.RequiredArgsConstructor;
+import net.wanji.databus.dao.entity.CrossLightsPO;
+import net.wanji.databus.dao.entity.CrossPhaseLightsPO;
+import net.wanji.databus.dao.entity.CrossPhasePO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
+import net.wanji.databus.dao.mapper.CrossLightsMapper;
+import net.wanji.databus.dao.mapper.CrossPhaseLightsMapper;
+import net.wanji.databus.dao.mapper.CrossPhaseMapper;
+import net.wanji.databus.dao.mapper.CrossSchemeMapper;
 import net.wanji.utc.common.constant.Constants;
-import net.wanji.utc.common.typeenum.*;
+import net.wanji.utc.common.typeenum.HkLightsDirEnum;
+import net.wanji.utc.common.typeenum.HkLightsTurnEnum;
+import net.wanji.utc.common.typeenum.HkLightsTypeEnum;
 import net.wanji.utc.entity.cache.PhaseCache;
-import net.wanji.utc.mapper.*;
-import net.wanji.utc.po.*;
 import net.wanji.utc.service.staticinfo.HkSchemePhaseLightsService;
 import net.wanji.utc.util.PathUtil;
 import org.springframework.stereotype.Service;

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/StaticInfoServiceImpl.java

 package net.wanji.utc.service.staticinfo.impl;
 
 import lombok.RequiredArgsConstructor;
+import net.wanji.databus.dao.entity.*;
+import net.wanji.databus.dao.mapper.*;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.dto.CrossInfoDTO;
 import net.wanji.utc.dto.CrossSchedulesDTO;
 import net.wanji.utc.dto.PlanSectionDTO;
 import net.wanji.utc.dto.SchemePhaseLightsDTO;
-import net.wanji.utc.mapper.*;
-import net.wanji.utc.po.*;
-import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService;
+import net.wanji.utc.mapper.CrossInfoMapper;
+import net.wanji.utc.mapper.ManufacturerInfoMapper;
+import net.wanji.utc.po.CrossInfoPO;
+import net.wanji.utc.po.ManufacturerInfoPO;
 import net.wanji.utc.service.staticinfo.*;
 import net.wanji.utc.vo.PlanSectionVO;
 import net.wanji.utc.vo.SchemePhaseLightsVO;

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/WanJiCommonStaticInfoServiceImpl.java

@@ -4,21 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.dao.entity.*;
+import net.wanji.databus.dao.mapper.*;
 import net.wanji.utc.common.Result;
-import net.wanji.utc.mapper.CrossLightsMapper;
-import net.wanji.utc.mapper.CrossPhaseLightsMapper;
-import net.wanji.utc.mapper.CrossPhaseMapper;
-import net.wanji.utc.mapper.CrossPlanMapper;
-import net.wanji.utc.mapper.CrossSchedulesMapper;
-import net.wanji.utc.mapper.CrossSchemeMapper;
-import net.wanji.utc.mapper.CrossSectionMapper;
-import net.wanji.utc.po.CrossLightsPO;
-import net.wanji.utc.po.CrossPhaseLightsPO;
-import net.wanji.utc.po.CrossPhasePO;
-import net.wanji.utc.po.CrossPlanPO;
-import net.wanji.utc.po.CrossSchedulesPO;
-import net.wanji.utc.po.CrossSchemePO;
-import net.wanji.utc.po.CrossSectionPO;
 import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService;
 import net.wanji.utc.util.HttpRestUtil;
 import net.wanji.utc.vo.PlanSectionVO;

signal-utc-service/src/main/java/net/wanji/utc/vo/PlanSectionVO.java

 package net.wanji.utc.vo;
 
 import lombok.Data;
-import net.wanji.utc.po.CrossPlanPO;
-import net.wanji.utc.po.CrossSectionPO;
+import net.wanji.databus.dao.entity.CrossPlanPO;
+import net.wanji.databus.dao.entity.CrossSectionPO;
 
 import java.util.List;
 

signal-utc-service/src/main/java/net/wanji/utc/vo/SchemePhaseLightsVO.java

 package net.wanji.utc.vo;
 
 import lombok.Data;
-import net.wanji.utc.po.CrossLightsPO;
-import net.wanji.utc.po.CrossPhaseLightsPO;
-import net.wanji.utc.po.CrossPhasePO;
-import net.wanji.utc.po.CrossSchemePO;
+import net.wanji.databus.dao.entity.CrossLightsPO;
+import net.wanji.databus.dao.entity.CrossPhaseLightsPO;
+import net.wanji.databus.dao.entity.CrossPhasePO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
 
 import java.util.List;
 

signal-utc-service/src/main/resources/mapper/CrossLightsMapper.xml

-<?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.utc.mapper.CrossLightsMapper">
-    <resultMap type="net.wanji.utc.po.CrossLightsPO" id="BaseResultMap">
-        <result property="id" column="id"/>
-        <result property="lightsNo" column="lights_no"/>
-        <result property="name" column="name"/>
-        <result property="type" column="type"/>
-        <result property="dir" column="dir"/>
-        <result property="turn" column="turn"/>
-        <result property="crossId" column="cross_id"/>
-        <result property="inOutType" column="in_out_type"/>
-        <result property="gmtCreate" column="gmt_create"/>
-        <result property="gmtModified" column="gmt_modified"/>
-    </resultMap>
-
-    <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_lights(lights_no,name,type,dir,turn,cross_id,in_out_type)
-        values (#{lightsNo},#{name},#{type},#{dir},#{turn},#{crossId},#{inOutType})
-    </insert>
-
-    <delete id="deleteOne">
-        delete from t_cross_lights
-        where cross_id = #{crossId} and name = #{elementId}
-    </delete>
-
-    <delete id="deleteByCrossId">
-        delete from t_cross_lights
-        where cross_id = #{crossId}
-    </delete>
-
-    <select id="selectByCrossId" resultMap="BaseResultMap">
-        select
-            id,lights_no,name,type,dir,turn,cross_id,in_out_type,gmt_create,gmt_modified
-        from t_cross_lights
-        where cross_id = #{crossId}
-    </select>
-
-
-</mapper>

signal-utc-service/src/main/java/net/wanji/utc/po/CrossLightsPO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossLightsPO.java

-package net.wanji.utc.po;
+package net.wanji.databus.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-utc-service/src/main/java/net/wanji/utc/po/CrossPhaseLightsPO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossPhaseLightsPO.java

-package net.wanji.utc.po;
+package net.wanji.databus.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-utc-service/src/main/java/net/wanji/utc/po/CrossPlanPO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossPlanPO.java

-package net.wanji.utc.po;
+package net.wanji.databus.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-utc-service/src/main/java/net/wanji/utc/po/CrossSchedulesPO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossSchedulesPO.java

-package net.wanji.utc.po;
+package net.wanji.databus.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +16,7 @@ public class CrossSchedulesPO {
     private Integer id ;
     /** 日期编号 */
     @ApiModelProperty(value = "日期编号",notes = "")
-    private Integer scheduleNo ;
+    private Integer scheduleNo;
     /** 日期名称 */
     @ApiModelProperty(value = "日期名称",notes = "")
     private String name ;

signal-utc-service/src/main/java/net/wanji/utc/po/CrossSectionPO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossSectionPO.java

-package net.wanji.utc.po;
+package net.wanji.databus.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +34,7 @@ public class CrossSectionPO {
     private Integer controlMode ;
     /** 方案ID */
     @ApiModelProperty(value = "方案ID",notes = "")
-    private Integer scemeId ;
+    private Integer scemeId;
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间",notes = "")
     private Date gmtCreate ;

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossPhaseLightsMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossPhaseLightsMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossPhaseLightsPO;
+import net.wanji.databus.dao.entity.CrossPhaseLightsPO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,4 +19,10 @@ public interface CrossPhaseLightsMapper {
     void insertBatch(@Param("entities") List<CrossPhaseLightsPO> crossPhaseLightsPOList);
 
     List<CrossPhaseLightsPO> selectByCrossId(String crossId);
+
+    List<CrossPhaseLightsPO> selectByEntity(@Param("entity") CrossPhaseLightsPO entity);
+
+    void updateLightsId(@Param("oldId") Integer oldId, @Param("newId") Integer newId);
+
 }
+

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossPhaseMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossPhaseMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossPhasePO;
+import net.wanji.databus.dao.entity.CrossPhasePO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossPlanMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossPlanMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossPlanPO;
+import net.wanji.databus.dao.entity.CrossPlanPO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +21,7 @@ public interface CrossPlanMapper {
     List<CrossPlanPO> selectByCrossId(@Param("crossId") String crossId);
 
     List<CrossPlanPO> selectByCrossIdAndPlanNo(@Param("crossId") String crossId, @Param("planNo")Integer planNo);
+
+    CrossPlanPO selectById(@Param("planId")Integer planId);
+
 }

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossSchedulesMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossSchedulesMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossSchedulesPO;
+import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossSchemeMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossSchemeMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossSchemePO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

signal-utc-service/src/main/java/net/wanji/utc/mapper/CrossSectionMapper.java → wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossSectionMapper.java

-package net.wanji.utc.mapper;
+package net.wanji.databus.dao.mapper;
 
-import net.wanji.utc.po.CrossSectionPO;
+import net.wanji.databus.dao.entity.CrossSectionPO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

signal-utc-service/src/main/resources/mapper/CrossPhaseLightsMapper.xml → wj-databus/src/main/resources/mapper/CrossPhaseLightsMapper.xml

 <?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.utc.mapper.CrossPhaseLightsMapper">
-    <resultMap type="net.wanji.utc.po.CrossPhaseLightsPO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossPhaseLightsMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossPhaseLightsPO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="lightsId" column="lights_id"/>
         <result property="phaseId" column="phase_id"/>
@@ -24,12 +24,28 @@
         where cross_id = #{crossId}
     </delete>
 
-    <select id="selectByCrossId" resultType="net.wanji.utc.po.CrossPhaseLightsPO">
+    <select id="selectByCrossId" resultType="net.wanji.databus.dao.entity.CrossPhaseLightsPO">
         select
             id,lights_id,phase_id,cross_id,gmt_create,gmt_modified
         from t_cross_phase_lights
         where cross_id = #{crossId}
     </select>
 
+    <select id="selectByEntity" parameterType="net.wanji.databus.dao.entity.CrossPhaseLightsPO" resultType="net.wanji.databus.dao.entity.CrossPhaseLightsPO">
+        select
+            id,lights_id,phase_id,cross_id,gmt_create,gmt_modified
+        from t_cross_phase_lights
+        <where>
+            <if test="entity.phaseId != null and entity.phaseId != ''">
+                phase_id = #{entity.phaseId}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateLightsId">
+        update t_base_cross_phase_lights
+        set lights_id = #{newId}
+        where lights_id = #{oldId}
+    </update>
 
 </mapper>

signal-utc-service/src/main/resources/mapper/CrossPhaseMapper.xml → wj-databus/src/main/resources/mapper/CrossPhaseMapper.xml

 <?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.utc.mapper.CrossPhaseMapper">
-    <resultMap type="net.wanji.utc.po.CrossPhasePO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossPhaseMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossPhasePO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="phaseNo" column="phase_no"/>
         <result property="name" column="name"/>

signal-utc-service/src/main/resources/mapper/CrossPlanMapper.xml → wj-databus/src/main/resources/mapper/CrossPlanMapper.xml

 <?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.utc.mapper.CrossPlanMapper">
-    <resultMap type="net.wanji.utc.po.CrossPlanPO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossPlanMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossPlanPO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="planNo" column="plan_no"/>
         <result property="name" column="name"/>
@@ -49,5 +49,11 @@
         where cross_id = #{crossId} and plan_no = #{planNo}
     </select>
 
+    <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossPlanPO">
+        select
+            id,plan_no,name,cross_id,gmt_create,gmt_modified
+        from t_cross_plan
+        where  plan_no = #{planId}
+    </select>
 
 </mapper>

signal-utc-service/src/main/resources/mapper/CrossSchedulesMapper.xml → wj-databus/src/main/resources/mapper/CrossSchedulesMapper.xml

 <?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.utc.mapper.CrossSchedulesMapper">
-    <resultMap type="net.wanji.utc.po.CrossSchedulesPO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossSchedulesMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossSchedulesPO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="scheduleNo" column="schedule_no"/>
         <result property="name" column="name"/>

signal-utc-service/src/main/resources/mapper/CrossSchemeMapper.xml → wj-databus/src/main/resources/mapper/CrossSchemeMapper.xml

 <?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.utc.mapper.CrossSchemeMapper">
-    <resultMap type="net.wanji.utc.po.CrossSchemePO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossSchemeMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossSchemePO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="schemeNo" column="scheme_no"/>
         <result property="name" column="name"/>

signal-utc-service/src/main/resources/mapper/CrossSectionMapper.xml → wj-databus/src/main/resources/mapper/CrossSectionMapper.xml

 <?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.utc.mapper.CrossSectionMapper">
-    <resultMap type="net.wanji.utc.po.CrossSectionPO" id="BaseResultMap">
+<mapper namespace="net.wanji.databus.dao.mapper.CrossSectionMapper">
+    <resultMap type="net.wanji.databus.dao.entity.CrossSectionPO" id="BaseResultMap">
         <result property="id" column="id"/>
         <result property="sectionNo" column="section_no"/>
         <result property="startTime" column="start_time"/>