elink-star
/
esua-epdc-js
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

uploadProjectInfo添加返回值

ftature/screen
wanggongfeng 4 years ago
parent
92f5514b83
commit
bbf8241b58
3 changed files with 81 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java
  2. 48
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java
  3. 44
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java

14
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenProjectDataServiceImpl.java
View File

@ -31,6 +31,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
public Result uploadProjectInfo(ScreenProjectFormDTO screenProjectFormDTO) {
// 数据统计
List<UploadProjectInfoDTO> data = baseDao.uploadProjectInfo(screenProjectFormDTO);
String resultStr = "1"; // [0:失败；1：成功]
if(data.size()!=0) {
if (data.size() > 1000) {
List<List<UploadProjectInfoDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
@ -40,23 +41,24 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
// 数据格式化
dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
// 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
resultStr = epmetUtils.httpPostItem(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
}
}
} else {
// 数据格式化
String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
// 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
resultStr = epmetUtils.httpPostItem(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_INFO, dataJson);
}
}
return new Result();
return new Result().ok(resultStr);
}
@Override
public Result uploadProjectProcess(ScreenProjectFormDTO screenProjectFormDTO) {
// 数据统计
List<UploadProjectProcessDTO> data = baseDao.uploadProjectProcess(screenProjectFormDTO);
String resultStr = "1"; // [0:失败；1：成功]
if(data.size()!=0){
if (data.size() > 1000) {
List<List<UploadProjectProcessDTO>> formList = ScreenIndexDataServiceImpl.fixedGrouping(data, NumConstant.ONE_THOUSAND);
@ -66,17 +68,17 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
// 数据格式化
dataJson = ScreenDataUtils.getScreenDataDateJson(formList.get(i), false);
// 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
resultStr = epmetUtils.httpPostItem(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
}
}
} else {
// 数据格式化
String dataJson = ScreenDataUtils.getScreenDataDateJson(data, false);
// 数据上报
epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
resultStr = epmetUtils.httpPostItem(EpmetConstant.EPMET_PROJECT_UPLOAD_PROJECT_PROCESS, dataJson);
}
}
return new Result();
return new Result().ok(resultStr);
}
@Override

48
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java
View File

@ -27,7 +27,7 @@ public class EpmetUtils {
private JwtUtils jwtUtils;
/**
* 大屏数据上报
* 大屏数据上报（老版）
*
* @param urlSuffix 接口地址后缀
* @param param 入参
@ -70,6 +70,52 @@ public class EpmetUtils {
}
/**
* 大屏数据上报（项目相关使用）
*
* @param urlSuffix 接口地址后缀
* @param param 入参
* @return java.lang.String[0:失败；1：成功]
* @author wgf
* @since 2020/9/7 14:07
*/
public String httpPostItem(String urlSuffix,String param) {
String code = "code";
// 应用ID
String appId = epmetProperties.getAppId();
// 生成AccessToken
String accessToken = getEpmetAccessToken();
// 接口地址
String url = epmetProperties.getUrl().concat(urlSuffix);
HttpResponse response = null;
try {
response = HttpRequest.post(url).body(param)
.header(EpmetConstant.HEARD_KEY_ACCESS_TOKEN, accessToken)
.header(EpmetConstant.HEARD_KEY_APP_ID, appId)
.header("lan", "zh")
.header("Content-Type", "application/json")
.header("Date-Type","real")
.execute();
if (NumConstant.TWO_HUNDRED != response.getStatus()) {
logger.error("数据上报失败, 返回状态：{}, 请求参数：{appId:{}, url:{}, accessToken:{}, param:{}}",
response.getStatus(), appId, url, accessToken, param);
return "0";
} else {
JSONObject result = JSONObject.parseObject(response.body());
if (!NumConstant.ZERO_STR.equals(result.get(code).toString())) {
logger.info("数据上报失败：{}，请求地址：{}，请求参数：{}", JSONObject.toJSONString(response.body()), url, param);
return "0";
}
}
} catch (Exception e) {
e.printStackTrace();
}
return "1";
}
/**
* 生成上报接口accessToken
*

44
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java
View File

@ -1,6 +1,7 @@
package com.elink.esua.epdc.task.screen;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.ScreenRecordDao;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.entity.ScreenRecordEntity;
@ -92,15 +93,18 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask {
screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime());
}
analysisFeignClient.uploadProjectInfo(screenProjectFormDTO);
//记录此次统计时间 并更新时间或者新增
screenRecordEntity.setStatisticsTime(new Date());
if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
screenRecordDao.updateById(screenRecordEntity);
} else {
screenRecordEntity.setJobName("uploadProjectInfo");
screenRecordDao.insert(screenRecordEntity);
Result result = analysisFeignClient.uploadProjectInfo(screenProjectFormDTO);
// [0:失败；1：成功] 成功后修改时间
if("1".equals(result.getData())){
//记录此次统计时间 并更新时间或者新增
screenRecordEntity.setStatisticsTime(new Date());
if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
screenRecordDao.updateById(screenRecordEntity);
} else {
screenRecordEntity.setJobName("uploadProjectInfo");
screenRecordDao.insert(screenRecordEntity);
}
}
logger.info("<" + methodName + "|项目信息上报>定时任务执行结束");
@ -130,17 +134,21 @@ public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask {
screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime());
}
analysisFeignClient.uploadProjectProcess(screenProjectFormDTO);
//记录此次统计时间 并更新时间或者新增
screenRecordEntity.setStatisticsTime(new Date());
if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
screenRecordDao.updateById(screenRecordEntity);
} else {
screenRecordEntity.setJobName("uploadProjectProcess");
screenRecordDao.insert(screenRecordEntity);
Result result = analysisFeignClient.uploadProjectProcess(screenProjectFormDTO);
// [0:失败；1：成功] 成功后修改时间
if("1".equals(result.getData())){
//记录此次统计时间 并更新时间或者新增
screenRecordEntity.setStatisticsTime(new Date());
if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
screenRecordDao.updateById(screenRecordEntity);
} else {
screenRecordEntity.setJobName("uploadProjectProcess");
screenRecordDao.insert(screenRecordEntity);
}
}
logger.info("<" + methodName + "|项目处理流程信息上报>定时任务执行结束");
}
}

Write Preview
Loading…
Cancel
Save