计划数据-计划信息、时段信息 接口

signal-feign-service/src/main/java/net/wanji/feign/service/common/FeignCommon.java

@@ -5,6 +5,7 @@ import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.databus.dto.*;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

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

+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;
+
+/**
+ * @ClassName VNtcipTimeBaseAscActionMapper
+ * @Description VNtcipTimeBaseAscAction Mapper
+ * @Author zhouleilei
+ * @Date 2024/11/12 09:30
+ */
+@DS("oracle")
+public interface VNtcipTimeBaseAscActionMapper extends BaseMapper<VNtcipTimeBaseAscAction> {
+}

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

+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 java.util.List;
+
+/**
+ * @ClassName VNtcipTimeBaseDayplanMapper
+ * @Description 时段视图 Mapper
+ * @Author zhouleilei
+ * @Date 2024/11/11 20:12
+ */
+@DS("oracle")
+public interface VNtcipTimeBaseDayplanMapper  extends BaseMapper<VNtcipTimeBaseDayplan> {
+
+    /**
+     * 根据路口编号和计划ID获取时段信息
+     * @param crossId 路口编号
+     * @param dayPlanId 计划ID
+     * @return 时段信息
+     */
+    List<VNtcipTimeBaseDayplan> listByCrossIdAndDayPlanId(String crossId, Integer dayPlanId);
+}

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

+package net.wanji.utc.hisense.pojo.view;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @ClassName VNtcipTimeBaseAscAction
+ * @Description 时基动作视图
+ * @Author zhouleilei
+ * @Date 2024/11/11 22:00
+ */
+@Data
+@TableName("hicon.V_NTCIPTIMEBASEASCACTION")
+public class VNtcipTimeBaseAscAction {
+    /** 所属路口编号  */
+    @TableField("CINTSID")
+    private String cIntsID;
+    /** 动作号  */
+    @TableField("NTIMEBASEASCACTIONNUMBER")
+    private Integer nTimebaseAscActionNumber;
+    /** 方案号  设置为 0 表明没有方案被选择 */
+    @TableField("NTIMEBASEASCPATTERN")
+    private Integer nTimebaseAscPattern;
+    /** 感应控制辅助功能选择 */
+    @TableField("NTIMEBASEASCAUXILLARYFUNCTION")
+    private Integer nTimebaseAscAuxillaryFunction;
+    /** 特殊功能 */
+    @TableField("NTIMEBASEASCSPECIALFUNCTION")
+    private Integer nTimebaseAscSpecialFunction;
+    /**  策略号 INT 默认 0 */
+    @TableField("NSTRATEGYNO")
+    private Integer nStrategyNo;
+}

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

+package net.wanji.utc.hisense.pojo.view;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @ClassName VNtcipTimeBaseDayplan
+ * @Description 时段视图
+ * @Author zhouleilei
+ * @Date 2024/11/11 19:57
+ */
+@Data
+@TableName("hicon.V_NTCIPTIMEBASEDAYPLAN")
+public class VNtcipTimeBaseDayplan {
+    /** 所属路口编号 NC(6) Y */
+    @TableField("CINTSID")
+    private String cIntsID;
+    /** 时段表号 INT Y (1..16)Y */
+    @TableField("NDAYPLANNUMBER")
+    private Integer nDayPlanNumber;
+    /** 时段序号 INT (1..48) */
+    @TableField("NDAYPLANEVENTNUMBER")
+    private Integer nDayPlanEventNumber;
+    /** 执行时刻的整点数 INT 24 时制 */
+    @TableField("NDAYPLANHOUR")
+    private Integer nDayPlanHour;
+    /** 执行时刻的整分数 INT */
+    @TableField("NDAYPLANMINUTE")
+    private Integer nDayPlanMinute;
+    /**  动作号 INT */
+    @TableField("NDAYPLANACTIONNUMBEROID")
+    private Integer nDayPlanActionNumberOID;
+    /** 策略号 INT 该时段所用方案的所属策略， 默认 0 */
+    @TableField("NSTRATEGYNO")
+    private Integer nStrategyNo;
+
+}

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

@@ -17,10 +17,13 @@ import net.wanji.databus.vo.SchemePhaseLightsVO;
 import net.wanji.utc.hisense.common.OperationBaseDom;
 import net.wanji.utc.hisense.common.constants.HttpConstants;
 import net.wanji.utc.hisense.mapper.VIntersectionMapper;
