UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中继中转服务完善

Browse Source
master
admin 3 years ago
parent adc2bae64b
commit 4f0d7e3b33
1 changed files with 107 additions and 80 deletions
Show Stats Download Patch File Download Diff File

95
src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
Unescape Escape View File

@ -78,7 +78,8 @@ public class IdcServiceImpl implements IdcService {
"basicThirdProducts//thr_products/id///updateTime///第三方产品信息","//sup_cert/id///updateTime/filePath//资质证书信息",
"//sup_cert_set/id///updateTime///供应商资质证书设置","companyCert//sup_company/customerId///updateTime///配送企业",
"manufacturerCert//sup_manufacturer/id///updateTime///生产企业","productCert//sup_product/id///updateTime///产品资质信息",
"dbDiProducts//productinfo/id///updateTime///DI产品信息","//udicompany/id///updateTime///国际库医疗器械注册人信息"};
"//udicompany/id///updateTime///国际库医疗器械注册人信息"};
//"dbDiProducts//productinfo/id///updateTime///DI产品信息",
private int orderNum=0;
@ -102,7 +103,6 @@ public class IdcServiceImpl implements IdcService {
return ResultVOUtils.success(list);
}
@Override
public BaseResponse download(HttpServletRequest request,Map<String,Object> params) {
Map<String,Object> map = dbDao.get("select * from basic_upload_status where taskId='"+params.get("taskId")+"'");
@ -168,16 +168,24 @@ public class IdcServiceImpl implements IdcService {
initTable();
Map<String,Object> map = dbDao.get("select * from sync_data_set limit 1");
if(map!=null&&map.get("downstreamEnable")!=null&&map.get("downstreamEnable").toString().equals("1")) {
if(isUpload) {
if(!(map.get("syncIp")!=null&&!StringUtils.isEmpty(map.get("syncIp").toString()))) {
logger.error("中继服务地址未配置");
return;
}
}
for(int i=0;i<SYNC_TABLES.length;i++) {
String[] tnames = SYNC_TABLES[i].split("/");
saveIdcLog("---","",map.get(tnames[0])+SYNC_TABLES[i],0,0);
if(!StringUtils.isEmpty(tnames[0])&&map!=null&&map.get(tnames[0])!=null&&map.get(tnames[0]).toString().equals("1"))
syncData(SYNC_TABLES[i],isUpload);
if(!StringUtils.isEmpty(tnames[0])&&map!=null&&map.get(tnames[0])!=null&&map.get(tnames[0]).toString().equals("1")) {
String syncIp = map.get("syncIp")!=null ? map.get("syncIp").toString() : "";
syncData(SYNC_TABLES[i],isUpload,syncIp);
}
}
}
}
private void syncData(String t,boolean isUpload) {
private void syncData(String t,boolean isUpload,String syncIp) {
boolean sync = true;
String[] tnames = t.split("/");
@ -216,7 +224,7 @@ public class IdcServiceImpl implements IdcService {
sync = nextTimePoint.before(nowUpdateTime);
}
if(sync) {
if(syncMasterData(map,isUpload)) {
if(syncMasterData(map,isUpload,syncIp)) {
setUpdateTime(tnames[2],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss"));
}
}
@ -287,11 +295,11 @@ public class IdcServiceImpl implements IdcService {
JSONObject json = JSONObject.parseObject(content);
String datePath = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
FileUtils.makeDirectory(filePath +datePath+"/");
FileUtils.makeDirectory(backFilePath +datePath+"/");
String fileName = filePath +datePath+"/"+json.getString("messageType")+"-"+json.getString("messageId")+".udi";
String backFileName = backFilePath +datePath+"/"+json.getString("messageType")+"-"+json.getString("messageId")+".udi";
FileUtils.makeDirectory( filePath +datePath+"/");
FileUtils.makeDirectory(backFilePath +datePath+"/");
FileUtils.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName);
String[] saveFiles= {};
@ -317,11 +325,20 @@ public class IdcServiceImpl implements IdcService {
saveUploadStatus(json.getString("messageType"),json.getString("messageId"),fileName);
/*解析入库*/
if(isLastLevel()) {
analyToDB(json,files);
if(!analyToDB(json,files))
return ResultVOUtils.error(9000, "解析失败");
} else {
//需要转发
if(isRelay()) {
relay(request.getHeader("reqNo"),content,saveFiles);
String host = getNextHost();
String result = relay(request.getHeader("reqNo"),content,saveFiles,host);
if(IDCUtils.isJson(result)) {
BaseResponse object = JSON.parseObject(result,BaseResponse.class);
return object;
} else {
return ResultVOUtils.error(9000, "转发失败");
}
}
}
return ResultVOUtils.success();
@ -357,13 +374,11 @@ public class IdcServiceImpl implements IdcService {
dbDao.save(sql);
}
private void saveExportStatus(String messageType,String taskId,String fileName) {
private void saveExportStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>();
map.put("id", CustomUtil.getId());
map.put("taskId", taskId);
map.put("cacheFilePath", fileName);
map.put("status", "0");
map.put("type", messageType);
map.putAll(params);
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_export_status");
String sql = "insert into basic_export_status "+DBAUtils.parseInsert(map, columns);
@ -400,7 +415,7 @@ public class IdcServiceImpl implements IdcService {
}
private boolean syncMasterData(Map<String,Object> params,boolean isUplaod) {
private boolean syncMasterData(Map<String,Object> params,boolean isUplaod,String syncIp) {
boolean success=false;
String tableName = params.get("tableName").toString();
String tableKey = params.get("tableKey").toString();
@ -482,7 +497,7 @@ public class IdcServiceImpl implements IdcService {
if(isUplaod) {
String result = "";
try {
result = relay("",JSON.toJSONString(data),files);
result = relay("",JSON.toJSONString(data),files,syncIp);
} catch (Exception ex) {
}
@ -504,12 +519,12 @@ public class IdcServiceImpl implements IdcService {
saveIdcLog(messageType,"",tableName +">fail:上传地址未连通",i *limit,total);
}
} else {
syncAddTask(data);
if(!StringUtils.isEmpty(recordSql)) {
dbDao.save("insert into idc_record (id,type,fkId,isEnd,createTime) values "+recordSql);
}
saveIdcLog(messageType,"",tableName +">success",i *limit,total);
}
syncAddTask(data,isUplaod);
}
}
}
@ -520,34 +535,41 @@ public class IdcServiceImpl implements IdcService {
}
/*增加同步任务*/
private void syncAddTask(Map<String,Object> json) {
private void syncAddTask(Map<String,Object> json,boolean isUpload) {
String content = JSON.toJSONString(json);
String datePath = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
FileUtils.makeDirectory(filePath +datePath+"/");
FileUtils.makeDirectory(backFilePath +datePath+"/");
String fileName = filePath +datePath+"/"+json.get("messageType")+"-"+json.get("messageId")+".udi";
String backFileName = backFilePath +datePath+"/"+json.get("messageType")+"-"+json.get("messageId")+".udi";
FileUtils.makeDirectory(filePath +datePath+"/");
FileUtils.makeDirectory(backFilePath +datePath+"/");
FileUtils.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName);
saveExportStatus(json.get("messageType").toString(),json.get("messageId").toString(),fileName);
//type,transportType,superiorService,subordinateService,cacheFilePath
Map<String,Object> map = new HashMap<>();
map.put("type", json.get("messageType"));
map.put("transportType", isUpload ? "1" : "2");
map.put("scheduleType", isUpload ? "1" : "0");
map.put("taskId", json.get("messageId"));
map.put("cacheFilePath", fileName);
saveExportStatus(map);
}
/*解析到数据库*/
private void analyToDB(JSONObject jsonObject,MultipartFile[] files) {
private boolean analyToDB(JSONObject jsonObject,MultipartFile[] files) {
if(!StringUtils.isEmpty(jsonObject.getString("tableName"))) {
List<Map<String,Object>> list = jsonObject.getObject("data", List.class);
analyData(jsonObject.getString("tableName"),jsonObject.getString("uniqueColumn"),list);
return analyData(jsonObject.getString("tableName"),jsonObject.getString("uniqueColumn"),list);
//图片处理
}
return false;
}
/*按表名解析数据到数据库，子表暂未处理*/
private void analyData(String tableName,String uniqueColumn,List<Map<String,Object>> list) {
private boolean analyData(String tableName,String uniqueColumn,List<Map<String,Object>> list) {
String tName = DBAUtils.tableRealName(tableName);
String sql="replace "+tName +"(";
@ -556,6 +578,7 @@ public class IdcServiceImpl implements IdcService {
String[] keyColumn=new String[30];
String[] keyDataType=new String[30];
List<Map<String,String>> columnList = dbDao.listColumnsMysql(tName);
boolean result = false;
int key=0;
int col=0;
for(int i=0;i<columnList.size();i++) {
@ -659,17 +682,18 @@ public class IdcServiceImpl implements IdcService {
}
}
if(n>0)
dbDao.save(sql);
if(n>0) {
result = (dbDao.save(sql)>0);
}
}
return result;
}
/*转发下级或上级中继服务*/
private String relay(String reqNo,String content,String[] files) {
String host = getNextHost();
private String relay(String reqNo,String content,String[] files,String ip) {
String host = ip;
String result="";
if(StringUtils.isEmpty(reqNo))
reqNo = UUID.randomUUID().toString();
@ -737,7 +761,7 @@ public class IdcServiceImpl implements IdcService {
/*是否需要转发*/
private boolean isRelay() {
String relayHost = getNextHost();
return !StringUtils.isEmpty(relayHost);
return StringUtils.isEmpty(relayHost) ? false : true;
}
@ -762,6 +786,7 @@ public class IdcServiceImpl implements IdcService {
map.put("apiCode", "common");
map.put("tableName", DBAUtils.tableAliasName(tableName));
map.put("uniqueColumn", params.get("uniqueColumn"));
map.put("filePathColumn", params.get("filePathColumn"));
map.put("sendTime", new Date());
map.put("version", "1.0");
map.put("total", list.size());
@ -880,4 +905,6 @@ public class IdcServiceImpl implements IdcService {
}
}
}

Write Preview
Loading…
Cancel
Save