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

Merge remote-tracking branch 'origin/master'

Browse Source
master
郑明梁 2 years ago
parent 0335e27969 fe01b788ee
commit e163559df3
12 changed files with 1520 additions and 1232 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java
Unescape Escape View File

@ -291,6 +291,9 @@ public class SupCompanyController {
companyEntity.setAuditor(authAdmin.getId() + ""); companyEntity.setAuditor(authAdmin.getId() + "");
companyEntity.setAuditTime(new Date()); companyEntity.setAuditTime(new Date());
companyEntity.setUpdateTime(new Date()); companyEntity.setUpdateTime(new Date());
if(companyEntity.getAuditComment() == null){
companyEntity.setAuditComment("");
}
boolean b = companyService.modifyCompany(companyEntity); boolean b = companyService.modifyCompany(companyEntity);
CustomerContactEntity customerContactEntity = new CustomerContactEntity(); CustomerContactEntity customerContactEntity = new CustomerContactEntity();
customerContactEntity.setTel(companyEntity.getTel()); customerContactEntity.setTel(companyEntity.getTel());

6
src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
Unescape Escape View File

@ -219,8 +219,7 @@ public class ThrProductsAddDiController {
udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
udiProductService.updateUdiInfo(udiProductEntity); udiProductService.updateUdiInfoByUuid(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1);
@ -250,12 +249,11 @@ public class ThrProductsAddDiController {
} }
} }
} }
} }
} }
return ResultVOUtils.success(); return ResultVOUtils.success("更新成功");
} }
/** /**

21
src/main/java/com/glxp/api/exception/UtilException.java
Unescape Escape View File

@ -1,21 +0,0 @@
package com.cpt.common.exception;
/**
* 工具类异常
*
* @author ruoyi
*/
public class UtilException extends RuntimeException {
public UtilException(Throwable e) {
super(e.getMessage(), e);
}
public UtilException(String message) {
super(message);
}
public UtilException(String message, Throwable throwable) {
super(message, throwable);
}
}

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

@ -1,68 +1,225 @@
package com.glxp.api.idc.controller; package com.glxp.api.idc.controller;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
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.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.dao.idc.DbDao; import com.glxp.api.dao.idc.DbDao;
import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.service.IdcService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import cn.hutool.core.io.IoUtil;
import javax.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j;
import java.util.Map;
/** /**
* 中继服务接口 * 中继服务接口
*/ */
@Slf4j
@RestController @RestController
public class IdcController { public class IdcController {
@Resource @Resource
IdcService idcService; IdcService idcService;
@Resource @Resource
DbDao dbDao; DbDao dbDao;
/*通用上传接口*/
//@Log("中继服务数据接收,下级往上级上传") /*通用上传接口*/
@RequestMapping(value = "/spssync/common/upload") //@Log("中继服务数据接收,下级往上级上传")
public BaseResponse upload(HttpServletRequest request, @RequestMapping(value = "/spssync/common/upload")
@RequestParam("content") String content, public BaseResponse upload(HttpServletRequest request,
@RequestParam(value = "files", required = false) MultipartFile[] files) { @RequestParam("content") String content,
// @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, //@Log("数据同步测试")
@RequestParam("content") String content, @RequestMapping(value = "/spssync/common/test")
@RequestParam(value = "files", required = false) MultipartFile[] files) { public BaseResponse test(HttpServletRequest request, @RequestBody Map<String, Object> params) {
// //
return idcService.receive("I",request, content, files); return idcService.send(params);
} }
//@Log("数据同步测试") //@Log("数据同步任务列表拉取")
@RequestMapping(value = "/spssync/common/test") @RequestMapping(value = "/spssync/common/list")
public BaseResponse test(HttpServletRequest request,@RequestBody Map<String, Object> params) { public BaseResponse list(HttpServletRequest request, @RequestBody(required = false) Map<String, Object> params) {
// return idcService.taskList(request, params);
return idcService.send(params); }
}
//@Log("数据同步任务根据任务ID下载数据")
//@Log("数据同步任务列表拉取") @RequestMapping(value = "/spssync/common/download")
@RequestMapping(value = "/spssync/common/list") @ResponseBody
public BaseResponse list(HttpServletRequest request,@RequestBody(required = false) Map<String, Object> params) { public BaseResponse download(HttpServletRequest request, @RequestBody Map<String, Object> params) {
return idcService.taskList(request,params); return idcService.download(request, params);
} }
//@Log("数据同步任务根据任务ID下载数据") //@Log("数据同步任务根据任务ID,返回下载成功标记")
@RequestMapping(value = "/spssync/common/download") @RequestMapping(value = "/spssync/common/success")
@ResponseBody @ResponseBody
public BaseResponse download(HttpServletRequest request,@RequestBody Map<String, Object> params) { public BaseResponse success(HttpServletRequest request, @RequestBody Map<String, Object> params) {
return idcService.download(request,params); return idcService.downlaodSuccess(request, params);
} }
//@Log("数据同步任务根据任务ID,返回下载成功标记") @RequestMapping("/mapi/**")
@RequestMapping(value = "/spssync/common/success") public Object mapi(HttpServletRequest request, HttpServletResponse httpServletResponse) {
@ResponseBody String uri = parseUri(request.getRequestURL().toString());
public BaseResponse success(HttpServletRequest request,@RequestBody Map<String, Object> params) {
return idcService.downlaodSuccess(request,params); 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;
}
} }

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

@ -0,0 +1,52 @@
package com.glxp.api.idc.service;
import java.io.IOException;
import java.net.URI;
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.RequestCallback;
import org.springframework.web.client.ResourceAccessException;
import org.springframework.web.client.ResponseExtractor;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import com.beust.jcommander.internal.Nullable;
import cn.hutool.core.lang.Assert;
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();
}
}*/
}
}

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

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

