[update] 优化持久层

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossPhaseMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/scheme/BaseCrossPhaseMapper.java

 package net.wanji.web.mapper.scheme;
 
-import net.wanji.web.po.scheme.CrossPhasePO;
+import net.wanji.databus.dao.entity.CrossPhasePO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @date : 2023-1-3
  */
 @Repository
-public interface CrossPhaseMapper {
+public interface BaseCrossPhaseMapper {
 
     Integer selectIdByCrossIdAndCoordPhaseNo(@Param("crossId") String crossId,
                                              @Param("schemeId") Integer schemeId,

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossPlanMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/scheme/BaseCrossPlanMapper.java

 package net.wanji.web.mapper.scheme;
 
+import net.wanji.databus.dao.entity.CrossPlanPO;
 import net.wanji.web.dto.RunningPlanDTO;
-import net.wanji.web.po.scheme.CrossPlanPO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date 2023/1/28 13:16
  */
 @Repository
-public interface CrossPlanMapper {
+public interface BaseCrossPlanMapper {
 
     void insertOne(CrossPlanPO crossPlanPO);
 

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossSchedulesMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/scheme/BaseCrossSchedulesMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2023/1/28 13:16
  */
 @Repository
-public interface CrossSchedulesMapper {
+public interface BaseCrossSchedulesMapper {
 
     void deleteByCrossId(@Param("crossId") String crossId);
 

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossSchemeMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/scheme/BaseCrossSchemeMapper.java

 package net.wanji.web.mapper.scheme;
 
-import net.wanji.web.po.scheme.CrossSchemePO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import java.util.Set;
  * @date : 2023-1-3
  */
 @Repository
-public interface CrossSchemeMapper {
+public interface BaseCrossSchemeMapper {
 
     void deleteByCrossId(@Param("crossId") String crossId);
 

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossSectionMapper.java → signal-control-service/src/main/java/net/wanji/web/mapper/scheme/BaseCrossSectionMapper.java

 package net.wanji.web.mapper.scheme;
 
-import net.wanji.web.po.scheme.CrossSectionPO;
+import net.wanji.databus.dao.entity.CrossSectionPO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2023/1/28 13:16
  */
 @Repository
-public interface CrossSectionMapper {
+public interface BaseCrossSectionMapper {
 
     void insertOne(CrossSectionPO crossSectionPO);
 

signal-control-service/src/main/java/net/wanji/web/mapper/scheme/CrossPhaseLightsMapper.java

-package net.wanji.web.mapper.scheme;
-
-import net.wanji.web.po.scheme.CrossPhaseLightsPO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 相位灯组关系;(t_base_cross_phase_lights)表数据库访问层
- * @author : hanbing
- * @date : 2023-1-3
- */
-@Repository
-public interface CrossPhaseLightsMapper {
-    void deleteByCrossId(@Param("crossId") String crossId);
-
-    void insertBatch(@Param("entities") Collection<CrossPhaseLightsPO> entities);
-
-    List<CrossPhaseLightsPO> selectByPhaseId(@Param("phaseId") Integer phaseId);
-
-    List<CrossPhaseLightsPO> selectByLightsId(@Param("lightsId") Integer lightsId);
-
-    void updateLightsId(@Param("oldId") Integer oldId, @Param("newId") Integer newId);
-
-    Integer selectIdByThreeIds(Integer lightsId, Integer phaseId, String crossId);
-
-    void insertOne(CrossPhaseLightsPO crossPhaseLightsPO);
-
-    List<CrossPhaseLightsPO> listCrossPhaseLightsPO(@Param("entity") CrossPhaseLightsPO entity);
-}

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossPhaseLightsPO.java

-package net.wanji.web.po.scheme;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author Kent HAN
- * @date 2023/1/3 9:51
- */
-@Data
-public class CrossPhaseLightsPO {
-    /** 主键 */
-    @ApiModelProperty(name = "主键",notes = "")
-    private Integer id ;
-    /** 灯组ID */
-    @ApiModelProperty(name = "灯组ID",notes = "")
-    private Integer lightsId = 0 ;
-    /** 相位ID */
-    @ApiModelProperty(name = "相位ID",notes = "")
-    private Integer phaseId ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossPlanPO.java

-package net.wanji.web.po.scheme;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 计划基础信息;(t_base_cross_plan)表
- *
- * @author Kent HAN
- * @date 2022/12/28 17:45
- */
-@Data
-public class CrossPlanPO {
-    /** 计划ID */
-    @ApiModelProperty(name = "计划ID",notes = "")
-    private Integer id ;
-    /** 计划号 */
-    @ApiModelProperty(name = "计划号",notes = "")
-    private String planNo ;
-    /** 计划名称 */
-    @ApiModelProperty(name = "计划名称",notes = "")
-    private String name ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}
\ No newline at end of file

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossSectionPO.java

-package net.wanji.web.po.scheme;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 时段基础信息;(t_base_cross_section)表
- *
- * @author Kent HAN
- * @date 2022/12/28 17:45
- */
-@Data
-public class CrossSectionPO {
-    /** 时段ID */
-    @ApiModelProperty(name = "时段ID",notes = "")
-    private Integer id ;
-    /** 时段号 */
-    @ApiModelProperty(name = "时段号",notes = "")
-    private String sectionNo ;
-    /** 开始时间 */
-    @ApiModelProperty(name = "开始时间",notes = "")
-    private String startTime ;
-    /** 结束时间 */
-    @ApiModelProperty(name = "结束时间",notes = "")
-    private String endTime ;
-    /** 路口ID */
-    @ApiModelProperty(name = "路口ID",notes = "")
-    private String crossId ;
-    /** 计划ID */
-    @ApiModelProperty(name = "计划ID",notes = "")
-    private Integer planId ;
-    /** 控制模式：1定周期；2绿波协调；3黄闪；4全红；5关灯；6单点自适应；7全感应；8半感应；9 */
-    @ApiModelProperty(name = "控制模式：1定周期；2绿波协调；3黄闪；4全红；5关灯；6单点自适应；7全感应；8半感应；9",notes = "")
-    private Integer controlMode ;
-    /** 方案ID */
-    @ApiModelProperty(name = "方案ID",notes = "")
-    private Integer schemeId ;
-    /** 创建时间 */
-    @ApiModelProperty(name = "创建时间",notes = "")
-    private Date gmtCreate ;
-    /** 修改时间 */
-    @ApiModelProperty(name = "修改时间",notes = "")
-    private Date gmtModified ;
-}
\ No newline at end of file

signal-control-service/src/main/java/net/wanji/web/service/CrossInfoService.java

@@ -2,7 +2,7 @@ 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.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.CrossInfoVO;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public class CrossInfoService {
 
     @Autowired
-    private CrossInfoMapper crossInfoMapper;
+    private BaseCrossInfoMapper baseCrossInfoMapper;
 
     @Autowired
     private TBaseAreaInfoMapper areaInfoMapper;
@@ -49,8 +49,8 @@ public class CrossInfoService {
      */
     public JsonViewObject selectAll(CrossInfoVO crossInfoVO) {
         PageResultPO<CrossInfoPO> page = new PageResultPO<>();
-        Integer count = crossInfoMapper.countSelectAll(crossInfoVO);
-        List<CrossInfoPO> list = crossInfoMapper.selectAll(crossInfoVO);
+        Integer count = baseCrossInfoMapper.countSelectAll(crossInfoVO);
+        List<CrossInfoPO> list = baseCrossInfoMapper.selectAll(crossInfoVO);
         page.setPageNum(crossInfoVO.getPageNum());
         page.setPageSize(crossInfoVO.getPageSize());
         page.setTotal(count);
@@ -66,14 +66,14 @@ public class CrossInfoService {
     public JsonViewObject addOne(BaseCrossInfoVO crossInfoPO) {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance().success();
         if (StringUtils.isNoneBlank(crossInfoPO.getId())) {
-            TBaseCrossInfo tBaseCrossInfo = crossInfoMapper.selectByPrimaryKey(crossInfoPO.getId());
+            TBaseCrossInfo tBaseCrossInfo = baseCrossInfoMapper.selectByPrimaryKey(crossInfoPO.getId());
             if (Objects.nonNull(tBaseCrossInfo)) {
                 return jsonViewObject.fail("路口编号重复，请重新设置！");
             }
         }
         TBaseCrossInfo record = getBaseCrossInfo(crossInfoPO);
         record.setGmtCreate(new Date());
-        int insert = crossInfoMapper.insertSelective(record);
+        int insert = baseCrossInfoMapper.insertSelective(record);
         if (insert > 0) {
             return jsonViewObject.success("添加成功");
         }
@@ -94,7 +94,7 @@ public class CrossInfoService {
             record.setIsSend(0);
         }
         record.setGmtModified(new Date());
-        int update = crossInfoMapper.updateByPrimaryKeySelective(record);
+        int update = baseCrossInfoMapper.updateByPrimaryKeySelective(record);
         if (update > 0) {
             return JsonViewObject.newInstance().success("修改成功");
         }
@@ -153,7 +153,7 @@ public class CrossInfoService {
      * @param ids id集合
      */
     public JsonViewObject delete(List<String> ids) {
-        crossInfoMapper.deleteBatchIds(ids);
+        baseCrossInfoMapper.deleteBatchIds(ids);
         return JsonViewObject.newInstance().success("删除成功");
     }
 

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -11,7 +11,7 @@ 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.databus.dao.mapper.CrossInfoMapper;
+import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.TBaseCrossInfo;
 import net.wanji.databus.vo.*;
@@ -60,7 +60,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
     private final GreenwaveRealtimeMapper greenwaveRealtimeMapper;
     private final AllDeviceStatusMapper allDeviceStatusMapper;
     private final GreenwaveCrossMapper greenwaveCrossMapper;
-    private final CrossInfoMapper tBaseCrossInfoMapper;
+    private final BaseCrossInfoMapper tBaseBaseCrossInfoMapper;
     private final TBaseAreaInfoMapper tBaseAreaInfoMapper;
     private final TBaseAreaCrossMapper tBaseAreaCrossMapper;
     private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
@@ -149,7 +149,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         CrossAlarmOutVO crossAlarmOutVO = new CrossAlarmOutVO();
         // 根据路口ID获取路口名称
         String crossId = crossAlarmPO.getCrossId();
-        TBaseCrossInfo tBaseCrossInfo = tBaseCrossInfoMapper.selectByPrimaryKey(crossId);
+        TBaseCrossInfo tBaseCrossInfo = tBaseBaseCrossInfoMapper.selectByPrimaryKey(crossId);
         crossAlarmOutVO.setCrossName(tBaseCrossInfo.getName());
         // 从例如POINT(116.29959807 39.95929275)中获取经纬度
         String location = tBaseCrossInfo.getLocation();
@@ -398,13 +398,13 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
 
     @Override
     public List<CrossDeviceStatusInfoOutVO> crossDeviceStatusInfo() {
-        List<CrossDeviceStatusInfoOutVO> results = tBaseCrossInfoMapper.listCrossDeviceStatusInfo();
+        List<CrossDeviceStatusInfoOutVO> results = tBaseBaseCrossInfoMapper.listCrossDeviceStatusInfo();
         return results;
     }
 
     @Override
     public CrossInfoPO selectCrossInfoById(String signalId) {
-        return tBaseCrossInfoMapper.selectById(signalId);
+        return tBaseBaseCrossInfoMapper.selectById(signalId);
     }
 
     @Override
@@ -427,7 +427,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         List<TBaseAreaCross> tBaseAreaCrosses = tBaseAreaCrossMapper.selectList(crossQuery);
 
         // 查询路口信息
-        List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(new LambdaQueryWrapper<>());
+        List<TBaseCrossInfo> tBaseCrossInfos = tBaseBaseCrossInfoMapper.selectList(new LambdaQueryWrapper<>());
 
         // 将路口和辖区转化为辖区实体
         getJurisdictionAreaTreeVO(resultList, tBaseAreaInfos, tBaseAreaCrosses, tBaseCrossInfos);
@@ -531,7 +531,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         Map<Integer, List<TBaseAreaCross>> areaIdMap = entityList.stream().collect(Collectors.groupingBy(TBaseAreaCross::getAreaId));
 
         // 路口编号获取路口名称和经纬度
-        List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(new LambdaQueryWrapper<>());
+        List<TBaseCrossInfo> tBaseCrossInfos = tBaseBaseCrossInfoMapper.selectList(new LambdaQueryWrapper<>());
         Map<String, String> crossIdNameMap = tBaseCrossInfos.stream().collect(Collectors.toMap(TBaseCrossInfo::getId, TBaseCrossInfo::getName));
         Map<String, String> crossIdLocationMap = tBaseCrossInfos.stream().collect(Collectors.toMap(TBaseCrossInfo::getId, TBaseCrossInfo::getLocation));
 
@@ -639,7 +639,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         List<TCrossControlHist> tCrossControlHists = controlHistMapper.selectRecentList();
         LambdaQueryWrapper<TBaseCrossInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TBaseCrossInfo::getIsSignal, "1");
-        List<TBaseCrossInfo> tBaseCrossInfos = tBaseCrossInfoMapper.selectList(wrapper);
+        List<TBaseCrossInfo> tBaseCrossInfos = tBaseBaseCrossInfoMapper.selectList(wrapper);
         if (!CollectionUtils.isEmpty(tCrossControlHists)) {
             if (Objects.nonNull(operationMode)) {
                 if (operationMode == 1) { //中心优化

signal-control-service/src/main/java/net/wanji/web/service/impl/SpecialServiceServiceImpl.java

@@ -3,7 +3,7 @@ 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.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.web.common.enums.CrossPhasePlanTurnTypeEnum;
 import net.wanji.web.common.enums.CrossDirEnum;
 import net.wanji.web.common.enums.SpecialServiceCrossTurnEnum;
@@ -37,7 +37,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
     CustomRidInfoMapper customRidInfoMapper;
 
     @Autowired
-    CrossInfoMapper tBaseCrossInfoMapper;
+    BaseCrossInfoMapper tBaseBaseCrossInfoMapper;
 
     @Autowired
     CrossDirTurnMapper crossDirTurnMapper;
@@ -152,7 +152,7 @@ public class SpecialServiceServiceImpl implements SpecialServiceService {
             Integer sort = specialServiceCrossPO.getSort();
             crossListOutVO.setSort(sort);
             crossListOutVO.setStatus(specialServiceCrossPO.getStatus());
-            TBaseCrossInfo tBaseCrossInfo = tBaseCrossInfoMapper.selectByPrimaryKey(specialServiceCrossPO.getCrossId());
+            TBaseCrossInfo tBaseCrossInfo = tBaseBaseCrossInfoMapper.selectByPrimaryKey(specialServiceCrossPO.getCrossId());
             // 经纬度
             String location = tBaseCrossInfo.getLocation();
             double[] lonLat = CrossUtil.getLonLat(location);

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/RunningPlanServiceImpl.java

@@ -2,17 +2,13 @@ package net.wanji.web.service.scheme.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import net.wanji.common.dto.CrossIdDTO;
+import net.wanji.databus.dao.entity.CrossPlanPO;
+import net.wanji.databus.dao.entity.CrossSchemePO;
+import net.wanji.databus.dao.entity.CrossSectionPO;
 import net.wanji.web.dto.RunningPlanDTO;
-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.mapper.scheme.CrossSectionMapper;
-import net.wanji.web.po.scheme.CrossPlanPO;
+import net.wanji.web.mapper.scheme.*;
 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.po.scheme.CrossSectionPO;
 import net.wanji.web.service.scheme.RunningPlanService;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -34,19 +30,19 @@ import java.util.stream.Collectors;
 public class RunningPlanServiceImpl implements RunningPlanService {
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-    private final CrossPlanMapper crossPlanMapper;
-    private final CrossSchemeMapper crossSchemeMapper;
-    private final CrossSectionMapper crossSectionMapper;
-    private final CrossSchedulesMapper crossSchedulesMapper;
+    private final BaseCrossPlanMapper BaseCrossPlanMapper;
+    private final BaseCrossSchemeMapper baseCrossSchemeMapper;
+    private final BaseCrossSectionMapper baseCrossSectionMapper;
+    private final BaseCrossSchedulesMapper baseCrossSchedulesMapper;
     private final CrossSchedulesPlanMapper crossSchedulesPlanMapper;
 
-    public RunningPlanServiceImpl(CrossPlanMapper crossPlanMapper, CrossSchemeMapper crossSchemeMapper,
-                                  CrossSectionMapper crossSectionMapper, CrossSchedulesMapper crossSchedulesMapper,
+    public RunningPlanServiceImpl(BaseCrossPlanMapper BaseCrossPlanMapper, BaseCrossSchemeMapper baseCrossSchemeMapper,
+                                  BaseCrossSectionMapper baseCrossSectionMapper, BaseCrossSchedulesMapper baseCrossSchedulesMapper,
                                   CrossSchedulesPlanMapper crossSchedulesPlanMapper) {
-        this.crossPlanMapper = crossPlanMapper;
-        this.crossSchemeMapper = crossSchemeMapper;
-        this.crossSectionMapper = crossSectionMapper;
-        this.crossSchedulesMapper = crossSchedulesMapper;
+        this.BaseCrossPlanMapper = BaseCrossPlanMapper;
+        this.baseCrossSchemeMapper = baseCrossSchemeMapper;
+        this.baseCrossSectionMapper = baseCrossSectionMapper;
+        this.baseCrossSchedulesMapper = baseCrossSchedulesMapper;
         this.crossSchedulesPlanMapper = crossSchedulesPlanMapper;
     }
 
@@ -55,9 +51,9 @@ public class RunningPlanServiceImpl implements RunningPlanService {
     public void saveRunningPlan(RunningPlanDTO runningPlanDTO) throws ParseException {
         String crossId = runningPlanDTO.getCrossId();
         // 清空之前计划
-        crossPlanMapper.deleteByCrossId(crossId);
-        crossSectionMapper.deleteByCrossId(crossId);
-        crossSchedulesMapper.deleteByCrossId(crossId);
+        BaseCrossPlanMapper.deleteByCrossId(crossId);
+        baseCrossSectionMapper.deleteByCrossId(crossId);
+        baseCrossSchedulesMapper.deleteByCrossId(crossId);
         crossSchedulesPlanMapper.deleteByCrossId(crossId);
         // 保存计划数据
         saveCrossPlan(runningPlanDTO, crossId);
@@ -82,7 +78,7 @@ public class RunningPlanServiceImpl implements RunningPlanService {
 
     private List<RunningPlanDTO.SchedulesPlanListElement> buildSchedulesPlanList(String crossId) {
         List<RunningPlanDTO.SchedulesPlanListElement> schedulesPlanList = new ArrayList<>();
-        List<CrossSchedulesPO> crossSchedulesPOList = crossSchedulesMapper.selectByCrossId(crossId);
+        List<CrossSchedulesPO> crossSchedulesPOList = baseCrossSchedulesMapper.selectByCrossId(crossId);
         for (CrossSchedulesPO crossSchedulesPO : crossSchedulesPOList) {
             String scheduleNo = crossSchedulesPO.getScheduleNo();
             String name = crossSchedulesPO.getName();
@@ -103,7 +99,7 @@ public class RunningPlanServiceImpl implements RunningPlanService {
     private List<RunningPlanDTO.ExecListElement> buildExecList(String crossId, String scheduleNo) {
         List<RunningPlanDTO.ExecListElement> execList = new ArrayList<>();
         // 获取调度ID
-        CrossSchedulesPO schedulesPO = crossSchedulesMapper.selectByCrossIdAndScheduleNo(crossId, scheduleNo);
+        CrossSchedulesPO schedulesPO = baseCrossSchedulesMapper.selectByCrossIdAndScheduleNo(crossId, scheduleNo);
         Integer schedulesId = schedulesPO.getId();
         // 根据路口ID、调度ID和计划ID查询调度计划关系
         List<CrossSchedulesPlanPO> crossSchedulesPlanPOList =
@@ -127,7 +123,7 @@ public class RunningPlanServiceImpl implements RunningPlanService {
             }
             execListElement.setWeek(week);
             execListElement.setSpecialDateList(specialDateList);
-            CrossPlanPO crossPlanPO = crossPlanMapper.selectById(planId);
+            CrossPlanPO crossPlanPO = BaseCrossPlanMapper.selectById(planId);
             execListElement.setPlanName(crossPlanPO.getName());
             execList.add(execListElement);
         }
@@ -136,9 +132,9 @@ public class RunningPlanServiceImpl implements RunningPlanService {
 
     private List<RunningPlanDTO.DailyPlanListElement> buildDailyPlanList(String crossId) {
         List<RunningPlanDTO.DailyPlanListElement> dailyPlanList = new ArrayList<>();
-        dailyPlanList = crossPlanMapper.selectDailyPlanList(crossId);
+        dailyPlanList = BaseCrossPlanMapper.selectDailyPlanList(crossId);
         if (CollectionUtil.isEmpty(dailyPlanList)) {
-            List<CrossPlanPO> crossPlanPOList = crossPlanMapper.selectByCrossId(crossId);
+            List<CrossPlanPO> crossPlanPOList = BaseCrossPlanMapper.selectByCrossId(crossId);
             if (CollectionUtil.isNotEmpty(crossPlanPOList)) {
                 for (CrossPlanPO crossPlanPO : crossPlanPOList) {
                     RunningPlanDTO.DailyPlanListElement dailyPlan = new RunningPlanDTO.DailyPlanListElement();
@@ -173,14 +169,14 @@ public class RunningPlanServiceImpl implements RunningPlanService {
             crossSchedulesPO.setName(schedulesPlan.getName());
             crossSchedulesPO.setStatus(0); // 新增调度状态为未执行
             crossSchedulesPO.setCrossId(crossId);
-            crossSchedulesMapper.insertOne(crossSchedulesPO);
+            baseCrossSchedulesMapper.insertOne(crossSchedulesPO);
             Integer crossSchedulesId = crossSchedulesPO.getId();
             // 遍历执行的日计划列表
             List<RunningPlanDTO.ExecListElement> execList = schedulesPlan.getExecList();
             for (RunningPlanDTO.ExecListElement execListElement : execList) {
                 // 根据路口ID和计划名获取计划ID
                 String planName = execListElement.getPlanName();
-                CrossPlanPO crossPlanPO = crossPlanMapper.selectByCrossIdAndName(crossId, planName);
+                CrossPlanPO crossPlanPO = BaseCrossPlanMapper.selectByCrossIdAndName(crossId, planName);
                 if (crossPlanPO != null) {
                     Integer planId = crossPlanPO.getId();
                     // 更新调度计划关系表
@@ -235,13 +231,13 @@ public class RunningPlanServiceImpl implements RunningPlanService {
             crossPlanPO.setPlanNo(planNo);
             crossPlanPO.setName(dailyPlan.getName());
             crossPlanPO.setCrossId(crossId);
-            crossPlanMapper.insertOne(crossPlanPO);
+            BaseCrossPlanMapper.insertOne(crossPlanPO);
             Integer crossPlanId = crossPlanPO.getId();
             List<RunningPlanDTO.TimeListElement> timeList = dailyPlan.getTimeList();
             for (RunningPlanDTO.TimeListElement time : timeList) {
                 // 根据路口ID和方案名获取方案ID
                 String schemeName = time.getSchemeName();
-                CrossSchemePO crossSchemePO = crossSchemeMapper.selectByCrossIdAndSchemeName(crossId, schemeName);
+                CrossSchemePO crossSchemePO = baseCrossSchemeMapper.selectByCrossIdAndSchemeName(crossId, schemeName);
                 Integer schemeId = crossSchemePO.getId();
                 // 更新时段表
                 updateCrossSection(crossId, crossPlanId, schemeId, time);
@@ -263,7 +259,7 @@ public class RunningPlanServiceImpl implements RunningPlanService {
         crossSectionPO.setCrossId(crossId);
         crossSectionPO.setPlanId(crossPlanId);
         crossSectionPO.setControlMode(1); // todo 暂时只有定周期
-        crossSectionPO.setSchemeId(schemeId);
-        crossSectionMapper.insertOne(crossSectionPO);
+        crossSectionPO.setScemeId(schemeId);
+        baseCrossSectionMapper.insertOne(crossSectionPO);
     }
 }

signal-control-service/src/main/java/net/wanji/web/task/SignalStatusTask.java

@@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.common.utils.tool.BeanMapUtils;
-import net.wanji.databus.dao.mapper.CrossInfoMapper;
+import net.wanji.databus.dao.mapper.BaseCrossInfoMapper;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.vo.SignalStatusVO;
 import net.wanji.feign.service.UtcFeignClients;
@@ -36,7 +36,7 @@ public class SignalStatusTask {
     private final TDeviceStatusMapper tDeviceStatusMapper;
     private final ControlHistMapper controlHistMapper;
     private final TDeviceStatusLogMapper tDeviceStatusLogMapper;
-    private final CrossInfoMapper crossInfoMapper;
+    private final BaseCrossInfoMapper baseCrossInfoMapper;
 
     @Scheduled(fixedRate = 1 * 30 * 1000)
     @Transactional
@@ -54,7 +54,7 @@ public class SignalStatusTask {
             // 信号机状态信息
             List<CrossInfoPO> crossInfoPOList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(crossIdList)) {
-                crossInfoPOList = crossInfoMapper.selectByCrossIds(crossIdList);
+                crossInfoPOList = baseCrossInfoMapper.selectByCrossIds(crossIdList);
             }
             List<CrossInfoPO> finalCrossInfoPOList = crossInfoPOList;
             content.forEach(signalStatusVO -> {

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

 package net.wanji.web.vo;
 
 import lombok.Data;
-import net.wanji.databus.po.CrossLightsPO;
-import net.wanji.web.po.scheme.CrossPhaseLightsPO;
-import net.wanji.web.po.scheme.CrossPhasePO;
-import net.wanji.web.po.scheme.CrossSchemePO;
+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.po.BaseCrossLightsPO;
 
 import java.util.List;
 
@@ -12,6 +12,6 @@ import java.util.List;
 public class SchemePhaseLightsVO {
     private List<CrossSchemePO> crossSchemeList;
     private List<CrossPhasePO> crossPhaseList;
-    private List<CrossLightsPO> crossLightsList;
+    private List<BaseCrossLightsPO> crossLightsList;
     private List<CrossPhaseLightsPO> crossPhaseLightsPOList;
 }
\ No newline at end of file

signal-control-service/src/main/resources/mapper/scheme/CrossPhaseMapper.xml → signal-control-service/src/main/resources/mapper/scheme/BaseCrossPhaseMapper.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.web.mapper.scheme.CrossPhaseMapper">
+<mapper namespace="net.wanji.web.mapper.scheme.BaseCrossPhaseMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap type="net.wanji.web.po.scheme.CrossPhasePO" id="BaseResultMap">
+    <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"/>
@@ -30,7 +30,7 @@
         id,phase_no,name,sort,cross_id,plan_id,ring_no,group_no,phase_type,control_mode,phase_time,green_time,green_flash_time,yellow_flash_time,red_flash_time,ped_flash_time,yellow_time,red_time,min_green_time,max_green_time
     </sql>
 
-    <select id="listCrossPhasePO" resultMap="BaseResultMap" parameterType="net.wanji.web.po.scheme.CrossPhasePO">
+    <select id="listCrossPhasePO" resultMap="BaseResultMap" parameterType="net.wanji.databus.dao.entity.CrossPhasePO">
         select
         <include refid="Base_Column_List"></include>
         from t_base_cross_phase

signal-control-service/src/main/resources/mapper/scheme/CrossPlanMapper.xml → signal-control-service/src/main/resources/mapper/scheme/BaseCrossPlanMapper.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.web.mapper.scheme.CrossPlanMapper">
+<mapper namespace="net.wanji.web.mapper.scheme.BaseCrossPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap type="net.wanji.web.po.scheme.CrossPlanPO" id="BaseResultMap">
+    <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"/>
@@ -13,8 +13,9 @@
     </resultMap>
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_plan(plan_no,name,cross_id)
-        values (#{planNo},#{name},#{crossId})
+        insert into t_base_cross_plan(plan_no, name, cross_id)
+        values (#{planNo}, #{name}, #{crossId});
+
     </insert>
 
     <delete id="deleteByCrossId">
@@ -55,14 +56,14 @@
         WHERE t1.cross_id = #{crossId}
     </select>
 
-    <select id="selectById" resultType="net.wanji.web.po.scheme.CrossPlanPO">
+    <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossPlanPO">
         select
             id,plan_no,name,cross_id,gmt_create,gmt_modified
         from t_base_cross_plan
         where id = #{planId}
     </select>
 
-    <select id="selectByCrossId" resultType="net.wanji.web.po.scheme.CrossPlanPO">
+    <select id="selectByCrossId" resultType="net.wanji.databus.dao.entity.CrossPlanPO">
         select
             id,plan_no,name,cross_id,gmt_create,gmt_modified
         from t_base_cross_plan

signal-control-service/src/main/resources/mapper/scheme/CrossSchedulesMapper.xml → signal-control-service/src/main/resources/mapper/scheme/BaseCrossSchedulesMapper.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.web.mapper.scheme.CrossSchedulesMapper">
+<mapper namespace="net.wanji.web.mapper.scheme.BaseCrossSchedulesMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap type="net.wanji.web.po.scheme.CrossSchedulesPO" id="BaseResultMap">

signal-control-service/src/main/resources/mapper/scheme/CrossSchemeMapper.xml → signal-control-service/src/main/resources/mapper/scheme/BaseCrossSchemeMapper.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.web.mapper.scheme.CrossSchemeMapper">
+<mapper namespace="net.wanji.web.mapper.scheme.BaseCrossSchemeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap type="net.wanji.web.po.scheme.CrossSchemePO" id="BaseResultMap">
+    <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"/>
@@ -107,7 +107,7 @@
         where cross_id = #{crossId} and name = #{schemeName}
     </select>
 
-    <select id="selectById" resultType="net.wanji.web.po.scheme.CrossSchemePO">
+    <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossSchemePO">
         select
             id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme

signal-control-service/src/main/resources/mapper/scheme/CrossSectionMapper.xml → signal-control-service/src/main/resources/mapper/scheme/BaseCrossSectionMapper.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.web.mapper.scheme.CrossSectionMapper">
+<mapper namespace="net.wanji.web.mapper.scheme.BaseCrossSectionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap type="net.wanji.web.po.scheme.CrossSectionPO" id="BaseResultMap">
+    <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"/>
@@ -31,7 +31,7 @@
         WHERE cross_id = #{crossId}
     </delete>
 
-    <select id="listCrossSectionPO" parameterType="net.wanji.web.po.scheme.CrossSectionPO" resultMap="BaseResultMap">
+    <select id="listCrossSectionPO" parameterType="net.wanji.databus.dao.entity.CrossSectionPO" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_list"/>
         from t_base_cross_section

signal-control-service/src/main/resources/mapper/scheme/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.web.mapper.scheme.CrossPhaseLightsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap type="net.wanji.web.po.scheme.CrossPhaseLightsPO" id="BaseResultMap">
-        <result property="id" column="id"/>
-        <result property="lightsId" column="lights_id"/>
-        <result property="phaseId" column="phase_id"/>
-        <result property="crossId" column="cross_id"/>
-        <result property="gmtCreate" column="gmt_create"/>
-        <result property="gmtModified" column="gmt_modified"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id, lights_id, phase_id, cross_id, gmt_create, gmt_modified
-    </sql>
-
-    <select id="listCrossPhaseLightsPO" resultMap="BaseResultMap" parameterType="net.wanji.web.po.scheme.CrossPhaseLightsPO">
-        select
-            <include refid="Base_Column_List"></include>
-        from t_base_cross_phase_lights
-        <where>
-            <if test="entity.crossId != null and entity.crossId != ''">
-                cross_id = #{entity.crossId}
-            </if>
-            <if test="entity.phaseId != null and entity.phaseId != ''">
-                phase_id = #{entity.phaseId}
-            </if>
-        </where>
-    </select>
-
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_phase_lights(lights_id,phase_id,cross_id)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.lightsId},#{entity.phaseId},#{entity.crossId})
-        </foreach>
-    </insert>
-
-    <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_phase_lights(lights_id,phase_id,cross_id)
-        values (#{lightsId},#{phaseId},#{crossId})
-    </insert>
-
-    <update id="updateLightsId">
-        update t_base_cross_phase_lights
-        set lights_id = #{newId}
-        where lights_id = #{oldId}
-    </update>
-
-    <delete id="deleteByCrossId">
-        delete from t_base_cross_phase_lights
-        where cross_id = #{crossId}
-    </delete>
-
-    <select id="selectByPhaseId" resultMap="BaseResultMap">
-        select
-            id,lights_id,phase_id,cross_id,gmt_create,gmt_modified
-        from t_base_cross_phase_lights
-        where phase_id = #{phaseId}
-    </select>
-
-    <select id="selectByLightsId" resultMap="BaseResultMap">
-        select
-            id,lights_id,phase_id,cross_id,gmt_create,gmt_modified
-        from t_base_cross_phase_lights
-        where lights_id = #{lightsId}
-    </select>
-
-    <select id="selectIdByThreeIds" resultType="java.lang.Integer">
-        SELECT id from t_base_cross_phase_lights
-        WHERE cross_id = #{crossId} and lights_id = #{lightsId} and phase_id = #{phaseId}
-    </select>
-
-
-</mapper>

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossPhasePO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossPhasePO.java

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

signal-control-service/src/main/java/net/wanji/web/po/scheme/CrossSchemePO.java → wj-databus/src/main/java/net/wanji/databus/dao/entity/CrossSchemePO.java

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