|
|
|
@ -3,13 +3,10 @@ package com.shxy.xymanager_admin.controller;
|
|
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.shxy.xymanager_common.annotation.Log;
|
|
|
|
|
import com.shxy.xymanager_common.base.BaseController;
|
|
|
|
|
import com.shxy.xymanager_common.util.DigestUtils;
|
|
|
|
|
import com.shxy.xymanager_common.util.StringUtils;
|
|
|
|
|
import com.shxy.xymanager_common.util.TokenUtil;
|
|
|
|
|
import com.shxy.xymanager_common.util.*;
|
|
|
|
|
import com.shxy.xymanager_common.zhiping.*;
|
|
|
|
|
import com.shxy.xymanager_common.entity.LeadPulls;
|
|
|
|
|
import com.shxy.xymanager_common.entity.Weathers;
|
|
|
|
|
import com.shxy.xymanager_common.util.DateUtil;
|
|
|
|
|
import com.shxy.xymanager_service.service.HenanService;
|
|
|
|
|
import com.shxy.xymanager_service.service.LeadPullsService;
|
|
|
|
|
import com.shxy.xymanager_service.service.WeatherService;
|
|
|
|
@ -196,13 +193,16 @@ public class ZhipingController extends BaseController {
|
|
|
|
|
item.setEquipId(weather.getCmdid());
|
|
|
|
|
result.add(item);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
String str = "从" + startTime + "到" + endTime + "无天气数据";
|
|
|
|
|
DingTalkPushUtil.pushText("覆冰", str);
|
|
|
|
|
}
|
|
|
|
|
return SdqjResult.success(result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@PostMapping("queryPullIces")
|
|
|
|
|
@ApiOperation("拉力覆冰数据同步查询")
|
|
|
|
|
@Log(title = "拉力覆冰数据同步查询", type = "查询")
|
|
|
|
|
@ApiOperation("覆冰拉力数据同步查询")
|
|
|
|
|
@Log(title = "覆冰拉力数据同步查询", type = "查询")
|
|
|
|
|
public SdqjResult queryPullIces(String token,
|
|
|
|
|
String startTime, String endTime) throws Exception {
|
|
|
|
|
|
|
|
|
@ -250,6 +250,9 @@ public class ZhipingController extends BaseController {
|
|
|
|
|
item.calculate();
|
|
|
|
|
result.add(item);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
String str = "从" + startTime + "到" + endTime + "无覆冰拉力数据";
|
|
|
|
|
DingTalkPushUtil.pushText("覆冰", str);
|
|
|
|
|
}
|
|
|
|
|
return SdqjResult.success(result);
|
|
|
|
|
}
|
|
|
|
|