Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/controller/induce/InduceFontHistController.java

@@ -77,4 +77,19 @@ public class InduceFontHistController {
         return jsonViewObject;
     }
 
+    @ApiOperation(value = "通过字体id删除诱导屏字体信息", notes = "通过字体id删除诱导屏字体信息",
+            response = JsonViewObject.class, produces = MediaType.APPLICATION_JSON)
+    @GetMapping(value = "/deleteOneById", produces = MediaType.APPLICATION_JSON)
+    public JsonViewObject deleteOneById(@RequestParam("id") Integer id) {
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        try {
+            induceFontHistService.deleteOneById(id);
+            jsonViewObject.success("删除成功");
+        } catch (Exception e) {
+            jsonViewObject.fail(I18nResourceBundle.getConstants("GET_FAILED_MSG"));
+            log.error("{} byLastOne error", this.getClass().getSimpleName(), e);
+        }
+        return jsonViewObject;
+    }
+
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/induce/InduceFontHistService.java

@@ -28,4 +28,11 @@ public interface InduceFontHistService {
      * @return
      */
     InduceFontHist getLastOne(String equipCode);
+
+    /**
+     * 通过id删除诱导屏文字信息
+     * @param id
+     * @return
+     */
+    void deleteOneById(Integer id);
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/induce/impl/InduceFontHistServiceImpl.java

@@ -60,4 +60,13 @@ public class InduceFontHistServiceImpl implements InduceFontHistService {
         }
         return null;
     }
+
+    @Override
+    public void deleteOneById(Integer id) {
+        if (Objects.nonNull(id)) {
+            InduceFontHist hist = new InduceFontHist();
+            hist.setId(id.longValue());
+            induceFontHistMapper.deleteById(id);
+        }
+    }
 }

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyControlSwitchReq.java

