命名规范

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

@@ -2,12 +2,12 @@ package net.wanji.utc.hisense.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.utc.hisense.pojo.view.VIntersectionEntity;
+import net.wanji.utc.hisense.pojo.view.VIntersectionView;
 
 /**
  * @author duanruiming
  * @date 2024/11/07 9:50
  */
 @DS("oracle")
-public interface VIntersectionMapper extends BaseMapper<VIntersectionEntity> {
+public interface VIntersectionMapper extends BaseMapper<VIntersectionView> {
 }

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

@@ -2,7 +2,7 @@ package net.wanji.utc.hisense.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseAscAction;
+import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseAscActionView;
 
 /**
  * @ClassName VNtcipTimeBaseAscActionMapper
@@ -11,5 +11,5 @@ import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseAscAction;
  * @Date 2024/11/12 09:30
  */
 @DS("oracle")
-public interface VNtcipTimeBaseAscActionMapper extends BaseMapper<VNtcipTimeBaseAscAction> {
+public interface VNtcipTimeBaseAscActionMapper extends BaseMapper<VNtcipTimeBaseAscActionView> {
 }

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

@@ -2,7 +2,7 @@ package net.wanji.utc.hisense.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseDayplan;
+import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseDayplanView;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @Date 2024/11/11 20:12
  */
 @DS("oracle")
-public interface VNtcipTimeBaseDayplanMapper  extends BaseMapper<VNtcipTimeBaseDayplan> {
+public interface VNtcipTimeBaseDayplanMapper  extends BaseMapper<VNtcipTimeBaseDayplanView> {
 
     /**
      * 根据路口编号和计划ID获取时段信息
@@ -21,5 +21,5 @@ public interface VNtcipTimeBaseDayplanMapper  extends BaseMapper<VNtcipTimeBaseD
      * @param dayPlanId 计划ID
      * @return 时段信息
      */
-    List<VNtcipTimeBaseDayplan> listByCrossIdAndDayPlanId(String crossId, Integer dayPlanId);
+    List<VNtcipTimeBaseDayplanView> listByCrossIdAndDayPlanId(String crossId, Integer dayPlanId);
 }

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

@@ -2,12 +2,12 @@ package net.wanji.utc.hisense.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseSchedule;
+import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseScheduleView;
 
 /**
  * @author duanruiming
  * @date 2024/11/07 11:23
  */
 @DS("oracle")
-public interface VNtcipTimeBaseScheduleMapper  extends BaseMapper<VNtcipTimeBaseSchedule> {
+public interface VNtcipTimeBaseScheduleMapper  extends BaseMapper<VNtcipTimeBaseScheduleView> {
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VIntersectionEntity.java → signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VIntersectionView.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @TableName("hicon.v_intersection")
-public class VIntersectionEntity {
+public class VIntersectionView {
     @TableField("CINTSID")
     private String cIntsID;
     @TableField("CINTSNAME")

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseAscAction.java → signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseAscActionView.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @TableName("hicon.V_NTCIPTIMEBASEASCACTION")
-public class VNtcipTimeBaseAscAction {
+public class VNtcipTimeBaseAscActionView {
     /** 所属路口编号  */
     @TableField("CINTSID")
     private String cIntsID;

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseDayplan.java → signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseDayplanView.java

@@ -12,7 +12,7 @@ import lombok.Data;
  */
 @Data
 @TableName("hicon.V_NTCIPTIMEBASEDAYPLAN")
-public class VNtcipTimeBaseDayplan {
+public class VNtcipTimeBaseDayplanView {
     /** 所属路口编号 NC(6) Y */
     @TableField("CINTSID")
     private String cIntsID;

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseSchedule.java → signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/view/VNtcipTimeBaseScheduleView.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @TableName("hicon.V_NTCIPTIMEBASESCHEDULE")
-public class VNtcipTimeBaseSchedule {
+public class VNtcipTimeBaseScheduleView {
     @TableField("CINTSID")
     private String cIntsID;
     @TableField("NTIMEBASESCHEDULENUMBER")

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

@@ -21,10 +21,10 @@ import net.wanji.utc.hisense.common.constants.HttpConstants;
 import net.wanji.utc.hisense.mapper.*;
 import net.wanji.utc.hisense.pojo.result.CoordinationStatus;
 import net.wanji.utc.hisense.pojo.result.CrossSchemeRings;
-import net.wanji.utc.hisense.pojo.view.VIntersectionEntity;
+import net.wanji.utc.hisense.pojo.view.VIntersectionView;
 import net.wanji.utc.hisense.pojo.view.VNtcipChannelPhaseDTO;
-import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseDayplan;
-import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseSchedule;
+import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseDayplanView;
+import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseScheduleView;
 import net.wanji.utc.hisense.service.StaticInfoService;
 import net.wanji.utc.hisense.util.OkHttpClientUtil;
 import org.dom4j.Document;
@@ -77,19 +77,19 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         Map<String, String> codeCrossIdMap = crossInfoPOList.stream().collect(Collectors.toMap(CrossInfoPO::getCode, CrossInfoPO::getId));
         List<CrossInfoPO> crossInfoPOS = new ArrayList<>();
         if (StringUtils.equalsIgnoreCase("HISENSE", crossInfoDTO.getManufacturerCode())) {
-            LambdaQueryWrapper<VIntersectionEntity> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(VIntersectionEntity::getCIntsID, codeList);
-            List<VIntersectionEntity> vIntersectionEntities = vIntersectionMapper.selectList(queryWrapper);
-            for (VIntersectionEntity vIntersectionEntity : vIntersectionEntities) {
-                String cIntsID = vIntersectionEntity.getCIntsID();
+            LambdaQueryWrapper<VIntersectionView> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(VIntersectionView::getCIntsID, codeList);
+            List<VIntersectionView> vIntersectionEntities = vIntersectionMapper.selectList(queryWrapper);
+            for (VIntersectionView vIntersectionView : vIntersectionEntities) {
+                String cIntsID = vIntersectionView.getCIntsID();
                 CrossInfoPO crossInfoPO = new CrossInfoPO();
                 crossInfoPO.setId(codeCrossIdMap.get(cIntsID));
                 crossInfoPO.setCode(cIntsID);
-                crossInfoPO.setName(vIntersectionEntity.getCIntsName());
-                crossInfoPO.setIp(vIntersectionEntity.getCCONTROLLERIP());
-                String[] array = {String.valueOf(vIntersectionEntity.getLongitude()), String.valueOf(vIntersectionEntity.getLatitude())};
+                crossInfoPO.setName(vIntersectionView.getCIntsName());
+                crossInfoPO.setIp(vIntersectionView.getCCONTROLLERIP());
+                String[] array = {String.valueOf(vIntersectionView.getLongitude()), String.valueOf(vIntersectionView.getLatitude())};
                 crossInfoPO.setLocation(StringUtils.join(array, ","));
-                crossInfoPO.setVersion(vIntersectionEntity.getCControllerModel());
+                crossInfoPO.setVersion(vIntersectionView.getCControllerModel());
                 crossInfoPO.setManufacturerId(22);
                 crossInfoPOS.add(crossInfoPO);
             }
@@ -110,14 +110,14 @@ public class StaticInfoServiceImpl implements StaticInfoService {
 
     @Override
     public List<PlanSectionVO> planSection(PlanSectionDTO planSectionDTO) throws Exception {
-        LambdaQueryWrapper<VNtcipTimeBaseDayplan> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(VNtcipTimeBaseDayplan::getCIntsID, planSectionDTO.getCrossId());
+        LambdaQueryWrapper<VNtcipTimeBaseDayplanView> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VNtcipTimeBaseDayplanView::getCIntsID, planSectionDTO.getCrossId());
         //planNo = -1 时查询所有计划
         if (planSectionDTO.getPlanNo() != -1) {
-            queryWrapper.eq(VNtcipTimeBaseDayplan::getCIntsID, planSectionDTO.getCrossId());
+            queryWrapper.eq(VNtcipTimeBaseDayplanView::getCIntsID, planSectionDTO.getCrossId());
         }
 
-        List<VNtcipTimeBaseDayplan> vNtcipTimeBaseDayplans = vNtcipTimeBaseDayplanMapper.selectList(queryWrapper);
+        List<VNtcipTimeBaseDayplanView> vNtcipTimeBaseDayplanViews = vNtcipTimeBaseDayplanMapper.selectList(queryWrapper);
 
 
 
@@ -136,24 +136,24 @@ public class StaticInfoServiceImpl implements StaticInfoService {
             for (String code : crossCodeList) {
                 CrossInfoPO crossInfoBySignalCode = CrossInfoCache.getCrossInfoBySignalCode(code);
                 String crossId = crossInfoBySignalCode.getId();
-                LambdaQueryWrapper<VNtcipTimeBaseSchedule> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(VNtcipTimeBaseSchedule::getCIntsID, code);
-                List<VNtcipTimeBaseSchedule> vNtcipTimeBaseSchedules = vNtcipTimeBaseScheduleMapper.selectList(queryWrapper);
-                if (!CollectionUtils.isEmpty(vNtcipTimeBaseSchedules)) {
-                    for (VNtcipTimeBaseSchedule vNtcipTimeBaseSchedule : vNtcipTimeBaseSchedules) {
-                        if (Objects.nonNull(vNtcipTimeBaseSchedule)) {
+                LambdaQueryWrapper<VNtcipTimeBaseScheduleView> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(VNtcipTimeBaseScheduleView::getCIntsID, code);
+                List<VNtcipTimeBaseScheduleView> vNtcipTimeBaseScheduleViews = vNtcipTimeBaseScheduleMapper.selectList(queryWrapper);
+                if (!CollectionUtils.isEmpty(vNtcipTimeBaseScheduleViews)) {
+                    for (VNtcipTimeBaseScheduleView vNtcipTimeBaseScheduleView : vNtcipTimeBaseScheduleViews) {
+                        if (Objects.nonNull(vNtcipTimeBaseScheduleView)) {
                             CrossSchedulesPO crossSchedulesPO = new CrossSchedulesPO();
                             crossSchedulesPO.setCrossId(crossId);
-                            crossSchedulesPO.setScheduleNo(vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
-                            crossSchedulesPO.setName("海信调度" + vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
+                            crossSchedulesPO.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
+                            crossSchedulesPO.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
                             // 海信月份
-                            Integer hisenseMonth = vNtcipTimeBaseSchedule.getNTimeBaseScheduleMonth();
+                            Integer hisenseMonth = vNtcipTimeBaseScheduleView.getNTimeBaseScheduleMonth();
                             // 星期
-                            Integer hisenseWeek = vNtcipTimeBaseSchedule.getNTimeBaseScheduleDay();
+                            Integer hisenseWeek = vNtcipTimeBaseScheduleView.getNTimeBaseScheduleDay();
                             // 日期 2147483647
-                            Integer hisenseDays = vNtcipTimeBaseSchedule.getNTimeBaseScheduleDate();
+                            Integer hisenseDays = vNtcipTimeBaseScheduleView.getNTimeBaseScheduleDate();
                             // 时段表号
-                            Integer hisensePlanId = vNtcipTimeBaseSchedule.getNTimeBaseScheduleDayPlan();
+                            Integer hisensePlanId = vNtcipTimeBaseScheduleView.getNTimeBaseScheduleDayPlan();
                             String monthsStr = ScheduleUtil.getSchedule(hisenseMonth.longValue(), 1);
                             String daysStr = ScheduleUtil.getSchedule(hisenseDays.longValue(), 2);
                             String weekStr = ScheduleUtil.getSchedule(hisenseWeek.longValue(), 3);
@@ -162,8 +162,8 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                                 for (String oneWeek : weekSplit) {
                                     CrossSchedulesPO crossSchedulesPOWeek = new CrossSchedulesPO();
                                     crossSchedulesPOWeek.setCrossId(crossId);
-                                    crossSchedulesPOWeek.setScheduleNo(vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
-                                    crossSchedulesPOWeek.setName("海信调度" + vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
+                                    crossSchedulesPOWeek.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
+                                    crossSchedulesPOWeek.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
                                     crossSchedulesPOWeek.setWeek(Integer.valueOf(oneWeek));
                                     crossSchedulesPOWeek.setMonths(monthsStr);
                                     crossSchedulesPOWeek.setDays(daysStr);
@@ -174,8 +174,8 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                                 // 不执行周调度
                                 CrossSchedulesPO crossSchedulesPOMonthDays = new CrossSchedulesPO();
                                 crossSchedulesPOMonthDays.setCrossId(crossId);
-                                crossSchedulesPOMonthDays.setScheduleNo(vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
-                                crossSchedulesPOMonthDays.setName("海信调度" + vNtcipTimeBaseSchedule.getNTimeBaseScheduleNumber());
+                                crossSchedulesPOMonthDays.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
+                                crossSchedulesPOMonthDays.setName("海信调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
                                 crossSchedulesPOMonthDays.setWeek(null);
                                 crossSchedulesPOMonthDays.setMonths(monthsStr);
                                 crossSchedulesPOMonthDays.setDays(daysStr);