+import net.wanji.utc.hisense.mapper.VNtcipTimeBaseAscActionMapper;
+import net.wanji.utc.hisense.mapper.VNtcipTimeBaseDayplanMapper;
 import net.wanji.utc.hisense.mapper.VNtcipTimeBaseScheduleMapper;
 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.VNtcipTimeBaseDayplan;
 import net.wanji.utc.hisense.pojo.view.VNtcipTimeBaseSchedule;
 import net.wanji.utc.hisense.service.StaticInfoService;
 import net.wanji.utc.hisense.util.OkHttpClientUtil;
@@ -58,6 +61,10 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     private VIntersectionMapper vIntersectionMapper;
     @Resource
     private VNtcipTimeBaseScheduleMapper vNtcipTimeBaseScheduleMapper;
+    @Resource
+    private VNtcipTimeBaseDayplanMapper vNtcipTimeBaseDayplanMapper;
+    @Resource
+    private VNtcipTimeBaseAscActionMapper vNtcipTimeBaseAscActionMapper;
 
     @Override
     public List<CrossInfoPO> crossBasicInfo(CrossInfoDTO crossInfoDTO) throws Exception {
@@ -94,6 +101,16 @@ 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());
+        //planNo = -1 时查询所有计划
+        if (planSectionDTO.getPlanNo() != -1) {
+            queryWrapper.eq(VNtcipTimeBaseDayplan::getCIntsID, planSectionDTO.getCrossId());
+        }
+
+        List<VNtcipTimeBaseDayplan> vNtcipTimeBaseDayplans = vNtcipTimeBaseDayplanMapper.selectList(queryWrapper);
+
+
         return null;
     }
 

signal-utc-hisense-service/src/main/resources/mapper/VNtcipTimeBaseAscActionMapper.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.hisense.mapper.VNtcipTimeBaseAscActionMapper">
+
+
+</mapper>
\ No newline at end of file

signal-utc-hisense-service/src/main/resources/mapper/VNtcipTimeBaseDayplanMapper.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.hisense.mapper.VNtcipTimeBaseDayplanMapper">
+
+
+</mapper>
\ No newline at end of file

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

@@ -11,17 +11,15 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dto.CrossIdDTO;
 import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
-import net.wanji.databus.vo.TempSchemeSendVO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import net.wanji.utc.service.control.ControlCommandStrategyService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-
 import java.util.Date;
 import java.util.Objects;
 

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

@@ -4,7 +4,7 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.*;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 
 import java.util.Date;

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

@@ -3,10 +3,9 @@ package net.wanji.utc.service.control;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
-import net.wanji.databus.vo.TempSchemeSendVO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 
 import java.util.Date;
 

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

@@ -11,7 +11,7 @@ import net.wanji.databus.po.BaseCrossLightsPO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.CrossPhaseDirTurnCache;
 import net.wanji.utc.cache.CrossSchemePhaseTimeCountCache;

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

@@ -8,18 +8,17 @@ 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.dto.ExtendPhaseDTO;
-import net.wanji.databus.dto.StepingPhaseDTO;
-import net.wanji.databus.vo.TempSchemeSendVO;
 import net.wanji.databus.dao.entity.CrossPhasePO;
 import net.wanji.databus.dao.entity.SetTimingPO;
 import net.wanji.databus.dao.mapper.CrossInfoMapper;
 import net.wanji.databus.dao.mapper.CrossPhaseMapper;
 import net.wanji.databus.dao.mapper.ManufacturerInfoMapper;
+import net.wanji.databus.dto.ExtendPhaseDTO;
+import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.ManufacturerInfoPO;
 import net.wanji.databus.vo.*;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import net.wanji.utc.common.exception.ControlException;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.common.typeenum.CrossLightsDirEnum;

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

@@ -6,7 +6,7 @@ import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.*;
 import net.wanji.feign.service.common.FeignCommon;
-import net.wanji.databus.vo.SchemeOptSendVO;
+import net.wanji.opt.vo.SchemeOptSendVO;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.UtcFeignClientCache;
 import net.wanji.utc.common.constant.Constants;

wj-common/src/main/java/net/wanji/common/utils/tool/ScheduleUtil.java

@@ -103,6 +103,6 @@ public class ScheduleUtil {
     public static void main(String[] args) {
         System.out.println(getSchedule(512L, 1));
         System.out.println(getSchedule(4294967295L, 2));
-        System.out.println(getSchedule(1L, 3));
+        System.out.println(getSchedule(4L, 3));
     }
 }