1517
src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

22
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.api.idc.thread;
import com.glxp.api.dao.schedule.ScheduledDao; import javax.annotation.Resource;
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,13 +10,17 @@ 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.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;
@Component @Component
@EnableScheduling @EnableScheduling
public class AsyncFetchTask implements SchedulingConfigurer { public class AsyncFetchTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncIdcTask.class); final Logger logger = LoggerFactory.getLogger(AsyncFetchTask.class);
@Resource @Resource
private ScheduledDao scheduledDao; private ScheduledDao scheduledDao;
@ -34,7 +36,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() : "* 0/30 * * * ?"; String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "* 3/30 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");
@ -45,9 +47,9 @@ public class AsyncFetchTask implements SchedulingConfigurer {
} }
private void process() { private void process() {
logger.info("syncFetch----process------------"); logger.info("syncFetch----process------------");
idcService.asyncFetchTask(); idcService.asyncFetchTask();
} }
} }

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

@ -1,400 +1,400 @@
package com.glxp.api.idc.utils; package com.glxp.api.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.api.util.DateUtil;
/** /**
* @author chenqf * @author chenqf
*/ */
public class DBAUtils { public class DBAUtils {
private static final Logger logger = LoggerFactory.getLogger(DBAUtils.class); private static final Logger logger = LoggerFactory.getLogger(DBAUtils.class);
private static final String keywords = ",limit,offset,sort,order,isLike,menuId,menuCode,page,isAuto,pageNo,pageSize,pageNum,sqlOrder,join,"; private static final String keywords = ",limit,offset,sort,order,isLike,menuId,menuCode,page,isAuto,pageNo,pageSize,pageNum,sqlOrder,join,";
/*解析where条件*/ /*解析where条件*/
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) {
String where = "";
boolean isAnd0 = false;
boolean isLike = params != null && params.get("isLike") != null && params.get("isLike").toString().equals("true") ? true : false;
if (sql.contains("sqlWhere") || !sql.contains("<if")) {
where = convertWhere(columns, params, dataWhere, sql);
if (!sql.contains("<if") && !StringUtils.isEmpty(where)) {
sql += sql.toLowerCase().contains(" where ") ? " and " + where : " where " + where;
}
}
int n = 0;
if (sql.contains("<if")) {
int s1 = sql.indexOf("<if");
if (isSimpleWhere && s1 > 0) {
for (int i = s1 - 1; i > -1; i--) {
if (!sql.substring(i, i + 1).equals(" ") && !sql.substring(i, i + 1).equals("\n")) {
isAnd0 = true;
}
}
}
if (!StringUtils.isEmpty(dataWhere)) {
if (sql.contains("sqlWhere")) {
if (params.get("sqlWhere") != null && !StringUtils.isEmpty(params.get("sqlWhere").toString())) {
String temp = params.get("sqlWhere").toString();
params.replace("sqlWhere", "(" + temp + ") and (" + dataWhere + ")");
} else {
params.put("sqlWhere", dataWhere);
}
}
}
while (sql.contains("<if")) {
int a = sql.indexOf("<if");
int b = sql.indexOf(">", a + 1);
int h = sql.indexOf("isLike", a + 1);
int j = sql.indexOf("!=", a + 1);
if (h > a && h < b) {
sql = j > 1 && j < b ? sql.substring(0, a) + "[!=isLike]" + sql.substring(b + 1) : sql.substring(0, a) + "[==isLike]" + sql.substring(b + 1);
n = 0;
continue;
}
int c = sql.indexOf("</if>");
String str = sql.substring(b + 1, c);
int e1 = str.indexOf("#{");
int e2 = str.indexOf("}", e1 + 1);
if (e1 < 0) {
e1 = str.indexOf("${");
}
String key = str.substring(e1 + 2, e2).trim();
Object obj = params.get(key);
String value = obj != null ? obj.toString() : "";
if (key.equals("sqlWhere")) {
if (StringUtils.isEmpty(value))
value = where;
}
if (!StringUtils.isEmpty(value)) {
str = str.length() > e2 + 1 ? str.substring(0, e1) + "'" + value + "'" + str.substring(e2 + 1) : str.substring(0, e1) + "'" + value + "'";
if (!isAnd0 && n == 0) {
if (str.length() > 3) {
if (str.trim().substring(0, 4).toLowerCase().equals("and ")) {
str = str.substring(str.toLowerCase().indexOf("and ") + 3);
}
if (str.trim().substring(0, 3).toLowerCase().equals("or ")) {
str = str.substring(str.toLowerCase().indexOf("or ") + 2);
}
}
}
n++;
} else {
str = "";
}
sql = sql.length() > c + 5 ? sql.substring(0, a) + str + sql.substring(c + 5) : sql.substring(0, a) + str;
}
}
if (sql.contains("<where>")) {
sql = n > 0 ? sql.replaceAll("<where>", " where ") : sql.replaceAll("<where>", "");
if (!StringUtils.isEmpty(dataWhere) && !sql.contains("sqlWhere")) {
sql = n > 0 ? sql.replaceAll("</where>", " and (" + dataWhere + ")") : sql.replaceAll("</where>", " (" + dataWhere + ")");
} else {
sql = sql.replaceAll("</where>", "");
}
}
if (sql.contains("=isLike")) {
int a1, a2, b1, b2;
a1 = sql.indexOf("[==isLike]");
a2 = sql.indexOf("</if>", a1 + 1);
if (a1 > 0 && a2 > 0) {
if (isLike) {
sql = sql.length() > a2 + 5 ? sql.substring(0, a1) + sql.substring(a1 + 10, a2) + sql.substring(a2 + 5) : sql.substring(0, a1) + sql.substring(a1 + 10, a2);
} else {
sql = sql.length() > a2 + 5 ? sql.substring(0, a1) + sql.substring(a2 + 5) : sql.substring(0, a1);
}
}
b1 = sql.indexOf("[!=isLike]");
b2 = sql.indexOf("</if>", b1 + 1);
if (b1 > 0 && b2 > 0) {
if (!isLike) {
sql = sql.length() > b2 + 5 ? sql.substring(0, b1) + sql.substring(b1 + 10, b2) + sql.substring(b2 + 5) : sql.substring(0, b1) + sql.substring(b1 + 10, b2);
} else {
sql = sql.length() > b2 + 5 ? sql.substring(0, b1) + sql.substring(b2 + 5) : sql.substring(0, b1);
}
}
}
sql = parseParams(sql, columns, params);
return sql;
}
public static String parseParams(String sql, Map<String, Object> columns, Map<String, Object> params) {
String[] iStr = {"#{", "${"};
for (int k = 0; k < 2; k++) {
while (sql.contains(iStr[k])) {
int a1 = sql.indexOf(iStr[k]);
int a2 = sql.indexOf("}", a1 + 1);
String key = sql.substring(a1 + 2, a2);
Object obj = params.get(key);
String value = obj != null ? obj.toString() : "";
String dataType = "0";
if (columns != null) {
Map<String, Object> map = (Map<String, Object>) columns.get(key);
dataType = map != null && map.get("dataType") != null ? map.get("dataType").toString() : "0";
}
sql = sql.substring(0, a1) + (dataType.equals("0") ? "'" : "") + value + (dataType.equals("0") ? "'" : "") + sql.substring(a2 + 1);
}
}
return sql;
}
/*生成where条件*/
public static String convertWhere(Map<String, Object> colums, Map<String, Object> params, String dataWhere) {
String where = convertWhere(colums, params, dataWhere, "");
return where;
}
public static String convertWhere(Map<String, Object> colums, Map<String, Object> params, String dataWhere, String sql) {
String where = "";
String value = "";
boolean isLike = false;
boolean isKey = false;
if (params != null && params.get("isLike") != null && params.get("isLike").toString().equals("true"))
isLike = true;
if (colums != null) {
Iterator keys = colums.keySet().iterator();
isKey = keys.hasNext();
}
for (String key : params.keySet()) {
Object obj = params.get(key);
value = "";
if (obj != null)
value = obj.toString();
if (!StringUtils.isEmpty(value) && !keywords.contains("," + key + ",") && (StringUtils.isEmpty(sql) || (!StringUtils.isEmpty(sql) && !sql.contains("{" + key + "}")))) {
if (key.equals("sqlWhere") || key.equals("join")) {
where += (!StringUtils.isEmpty(where) ? " and " : "") + " " + value;
} else {
String[] cns = key.split(",");
String wh = "";
for (String cn : cns) {
String columnName = cn;//StringUtils.propertyToField(cn);
if (colums != null && isKey && colums.get(cn) == null) {
logger.error("列名" + columnName + "不存在,属性" + cn + "错误.");
} else {
if (!StringUtils.isEmpty(wh))
wh += " or ";
if (isLike) {
wh += "instr(" + columnName + ",'" + value + "')>0";
} else {
wh += columnName + "='" + value + "'";
}
}
}
where += !StringUtils.isEmpty(wh) ? (!StringUtils.isEmpty(where) ? " and " : "") + "(" + wh + ")" : "";
}
}
}
if (!StringUtils.isEmpty(dataWhere)) {
if (!StringUtils.isEmpty(where)) {
where = "(" + where + ") and (" + dataWhere + ")";
} else {
where = dataWhere;
}
}
if (!StringUtils.isEmpty(where))
where = "(" + where + ")";
return where;
}
/*生成insert语句*/
public static String parseInsert(Map<String, Object> params, Map<String, Object> columns) {
String ins = "";
String vas = "";
String sql = "";
for (String key : columns.keySet()) {
String value = "";
if (params.get(key) != null)
value = params.get(key).toString();
Map<String, Object> map = (Map<String, Object>) columns.get(key);
String dataType = map.get("dataType").toString();
String extra = map.get("extra") != null && map.get("extra").toString().toLowerCase().contains("auto") ? "A" : "N";
if (map.get("columnKey").toString().equals("PRI") && extra.equals("N")) {
if (StringUtils.isEmpty(value)) {
}
}
value = DBAUtils.escape(value);
if (!StringUtils.isEmpty(value)) {
if (!StringUtils.isEmpty(ins))
ins += ",";
ins += map.get("columnName").toString();
if (!StringUtils.isEmpty(vas))
vas += ",";
if (StringUtils.isEmpty(value)) {
vas += "null";
} else {
if (dataType.equals("C")) {
vas += "'" + value + "'";
} else if (dataType.equals("N")) {
vas += value;
} else {
String str = "";
Date date = new Date();
if (StringUtils.isNumeric(value)) {
date = new Date(Long.valueOf(value));
str = DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
} else {
str = DateUtil.formatDate(IDCUtils.parseDate(value), "yyyy-MM-dd HH:mm:ss");
}
vas += "cast('" + str + "' as datetime)";
}
}
}
}
if (!StringUtils.isEmpty(ins) && !StringUtils.isEmpty(vas)) {
sql = "(" + ins + ") values (" + vas + ")";
}
return sql;
}
public static String convertColumnType(String dataType, String dbType, String width) {
String columnType = dataType.toLowerCase();
if (dbType.contains("oracle.")) {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar2" + width) : ("varchar2(" + width + ")") :
columnType.contains("char") ? width.contains("(") ? ("char" + width) : ("char(" + width + ")") :
columnType.contains("date") || columnType.contains("time") ? "date" :
columnType.contains("int") || columnType.contains("num") || columnType.contains("dec") ? width.contains("(") ? ("number" + width + "") : ("number(" + width + ")") : "";
} else {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar" + width) : ("varchar(" + width + ")") :
columnType.contains("char") ? width.contains("(") ? ("char" + width) : ("char(" + width + ")") :
columnType.contains("date") || columnType.contains("time") ? "datetime" :
columnType.contains("int") || columnType.contains("num") || columnType.contains("dec") ? width != null && width.contains(",") ? width.contains("(") ? ("decimal" + width + "") : ("decimal(" + width + ")") : "int" : "";
}
return columnType;
}
private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210";
private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789";
/*表名简单转义*/
public static String tableAliasName(String tableName) {
String tname = "2d";
for (int i = 0; i < tableName.length(); i++) {
int idx = realNamechars.indexOf(tableName.substring(i, i + 1).toLowerCase());
if (idx > -1) {
tname += aliasNameChars.substring(idx, idx + 1);
} else {
tname += tableName.substring(i, i + 1).toLowerCase();
}
}
return tname;
}
/*获取实际表名*/
public static String tableRealName(String tableName) {
String tname = "";
String result = "";
tableName = tableName.replaceAll("202c", ",");
String[] tabs = tableName.split(",");
for (int n = 0; n < tabs.length; n++) {
String t = tabs[n];
tname = "";
if (!StringUtils.isEmpty(t)) {
if (!StringUtils.isEmpty(result))
result += ",";
if (t.length() > 2 && t.substring(0, 2).toLowerCase().equals("2d")) {
t = t.substring(2);
for (int i = 0; i < t.length(); i++) {
int idx = aliasNameChars.indexOf(t.substring(i, i + 1).toLowerCase());
if (idx > -1) {
tname += realNamechars.substring(idx, idx + 1);
} else {
tname += t.substring(i, i + 1);
}
}
} else {
tname = t;
}
result += tname;
}
}
return result;
}
public static String tableJoinWhere(String tableName, Map<String, Object> columns) {
String result = "";
if (tableName.contains(",")) {
String[] tabs = tableName.split(",");
String mTname = ((Map) columns.get("id")).get("tableName").toString();
//String sTname = ((Map)columns.get(StringUtils.uncapitalize(StringUtils.columnToJava(mTname,"false"))+"Id")).get("tableName").toString();
//result = mTname+".id="+sTname+"."+mTname+"_id";
}
return result;
}
/*从update语句解析select*/
public static String updateSqlToSelectSql(String sql, Map<String, Object> map) {
String aSql = sql.toLowerCase();
String result = "";
if (map == null)
map = new HashMap<String, Object>();
if (aSql.contains("update ")) {
int uIdx = aSql.indexOf("update ");
int sIdx = aSql.indexOf(" set ");
String tName = aSql.substring(uIdx + 7, sIdx);
int wIdx = aSql.indexOf(" where ");
String where = aSql.substring(wIdx + 7);
if (where.contains("=")) {
result = "select * from " + tName + " where ";
String[] tWh = where.split(" and ");
for (int i = 0; i < tWh.length; i++) {
if (tWh[i].contains("=")) {
if (!tWh[i].substring(0, tWh[i].indexOf("=")).toLowerCase().trim().equals("data_version")) {
result += tWh[i];
map.put("businessId", tWh[i].substring(tWh[i].indexOf("=") + 1).replaceAll("'", ""));
break;
}
}
}
}
map.put("tableName", tName);
}
return result;
} }
public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere,boolean isSimpleWhere) {
public static String escape(String str) { String where="";
String value = str; boolean isAnd0 = false;
if (value != null && value.contains("'")) { boolean isLike = params!=null&&params.get("isLike")!=null&&params.get("isLike").toString().equals("true") ? true : false;
value = value.replaceAll("'", "CCCBBBAAA12345ZZZYYYXXX");
value = value.replaceAll("CCCBBBAAA12345ZZZYYYXXX", "''"); if(sql.contains("sqlWhere")||!sql.contains("<if")) {
} where = convertWhere(columns,params,dataWhere,sql);
return value; if(!sql.contains("<if")&&!StringUtils.isEmpty(where)) {
} sql+=sql.toLowerCase().contains(" where ") ? " and "+where : " where " +where;
}
}
int n=0;
if(sql.contains("<if")) {
int s1 = sql.indexOf("<if");
if(isSimpleWhere&&s1>0) {
for(int i=s1-1;i>-1;i--) {
if(!sql.substring(i,i+1).equals(" ")&&!sql.substring(i,i+1).equals("\n")) {
isAnd0 = true;
}
}
}
if(!StringUtils.isEmpty(dataWhere)) {
if(sql.contains("sqlWhere")) {
if(params.get("sqlWhere")!=null&&!StringUtils.isEmpty(params.get("sqlWhere").toString())) {
String temp = params.get("sqlWhere").toString();
params.replace("sqlWhere", "("+temp+") and ("+dataWhere+")");
} else {
params.put("sqlWhere", dataWhere);
}
}
}
while(sql.contains("<if")) {
int a = sql.indexOf("<if");
int b = sql.indexOf(">",a+1);
int h = sql.indexOf("isLike",a+1);
int j = sql.indexOf("!=",a+1);
if(h>a&&h<b) {
sql = j>1&&j<b ? sql.substring(0,a)+"[!=isLike]"+sql.substring(b+1) : sql.substring(0,a)+"[==isLike]"+sql.substring(b+1);
n=0;
continue;
}
int c = sql.indexOf("</if>");
String str = sql.substring(b+1,c);
int e1 = str.indexOf("#{");
int e2 = str.indexOf("}",e1 +1);
if(e1<0) {
e1 = str.indexOf("${");
}
String key =str.substring(e1 +2,e2).trim();
Object obj = params.get(key);
String value = obj!=null ? obj.toString() : "";
if(key.equals("sqlWhere")) {
if(StringUtils.isEmpty(value))
value = where;
}
if(!StringUtils.isEmpty(value)) {
str = str.length()>e2+1 ? str.substring(0,e1)+"'"+value+"'"+str.substring(e2+1) : str.substring(0,e1)+"'"+value+"'";
if(!isAnd0&&n==0) {
if(str.length()>3) {
if(str.trim().substring(0, 4).toLowerCase().equals("and ")) {
str = str.substring(str.toLowerCase().indexOf("and ")+3);
}
if(str.trim().substring(0, 3).toLowerCase().equals("or ")) {
str = str.substring(str.toLowerCase().indexOf("or ")+2);
}
}
}
n++;
} else {
str = "";
}
sql = sql.length()>c+5 ? sql.substring(0,a) +str+sql.substring(c+5) : sql.substring(0,a) +str;
}
}
if(sql.contains("<where>")) {
sql = n>0 ? sql.replaceAll("<where>", " where ") : sql.replaceAll("<where>", "");
if(!StringUtils.isEmpty(dataWhere)&&!sql.contains("sqlWhere")) {
sql = n>0 ? sql.replaceAll("</where>", " and ("+dataWhere+")") : sql.replaceAll("</where>", " ("+dataWhere+")");
} else {
sql = sql.replaceAll("</where>", "");
}
}
if(sql.contains("=isLike")) {
int a1,a2,b1,b2;
a1 = sql.indexOf("[==isLike]");
a2 = sql.indexOf("</if>",a1+1);
if(a1>0&&a2>0) {
if(isLike) {
sql = sql.length()>a2+5 ? sql.substring(0,a1)+sql.substring(a1 +10, a2) +sql.substring(a2+5) : sql.substring(0,a1)+sql.substring(a1 +10, a2);
} else {
sql = sql.length()>a2+5 ? sql.substring(0,a1)+sql.substring(a2+5) : sql.substring(0,a1);
}
}
b1 = sql.indexOf("[!=isLike]");
b2 = sql.indexOf("</if>",b1 +1);
if(b1>0&&b2>0) {
if(!isLike) {
sql = sql.length()>b2+5 ? sql.substring(0,b1)+sql.substring(b1 +10, b2) +sql.substring(b2+5) : sql.substring(0,b1)+sql.substring(b1 +10, b2);
} else {
sql = sql.length()>b2+5 ? sql.substring(0,b1)+sql.substring(b2+5) : sql.substring(0,b1);
}
}
}
sql =parseParams(sql,columns,params);
return sql;
}
public static String parseParams(String sql,Map<String,Object> columns,Map<String,Object> params) {
String[] iStr={"#{","${"};
for(int k=0;k<2;k++) {
while(sql.contains(iStr[k])) {
int a1 = sql.indexOf(iStr[k]);
int a2 = sql.indexOf("}",a1 +1);
String key = sql.substring(a1+2,a2);
Object obj = params.get(key);
String value = obj!=null ? obj.toString() : "";
String dataType = "0";
if(columns!=null) {
Map<String,Object> map = (Map<String, Object>) columns.get(key);
dataType = map!=null&&map.get("dataType")!=null ? map.get("dataType").toString() : "0";
}
sql = sql.substring(0,a1)+(dataType.equals("0") ? "'" : "")+value+(dataType.equals("0") ? "'" : "")+sql.substring(a2 +1);
}
}
return sql;
}
/*生成where条件*/
public static String convertWhere(Map<String,Object> colums,Map<String,Object> params,String dataWhere) {
String where=convertWhere(colums,params,dataWhere,"");
return where;
}
public static String convertWhere(Map<String,Object> colums,Map<String,Object> params,String dataWhere,String sql) {
String where="";
String value ="";
boolean isLike = false;
boolean isKey = false;
if(params!=null&&params.get("isLike")!=null&&params.get("isLike").toString().equals("true"))
isLike = true;
if(colums!=null) {
Iterator keys = colums.keySet().iterator();
isKey = keys.hasNext();
}
for(String key : params.keySet()){
Object obj = params.get(key);
value = "";
if(obj!=null)
value = obj.toString();
if(!StringUtils.isEmpty(value)&&!keywords.contains(","+key+",")&&(StringUtils.isEmpty(sql)||(!StringUtils.isEmpty(sql)&&!sql.contains("{"+key+"}")))) {
if(key.equals("sqlWhere")||key.equals("join")) {
where+=(!StringUtils.isEmpty(where) ? " and " : "") +" "+value;
} else {
String[] cns = key.split(",");
String wh = "";
for (String cn:cns) {
String columnName = cn;//StringUtils.propertyToField(cn);
if(colums!=null&&isKey&&colums.get(cn)==null) {
logger.error("列名"+columnName+"不存在,属性"+cn+"错误.");
} else {
if(!StringUtils.isEmpty(wh))
wh+=" or ";
if(isLike) {
wh+="instr("+columnName+",'"+value+"')>0";
} else {
wh+=columnName+"='"+value+"'";
}
}
}
where+=!StringUtils.isEmpty(wh) ? (!StringUtils.isEmpty(where) ? " and " : "") + "("+wh+")" : "";
}
}
}
if(!StringUtils.isEmpty(dataWhere)) {
if(!StringUtils.isEmpty(where)) {
where = "("+where+") and ("+dataWhere+")";
} else {
where = dataWhere;
}
}
if(!StringUtils.isEmpty(where))
where = "("+where+")";
return where;
}
/*生成insert语句*/
public static String parseInsert(Map<String,Object> params,Map<String,Object> columns) {
String ins="";
String vas="";
String sql="";
for(String key : columns.keySet()){
String value = "";
if(params.get(key)!=null)
value = params.get(key).toString();
Map<String,Object> map = (Map<String, Object>) columns.get(key);
String dataType = map.get("dataType").toString();
String extra = map.get("extra")!=null&&map.get("extra").toString().toLowerCase().contains("auto") ? "A" : "N";
if(map.get("columnKey").toString().equals("PRI")&&extra.equals("N")) {
if(StringUtils.isEmpty(value)) {
}
}
value = DBAUtils.escape(value);
if(!StringUtils.isEmpty(value)) {
if(!StringUtils.isEmpty(ins))
ins+=",";
ins+=map.get("columnName").toString();
if(!StringUtils.isEmpty(vas))
vas+=",";
if(StringUtils.isEmpty(value)) {
vas+="null";
} else {
if(dataType.equals("C")) {
vas+="'"+value+"'";
} else if (dataType.equals("N")) {
vas+=value;
} else {
String str = "";
Date date = new Date();
if(StringUtils.isNumeric(value)) {
date = new Date(Long.valueOf(value));
str = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
} else {
str = DateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss");
}
vas+="cast('"+str+"' as datetime)";
}
}
}
}
if(!StringUtils.isEmpty(ins)&&!StringUtils.isEmpty(vas)) {
sql = "("+ins+") values ("+vas+")";
}
return sql;
}
public static String convertColumnType(String dataType,String dbType,String width) {
String columnType = dataType.toLowerCase();
if(dbType.contains("oracle.")) {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar2" +width) : ("varchar2(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("date")||columnType.contains("time") ? "date" :
columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width.contains("(") ? ("number"+width+"") : ("number("+width+")") : "";
} else {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar" +width) : ("varchar(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("date")||columnType.contains("time") ? "datetime" :
columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width !=null && width.contains(",") ? width.contains("(") ? ("decimal"+width+"") : ("decimal("+width+")") : "int" : "";
}
return columnType;
}
private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210";
private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789";
/*表名简单转义*/
public static String tableAliasName(String tableName) {
String tname="2d";
for(int i=0;i<tableName.length();i++) {
int idx = realNamechars.indexOf(tableName.substring(i,i+1).toLowerCase());
if(idx>-1) {
tname+=aliasNameChars.substring(idx,idx+1);
} else {
tname+=tableName.substring(i,i+1).toLowerCase();
}
}
return tname;
}
/*获取实际表名*/
public static String tableRealName(String tableName) {
String tname="";
String result = "";
tableName = tableName.replaceAll("202c", ",");
String[] tabs = tableName.split(",");
for(int n=0;n<tabs.length;n++) {
String t = tabs[n];
tname="";
if(!StringUtils.isEmpty(t)) {
if(!StringUtils.isEmpty(result))
result +=",";
if (t.length()>2&&t.substring(0, 2).toLowerCase().equals("2d")) {
t = t.substring(2);
for(int i=0;i<t.length();i++) {
int idx = aliasNameChars.indexOf(t.substring(i,i+1).toLowerCase());
if(idx>-1) {
tname+=realNamechars.substring(idx,idx+1);
} else {
tname+=t.substring(i,i+1);
}
}
} else {
tname = t;
}
result+=tname;
}
}
return result;
}
public static String tableJoinWhere(String tableName,Map<String,Object> columns) {
String result = "";
if(tableName.contains(",")) {
String[] tabs = tableName.split(",");
String mTname = ((Map)columns.get("id")).get("tableName").toString();
//String sTname = ((Map)columns.get(StringUtils.uncapitalize(StringUtils.columnToJava(mTname,"false"))+"Id")).get("tableName").toString();
//result = mTname+".id="+sTname+"."+mTname+"_id";
}
return result;
}
/*从update语句解析select*/
public static String updateSqlToSelectSql(String sql,Map<String,Object> map) {
String aSql = sql.toLowerCase();
String result = "";
if(map==null)
map = new HashMap<String,Object>();
if(aSql.contains("update ")) {
int uIdx = aSql.indexOf("update ");
int sIdx = aSql.indexOf(" set ");
String tName = aSql.substring(uIdx+7,sIdx);
int wIdx = aSql.indexOf(" where ");
String where = aSql.substring(wIdx+7);
if(where.contains("=")) {
result = "select * from "+tName+" where ";
String[] tWh = where.split(" and ");
for(int i=0;i<tWh.length;i++) {
if(tWh[i].contains("=")) {
if(!tWh[i].substring(0, tWh[i].indexOf("=")).toLowerCase().trim().equals("data_version")) {
result+= tWh[i];
map.put("businessId", tWh[i].substring(tWh[i].indexOf("=")+1).replaceAll("'", ""));
break;
}
}
}
}
map.put("tableName", tName);
}
return result;
}
public static String escape(String str) {
String value = str;
if(value!=null&&value.contains("'")) {
value = value.replaceAll("'", "CCCBBBAAA12345ZZZYYYXXX");
value = value.replaceAll("CCCBBBAAA12345ZZZYYYXXX", "''");
}
return value;
}
} }

