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

任务id,开始，结束时间

Browse Source
master
admin 2 years ago
parent 78efd5b5eb
commit 85d48f9b6b
1 changed files with 242 additions and 242 deletions
Show Stats Download Patch File Download Diff File

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

@ -66,13 +66,13 @@ public class IdcServiceImpl implements IdcService {
private String backFilePath; private String backFilePath;
@Value("${API_KEY}") @Value("${API_KEY}")
private String apiKey; private String apiKey;
@Value("${API_SECRET}") @Value("${API_SECRET}")
private String apiSecret; private String apiSecret;
/*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/ /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/
private final String[] SYNC_TABLES= { private final String[] SYNC_TABLES= {
"entrustAction//basic_entrust_accept/id///updateTime///委托验收","basicProducts//basic_udirel/id///updateTime///耗材字典","/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情", "entrustAction//basic_entrust_accept/id///updateTime///委托验收","basicProducts//basic_udirel/id///updateTime///耗材字典","/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情",
"/companyCert/company_product_relevance/id/customerId/unitFk/updateTime///供应商关联信息", "/companyCert/company_product_relevance/id/customerId/unitFk/updateTime///供应商关联信息",
"basicCorp//basic_corp/id///updateTime///往来单位","typeThird//thr_bustype_origin/id///updateTime///第三方单据类型", "basicCorp//basic_corp/id///updateTime///往来单位","typeThird//thr_bustype_origin/id///updateTime///第三方单据类型",
"basicThirdCorp//thr_corp/id///updateTime///第三方往来单位","//thr_dept/id///updateTime///第三方部门", "basicThirdCorp//thr_corp/id///updateTime///第三方往来单位","//thr_dept/id///updateTime///第三方部门",
@ -85,14 +85,14 @@ public class IdcServiceImpl implements IdcService {
"/manufacturerCert/sup_cert/id/manufacturerId/manufacturerIdFk/updateTime/filePath/type=2/生产企业资质证书信息", "/manufacturerCert/sup_cert/id/manufacturerId/manufacturerIdFk/updateTime/filePath/type=2/生产企业资质证书信息",
"/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息", "/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息",
"//udicompany/id///updateTime///国际库医疗器械注册人信息"}; "//udicompany/id///updateTime///国际库医疗器械注册人信息"};
//"dbDiProducts//productinfo/id///updateTime///DI产品信息", //"dbDiProducts//productinfo/id///updateTime///DI产品信息",
//"basicInv/////////仓库字典", //"basicInv/////////仓库字典",
//"typeBus/////////业务单据类型", //"typeBus/////////业务单据类型",
//"typeScan/////////扫码单据类型", //"typeScan/////////扫码单据类型",
private int orderNum=0; private int orderNum=0;
@Resource @Resource
private SystemParamConfigService systemParamConfigService; private SystemParamConfigService systemParamConfigService;
@Resource @Resource
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@ -101,7 +101,7 @@ public class IdcServiceImpl implements IdcService {
private DbDao dbDao; private DbDao dbDao;
@Resource @Resource
private ScheduledDao scheduledDao; private ScheduledDao scheduledDao;
@Override @Override
public BaseResponse taskList(HttpServletRequest request,Map<String,Object> params) { public BaseResponse taskList(HttpServletRequest request,Map<String,Object> params) {
@ -132,18 +132,18 @@ public class IdcServiceImpl implements IdcService {
} }
/*UDI系统上传自助平台*/ /*UDI系统上传自助平台*/
@Override @Override
public void asyncUdiTask() { public void asyncUdiTask() {
logger.info("UDI管理系统同步任务开始--------"); logger.info("UDI管理系统同步任务开始--------");
asyncDataTask(true); asyncDataTask(true);
} }
/*自助平台生成任务，不上传*/ /*自助平台生成任务，不上传*/
@Override @Override
public void asyncSpsTask() { public void asyncSpsTask() {
logger.info("自助平台同步任务开始--------"); logger.info("自助平台同步任务开始--------");
asyncDataTask(false); asyncDataTask(false);
} }
/*拉取前一级中继服务数据*/ /*拉取前一级中继服务数据*/
@Async @Async
@ -177,11 +177,8 @@ public class IdcServiceImpl implements IdcService {
if(IDCUtils.isJson(result)) { if(IDCUtils.isJson(result)) {
JSONObject json = JSON.parseObject(result); JSONObject json = JSON.parseObject(result);
if(json!=null&&json.getInteger("code")==20000&&json.getString("data")!=null) {
if(json!=null&&json.getInteger("code")==20000&&json.get("data")!=null) { List<Map> list = JSON.parseArray(json.getString("data"), Map.class);
List<Map> list = JSON.parseArray(JSON.toJSONString(json.get("data")), Map.class);
if(list!=null) { if(list!=null) {
for(Map map:list) { for(Map map:list) {
Map<String,Object> params = new HashMap<String,Object>(); Map<String,Object> params = new HashMap<String,Object>();
@ -196,7 +193,7 @@ public class IdcServiceImpl implements IdcService {
@Async @Async
@Override @Override
public void asyncIdcTask() { public void asyncIdcTask() {
initTable(); initTable();
Map<String,Object> map = dbDao.get("select * from idc_var where code='system_type'"); Map<String,Object> map = dbDao.get("select * from idc_var where code='system_type'");
if(map==null) { if(map==null) {
@ -261,18 +258,18 @@ public class IdcServiceImpl implements IdcService {
ScheduledRequest scheduledRequest = new ScheduledRequest(); ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("sync"+WordUtils.capitalizeFully(tnames[2], new char[]{'_'}).replace("_", "")); scheduledRequest.setCronName("sync"+WordUtils.capitalizeFully(tnames[2], new char[]{'_'}).replace("_", ""));
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity!=null ? scheduledEntity.getCron() : ""; String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "";
if(!StringUtils.isEmpty(cron)) { if(!StringUtils.isEmpty(cron)) {
CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron); CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron);
Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime)); Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime));
sync = nextTimePoint.before(nowUpdateTime); sync = nextTimePoint.before(nowUpdateTime);
} }
if(sync) { if(sync) {
if(syncMasterData(map,isUpload,syncIp)) { if(syncMasterData(map,isUpload,syncIp)) {
setUpdateTime(tnames[2]+"."+tnames[0],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss")); setUpdateTime(tnames[2]+"."+tnames[0],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss"));
} }
} }
} }
} }
@ -280,16 +277,17 @@ public class IdcServiceImpl implements IdcService {
private String fetchData(String host,Map<String,Object> params) { private String fetchData(String host,Map<String,Object> params) {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.build(); .build();
MediaType mediaType = MediaType.parse("application/json"); MediaType mediaType = MediaType.parse("application/json");
RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(params)); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(params));
Request request = new Request.Builder() Request request = new Request.Builder()
.url(host+"/spssync/common/download") .url(host+"/spssync/common/download")
.method("POST", body) .method("POST", body)
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.build(); .build();
String result = ""; String result = "";
MultipartFile[] files = {}; MultipartFile[] files = {};
Date startTime = new Date();
try { try {
boolean success=true; boolean success=true;
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
@ -304,11 +302,11 @@ public class IdcServiceImpl implements IdcService {
} else { } else {
success = false; success = false;
} }
syncAddTaskStatus(json.getJSONObject("data"),3,success); syncAddTaskStatus(json.getJSONObject("data"),3,success,startTime,true);
} else { } else {
if(json.get("code")!=null&&json.get("data")!=null) { if(json.get("code")!=null&&json.get("data")!=null) {
logger.info("res1-->"+JSON.toJSONString(json)); //logger.info("res1-->"+JSON.toJSONString(json));
syncAddTaskStatus(json.getJSONObject("data"),0,success); syncAddTaskStatus(json.getJSONObject("data"),0,success,startTime,true);
analyMiddle(host,json.getJSONObject("data"),files,false,false); analyMiddle(host,json.getJSONObject("data"),files,false,false);
} }
} }
@ -328,16 +326,16 @@ public class IdcServiceImpl implements IdcService {
private String post(String url,Map<String,Object> params) { private String post(String url,Map<String,Object> params) {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.build(); .build();
MediaType mediaType = MediaType.parse("application/json"); MediaType mediaType = MediaType.parse("application/json");
RequestBody body = RequestBody.create(mediaType, ""); RequestBody body = RequestBody.create(mediaType, "");
if(params!=null) if(params!=null)
body = RequestBody.create(mediaType,JSON.toJSONString(params)); body = RequestBody.create(mediaType,JSON.toJSONString(params));
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.method("POST", body) .method("POST", body)
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.build(); .build();
String result = ""; String result = "";
try { try {
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
@ -351,14 +349,14 @@ public class IdcServiceImpl implements IdcService {
public BaseResponse downlaodSuccess(HttpServletRequest request,Map<String,Object> params) { public BaseResponse downlaodSuccess(HttpServletRequest request,Map<String,Object> params) {
String sql = "update basic_export_status set receiveStatus='1' where id='"+params.get("taskId")+"'"; String sql = "update basic_export_status set receiveStatus='1',endTime=now() where id='"+params.get("taskId")+"'";
dbDao.update(sql); dbDao.update(sql);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
/****/ /****/
@Override @Override
public BaseResponse receive(HttpServletRequest request, public BaseResponse receive(HttpServletRequest request,
String content,MultipartFile[] files) { String content,MultipartFile[] files) {
/*授权检查,后续完善*/ /*授权检查,后续完善*/
String apiKey = request.getHeader("apiKey"); String apiKey = request.getHeader("apiKey");
String secretKey = request.getHeader("secretKey"); String secretKey = request.getHeader("secretKey");
@ -375,21 +373,21 @@ public class IdcServiceImpl implements IdcService {
IDCUtils.createDirectory(filePath +backFileSlash +datePath+"/"); IDCUtils.createDirectory(filePath +backFileSlash +datePath+"/");
FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName); FileUtils.SaveFileAs(content, backFileName);
ArrayList<String> saveFiles = new ArrayList<>(); ArrayList<String> saveFiles = new ArrayList<>();
Date startTime = new Date();
if(files!=null) { if(files!=null) {
int n=0; int n=0;
try { try {
for(MultipartFile file:files) { for(MultipartFile file:files) {
String imageName = filePath +filePathSlash+"register/file/image2/"+file.getOriginalFilename(); String imageName = filePath +filePathSlash+"register/file/image2/"+file.getOriginalFilename();
saveFiles.add(imageName); saveFiles.add(imageName);
writeFile(file.getBytes(), filePath +filePathSlash+"register/file/image2/", file.getOriginalFilename()); writeFile(file.getBytes(), filePath +filePathSlash+"register/file/image2/", file.getOriginalFilename());
writeFile(file.getBytes(), backFilePath +backFileSlash+datePath+"register/file/image2/", file.getOriginalFilename()); writeFile(file.getBytes(), backFilePath +backFileSlash+datePath+"register/file/image2/", file.getOriginalFilename());
n++; n++;
} }
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -398,33 +396,33 @@ public class IdcServiceImpl implements IdcService {
e.printStackTrace(); e.printStackTrace();
} }
} }
/*解析入库*/ /*解析入库*/
boolean success = false; boolean success = false;
if(isLastLevel()) { if(isLastLevel()) {
success = analyMiddle("",json,files,true,true); success = analyMiddle("",json,files,true,true);
syncAddTaskStatus(json,2,success); syncAddTaskStatus(json,2,success,startTime,true);
if(!success) { if(!success) {
return ResultVOUtils.error(9000, "解析失败"); return ResultVOUtils.error(9000, "解析失败");
} }
} else { } else {
//需要转发 //需要转发
if(isRelay()) { if(isRelay()) {
String host = getNextHost(); String host = getNextHost();
String result = relay(request.getHeader("reqNo"),content,saveFiles,host); String result = relay(request.getHeader("reqNo"),content,saveFiles,host);
if(IDCUtils.isJson(result)) { if(IDCUtils.isJson(result)) {
syncAddTaskStatus(json,1,true); syncAddTaskStatus(json,1,true,startTime,true);
BaseResponse object = JSON.parseObject(result,BaseResponse.class); BaseResponse object = JSON.parseObject(result,BaseResponse.class);
return object; return object;
} else { } else {
syncAddTaskStatus(json,1,false); syncAddTaskStatus(json,1,false,startTime,false);
return ResultVOUtils.error(9000, "转发失败"); return ResultVOUtils.error(9000, "转发失败");
} }
} }
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -448,16 +446,14 @@ public class IdcServiceImpl implements IdcService {
public void downloadFile(String fileName,HttpServletResponse response) { public void downloadFile(String fileName,HttpServletResponse response) {
OutputStream os; OutputStream os;
String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : fileName.substring(0,1).equals("/") ? "" : "/"; String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : fileName.substring(0,1).equals("/") ? "" : "/";
if(!FileUtils.isFileExist(filePath+filePathSlash+fileName))
fileName = "11.jpg"; try {
logger.info(filePath+filePathSlash+fileName);
try {
if(FileUtils.isFileExist(filePath+filePathSlash+fileName)) { if(FileUtils.isFileExist(filePath+filePathSlash+fileName)) {
byte[] bytes = FileUtils.readFileByBytes(filePath+filePathSlash+fileName); byte[] bytes = FileUtils.readFileByBytes(filePath+filePathSlash+fileName);
os = response.getOutputStream(); os = response.getOutputStream();
os.write(bytes); os.write(bytes);
os.flush(); os.flush();
os.close(); os.close();
} }
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
@ -468,23 +464,21 @@ public class IdcServiceImpl implements IdcService {
private void saveUploadStatus(Map<String,Object> params) { private void saveUploadStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params); map.putAll(params);
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_upload_status"); Map<String,Object> columns = getColumn("basic_upload_status");
String sql = "insert into basic_upload_status "+DBAUtils.parseInsert(map, columns); String sql = "replace basic_upload_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql); dbDao.save(sql);
} }
private void saveExportStatus(Map<String,Object> params) { private void saveExportStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params); map.putAll(params);
map.put("receiveStatus", "0"); map.put("receiveStatus", "0");
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_export_status"); Map<String,Object> columns = getColumn("basic_export_status");
String sql = "insert into basic_export_status "+DBAUtils.parseInsert(map, columns); String sql = "replace basic_export_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql); dbDao.save(sql);
} }
@ -492,10 +486,9 @@ public class IdcServiceImpl implements IdcService {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.put("receiveStatus", "0"); map.put("receiveStatus", "0");
map.putAll(params); map.putAll(params);
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_download_status"); Map<String,Object> columns = getColumn("basic_download_status");
String sql = "insert into basic_download_status "+DBAUtils.parseInsert(map, columns); String sql = "replace basic_download_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql); dbDao.save(sql);
} }
@ -566,6 +559,7 @@ public class IdcServiceImpl implements IdcService {
for(int i=0;i<Math.ceil(total/limit)+1;i++) { for(int i=0;i<Math.ceil(total/limit)+1;i++) {
whereParams.replace("page", i *limit); whereParams.replace("page", i *limit);
whereParams.replace("limit",limit); whereParams.replace("limit",limit);
Date startTime = new Date();
Map<String,Object> data = getData(messageType,tableName,params,whereParams); Map<String,Object> data = getData(messageType,tableName,params,whereParams);
String recordSql = ""; String recordSql = "";
orderNum++; orderNum++;
@ -575,6 +569,7 @@ public class IdcServiceImpl implements IdcService {
List<Map> list = JSONObject.parseArray(JSON.toJSONString(data.get("data")), Map.class); List<Map> list = JSONObject.parseArray(JSON.toJSONString(data.get("data")), Map.class);
if(list!=null&&list.size()>0) { if(list!=null&&list.size()>0) {
for(int m=0;m<list.size();m++) { for(int m=0;m<list.size();m++) {
if(!StringUtils.isEmpty(filePathColumn)&&list.get(m).get(filePathColumn)!=null) { if(!StringUtils.isEmpty(filePathColumn)&&list.get(m).get(filePathColumn)!=null) {
String fileNames = list.get(m).get(filePathColumn).toString(); String fileNames = list.get(m).get(filePathColumn).toString();
String[] str = fileNames.split(","); String[] str = fileNames.split(",");
@ -585,6 +580,7 @@ public class IdcServiceImpl implements IdcService {
} }
recordSql+=!StringUtils.isEmpty(recordSql) ? "," : ""; recordSql+=!StringUtils.isEmpty(recordSql) ? "," : "";
recordSql+="('"+UUID.randomUUID().toString().replaceAll("-", "")+"','"+tableName+"','"+list.get(m).get(keyColumn)+"','"+isEnd+"',now())"; recordSql+="('"+UUID.randomUUID().toString().replaceAll("-", "")+"','"+tableName+"','"+list.get(m).get(keyColumn)+"','"+isEnd+"',now())";
if(childNum>-1) { if(childNum>-1) {
for(int z=0;z<childNum+1;z++) { for(int z=0;z<childNum+1;z++) {
String[] chidTnames = childs[z].split("/"); String[] chidTnames = childs[z].split("/");
@ -643,7 +639,7 @@ public class IdcServiceImpl implements IdcService {
} }
saveIdcLog(messageType,"",tableName +">success",i *limit,total); saveIdcLog(messageType,"",tableName +">success",i *limit,total);
} }
syncAddTaskStatus(data,isUpload ? 1 : 0 ,success); syncAddTaskStatus(data,isUpload ? 1 : 0 ,success,startTime,isUpload);
} }
} }
} }
@ -654,7 +650,7 @@ public class IdcServiceImpl implements IdcService {
} }
/*增加同步任务状态*/ /*增加同步任务状态*/
private void syncAddTaskStatus(Map<String,Object> json,int scheduleType,boolean success) { private void syncAddTaskStatus(Map<String,Object> json,int scheduleType,boolean success,Date startTime,boolean isEnd) {
try try
{ {
String content = JSON.toJSONString(json); String content = JSON.toJSONString(json);
@ -667,23 +663,30 @@ public class IdcServiceImpl implements IdcService {
IDCUtils.createDirectory(filePath +datePath+"/"); IDCUtils.createDirectory(filePath +datePath+"/");
FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName); FileUtils.SaveFileAs(content, backFileName);
//type,transportType,superiorService,subordinateService,cacheFilePath //type,transportType,superiorService,subordinateService,cacheFilePath
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("type", json.get("messageType")); map.put("type", json.get("messageType"));
map.put("transportType", scheduleType == 0 ? "1" : "2"); map.put("id", json.get("messageId"));
map.put("scheduleType", scheduleType); if(json.get("id")==null)
map.put("taskId", json.get("messageId")); map.put("id", CustomUtil.getId());
map.put("cacheFilePath", fileName); map.put("transportType", scheduleType == 0 ? "1" : "2");
map.put("status", success ? "1" : "0"); map.put("scheduleType", scheduleType);
if(scheduleType==2) { map.put("taskId", json.get("messageId"));
saveUploadStatus(map); map.put("cacheFilePath", fileName);
} else if (scheduleType==3) { map.put("status", success ? "1" : "0");
saveDownloadStatus(map); map.put("startTime", startTime!=null ? startTime : new Date());
} else { map.put("updateTime", new Date());
saveExportStatus(map); if(isEnd)
} map.put("endTime", new Date());
if(scheduleType==2) {
saveUploadStatus(map);
} else if (scheduleType==3) {
saveDownloadStatus(map);
} else {
saveExportStatus(map);
}
} catch (Exception ex) { } catch (Exception ex) {
logger.error(ex.getMessage()); logger.error(ex.getMessage());
} }
@ -777,7 +780,7 @@ public class IdcServiceImpl implements IdcService {
key++; key++;
} else { } else {
if(columnList.get(i).get("columnKey")!=null&&!StringUtils.isEmpty(columnList.get(i).get("columnKey").toString())&& if(columnList.get(i).get("columnKey")!=null&&!StringUtils.isEmpty(columnList.get(i).get("columnKey").toString())&&
("PRI".contains(columnList.get(i).get("columnKey").toString()))) { ("PRI".contains(columnList.get(i).get("columnKey").toString()))) {
keyColumn[key] = columnList.get(i).get("columnName").toString(); keyColumn[key] = columnList.get(i).get("columnName").toString();
keyDataType[key]=columnList.get(i).get("dataType").toString().contains("char") ? "C" : columnList.get(i).get("dataType").toString().contains("date") ? "D" : "N"; keyDataType[key]=columnList.get(i).get("dataType").toString().contains("char") ? "C" : columnList.get(i).get("dataType").toString().contains("date") ? "D" : "N";
key++; key++;
@ -823,35 +826,35 @@ public class IdcServiceImpl implements IdcService {
String value = list.get(i).get(attrName) !=null ? list.get(i).get(attrName).toString() : ""; String value = list.get(i).get(attrName) !=null ? list.get(i).get(attrName).toString() : "";
value = DBAUtils.escape(value); value = DBAUtils.escape(value);
String dataType = columnList.get(k).get("dataType").toLowerCase().contains("char") || columnList.get(k).get("dataType").toLowerCase().contains("text") ? String dataType = columnList.get(k).get("dataType").toLowerCase().contains("char") || columnList.get(k).get("dataType").toLowerCase().contains("text") ?
"C" : columnList.get(k).get("dataType").toLowerCase().contains("date") ? "D" : "N" ; "C" : columnList.get(k).get("dataType").toLowerCase().contains("date") ? "D" : "N" ;
sql+=m>0 ? "," : ""; sql+=m>0 ? "," : "";
boolean ups = list.get(i).containsKey(attrName) ? true : false ; boolean ups = list.get(i).containsKey(attrName) ? true : false ;
updateSet+=ups&&h>0 ? "," : ""; updateSet+=ups&&h>0 ? "," : "";
updateSet+=ups ? columnList.get(k).get("columnName")+"=" : ""; updateSet+=ups ? columnList.get(k).get("columnName")+"=" : "";
if(StringUtils.isEmpty(value)) { if(StringUtils.isEmpty(value)) {
sql+="null"; sql+="null";
updateSet+=ups ? "null" : ""; updateSet+=ups ? "null" : "";
} else {
if(dataType.equals("C")) {
sql+="'"+value+"'";
updateSet+=ups ? "'"+value+"'" : "";
} else if (dataType.equals("N")) {
sql+=value;
updateSet+=ups ? value : "";
} else { } else {
Date date = new Date(); if(dataType.equals("C")) {
date = StringUtils.isNumeric(value) ? new Date(Long.valueOf(value)) : IDCUtils.parseDate(value); sql+="'"+value+"'";
String str = DateUtils.format(date, "yyyy-MM-dd HH:mm:ss"); updateSet+=ups ? "'"+value+"'" : "";
sql+="cast('"+str+"' as datetime)"; } else if (dataType.equals("N")) {
updateSet+=ups ? "cast('"+str+"' as datetime)" : ""; sql+=value;
updateSet+=ups ? value : "";
} else {
Date date = new Date();
date = StringUtils.isNumeric(value) ? new Date(Long.valueOf(value)) : IDCUtils.parseDate(value);
String str = DateUtils.format(date, "yyyy-MM-dd HH:mm:ss");
sql+="cast('"+str+"' as datetime)";
updateSet+=ups ? "cast('"+str+"' as datetime)" : "";
}
} }
m++;
if(operateMode.equals("U")&&!StringUtils.isEmpty(updateSet)&&!StringUtils.isEmpty(updateWhere))
dbDao.update(upd + updateSet+" where "+updateWhere);
h+=ups ? 1 : 0;
} }
m++;
if(operateMode.equals("U")&&!StringUtils.isEmpty(updateSet)&&!StringUtils.isEmpty(updateWhere))
dbDao.update(upd + updateSet+" where "+updateWhere);
h+=ups ? 1 : 0;
}
sql+=")"; sql+=")";
n++; n++;
@ -864,7 +867,6 @@ public class IdcServiceImpl implements IdcService {
for (Object o : (List<?>) obj) { for (Object o : (List<?>) obj) {
chList.add((Map<String,Object>)o); chList.add((Map<String,Object>)o);
} }
//logger.info("childList-->"+list.get(i).get("tableName"+m)+"-->"+JSON.toJSONString(chList));
analyToDB(host,list.get(i).get("tableName"+m).toString(),"","",chList,isUpload); analyToDB(host,list.get(i).get("tableName"+m).toString(),"","",chList,isUpload);
} else { } else {
break; break;
@ -873,7 +875,6 @@ public class IdcServiceImpl implements IdcService {
} }
if(n>0) { if(n>0) {
result = (dbDao.save(sql)>0); result = (dbDao.save(sql)>0);
if(!result) if(!result)
logger.error(tableName+"-->fetchSave Fail"); logger.error(tableName+"-->fetchSave Fail");
@ -894,7 +895,7 @@ public class IdcServiceImpl implements IdcService {
host+="/spssync/common/upload" ; host+="/spssync/common/upload" ;
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.connectTimeout(30, TimeUnit.SECONDS)//设置连接超时时间 .connectTimeout(30, TimeUnit.SECONDS)//设置连接超时时间
.readTimeout(30, TimeUnit.SECONDS)//设置读取超时时间 .readTimeout(30, TimeUnit.SECONDS)//设置读取超时时间
.build(); .build();
MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
@ -905,8 +906,8 @@ public class IdcServiceImpl implements IdcService {
for (int i = 0; i < files.size(); i++) { for (int i = 0; i < files.size(); i++) {
if(!StringUtils.isEmpty(files.get(i))) { if(!StringUtils.isEmpty(files.get(i))) {
File file = new File(files.get(i)); File file = new File(files.get(i));
builder.addFormDataPart("files",files.get(i), builder.addFormDataPart("files",files.get(i),
RequestBody.create(MediaType.parse(fileType), file)); RequestBody.create(MediaType.parse(fileType), file));
} }
} }
} }
@ -914,17 +915,17 @@ public class IdcServiceImpl implements IdcService {
RequestBody body = builder.build(); RequestBody body = builder.build();
Request req = new Request.Builder() Request req = new Request.Builder()
.url(host) .url(host)
.method("POST", body) .method("POST", body)
.addHeader("Content-Type", "application/x-www-form-urlencoded") .addHeader("Content-Type", "application/x-www-form-urlencoded")
.addHeader("format", "json") .addHeader("format", "json")
.addHeader("apiKey", apiKey) .addHeader("apiKey", apiKey)
.addHeader("secretKey", apiSecret) .addHeader("secretKey", apiSecret)
.addHeader("reqNo", reqNo) .addHeader("reqNo", reqNo)
.addHeader("timestamp",DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")) .addHeader("timestamp",DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"))
.addHeader("Access-Control-Allow-Headers", "Authorization, Origin, X-Requested-With, Content-Type, Accept") .addHeader("Access-Control-Allow-Headers", "Authorization, Origin, X-Requested-With, Content-Type, Accept")
.build(); .build();
try { try {
Response response = client.newCall(req).execute(); Response response = client.newCall(req).execute();
result=response.body().string(); result=response.body().string();
log.debug("result--->"+result); log.debug("result--->"+result);
@ -947,7 +948,7 @@ public class IdcServiceImpl implements IdcService {
String[] str = fileName.split(","); String[] str = fileName.split(",");
for(int i=0;i<str.length;i++) { for(int i=0;i<str.length;i++) {
if(!StringUtils.isEmpty(str[i])) { if(!StringUtils.isEmpty(str[i])) {
//logger.info("downloadFile-->"+str[i]);
if(!signleDownloadFile(syncIp,str[i])) if(!signleDownloadFile(syncIp,str[i]))
success = false; success = false;
} }
@ -958,7 +959,7 @@ public class IdcServiceImpl implements IdcService {
} }
private boolean signleDownloadFile(String syncIp,String fileName) { private boolean signleDownloadFile(String syncIp,String fileName) {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.build();; .build();;
MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
RequestBody body = RequestBody.create(mediaType, "fileName="+fileName); RequestBody body = RequestBody.create(mediaType, "fileName="+fileName);
@ -1033,7 +1034,6 @@ public class IdcServiceImpl implements IdcService {
String where = DBAUtils.convertWhere(column,params,""); String where = DBAUtils.convertWhere(column,params,"");
sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; sql+=!StringUtils.isEmpty(where) ? " where "+where : "";
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params); map.putAll(params);
map.put("sql", sql); map.put("sql", sql);
@ -1044,7 +1044,7 @@ public class IdcServiceImpl implements IdcService {
private Map<String,Object> getData(String messageType,String tableName,Map<String,Object> params,Map<String,Object> whereParams) { private Map<String,Object> getData(String messageType,String tableName,Map<String,Object> params,Map<String,Object> whereParams) {
List<Map<String,Object>> list = getList(tableName,whereParams); List<Map<String,Object>> list = getList(tableName,whereParams);
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.put("messageId", UUID.randomUUID().toString().replaceAll("-", "")); map.put("messageId", CustomUtil.getId());
map.put("messageType", messageType); map.put("messageType", messageType);
map.put("apiCode", "common"); map.put("apiCode", "common");
map.put("tableName", DBAUtils.tableAliasName(tableName)); map.put("tableName", DBAUtils.tableAliasName(tableName));
@ -1099,7 +1099,7 @@ public class IdcServiceImpl implements IdcService {
for(int i=0;i<columnList.size();i++) { for(int i=0;i<columnList.size();i++) {
Map<String,Object> column = new HashMap<String,Object>(); Map<String,Object> column = new HashMap<String,Object>();
String dataType =columnList.get(i).get("dataType").toLowerCase().contains("char") || columnList.get(i).get("dataType").toLowerCase().contains("text")? String dataType =columnList.get(i).get("dataType").toLowerCase().contains("char") || columnList.get(i).get("dataType").toLowerCase().contains("text")?
"C" : columnList.get(i).get("dataType").toLowerCase().contains("date") ? "D" : "N" ;; "C" : columnList.get(i).get("dataType").toLowerCase().contains("date") ? "D" : "N" ;;
String attrName = columnList.get(i).get("columnName").toString(); String attrName = columnList.get(i).get("columnName").toString();
if(map.get(attrName)==null) { if(map.get(attrName)==null) {
column.put("tableName", tname); column.put("tableName", tname);

Write Preview
Loading…
Cancel
Save