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

页面展示，同步相关修改

Browse Source
master
anthonywj 2 years ago
parent 437938b6c9
commit 78efd5b5eb
13 changed files with 240 additions and 240 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/constant/BasicProcessStatus.java
Unescape Escape View File

@ -27,7 +27,7 @@ public class BasicProcessStatus {
public static final int BASIC_THIRD_ORDER = 6; //往来单位 public static final int BASIC_THIRD_ORDER = 6; //往来单位
public static final int NEW_ALL_DATA = 7; //所有最新数据 public static final int NEW_ALL_DATA = 7; //所有最新数据
public static final int NEW_ALL_BUS = 8; public static final int NEW_ALL_BUS = 8;
public static final int NEW_ALL_ORDER = 9; public static final String NEW_ALL_ORDER = "9";
public static final int NEW_ALL_DI = 10; public static final int NEW_ALL_DI = 10;
public static final int SCHEDULE_NORMAL = 1; //常规任务 public static final int SCHEDULE_NORMAL = 1; //常规任务

2
src/main/java/com/glxp/api/entity/sync/BasicDownloadStatusEntity.java
Unescape Escape View File

@ -18,7 +18,7 @@ public class BasicDownloadStatusEntity {
private String taskId; private String taskId;
private String idDatas; private String idDatas;
private Integer status; private Integer status;
private Integer type; private String type;
private Date updateTime; private Date updateTime;
private Integer scheduleType; private Integer scheduleType;
private Date startTime; private Date startTime;

2
src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
Unescape Escape View File

@ -10,7 +10,7 @@ public class BasicExportStatusEntity {
private String id; private String id;
private String idDatas; private String idDatas;
private Integer status; private Integer status;
private Integer type; private String type;
private Date updateTime; private Date updateTime;
private Integer scheduleType; private Integer scheduleType;
private Date startTime; private Date startTime;

2
src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
Unescape Escape View File

@ -158,7 +158,7 @@ public class SpGetHttpClient {
} }
public String getBasicData(String id, int type) { public String getBasicData(String id, String type) {
BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
basicExportStatusRequest.setId(id); basicExportStatusRequest.setId(id);
basicExportStatusRequest.setType(type); basicExportStatusRequest.setType(type);

270
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
@ -196,7 +196,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 +261,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,14 +280,14 @@ 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 = {};
try { try {
@ -328,16 +328,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();
@ -358,7 +358,7 @@ public class IdcServiceImpl implements IdcService {
/****/ /****/
@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 +375,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<>();
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 +398,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);
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);
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);
return ResultVOUtils.error(9000, "转发失败"); return ResultVOUtils.error(9000, "转发失败");
} }
} }
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -456,8 +456,8 @@ public class IdcServiceImpl implements IdcService {
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
@ -667,23 +667,23 @@ 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("transportType", scheduleType == 0 ? "1" : "2");
map.put("scheduleType", scheduleType); map.put("scheduleType", scheduleType);
map.put("taskId", json.get("messageId")); map.put("taskId", json.get("messageId"));
map.put("cacheFilePath", fileName); map.put("cacheFilePath", fileName);
map.put("status", success ? "1" : "0"); map.put("status", success ? "1" : "0");
if(scheduleType==2) { if(scheduleType==2) {
saveUploadStatus(map); saveUploadStatus(map);
} else if (scheduleType==3) { } else if (scheduleType==3) {
saveDownloadStatus(map); saveDownloadStatus(map);
} else { } else {
saveExportStatus(map); saveExportStatus(map);
} }
} catch (Exception ex) { } catch (Exception ex) {
logger.error(ex.getMessage()); logger.error(ex.getMessage());
} }
@ -777,7 +777,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 +823,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 {
if(dataType.equals("C")) { Date date = new Date();
sql+="'"+value+"'"; date = StringUtils.isNumeric(value) ? new Date(Long.valueOf(value)) : IDCUtils.parseDate(value);
updateSet+=ups ? "'"+value+"'" : ""; String str = DateUtils.format(date, "yyyy-MM-dd HH:mm:ss");
} else if (dataType.equals("N")) { sql+="cast('"+str+"' as datetime)";
sql+=value; updateSet+=ups ? "cast('"+str+"' as datetime)" : "";
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++;
@ -894,7 +894,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 +905,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 +914,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);
@ -958,7 +958,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);
@ -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);

2
src/main/java/com/glxp/api/req/sync/BasicDownloadRequest.java
Unescape Escape View File

