|
|
|
@ -52,6 +52,74 @@ public class ApiTestController {
|
|
|
|
|
@Resource
|
|
|
|
|
private DepartmentMybatisDao departmentMybatisDao;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 拉取无量云任务数据,根据单租户、业务主体拉取
|
|
|
|
|
* pull wyl task data
|
|
|
|
|
* @param request
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("pullPictureByOneAccountNo")
|
|
|
|
|
public String pullPictureByOneAccountNo(HttpServletRequest request){
|
|
|
|
|
String beginStr = request.getParameter("beginStr");
|
|
|
|
|
String endStr = request.getParameter("endStr");
|
|
|
|
|
String pageSize = request.getParameter("pageSize");
|
|
|
|
|
String pageNo = request.getParameter("pageNo");
|
|
|
|
|
String tenantNoStr = request.getParameter("tenantNo");
|
|
|
|
|
if(StringUtils.isBlank(tenantNoStr)){
|
|
|
|
|
return "租户不能为空";
|
|
|
|
|
}
|
|
|
|
|
String accountNoStr = request.getParameter("accountNo");
|
|
|
|
|
if(StringUtils.isBlank(accountNoStr)){
|
|
|
|
|
return "业务主体不能为空";
|
|
|
|
|
}
|
|
|
|
|
Long tenantNo = Long.parseLong(request.getParameter("tenantNo"));
|
|
|
|
|
Long accountNo = Long.parseLong(request.getParameter("accountNo"));
|
|
|
|
|
|
|
|
|
|
PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
|
|
|
|
|
DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
// DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
Instant binstant = dateTime.toInstant();
|
|
|
|
|
DateTime dateTime1 = DateUtil.parse(endStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
// DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
Instant einstant = dateTime1.toInstant();
|
|
|
|
|
pictureSourceParameter.setStartTime(Date.from(binstant));
|
|
|
|
|
pictureSourceParameter.setEndTime(Date.from(einstant));
|
|
|
|
|
pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
|
|
|
|
|
pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
|
|
|
|
|
pictureSourceParameter.setTenantNo(tenantNo);
|
|
|
|
|
pictureSourceParameter.setAccountNo(accountNo);
|
|
|
|
|
try {
|
|
|
|
|
ApiPage<PictureSourceResult> apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter);
|
|
|
|
|
if(apiPage==null){
|
|
|
|
|
return "获取数据为空!";
|
|
|
|
|
}
|
|
|
|
|
List<PictureSourceResult> listResult= apiPage.getRecords();
|
|
|
|
|
int count = apiPage.getTotal();
|
|
|
|
|
int localCount = listResult.size();
|
|
|
|
|
int size = 0;
|
|
|
|
|
for (PictureSourceResult pictureSourceResult : listResult) {
|
|
|
|
|
//1.如果不存在图片默认一个默认图片,方便走测试。
|
|
|
|
|
if(pictureSourceResult.getLivePhoto()==null){
|
|
|
|
|
List<Map<String,Object>> livePhoto = new ArrayList<>();
|
|
|
|
|
Map<String,Object> map = new HashMap<>();
|
|
|
|
|
map.put("imgUrl","http://47.93.59.251/api/image/default.png");
|
|
|
|
|
map.put("imgName","default.png");
|
|
|
|
|
livePhoto.add(map);
|
|
|
|
|
pictureSourceResult.setLivePhoto(livePhoto);
|
|
|
|
|
// continue;
|
|
|
|
|
}
|
|
|
|
|
size++;
|
|
|
|
|
//将可以处理数据放入处理队列中
|
|
|
|
|
TaskQueue.pictureDisposePushData(pictureSourceResult);
|
|
|
|
|
}
|
|
|
|
|
return "当前区间内图片总数:"+count+"条,本次获取:"+localCount+"条,可处理数据:"+size+"条";
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return "处理失败";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("psTest")
|
|
|
|
|
public String psTset(HttpServletRequest request) {
|
|
|
|
|
String beginStr = request.getParameter("beginStr");
|
|
|
|
|