@@ -9,7 +9,7 @@ import java.util.List;
  */
 @Data
 public class StrategyControlSwitchReq {
-    private List<Detail> req;
+    private List<Detail> data;
 
     @Data
     public static class Detail {

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/impl/PushStrategyControlServiceImpl.java

@@ -27,6 +27,7 @@ public class PushStrategyControlServiceImpl implements PushStrategyControlServic
     @Override
     public Result push(StrategyControlReq req) throws Exception {
         //String url = "http://37.12.182.50:8082/api/traffic/strategy/info";
+        //String url = "http://37.12.182.50:8182/api/traffic/strategy/info";
         try {
             ObjectMapper mapper = JacksonUtils.getInstance();
             String resultStr = RestTemplateTool.post(url, mapper.writeValueAsString(req));
@@ -45,7 +46,8 @@ public class PushStrategyControlServiceImpl implements PushStrategyControlServic
 
     @Override
     public Result switchPush(StrategyControlSwitchReq req) throws Exception {
-        String switchUrl = "http://37.12.182.50:8082/api/traffic/strategy/control";
+        //String switchUrl = "http://37.12.182.50:8082/api/traffic/strategy/control";
+        //String switchUrl = "http://37.12.182.50:8182/api/traffic/strategy/control";
         try {
             ObjectMapper mapper = JacksonUtils.getInstance();
             String resultStr = RestTemplateTool.post(switchUrl, mapper.writeValueAsString(req));

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/impl/StrategyControlServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.Constants;
@@ -246,6 +247,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 histVO.setId(crossId);
                 histVO.setName(resultEntity.getCrossName());
                 String coordinateByCrossId = BaseCrossInfoCache.getCoordinateByCrossId(crossId);
+                if (StringUtils.isBlank(coordinateByCrossId)) {
+                    continue;
+                }
                 histVO.setWkt(coordinateByCrossId.replace("POINT(", "").replace(" ", ",").replace(")", ""));
                 histVO.setStrategy(resultEntity.getCurrentAlgo());
                 histVO.setStrategyName(StrategyCrossAlgoEnum.getDescByCode(resultEntity.getCurrentAlgo()));
@@ -526,33 +530,37 @@ public class StrategyControlServiceImpl implements StrategyControlService {
 
     private List<StrategyControlDataExt> getCrossList(Date date) {
         List<StrategyControlDataExt> results = new ArrayList<>();
-        List<HoloEventInfoPO> holoEventInfoPOS = holoEventMapper.selectAIList(date);
-        if (!CollectionUtils.isEmpty(holoEventInfoPOS)) {
-            for (HoloEventInfoPO holoEventInfoPO : holoEventInfoPOS) {
+        List<StrategyCrossResultEntity> resultList = strategyCrossResultMapper.selectAICrossList(null);
+        if (!CollectionUtils.isEmpty(resultList)) {
+            for (StrategyCrossResultEntity entity : resultList) {
                 StrategyControlDataExt ext = new StrategyControlDataExt();
-                ext.setBizId(holoEventInfoPO.getCrossId());
-                ext.setCrossName(holoEventInfoPO.getRemark());
-                String location = holoEventInfoPO.getExtend();
+                ext.setBizId(entity.getCrossId());
+                ext.setCrossName(entity.getCrossName());
+                String location = entity.getResponseContent();
                 location = location.replace("POINT(", "").replace(" ", ",").replace(")", "");
                 ext.setWkt(location);
-                String eventType = holoEventInfoPO.getType();
-                Integer alarmStatus = holoEventInfoPO.getAlarmStatus();
-                String optMethod = "效率提升";
-                ext.setStatus(alarmStatus);
-                ext.setOptMethod(optMethod);
-                if (StringUtils.equals(eventType, "702")) {
-                    ext.setOptMethod("均衡调控");
+                Integer currentAlgo = entity.getCurrentAlgo();
+                Date issueTime = entity.getIssueTime();
+                Date current = new Date();
+
+                // 优化时间大于5分钟，默认优化完
+                if (Objects.nonNull(issueTime) && current.getTime() - issueTime.getTime() > 5 * 60 * 1000) {
+                    currentAlgo = null;
                 }
-                if (StringUtils.isBlank(eventType)) {
+
+                if (Objects.isNull(currentAlgo)) {
+                    ext.setOptStatus("正常");
                     ext.setOptMethod("畅通");
-                    ext.setStatus(-1);
+                } else if (Objects.equals(1, currentAlgo)) {
+                    ext.setOptStatus("优化中");
+                    ext.setOptMethod("均衡调控");
+                } else {
+                    ext.setOptStatus("优化中");
+                    ext.setOptMethod("效率提升");
                 }
-                String desc = EventStatusEnum.getDesc(alarmStatus);
-                ext.setOptStatus(desc);
                 results.add(ext);
             }
         }
-        results.sort(Comparator.comparing(StrategyControlDataExt::getStatus).reversed());
         return results;
     }
 
@@ -717,9 +725,41 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                     strategyDailyPlanInfoMapper.insert(dailyPlanInfoEntity);
                 }
             }
-            return JsonViewObject.newInstance().success();
+            StrategyControlVO strategyControlVO = convertDataList(list);
+            StrategyControlReq req = convertReq(strategyControlVO);
+
+            List<StrategyControlDataReq> data = req.getData();
+            for (StrategyControlDataReq datum : data) {
+                StrategyControlDataEntity strategyControlDataEntity = new StrategyControlDataEntity();
+                strategyControlDataEntity.setBizId(datum.getBiz_id());
+                strategyControlDataEntity.setBizType(datum.getBiz_type());
+                strategyControlDataEntity.setStrategy(datum.getStrategy());
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                strategyControlDataEntity.setScheduleStart(simpleDateFormat.parse(datum.getSchedule_start()));
+                strategyControlDataEntity.setScheduleStart(simpleDateFormat.parse(datum.getSchedule_start()));
+                ObjectMapper instance = JacksonUtils.getInstance();
+                strategyControlDataEntity.setTime(instance.writeValueAsString(datum.getTime_table()));
+                strategyControlDataEntity.setFrequency(datum.getStrategy());
+                strategyControlDataEntity.setStatus(datum.getStatus());
+                strategyControlInfoMapper.insert(strategyControlDataEntity);
+            }
+
+            // 优化策略下发逻辑，保存是推送神思策略，下发时下发开关
+            log.error("下发神思策略信息详情： {}", JacksonUtils.getInstance().writeValueAsString(req));
+            Result result = pushStrategyControlService.push(req);
+            if (Objects.nonNull(result)) {
+                JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+                jsonViewObject.setCode(Integer.valueOf(result.getCode()));
+                jsonViewObject.setMessage(result.getMsg());
+                jsonViewObject.setContent(result.getData());
+                jsonViewObject.setStatus(StringUtils.equals("200", result.getCode()) ? Constants.JsonView.STATUS_SUCCESS : Constants.JsonView.STATUS_FAIL);
+                return jsonViewObject;
+            } else {
+                log.error("推送神思策略控制失败");
+                return JsonViewObject.newInstance().fail("推送神思策略控制失败！");
+            }
         } catch (Exception e) {
-            log.error("策略管理数据保存失败，：{}", e);
+            log.error("策略管理数据保存, 推送神思远程服务失败：{}", e);
             throw new Exception(e);
         }
     }
@@ -736,7 +776,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
         planInfoEntity.setCrossId(executePlan.getCrossId());
         planInfoEntity.setPlanId(executePlan.getPlanId());
         planInfoEntity.setType(executePlan.getType());
-        planInfoEntity.setCompany("A厂商");
+        planInfoEntity.setCompany(executePlan.getCompany());
         planInfoEntity.setStatus(executePlan.getStatus());
         planInfoEntity.setStartTime(executePlan.getStartTime());
         planInfoEntity.setEndTime(executePlan.getEndTime());
@@ -760,20 +800,50 @@ public class StrategyControlServiceImpl implements StrategyControlService {
             strategyControlDataEntity.setStatus(datum.getStatus());
             strategyControlInfoMapper.insert(strategyControlDataEntity);
         }
-
-        log.error("下发神思策略信息详情： {}", JacksonUtils.getInstance().writeValueAsString(req));
-        Result result = pushStrategyControlService.push(req);
-        //Result result = new Result("200", "成功", null);
-        if (Objects.nonNull(result)) {
+        StrategyControlSwitchReq switchReq = getSwitchReq(req);
+        Result witchPustResult = pushStrategyControlService.switchPush(switchReq);
+        if (Objects.nonNull(witchPustResult)) {
             JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-            jsonViewObject.setCode(Integer.valueOf(result.getCode()));
-            jsonViewObject.setMessage(result.getMsg());
-            jsonViewObject.setContent(result.getData());
-            jsonViewObject.setStatus(StringUtils.equals("200", result.getCode()) ? Constants.JsonView.STATUS_SUCCESS : Constants.JsonView.STATUS_FAIL);
+            jsonViewObject.setCode(Integer.valueOf(witchPustResult.getCode()));
+            jsonViewObject.setMessage(witchPustResult.getMsg());
+            jsonViewObject.setStatus(StringUtils.equals("200", witchPustResult.getCode()) ? Constants.JsonView.STATUS_SUCCESS : Constants.JsonView.STATUS_FAIL);
+
+            StringBuilder sb = new StringBuilder();
+            List<LinkedHashMap<String, Object>>  contentList = (List<LinkedHashMap<String, Object>>) witchPustResult.getData();
+            for (LinkedHashMap<String, Object> item : contentList) {
+                Object result = item.get("result");
+                if (Objects.equals(1, result)) {
+                    sb.append(item.get("biz_id")).append(item.get("strategy")).append("策略控制成功");
+                    jsonViewObject.setContent(sb);
+                } else {
+                    sb.append(item.get("biz_id")).append(item.get("strategy")).append("策略控制失败");
+                    jsonViewObject.setContent(sb);
+                }
+            }
+
             return jsonViewObject;
         } else {
-            return JsonViewObject.newInstance().fail("推送神思策略控制失败！");
+            log.error("推送神思策略控制开关失败");
+            return JsonViewObject.newInstance().fail("推送神思策略控制开关失败！");
+        }
+    }
+
+    private StrategyControlSwitchReq getSwitchReq(StrategyControlReq req) {
+        StrategyControlSwitchReq switchReq = new StrategyControlSwitchReq();
+        List<StrategyControlDataReq> data = req.getData();
+        if (!CollectionUtils.isEmpty(data)) {
+            List<StrategyControlSwitchReq.Detail> details = new ArrayList<>();
+            for (StrategyControlDataReq datum : data) {
+                StrategyControlSwitchReq.Detail detail = new StrategyControlSwitchReq.Detail();
+                detail.setBiz_id(datum.getBiz_id());
+                detail.setBiz_type(datum.getBiz_type());
+                detail.setStrategy(datum.getStrategy());
+                detail.setStatus(0);
+                details.add(detail);
+            }
+            switchReq.setData(details);
         }
+        return switchReq;
     }
 
     /**

signal-optimize-service/src/main/resources/mapper/StrategyCrossResultMapper.xml

@@ -7,21 +7,27 @@
 
 
     <select id="selectAICrossList" resultType="net.wanji.opt.synthesis.pojo.StrategyCrossResultEntity">
-        select t1.id as cross_id, t1.name as cross_name, t2.current_algo, t2.issue_time
-        from t_base_cross_info t1 left join
-        (
-        select cross_id, cross_name, max(issue_time) issue_time, current_algo
-        from t_strategy_cross_result
-        where issue_time > #{date} and response_code = 200
-        union
-        select cross_id, cross_name, max(issue_time) issue_time, current_algo
-        from t_strategy_cross_result
-        where issue_time > #{date} and response_code &lt; 0
-        group by cross_id
-        order by issue_time
-        ) t2 on t1.id = t2.cross_id
-        where t1.is_signal = 1
-        order by t2.issue_time desc;
+        select t1.id as crossId, t1.name as crossName, t2.issue_time, t2.current_algo, t2.response_code, t1.location as responseContent from
+        (select id, name, location from t_base_cross_info  where is_signal = 1) t1
+        left join (select cross_id, max(issue_time) issue_time, current_algo, response_code from t_strategy_cross_result group by cross_id) t2
+        on t1.id = t2.cross_id
+        and t2.issue_time > DATE_FORMAT(now(),'%Y-%m-%d 00:00:00')
+        order by t2.issue_time desc
+<!--        select t1.id as cross_id, t1.name as cross_name, t2.current_algo, t2.issue_time-->
+<!--        from t_base_cross_info t1 left join-->
+<!--        (-->
+<!--        select cross_id, cross_name, max(issue_time) issue_time, current_algo-->
+<!--        from t_strategy_cross_result-->
+<!--        where issue_time > #{date} and response_code = 200-->
+<!--        union-->
+<!--        select cross_id, cross_name, max(issue_time) issue_time, current_algo-->
+<!--        from t_strategy_cross_result-->
+<!--        where issue_time > #{date} and response_code &lt; 0-->
+<!--        group by cross_id-->
+<!--        order by issue_time-->
+<!--        ) t2 on t1.id = t2.cross_id-->
+<!--        where t1.is_signal = 1-->
+<!--        order by t2.issue_time desc;-->
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -24,7 +24,6 @@ import net.wanji.utc.hisense.pojo.dto.CrossSchemePhaseCountDownDTO;
 import net.wanji.utc.hisense.pojo.dto.PhaseCountDownDTO;
 import net.wanji.utc.hisense.service.SignalStatusService;
 import net.wanji.utc.hisense.util.OkHttpClientUtil;
-import net.wanji.utc.hisense.util.OkHttpClientUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -54,6 +53,8 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     private  String shensiUrl;
     @Value("${hisenseLightsStatus.baiduUrl}")
     private  String baiduUrl;
+    @Value("${hisenseLightsStatus.yiGouUrl}")
+    private  String yiGouUrl;
 
     @Override
     public List<SignalStatusLogPO> runningStatusAlarm(String crossId) throws DocumentException {
@@ -193,7 +194,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     public void receiveLightStatus(List<HisenseLightStatusPojo> hisenseLightStatusPojos) throws Exception {
 
         ObjectMapper jackson = JacksonUtils.getInstance();
-        pushOtherCompany(hisenseLightStatusPojos, jackson, shensiUrl, baiduUrl);
+        pushOtherCompany(hisenseLightStatusPojos, jackson, shensiUrl, baiduUrl, yiGouUrl);
 
         if (!CollectionUtils.isEmpty(hisenseLightStatusPojos)) {
             for (HisenseLightStatusPojo hisenseLightStatusPojo : hisenseLightStatusPojos) {
@@ -209,6 +210,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
                         if (Objects.isNull(crossInfo)) {
                             continue;
                         }
+                        StaticInfoServiceImpl.planMap.put(crossInfo.getId(), content.getPlanId());
                         String crossId = crossInfo.getId();
                         Long lastSignalMachineStamp = SignalDataCache.runningStatusStampMap.get(crossId);
                         if (Objects.isNull(lastSignalMachineStamp)) {
@@ -260,7 +262,7 @@ public class SignalStatusServiceImpl implements SignalStatusService {
     }
 
     private static void pushOtherCompany(List<HisenseLightStatusPojo> hisenseLightStatusPojos, ObjectMapper jackson,
-                                         String shensiUrl, String baiduUrl) {
+                                         String shensiUrl, String baiduUrl, String yiGouUrl) {
         try {
             OkHttpClientUtil.jsonPost(shensiUrl, jackson.writeValueAsString(hisenseLightStatusPojos));
         } catch (Exception e) {
@@ -271,6 +273,11 @@ public class SignalStatusServiceImpl implements SignalStatusService {
         } catch (Exception e) {
             log.error("海信灯态推送百度失败：{}", e.getMessage());
         }
+        try {
+            OkHttpClientUtil.jsonPost(yiGouUrl, jackson.writeValueAsString(hisenseLightStatusPojos));
+        } catch (Exception e) {
+            log.error("海信灯态推送易购失败：{}", e.getMessage());
+        }
     }
 
     /**

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

@@ -79,6 +79,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     private CrossSchemeStageOptLogMapper crossSchemeStageOptLogMapper;
     @Resource
     private BaseCrossSchemeMapper baseCrossSchemeMapper;
+    public static  Map<String, Integer> planMap = new HashMap<>();
 
     @Override
     public List<CrossInfoPO> crossBasicInfo(CrossInfoDTO crossInfoDTO) throws Exception {
@@ -697,10 +698,10 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                                 crossSchedulesPOMonthDays.setCrossId(crossId);
                                 crossSchedulesPOMonthDays.setScheduleNo(vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
                                 crossSchedulesPOMonthDays.setName("调度" + vNtcipTimeBaseScheduleView.getNTimeBaseScheduleNumber());
-                                crossSchedulesPOMonthDays.setWeek(null);
+                                crossSchedulesPOMonthDays.setWeek(0);
                                 crossSchedulesPOMonthDays.setMonths(monthsStr);
                                 crossSchedulesPOMonthDays.setDays(daysStr);
-                                crossSchedulesPOMonthDays.setPlanId(0);
+                                crossSchedulesPOMonthDays.setPlanId(hisensePlanId);
                                 results.add(crossSchedulesPOMonthDays);
                             }
                         }
@@ -804,6 +805,8 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         Element messageContent = (Element) document.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT);
         messageContent.addElement(HttpConstants.SPOT).setText(crossInfoPOExt.getCode());
         //获取当前运行的方案号
+        Integer integer = planMap.get(crossSchemeRingsDTO.getCrossId());
+        /*if (ObjectUtil.isEmpty(integer)){
             CoordinationStatus coordinationStatus = crossPlan(crossSchemeRingsDTO.getCrossId());
             if (ObjectUtil.isEmpty(coordinationStatus)) {
                 //获取方案号失败
@@ -816,7 +819,21 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                 crossSchemeRings.setPattern(coordinationStatus.getCoordPatternStatus());
                 return crossSchemeRings;
             }
-        messageContent.addElement(HttpConstants.PATTERN).setText(coordinationStatus.getCoordPatternStatus());
+            integer = Integer.valueOf(coordinationStatus.getCoordPatternStatus());
+        }*/
+        if (ObjectUtil.isEmpty(integer)){
+                //获取方案号失败
+                log.error("请求方案环图前，获取当前运行方案号失败,没有该路口的灯态信息，crossId：{}", crossSchemeRingsDTO.getCrossId());
+                return null;
+        } else if (255 == integer) {
+            //黃闪
+            CrossSchemeRings crossSchemeRings = new CrossSchemeRings();
+            crossSchemeRings.setSpot(crossSchemeRingsDTO.getCrossId());
+            crossSchemeRings.setPattern(String.valueOf(integer));
+            return crossSchemeRings;
+        }
+
+        messageContent.addElement(HttpConstants.PATTERN).setText(String.valueOf(integer));
 
         //给海信发送http请求
         String post = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());

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

@@ -224,7 +224,7 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
             if (code != 200){
                 JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(crossSchemeRingsDTO));
                 //插入命令操作日志
-                controlCommandStrategyService.insertCommandLog(now,jsonViewObject, jsonObject,10);
+//                controlCommandStrategyService.insertCommandLog(now,jsonViewObject, jsonObject,10);
             }
         } else {
             CrossSchemeRings crossSchemeRings = getCrossSchemeRings(crossSchemeRingsDTO);

signal-utc-service/src/main/java/net/wanji/utc/util/StringUtils.java

 package net.wanji.utc.util;
 
+import cn.hutool.core.util.ObjectUtil;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
+import net.wanji.databus.dao.entity.BaseCrossSchemePO;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.*;
 
 @Slf4j
 public class StringUtils extends org.apache.commons.lang3.StringUtils {
+    public static void main(String[] args) {
+//        GreenwaveScenePO areaIndex = new GreenwaveScenePO();
+//		System.out.println(areaIndex.toString().replaceAll("=null",""));
+        // 替换为你的类
+        Class<BaseCrossSchemePO> clazz = BaseCrossSchemePO.class;
+        List<String> list = new ArrayList<>();
+        // 遍历所有字段
+        for (Field field : clazz.getDeclaredFields()) {
+            // 获取 @ApiModelProperty 注解
+            ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class);
+            if (apiModelProperty != null) {
+                System.out.print(field.getName() +"\t");
+                System.out.println(ObjectUtil.isNotEmpty(apiModelProperty.value())?apiModelProperty.value():apiModelProperty.name());
+//				list.add(apiModelProperty.value());
+                // 你可以继续打印其他属性如 notes, required 等
+            }
+        }
+
+    }
 
     /**
      * @description: 判断字符串是否为空

wj-databus/src/main/resources/mapper/BaseCrossSchemeMapper.xml

@@ -241,7 +241,7 @@
             AND schedules.`week` = #{week}
             AND DATE_FORMAT( NOW(), '%H:%i' ) BETWEEN DATE_FORMAT( CAST( section.start_time AS TIME ), '%H:%i' )
             AND DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' )
-            ORDER BY DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ) DESC LIMIT 1
+            ORDER BY schedules.special_date,  DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ) DESC LIMIT 1
 
     </select>
     <select id="selectSchemeByParams" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
@@ -258,7 +258,7 @@
             AND schedules.`week` = #{week}
             AND DATE_FORMAT( #{queryTime}, '%H:%i' ) BETWEEN DATE_FORMAT( CAST( section.start_time AS TIME ), '%H:%i' )
             AND DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' )
-            ORDER BY DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ) DESC LIMIT 1
+            ORDER BY schedules.special_date,   DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ) DESC LIMIT 1
 
     </select>