|
@@ -55,42 +55,16 @@ public class EngineeringController {
|
|
|
log.info("SecurityUtils.getToken():{}",SecurityUtils.getToken());
|
|
|
R<?> result = remoteDataBaseService.receivedMessage(list);
|
|
|
if (result.getCode() == 200) {
|
|
|
- return R.ok("推送成功");
|
|
|
+ return R.ok("成功");
|
|
|
} else {
|
|
|
return R.fail(result.getMsg());
|
|
|
}
|
|
|
} else {
|
|
|
- return R.fail("推送失败");
|
|
|
+ return R.fail(5005,"Token过期,请重新获取!");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
- @PostMapping("/receiveEngineeringData")
|
|
|
- @ResponseBody
|
|
|
- public R<?> receiveEngineeringData(@RequestBody List<CenterdataTKeyProjectsPictures> list) {
|
|
|
- log.info("List<CenterdataTKeyProjectsPictures>:{}",list);
|
|
|
- R<String> appUrl = remoteConfigService.remotegetConfigKey("appUrl");
|
|
|
- List<CenterdataTKeyProjectsPictures> requestList = new ArrayList<>();
|
|
|
- for (CenterdataTKeyProjectsPictures var : list) {
|
|
|
- List<String> pictureList = new ArrayList<>();
|
|
|
- CenterdataTKeyProjectsPictures centerdataTKeyProjectsPictures = new CenterdataTKeyProjectsPictures();
|
|
|
- centerdataTKeyProjectsPictures.setProjectId(var.getProjectId());
|
|
|
- for (String str : var.getSchedulePictures()) {
|
|
|
- pictureList.add(appUrl.getData().toString() + str);
|
|
|
- }
|
|
|
- centerdataTKeyProjectsPictures.setSchedulePictures(pictureList);
|
|
|
- requestList.add(var);
|
|
|
- }
|
|
|
- // TODO: 2024/1/16 0016 待修改
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
- jsonObject.put("", requestList);
|
|
|
- try {
|
|
|
- RestUtil.post(url, jsonObject);
|
|
|
- } catch (Exception e) {
|
|
|
- log.info("重点工程报错");
|
|
|
- }
|
|
|
- return R.ok("接收成功");
|
|
|
- }
|
|
|
|
|
|
/**
|
|
|
* 重点区域
|