18
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.api.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;
/** /**
@ -17,13 +19,13 @@ public class IDCUtils {
private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210";
private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789"; private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789";
private final static String MONTH_EN = "JanFebMarAprMayJunJulAugSepOctNovDec"; private final static String MONTH_EN = "JanFebMarAprMayJunJulAugSepOctNovDec";
//判断是否json字符串 //判断是否json字符串
public static boolean isJson(String json) { public static boolean isJson(String json) {
if(json!=null&&json.contains("{")&&json.contains("}")&&json.contains("\"")) if(json!=null&&json.contains("{")&&json.contains("}")&&json.contains("\""))
return true; return true;
return false; return false;
} }
public static Date parseDate(String str) { public static Date parseDate(String str) {
return parseDate(str,"yyyy-MM-dd HH:mm:ss"); return parseDate(str,"yyyy-MM-dd HH:mm:ss");
} }
@ -96,15 +98,15 @@ public class IDCUtils {
dateStr=df.format(new Date(Long.valueOf(str))); dateStr=df.format(new Date(Long.valueOf(str)));
} }
dateStr = dateStr.replace("T", " "); dateStr = dateStr.replace("T", " ");
Date date = null; Date date = null;
try { try {
date = df.parse(dateStr); date = df.parse(dateStr);
} catch (ParseException e) { } catch (ParseException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
} }
return date; return date;
} }
} }

4
src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
Unescape Escape View File

@ -222,11 +222,11 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) { if (StrUtil.isNotEmpty(deliveryInstock) && deliveryInstock.equals("1")) {
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>() bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.gt("spUse", 0).eq("enable", true)); .gt("spUse", 1).eq("enable", true));
} else { } else {
bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>() bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
.eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
.gt("spUse", 0).eq("inStock", false).eq("enable", true)); .gt("spUse", 1).eq("inStock", false).eq("enable", true));
} }
break; break;

32
src/main/java/com/glxp/api/idc/thread/AsyncIdcTask.java → src/main/java/com/glxp/api/task/AsyncSpsTask.java
Unescape Escape View File

@ -1,9 +1,7 @@
package com.glxp.api.idc.thread; package com.glxp.api.task;
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,13 +10,17 @@ 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.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;
@Component @Component
@EnableScheduling @EnableScheduling
public class AsyncIdcTask implements SchedulingConfigurer { public class AsyncSpsTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncIdcTask.class); final Logger logger = LoggerFactory.getLogger(AsyncSpsTask.class);
@Resource @Resource
private ScheduledDao scheduledDao; private ScheduledDao scheduledDao;
@ -31,23 +33,23 @@ public class AsyncIdcTask implements SchedulingConfigurer {
scheduledTaskRegistrar.addTriggerTask(() -> process(), scheduledTaskRegistrar.addTriggerTask(() -> process(),
triggerContext -> { triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest(); ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("syncIdc"); scheduledRequest.setCronName("syncIdcSps");
logger.info("syncIdc----------------"); logger.info("syncIdcSps----------------");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "* 0/30 * * * ?"; String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "* 0/30 * * * ?";
if (cron.isEmpty()) { if (cron.isEmpty()) {
logger.error("cron is null"); logger.error("cron is null");
} }
logger.info("syncIdc----------------"); logger.info("syncIdcSps----------------");
return new CronTrigger(cron).nextExecutionTime(triggerContext); return new CronTrigger(cron).nextExecutionTime(triggerContext);
}); });
} }
private void process() { private void process() {
logger.info("syncIdc----process------------"); logger.info("syncIdcSps----process------------");
idcService.asyncIdcTask(); idcService.asyncSpsTask();
} }
} }
Write Preview
Loading…
Cancel
Save