Merge remote-tracking branch 'origin/master'

YYC

2023-10-27 08000305684ec0c758090fbb5cbd85132218fcef

 igds-web/src/main/java/com/ld/igds/TestAction.java

@@ -11,7 +11,7 @@
import com.ld.igds.grain.service.CoreGrainService;
import com.ld.igds.models.WeatherConf;
import com.ld.igds.models.WeatherInfo;
import com.ld.igds.timer.WeatherScheduled;
import com.ld.igds.timer.WeatherTimerService;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -37,9 +37,7 @@
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private WeatherScheduled weatherScheduled;
    @Autowired
    private TestService testService;
    private WeatherTimerService weatherTimerService;

    @Override
    public String getUrl() {
@@ -127,7 +125,6 @@
                return;
            }
            log.info("------initRecordCurStorageOUT--------");
            testService.initRecordCurStorageOUT(p1, p2);
        }

        if (t.equals("reset-in-storage")) {
@@ -137,11 +134,10 @@
            if (null == p2) {// 开始时间
                return;
            }
            testService.initRecordCurStorageIN(p1, p2);
        }

        if (t.equals("weather11")) {
            weatherScheduled.scheduled();
            weatherTimerService.doExe();
        }
    }

@@ -172,7 +168,7 @@
            log.info("-----测试调用气象----deptId={},cityId={}", deptId, cityId);

            Date date = new Date();
            WeatherInfo info = weatherScheduled.getWeatherByWeb(date, conf);
            WeatherInfo info = weatherTimerService.getWeatherByWeb(date, conf);
            if (null == info) {
                response.getWriter().print("MSG:ERROR");
            } else {