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

更新IDC同步服务

Browse Source
master
admin 3 years ago
parent f86e45e894
commit a157223c2a
8 changed files with 1500 additions and 1256 deletions
Show Stats Download Patch File Download Diff File

191
src/main/java/com/glxp/api/idc/controller/IdcController.java
Unescape Escape View File

@ -1,25 +1,49 @@
package com.glxp.api.idc.controller; package com.glxp.sale.admin.idc.controller;
import com.glxp.api.common.res.BaseResponse; import java.io.BufferedReader;
import com.glxp.api.dao.idc.DbDao; import java.io.IOException;
import com.glxp.api.idc.service.IdcService; import java.io.InputStreamReader;
import org.springframework.web.bind.annotation.*; import java.util.Enumeration;
import org.springframework.web.multipart.MultipartFile; import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Map; import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.glxp.sale.admin.idc.dao.DbDao;
import com.glxp.sale.admin.idc.service.IdcService;
import com.glxp.sale.common.res.BaseResponse;
import cn.hutool.core.io.IoUtil;
import lombok.extern.slf4j.Slf4j;
/** /**
* 中继服务接口 * 中继服务接口
*/ */
@Slf4j
@RestController @RestController
public class IdcController { public class IdcController {
@Resource @Resource
IdcService idcService; IdcService idcService;
@Resource @Resource
DbDao dbDao; DbDao dbDao;
/*通用上传接口*/ /*通用上传接口*/
//@Log("中继服务数据接收,下级往上级上传") //@Log("中继服务数据接收,下级往上级上传")
@RequestMapping(value = "/spssync/common/upload") @RequestMapping(value = "/spssync/common/upload")
@ -27,18 +51,10 @@ public class IdcController {
@RequestParam("content") String content, @RequestParam("content") String content,
@RequestParam(value = "files", required = false) MultipartFile[] files) { @RequestParam(value = "files", required = false) MultipartFile[] files) {
// //
return idcService.receive("U",request, content, files); return idcService.receive( request, content, files);
}
/*通用下发接口*/
//@Log("中继服务数据接收,上级往下级下发")
@RequestMapping(value = "/spssync/common/issued")
public BaseResponse issued(HttpServletRequest request,
@RequestParam("content") String content,
@RequestParam(value = "files", required = false) MultipartFile[] files) {
//
return idcService.receive("I",request, content, files);
} }
//@Log("数据同步测试") //@Log("数据同步测试")
@RequestMapping(value = "/spssync/common/test") @RequestMapping(value = "/spssync/common/test")
public BaseResponse test(HttpServletRequest request, @RequestBody Map<String, Object> params) { public BaseResponse test(HttpServletRequest request, @RequestBody Map<String, Object> params) {
@ -65,4 +81,145 @@ public class IdcController {
public BaseResponse success(HttpServletRequest request, @RequestBody Map<String, Object> params) { public BaseResponse success(HttpServletRequest request, @RequestBody Map<String, Object> params) {
return idcService.downlaodSuccess(request, params); return idcService.downlaodSuccess(request, params);
} }
@RequestMapping("/mapi/**")
public Object mapi(HttpServletRequest request, HttpServletResponse httpServletResponse) {
String uri = parseUri(request.getRequestURL().toString());
if (uri.contains("getImage")) {
return redirectIamge(request, httpServletResponse, uri);
} else {
return redirect(request, uri);
}
}
HttpEntity<String> buildHeader(HttpServletRequest request) {
log.info(request.getMethod());
String bodyContent = "";
Map<String, Object> headerParam = new HashMap<>();
if (request.getMethod().equals(HttpMethod.GET)) {
Map<String, Object> bodyParam = new HashMap<String, Object>();
Enumeration pNames = request.getParameterNames();
while (pNames.hasMoreElements()) {
String name = (String) pNames.nextElement();
String value = request.getParameter(name);
bodyParam.put(name, value);
}
bodyContent = JSON.toJSONString(bodyParam);
} else {
BufferedReader reader = null;
try {
reader = new BufferedReader(new InputStreamReader(request.getInputStream()));
bodyContent = IoUtil.read(reader);
log.info(bodyContent);
} catch (IOException e) {
e.printStackTrace();
}
}
HttpHeaders headers = new HttpHeaders();
Enumeration<String> enumeration = request.getHeaderNames();
while (enumeration.hasMoreElements()) {
String name = enumeration.nextElement();
String value = request.getHeader(name);
headerParam.put(name, value);
headers.add(name, value);
}
//headers.add("Content-Type", "application/json;charset=UTF-8");
HttpEntity<String> http = new HttpEntity<>(bodyContent, headers);
return http;
}
private byte[] redirectIamge(HttpServletRequest request, HttpServletResponse httpServletResponse, String uri) {
uri = uri.replace("mapi/", "");
uri = "http://116.204.106.103:9150/UDI_SPMS_SERVER/" + uri;
RestTemplate restTemplate = new RestTemplate();
// HttpEntity<String> httpEntity = buildHeader(request);
log.info(request.getMethod());
Map<String, Object> headerParam = new HashMap<>();
Map<String, Object> bodyParam = new HashMap<String, Object>();
Enumeration pNames = request.getParameterNames();
String parm = "";
while (pNames.hasMoreElements()) {
String name = (String) pNames.nextElement();
String value = request.getParameter(name);
bodyParam.put(name, value);
parm = parm + name + "=" + value + "&";
}
uri = uri + "?" + parm.substring(0, parm.length() - 1);
HttpHeaders headers = new HttpHeaders();
Enumeration<String> enumeration = request.getHeaderNames();
while (enumeration.hasMoreElements()) {
String name = enumeration.nextElement();
String value = request.getHeader(name);
headerParam.put(name, value);
headers.add(name, value);
}
//headers.add("Content-Type", "application/json;charset=UTF-8");
HttpEntity<String> http = new HttpEntity<>(JSON.toJSONString(bodyParam), headers);
log.info(uri);
// ResponseEntity<Resource> entity = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, Resource.class);
// ResponseEntity<Resource> responseEntity = restTemplate.exchange(uri,
// HttpMethod.GET, http, Resource.class, new Object[0]);
// ResponseEntity<HttpServletResponse> responseEntity = restTemplate.exchange(uri, HttpMethod.GET, http, HttpServletResponse.class);
ResponseEntity<byte[]> rsp = restTemplate.getForEntity(uri, byte[].class);
// String targetPath = "D:\\wmslog\\splash-down.png";
// try {
// Files.write(Paths.get(targetPath), Objects.requireNonNull(rsp.getBody(),
// "未获取到下载文件"));
// } catch (IOException e) {
// e.printStackTrace();
// }
return rsp.getBody();
}
private JSONObject redirect(HttpServletRequest request, String uri) {
RestTemplate restTemplate = new RestTemplate();
HttpEntity<String> httpEntity = buildHeader(request);
log.info(uri);
uri = uri.replace("mapi/", "");
uri = "http://116.204.106.103:9150/UDI_SPMS_SERVER/" + uri;
log.info(uri);
ResponseEntity<JSONObject> responseBody = null;
if (request.getMethod().equals("POST"))
responseBody = restTemplate.postForEntity(uri, httpEntity, JSONObject.class);
else if (request.getMethod().equals("GET")) {
responseBody = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, JSONObject.class);
} else if (request.getMethod().equals("PUT")) {
responseBody = restTemplate.exchange(uri, HttpMethod.PUT, httpEntity, JSONObject.class);
} else if (request.getMethod().equals("DELETE")) {
responseBody = restTemplate.exchange(uri, HttpMethod.DELETE, httpEntity, JSONObject.class);
}
JSONObject result = responseBody.getBody();
return result;
}
private String parseUri(String url) {
String uri = url;
int a1 = uri.indexOf("://");
int a2 = 0;
if (a1 > 0) {
a2 = uri.indexOf("/", a1 + 4);
if (a2 > 0) {
uri = uri.substring(a2 + 1);
}
}
return uri;
}
} }

46
src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java
Unescape Escape View File

@ -0,0 +1,46 @@
package com.glxp.sale.admin.idc.service;
import cn.hutool.core.lang.Assert;
import com.beust.jcommander.internal.Nullable;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.web.client.*;
import java.io.IOException;
import java.net.URI;
public class DownloadRestTemplate extends RestTemplate {
public DownloadRestTemplate(ClientHttpRequestFactory requestFactory) {
super(requestFactory);
}
protected <T> T doExecute(URI url, @Nullable HttpMethod method, @Nullable RequestCallback requestCallback,
@Nullable ResponseExtractor<T> responseExtractor) throws RestClientException {
Assert.notNull(url, "URI is required");
Assert.notNull(method, "HttpMethod is required");
ClientHttpResponse response = null;
try {
ClientHttpRequest request = createRequest(url, method);
if (requestCallback != null) {
requestCallback.doWithRequest(request);
}
response = request.execute();
handleResponse(url, method, response);
return (responseExtractor != null ? responseExtractor.extractData(response) : null);
} catch (IOException ex) {
String resource = url.toString();
String query = url.getRawQuery();
resource = (query != null ? resource.substring(0, resource.indexOf('?')) : resource);
throw new ResourceAccessException("I/O error on " + method.name() +
" request for \"" + resource + "\": " + ex.getMessage(), ex);
}
/*finally {
if (response != null) {
response.close();
}
}*/
}
}

15
src/main/java/com/glxp/api/idc/service/IdcService.java
Unescape Escape View File

@ -1,21 +1,22 @@
package com.glxp.api.idc.service; package com.glxp.sale.admin.idc.service;
import com.glxp.api.common.res.BaseResponse; import java.util.Map;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Map;
import org.springframework.web.multipart.MultipartFile;
import com.glxp.sale.common.res.BaseResponse;
/*数据中继数据中心(接收)*/ /*数据中继数据中心(接收)*/
public interface IdcService { public interface IdcService {
BaseResponse receive(String direction, HttpServletRequest request, BaseResponse receive(HttpServletRequest request,
String content,MultipartFile[] files); String content,MultipartFile[] files);
BaseResponse send(Map<String,Object> params); BaseResponse send(Map<String,Object> params);
BaseResponse send(String messageType,String tableName,Map<String,Object> params); BaseResponse send(String messageType,String tableName,Map<String,Object> params);
BaseResponse taskList(HttpServletRequest request,Map<String,Object> params); BaseResponse taskList(HttpServletRequest request,Map<String,Object> params);
@ -27,5 +28,7 @@ public interface IdcService {
BaseResponse downlaodSuccess(HttpServletRequest request,Map<String,Object> params); BaseResponse downlaodSuccess(HttpServletRequest request,Map<String,Object> params);
public void asyncIdcTask(); public void asyncIdcTask();
void asyncUdiTask();
void asyncSpsTask();
} }

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

@ -1,25 +1,21 @@
package com.glxp.api.idc.service.impl; package com.glxp.sale.admin.idc.service.impl;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.idc.DbDao;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.idc.service.IdcService;
import com.glxp.api.idc.utils.DBAUtils;
import com.glxp.api.idc.utils.IDCUtils;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.FileUtils;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils; import org.apache.commons.text.WordUtils;
import org.apache.tools.ant.util.DateUtils; import org.apache.tools.ant.util.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -30,13 +26,30 @@ import org.springframework.scheduling.support.CronSequenceGenerator;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import com.alibaba.fastjson.JSON;
import javax.servlet.http.HttpServletRequest; import com.alibaba.fastjson.JSONObject;
import java.io.File; import com.glxp.sale.admin.dao.info.ScheduledDao;
import java.io.FileOutputStream; import com.glxp.sale.admin.entity.info.ScheduledEntity;
import java.io.IOException; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import java.util.*; import com.glxp.sale.admin.idc.dao.DbDao;
import java.util.concurrent.TimeUnit; import com.glxp.sale.admin.idc.service.IdcService;
import com.glxp.sale.admin.idc.utils.DBAUtils;
import com.glxp.sale.admin.idc.utils.IDCUtils;
import com.glxp.sale.admin.req.info.ScheduledRequest;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.FileUtils;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
/*数据中继数据中心(接收)*/ /*数据中继数据中心(接收)*/
@ -54,27 +67,18 @@ public class IdcServiceImpl implements IdcService {
@Value("${API_SECRET}") @Value("${API_SECRET}")
private String apiSecret; private String apiSecret;
/*自助平台->UDI*/ /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/
private final String[] SPMS_TO_UDI_TABLES = { private final String[] SYNC_TABLES= {
"basic_udirel/updateTime//耗材字典", "basic_products///耗材字典信息详情", "company_product_relevance/updateTime//供应商关联信息", "entrustAction////////委托验收,basicProducts//basic_udirel///updateTime///耗材字典","/basicProducts/basic_products//////耗材字典信息详情",
"basic_corp/updateTime//往来单位", "thr_bustype_origin/updateTime//第三方单据类型", "//company_product_relevance///updateTime///供应商关联信息",
"thr_corp/updateTime//第三方往来单位", "thr_dept/updateTime//第三方部门", "basicCorp//basic_corp///updateTime///往来单位","typeThird//thr_bustype_origin///updateTime///第三方单据类型",
"thr_inv_products/updateTime//第三方库存", "thr_inv_warehouse///第三方仓库", "basicThirdCorp//thr_corp///updateTime///第三方往来单位","//thr_dept///updateTime///第三方部门",
"thr_order/updateTime//第三方单据", "thr_order_detail/updateTime//第三方单据详情", "//thr_inv_products///updateTime///第三方库存","basicThirdInv//thr_inv_warehouse//////第三方仓库",
"thr_products/updateTime//第三方产品信息", "sup_cert/updateTime/filePath/资质证书信息", "basicThirdBusOrder//thr_order///updateTime///第三方业务单据","/basicThirdBusOrder/thr_order_detail///updateTime///第三方单据详情",
"sup_cert_set/updateTime//供应商资质证书设置", "sup_company/updateTime//配送供应商资质信息", "basicThirdProducts//thr_products///updateTime///第三方产品信息","//sup_cert///updateTime/filePath//资质证书信息",
"sup_manufacturer/updateTime//生产企业资质信息", "sup_product/updateTime//产品资质信息"}; "//sup_cert_set///updateTime///供应商资质证书设置","companyCert//sup_company///updateTime///配送企业",
/*UDI->自助平台*/ "manufacturerCert//sup_manufacturer///updateTime///生产企业","productCert//sup_product///updateTime///产品资质信息",
private final String[] UDI_TO_SPMS_TABLES = { "dbDiProducts//productinfo///updateTime///DI产品信息,//udicompany///updateTime///国际库医疗器械注册人信息"};
"basic_udirel/updateTime//耗材字典", "basic_products///耗材字典信息详情", "company_product_relevance/updateTime//供应商关联信息",
"basic_corp/updateTime//往来单位", "thr_bustype_origin/updateTime//第三方单据类型",
"thr_corp/updateTime//第三方往来单位", "thr_dept/updateTime//第三方部门",
"thr_inv_products/updateTime//第三方库存", "thr_inv_warehouse///第三方仓库",
"thr_order/updateTime//第三方单据", "thr_order_detail/updateTime//第三方单据详情",
"thr_products/updateTime//第三方产品信息", "sup_cert/updateTime/filePath/资质证书信息",
"sup_cert_set/updateTime//供应商资质证书设置", "sup_company/updateTime//配送供应商资质信息",
"sup_manufacturer/updateTime//生产企业资质信息", "sup_product/updateTime//产品资质信息",
"productinfo/updateTime//国家库UDI数据,udicompany/updateTime//国际库医疗器械注册人信息"};
private int orderNum=0; private int orderNum=0;
@ -108,14 +112,25 @@ public class IdcServiceImpl implements IdcService {
return ResultVOUtils.success(object); return ResultVOUtils.success(object);
} }
/*UDI系统上传自助平台*/
@Override
public void asyncUdiTask() {
asyncDataTask(true);
}
/*自助平台生成任务，不上传*/
@Override
public void asyncSpsTask() {
asyncDataTask(false);
}
/*拉取前一级中继服务数据*/ /*拉取前一级中继服务数据*/
@Async @Async
@Override @Override
public void asyncFetchTask() { public void asyncFetchTask() {
String[] directions = {"I", "U"};
for (String dir : directions) {
Map<String,Object> query = new HashMap<String,Object>(); Map<String,Object> query = new HashMap<String,Object>();
String host = getNextHost(dir); String host = getNextHost();
if(!StringUtils.isEmpty(host)) { if(!StringUtils.isEmpty(host)) {
String result = post(host+"/spssync/common/list",query); String result = post(host+"/spssync/common/list",query);
if(IDCUtils.isJson(result)) { if(IDCUtils.isJson(result)) {
@ -132,73 +147,83 @@ public class IdcServiceImpl implements IdcService {
} }
} }
} }
}
} }
@Async @Async
@Override @Override
public void asyncIdcTask() { public void asyncIdcTask() {
initTable(); initTable();
String[] tNames = {}; Map<String,Object> map = dbDao.get("select * from idc_var where code='system_type'");
String direction = getDirection(); if(map==null) {
dbDao.save("insert into idc_var (code,content) values ('system_type','IDC')");
if (direction.equals("I")) {
tNames = SPMS_TO_UDI_TABLES;
} else if (direction.equals("U")) {
tNames = UDI_TO_SPMS_TABLES;
}
/*为顶级或末级，以及下游或上游连通，可执行*/
Boolean isLastLevel = isLastLevel(direction);
Boolean isRelay = isRelay(direction);
logger.info("-----数据传输任务开始----" + direction + "\n");
logger.info("-----是否需要上传或下发数据：" + isLastLevel + ",是否已配置接收地址:" + isRelay + "----\n");
if (isLastLevel && isRelay) {
for (String t : tNames) {
uploadData(t);
} }
} }
}
private void asyncDataTask(boolean isUpload) {
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"))
for(int i=0;i<SYNC_TABLES.length;i++) {
String[] tnames = SYNC_TABLES[i].split("/");
if(!StringUtils.isEmpty(tnames[0])&&map!=null&&map.get(tnames[0])!=null&&map.get(tnames[0]).toString().equals("1"))
syncData(SYNC_TABLES[i],isUpload);
}
}
private void uploadData(String t) { private void syncData(String t,boolean isUpload) {
String[] tn = t.split("/"); boolean sync = true;
String lastUpdateTime = getUpdateTime(tn[0]); String[] tnames = t.split("/");
String[] cnames = {};
String lastUpdateTime = getUpdateTime(tnames[0]);
Date nowUpdateTime = new Date(); Date nowUpdateTime = new Date();
List<Map<String, String>> keyList = dbDao.listKeyMysql(tn[0]); if(!StringUtils.isEmpty(tnames[0])) {
int n=-1;
for(int k=0;k<SYNC_TABLES.length;k++) {
if(SYNC_TABLES[k].contains("/"+tnames[0]+"/")) {
n++;
cnames[n] = SYNC_TABLES[k];
}
}
List<Map<String, String>> keyList = dbDao.listKeyMysql(tnames[2]);
String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id";
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String sqlWhere = "not exists (select fkId from idc_record where type='" + tn[0] + "' and fkId=" + tn[0] + "." + keyColumn + ")"; String sqlWhere = "not exists (select fkId from idc_record where type='"+tnames[2]+"' and fkId="+tnames[2]+"."+keyColumn+")";
if (!StringUtils.isEmpty(tn[1])) { if(!StringUtils.isEmpty(tnames[2])) {
sqlWhere += " and " + tn[1] + ">=cast('" + lastUpdateTime + "' as datetime)"; sqlWhere+=" and "+tnames[5]+">=cast('"+lastUpdateTime+"' as datetime)";
} else { } else {
map.put("isEnd", "1"); map.put("isEnd", "1");
} }
if (tn[0].equals("thr_order"))
logger.info("-------------------" + sqlWhere);
map.put("sqlWhere", sqlWhere); map.put("sqlWhere", sqlWhere);
map.put("tableName", tn[0]); map.put("dataWhere", tnames[7]);
map.put("filePathColumn", tn[2]); map.put("tableKey", tnames[0]);
map.put("messageType", tn[3]); map.put("tableName", tnames[2]);
map.put("messageName", tn[3]); map.put("masterLinkColumn", tnames[3]);
map.put("subLinkColumn", tnames[4]);
map.put("filePathColumn", tnames[6]);
map.put("messageType", tnames[8]);
map.put("messageName", tnames[8]);
ScheduledRequest scheduledRequest = new ScheduledRequest(); ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("sync" + WordUtils.capitalizeFully(tn[0], 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() : "";
boolean send = true;
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));
send = nextTimePoint.before(nowUpdateTime); sync = nextTimePoint.before(nowUpdateTime);
}
if(sync) {
if(syncMasterData(map,isUpload)) {
setUpdateTime(tnames[2],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss"));
} }
if (send) {
BaseResponse result = send(map);
if (result.getCode() == 20000) {
setUpdateTime(tn[0], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss"));
} }
} }
} }
private String fetchData(String url,Map<String,Object> params) { private String fetchData(String url,Map<String,Object> params) {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.build(); .build();
@ -250,10 +275,9 @@ public class IdcServiceImpl implements IdcService {
dbDao.update(sql); dbDao.update(sql);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
/****/
/*direction方向 U 上传，I 下发，往自助平台为上传，往UDI管理系统为下发*/
@Override @Override
public BaseResponse receive(String direction, 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");
@ -291,12 +315,12 @@ public class IdcServiceImpl implements IdcService {
} }
saveUploadStatus(json.getString("messageType"),json.getString("messageId"),fileName); saveUploadStatus(json.getString("messageType"),json.getString("messageId"),fileName);
/*解析入库*/ /*解析入库*/
if (isLastLevel(direction)) { if(isLastLevel()) {
analyToDB(json,files); analyToDB(json,files);
} else { } else {
//需要转发 //需要转发
if (isRelay(direction)) { if(isRelay()) {
relay(direction, request.getHeader("reqNo"), content, saveFiles); relay(request.getHeader("reqNo"),content,saveFiles);
} }
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
@ -311,15 +335,9 @@ public class IdcServiceImpl implements IdcService {
} }
@Override @Override
public BaseResponse send(String messageType,String tableName,Map<String,Object> params) { public BaseResponse send(String messageType,String tableName,Map<String,Object> params) {
try {
if (sendOnPage(messageType, tableName, params))
return ResultVOUtils.success();
} catch (Exception ex) {
logger.error(ex.getMessage());
}
return ResultVOUtils.error(9999, ""); return ResultVOUtils.error(9999, "");
} }
@ -338,6 +356,19 @@ public class IdcServiceImpl implements IdcService {
dbDao.save(sql); dbDao.save(sql);
} }
private void saveExportStatus(String messageType,String taskId,String fileName) {
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.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_export_status");
String sql = "insert into basic_export_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql);
}
private void saveDownloadStatus(String messageType,String taskId,String remark) { private void saveDownloadStatus(String messageType,String taskId,String remark) {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.put("id", CustomUtil.getId()); map.put("id", CustomUtil.getId());
@ -351,7 +382,6 @@ public class IdcServiceImpl implements IdcService {
dbDao.save(sql); dbDao.save(sql);
} }
private void saveIdcLog(String messageType,String taskId,String content,int offset,int total) { private void saveIdcLog(String messageType,String taskId,String content,int offset,int total) {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.put("id", CustomUtil.getId()); map.put("id", CustomUtil.getId());
@ -368,29 +398,43 @@ public class IdcServiceImpl implements IdcService {
dbDao.save(sql); dbDao.save(sql);
} }
private boolean sendOnPage(String messageType, String tableName, Map<String, Object> params) {
private boolean syncMasterData(Map<String,Object> params,boolean isUplaod) {
boolean success=false; boolean success=false;
String tableName = params.get("tableName").toString();
String tableKey = params.get("tableKey").toString();
String[] childs = {};
int childNum = -1;
for(String str:SYNC_TABLES) {
if(str.contains("/"+tableKey+"/")) {
childNum++;
childs[childNum] = str;
}
}
Map<String,String> table = dbDao.getMysql(tableName); Map<String,String> table = dbDao.getMysql(tableName);
if(!(table!=null&&table.get("tableName")!=null)) if(!(table!=null&&table.get("tableName")!=null))
return false; return false;
String sql = "select count(*) from "+tableName; String sql = "select count(*) from "+tableName;
Map<String,Object> column = getColumn(tableName); Map<String,Object> column = getColumn(tableName);
Map<String,Object> whMap = new HashMap<String,Object>();
whMap.put("sqlWhere", params.get("sqlWhere"));
whMap.put("dataWhere", params.get("dataWhere"));
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String where = DBAUtils.convertWhere(column, params, ""); String where = DBAUtils.convertWhere(column,whMap,"");
sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; sql+=!StringUtils.isEmpty(where) ? " where "+where : "";
map.put("sql", sql); map.put("sql", sql);
int total = dbDao.count(map); int total = dbDao.count(map);
String direction = getDirection();
String isEnd = params.get("isEnd")!=null ? params.get("isEnd").toString() : "0"; String isEnd = params.get("isEnd")!=null ? params.get("isEnd").toString() : "0";
int limit = 50; int limit = 50;
String[] files = new String[limit]; String[] files = new String[limit];
String filePathColumn = params.get("filePathColumn")!=null ? params.get("filePathColumn").toString() : ""; String filePathColumn = params.get("filePathColumn")!=null ? params.get("filePathColumn").toString() : "";
orderNum++; orderNum++;
String messageType = params.get("messageType").toString();
saveIdcLog(messageType,"",tableName +">"+where,0,total); saveIdcLog(messageType,"",tableName +">"+where,0,total);
if (tableName.equals("thr_order"))
logger.info("tableName-->" + tableName + "-->row-->" + total + "-->sqlWhere-->" + where);
if(total>0) { if(total>0) {
success = true; success = true;
params.put("page", 0); params.put("page", 0);
@ -414,10 +458,22 @@ 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&&params.get("masterLinkColumn")!=null&&params.get("subLinkColumn")!=null) {
for(int z=0;z<childNum+1;z++) {
String[] chidTnames = childs[z].split("/");
String keyValue = list.get(i).get(params.get("masterLinkColumn")).toString();
Map<String,Object> childMap = new HashMap<>();
childMap.put(params.get("subLinkColumn").toString(), keyValue);
List<Map<String,Object>> childList = getList(chidTnames[2],childMap);
list.get(m).put("tableName"+z, chidTnames[2]);
list.get(m).put("data"+z, childList);
}
}
} }
orderNum++; orderNum++;
String result = relay(direction, "", JSON.toJSONString(data), files); if(isUplaod) {
String result = relay("",JSON.toJSONString(data),files);
if(IDCUtils.isJson(result)) { if(IDCUtils.isJson(result)) {
JSONObject json = JSON.parseObject(result); JSONObject json = JSON.parseObject(result);
if(json.getInteger("code")==20000) { if(json.getInteger("code")==20000) {
@ -432,14 +488,36 @@ public class IdcServiceImpl implements IdcService {
saveIdcLog(messageType,"",tableName +">"+result,i *limit,total); saveIdcLog(messageType,"",tableName +">"+result,i *limit,total);
} }
} }
} else {
syncAddTask(data);
}
} }
} }
} }
} }
return success; return success;
} }
/*增加同步任务*/
private void syncAddTask(Map<String,Object> json) {
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.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName);
saveExportStatus(json.get("messageType").toString(),json.get("messageId").toString(),fileName);
}
/*解析到数据库*/ /*解析到数据库*/
private void analyToDB(JSONObject jsonObject,MultipartFile[] files) { private void analyToDB(JSONObject jsonObject,MultipartFile[] files) {
if(!StringUtils.isEmpty(jsonObject.getString("tableName"))) { if(!StringUtils.isEmpty(jsonObject.getString("tableName"))) {
@ -539,6 +617,18 @@ public class IdcServiceImpl implements IdcService {
sql+=")"; sql+=")";
n++; n++;
} }
for(int m=0;m<6;m++) {
if(list.get(i).get("tableName"+m)!=null&&list.get(i).get("data"+m)!=null) {
Object obj = list.get(i).get("data"+m);
List<Map<String,Object>> chList = new ArrayList<Map<String,Object>>();
for (Object o : (List<?>) obj) {
chList.add((Map<String,Object>)o);
}
analyData(list.get(i).get("tableName"+m).toString(),chList);
}
}
} }
if(n>0) if(n>0)
dbDao.save(sql); dbDao.save(sql);
@ -549,13 +639,13 @@ public class IdcServiceImpl implements IdcService {
/*转发下级或上级中继服务*/ /*转发下级或上级中继服务*/
private String relay(String direction, String reqNo, String content, String[] files) { private String relay(String reqNo,String content,String[] files) {
String host = getNextHost(direction); String host = getNextHost();
String result=""; String result="";
if(StringUtils.isEmpty(reqNo)) if(StringUtils.isEmpty(reqNo))
reqNo = UUID.randomUUID().toString(); reqNo = UUID.randomUUID().toString();
if(!StringUtils.isEmpty(host)) { if(!StringUtils.isEmpty(host)) {
host += direction.equals("U") ? "/spssync/common/upload" : "/spssync/common/issued"; 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)//设置读取超时时间
@ -602,42 +692,38 @@ public class IdcServiceImpl implements IdcService {
} }
/*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/ /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/
private String getNextHost(String direction) { private String getNextHost() {
SystemParamConfigEntity systemParamConfigEntity = SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("upper_server_ip");
direction.equals("U") ? getSystemParamConfig("upper_server_host", "自助平台数据接收服务地址", "", "接收由UDI系统上传的数据") :
direction.equals("I") ? getSystemParamConfig("lower_server_host", "UDI系统数据接收服务地址", "", "接收由自助平台下发的数据") : null;
String host = systemParamConfigEntity!=null ? systemParamConfigEntity.getParamValue() : ""; String host = systemParamConfigEntity!=null ? systemParamConfigEntity.getParamValue() : "";
host = !StringUtils.isEmpty(host)&&host.substring(host.length() -1).equals("/") ? host.substring(0,host.length() -1) : host; host = !StringUtils.isEmpty(host)&&host.substring(host.length() -1).equals("/") ? host.substring(0,host.length() -1) : host;
return host; return host;
} }
/*判断是否上传或下发数据*/ /*判断是否需要解析入库,中继服务只转发*/
private boolean isLastLevel(String direction) { private boolean isLastLevel() {
return direction.equals("I") || direction.equals("U") ? true : false; Map<String,Object> map = dbDao.get("select * from idc_var where code='system_type'");
} return !(map!=null&&map.get("content")!=null&&map.get("content").toString().equals("IDC")) ;
/*检查当前系统为自助平台（下发）还是UDI系统(上传)，返回传输方向,如果都未设置，默认返回下发*/
private String getDirection() {
SystemParamConfigEntity systemParamConfigEntity = getSystemParamConfig("sync_system_type", "系统类型", "IDC", "UDI(UDI管理系统，由UDI系统往自助平台上传数据),SPS(自助平台，由自助平台往UDI系统下发数据),IDC(中继服务,只接收，转发或暂存数据供下一级服务拉取数据)");
return systemParamConfigEntity.getParamValue().equals("UDI") ? "U" : systemParamConfigEntity.getParamValue().equals("SPS") ? "I" : "N";
} }
/*是否需要转发*/ /*是否需要转发*/
private boolean isRelay(String direction) { private boolean isRelay() {
String relayHost = getNextHost(direction); String relayHost = getNextHost();
return !StringUtils.isEmpty(relayHost); return !StringUtils.isEmpty(relayHost);
} }
/*由表名获取数据*/ private List<Map<String,Object>> getList(String tableName,Map<String,Object> params) {
private Map<String, Object> getData(String messageType, String tableName, Map<String, Object> params) {
String sql = "select "+tableName+".*,'A' as operateMode from "+tableName; String sql = "select "+tableName+".*,'A' as operateMode from "+tableName;
Map<String,Object> column = getColumn(tableName); Map<String,Object> column = getColumn(tableName);
String where = DBAUtils.convertWhere(column,params,""); String where = DBAUtils.convertWhere(column,params,"");
sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; sql+=!StringUtils.isEmpty(where) ? " where "+where : "";
params.put("sql", sql); params.put("sql", sql);
List<Map<String,Object>> list = dbDao.list(params); List<Map<String,Object>> list = dbDao.list(params);
return list;
}
/*由表名获取数据*/
private Map<String,Object> getData(String messageType,String tableName,Map<String,Object> params) {
List<Map<String,Object>> list = getList(tableName,params);
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", UUID.randomUUID().toString().replaceAll("-", ""));
map.put("messageType", messageType); map.put("messageType", messageType);
@ -651,6 +737,8 @@ public class IdcServiceImpl implements IdcService {
} }
private SystemParamConfigEntity getSystemParamConfig(String paramKey,String paramName,String defaultValue,String paramExplain) { private SystemParamConfigEntity getSystemParamConfig(String paramKey,String paramName,String defaultValue,String paramExplain) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(paramKey); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(paramKey);
if(systemParamConfigEntity==null||(systemParamConfigEntity!=null&&StringUtils.isEmpty(systemParamConfigEntity.getParamKey()))) { if(systemParamConfigEntity==null||(systemParamConfigEntity!=null&&StringUtils.isEmpty(systemParamConfigEntity.getParamKey()))) {
@ -667,7 +755,6 @@ public class IdcServiceImpl implements IdcService {
System.out.print(JSON.toJSONString(systemParamConfigEntity)+"\n"); System.out.print(JSON.toJSONString(systemParamConfigEntity)+"\n");
return systemParamConfigEntity; return systemParamConfigEntity;
} }
private void writeFile(byte[] file, String filePath, String fileName) throws Exception { private void writeFile(byte[] file, String filePath, String fileName) throws Exception {
File targetFile = new File(filePath); File targetFile = new File(filePath);
if (!targetFile.exists()) { if (!targetFile.exists()) {
@ -692,8 +779,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);
@ -729,7 +815,6 @@ public class IdcServiceImpl implements IdcService {
} }
return updateTime; return updateTime;
} }
private String setUpdateTime(String id,String updateTime) { private String setUpdateTime(String id,String updateTime) {
String sql = ""; String sql = "";
Map<String,Object> map = dbDao.get("select * from idc_status where id='"+id+"'"); Map<String,Object> map = dbDao.get("select * from idc_status where id='"+id+"'");
@ -742,14 +827,19 @@ public class IdcServiceImpl implements IdcService {
} }
return updateTime; return updateTime;
} }
private void initTable() { private void initTable() {
alterTable("idc_var","create table idc_var (code varchar(60),content varchar(200),PRIMARY KEY (code))");
alterTable("idc_status","create table idc_status (id varchar(36),statusTime datetime,PRIMARY KEY (id))"); alterTable("idc_status","create table idc_status (id varchar(36),statusTime datetime,PRIMARY KEY (id))");
alterTable("idc_record","create table idc_record (id varchar(36),type varchar(60),fkId varchar(36),isEnd char(1),createTime datetime,primary key (id),INDEX i_idc_record_fk_id (fkId),INDEX i_idc_record_create_time (createTime))"); alterTable("idc_record","create table idc_record (id varchar(36),type varchar(60),fkId varchar(36),isEnd char(1),createTime datetime,primary key (id),INDEX i_idc_record_fk_id (fkId),INDEX i_idc_record_create_time (createTime))");
alterTable("idc_log","create table idc_log (id varchar(36),orderNum int,taskId varchar(60),type varchar(60),content varchar(2000),offset int,total int,createTime datetime,PRIMARY KEY (id))"); alterTable("idc_log","create table idc_log (id varchar(36),orderNum int,taskId varchar(60),type varchar(60),content varchar(2000),offset int,total int,createTime datetime,PRIMARY KEY (id))");
dbDao.delete("delete from idc_record where createTime<date_sub(now(),interval 2 day) and isEnd='0'"); dbDao.delete("delete from idc_record where createTime<date_sub(now(),interval 2 day) and isEnd='0'");
} try {
jdbcTemplate.execute("alter table basic_export_status add column cacheFilePath varchar(255)");
jdbcTemplate.execute("alter table basic_upload_status add column cacheFilePath varchar(255)");
} catch (Exception e) {
}
}
private void alterTable(String tableName,String sql) { private void alterTable(String tableName,String sql) {
Map<String,String> map = dbDao.getMysql(tableName); Map<String,String> map = dbDao.getMysql(tableName);
if(!(map!=null&&map.get("tableName")!=null)) { if(!(map!=null&&map.get("tableName")!=null)) {
@ -757,5 +847,4 @@ public class IdcServiceImpl implements IdcService {
} }
} }
} }

15
src/main/java/com/glxp/api/idc/thread/AsyncFetchTask.java
Unescape Escape View File

@ -1,9 +1,7 @@
package com.glxp.api.idc.thread; package com.glxp.sale.admin.idc.thread;
import javax.annotation.Resource;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.idc.service.IdcService;
import com.glxp.api.req.system.ScheduledRequest;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
@ -12,7 +10,10 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger; import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import com.glxp.sale.admin.dao.info.ScheduledDao;
import com.glxp.sale.admin.entity.info.ScheduledEntity;
import com.glxp.sale.admin.idc.service.IdcService;
import com.glxp.sale.admin.req.info.ScheduledRequest;
@Component @Component
@EnableScheduling @EnableScheduling
@ -34,7 +35,7 @@ public class AsyncFetchTask 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() : "15 * * * * ?"; String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "* 3/30 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");

53
src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java
Unescape Escape View File

@ -1,53 +0,0 @@
package com.glxp.api.idc.thread;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.idc.service.IdcService;
import com.glxp.api.req.system.ScheduledRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
@EnableScheduling
public class AsyncIdcTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncIdcTask.class);
@Resource
private ScheduledDao scheduledDao;
@Resource
private IdcService idcService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("syncIdc");
logger.info("syncIdc----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 */30 * * * ?";
if (cron.isEmpty()) {
logger.error("cron is null");
}
logger.info("syncIdc----------------");
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
logger.info("syncIdc----process------------");
idcService.asyncIdcTask();
}
}

21
src/main/java/com/glxp/api/idc/utils/DBAUtils.java
Unescape Escape View File

@ -1,15 +1,17 @@
package com.glxp.api.idc.utils; package com.glxp.sale.admin.idc.utils;
import com.glxp.api.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.glxp.sale.admin.util.DateUtil;
/** /**
* @author chenqf * @author chenqf
@ -22,7 +24,6 @@ public class DBAUtils {
public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere) { public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere) {
return parseWhere(sql,columns,params,dataWhere,false); return parseWhere(sql,columns,params,dataWhere,false);
} }
public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere,boolean isSimpleWhere) { public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere,boolean isSimpleWhere) {
String where=""; String where="";
boolean isAnd0 = false; boolean isAnd0 = false;
@ -162,7 +163,6 @@ public class DBAUtils {
String where=convertWhere(colums,params,dataWhere,""); String where=convertWhere(colums,params,dataWhere,"");
return where; return where;
} }
public static String convertWhere(Map<String,Object> colums,Map<String,Object> params,String dataWhere,String sql) { public static String convertWhere(Map<String,Object> colums,Map<String,Object> params,String dataWhere,String sql) {
String where=""; String where="";
String value =""; String value ="";
@ -220,6 +220,7 @@ public class DBAUtils {
} }
/*生成insert语句*/ /*生成insert语句*/
public static String parseInsert(Map<String,Object> params,Map<String,Object> columns) { public static String parseInsert(Map<String,Object> params,Map<String,Object> columns) {
String ins=""; String ins="";
@ -279,6 +280,7 @@ public class DBAUtils {
} }
public static String convertColumnType(String dataType,String dbType,String width) { public static String convertColumnType(String dataType,String dbType,String width) {
String columnType = dataType.toLowerCase(); String columnType = dataType.toLowerCase();
if(dbType.contains("oracle.")) { if(dbType.contains("oracle.")) {
@ -295,10 +297,8 @@ public class DBAUtils {
return columnType; return columnType;
} }
private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210";
private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789"; private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789";
/*表名简单转义*/ /*表名简单转义*/
public static String tableAliasName(String tableName) { public static String tableAliasName(String tableName) {
String tname="2d"; String tname="2d";
@ -312,7 +312,6 @@ public class DBAUtils {
} }
return tname; return tname;
} }
/*获取实际表名*/ /*获取实际表名*/
public static String tableRealName(String tableName) { public static String tableRealName(String tableName) {
String tname=""; String tname="";

10
src/main/java/com/glxp/api/idc/utils/IDCUtils.java
Unescape Escape View File

@ -1,12 +1,14 @@
package com.glxp.api.idc.utils; package com.glxp.sale.admin.idc.utils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
/** /**

Write Preview
Loading…
Cancel
Save