@ -8,7 +8,7 @@ public class BasicDownloadRequest extends ListPageRequest {
private String id; private String id;
private String taskId; //任务ID private String taskId; //任务ID
private Integer status; private Integer status;
private Integer type; private String type;
private String idDatas; private String idDatas;
private Integer scheduleType; private Integer scheduleType;
public Integer createType; public Integer createType;

2
src/main/java/com/glxp/api/req/sync/BasicExportStatusRequest.java
Unescape Escape View File

@ -7,7 +7,7 @@ import lombok.Data;
public class BasicExportStatusRequest extends ListPageRequest { public class BasicExportStatusRequest extends ListPageRequest {
private String id; private String id;
private Integer status; private Integer status;
private Integer type; private String type;
private String idDatas; private String idDatas;
private Integer scheduleType; private Integer scheduleType;
public Integer createType; public Integer createType;

2
src/main/java/com/glxp/api/res/system/SyncDataSetResponse.java
Unescape Escape View File

@ -32,7 +32,7 @@ public class SyncDataSetResponse {
private List<SyncDataBustypeEntity> busTypes; //扫码单据类型 private List<SyncDataBustypeEntity> busTypes; //扫码单据类型
private List<SyncDataChangeBustypesEntity> changeBusTypes; //业务单据类型 private List<SyncDataChangeBustypesEntity> changeBusTypes; //业务单据类型
private List<SyncDataPurTypeEntity> purTypeEntities; // private List<SyncDataPurTypeEntity> purTypeEntities;
private String orderSyncStart; private String orderSyncStart;
private String basicSyncStart; private String basicSyncStart;

9
src/main/java/com/glxp/api/service/sync/UpBasicService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity;
import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurOrderEntity;
import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity;
import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity;
import com.glxp.api.entity.system.SyncDataPurTypeEntity; import com.glxp.api.entity.system.SyncDataPurTypeEntity;
import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest;
@ -106,10 +107,10 @@ public class UpBasicService {
List<PurOrderEntity> purOrderEntities = new ArrayList<>(); List<PurOrderEntity> purOrderEntities = new ArrayList<>();
FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
if (CollUtil.isNotEmpty(syncDataSetEntity.getPurTypeEntities())) { if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) {
for (SyncDataPurTypeEntity syncDataBustypeEntity : syncDataSetEntity.getPurTypeEntities()) { for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) {
if (syncDataBustypeEntity.getType() == ConstantStatus.BUS_TYPE_DD) { if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) {
List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus()); List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus());
if (CollUtil.isNotEmpty(temps)) { if (CollUtil.isNotEmpty(temps)) {
purOrderEntities.addAll(temps); purOrderEntities.addAll(temps);
} }

2
src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
Unescape Escape View File

@ -36,7 +36,7 @@ public class AsyncFetchUdiTask implements SchedulingConfigurer {
scheduledRequest.setCronName("syncFetch"); scheduledRequest.setCronName("syncFetch");
logger.info("syncFetch----------------"); logger.info("syncFetch----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/5 * * * ?"; String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");

10
src/main/java/com/glxp/api/task/AsyncUdiTask.java
Unescape Escape View File

@ -16,7 +16,6 @@ import com.glxp.api.idc.service.IdcService;
import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.req.system.ScheduledRequest;
@Component @Component
@EnableScheduling @EnableScheduling
public class AsyncUdiTask implements SchedulingConfigurer { public class AsyncUdiTask implements SchedulingConfigurer {
@ -37,7 +36,7 @@ public class AsyncUdiTask implements SchedulingConfigurer {
scheduledRequest.setCronName("syncIdcUdi"); scheduledRequest.setCronName("syncIdcUdi");
logger.info("syncIdcUdi----------------"); logger.info("syncIdcUdi----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "0 0/3 * * * ?"; String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");
@ -48,9 +47,8 @@ public class AsyncUdiTask implements SchedulingConfigurer {
} }
private void process() { private void process() {
logger.info("syncIdcUdi----process------------"); logger.info("syncIdcUdi----process------------");
idcService.asyncUdiTask();
idcService.asyncUdiTask(); }
}
} }

1
src/main/java/com/glxp/api/task/SyncHeartTask.java
Unescape Escape View File

@ -67,6 +67,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
} }
if (curTime2 - lastTime2 > timeInterval2) { if (curTime2 - lastTime2 > timeInterval2) {
heartService.uploadAllOrder(null); heartService.uploadAllOrder(null);
heartService.uploadAllBusOrder(null);
redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2); redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2);
} }

2
src/main/resources/application-dev.yml
Unescape Escape View File

@ -46,7 +46,7 @@ logging:
level: level:
com.glxp.api.dao: debug com.glxp.api.dao: debug
file_path: D:/udi/udiwms/udiwmsfile/ file_path: D:/udi/inUdiwms/udiwmsfile/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

Write Preview
Loading…
Cancel
Save