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 58d8214ca8 0ea8141787
commit 9f197f887d
3 changed files with 1153 additions and 1099 deletions
Show Stats Download Patch File Download Diff File

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

@ -138,7 +138,6 @@ public class IdcServiceImpl implements IdcService {
logger.info("UDI管理系统同步任务开始--------");
asyncDataTask(true);
}
/*自助平台生成任务，不上传*/
@Override
public void asyncSpsTask() {
@ -152,7 +151,6 @@ public class IdcServiceImpl implements IdcService {
public void asyncFetchUdiTask() {
fetchTask(false);
}
@Async
@Override
public void asyncFetchTask() {
@ -276,6 +274,7 @@ public class IdcServiceImpl implements IdcService {
}
private String fetchData(String host,Map<String,Object> params) {
OkHttpClient client = new OkHttpClient().newBuilder()
.build();
@ -288,6 +287,7 @@ public class IdcServiceImpl implements IdcService {
.build();
String result = "";
MultipartFile[] files = {};
Date startTime = new Date();
try {
boolean success=true;
Response response = client.newCall(request).execute();
@ -302,11 +302,11 @@ public class IdcServiceImpl implements IdcService {
} else {
success = false;
}
syncAddTaskStatus(json.getJSONObject("data"), 3, success);
syncAddTaskStatus(json.getJSONObject("data"),3,success,startTime,true);
} else {
if(json.get("code")!=null&&json.get("data")!=null) {
logger.info("res1-->" + JSON.toJSONString(json));
syncAddTaskStatus(json.getJSONObject("data"), 0, success);
//logger.info("res1-->"+JSON.toJSONString(json));
syncAddTaskStatus(json.getJSONObject("data"),0,success,startTime,true);
analyMiddle(host,json.getJSONObject("data"),files,false,false);
}
}
@ -349,11 +349,10 @@ public class IdcServiceImpl implements IdcService {
public BaseResponse downlaodSuccess(HttpServletRequest request,Map<String,Object> params) {
String sql = "update basic_export_status set receiveStatus='1' where id='" + params.get("taskId") + "'";
String sql = "update basic_export_status set receiveStatus='1',endTime=now() where id='"+params.get("taskId")+"'";
dbDao.update(sql);
return ResultVOUtils.success();
}
/****/
@Override
public BaseResponse receive(HttpServletRequest request,
@ -376,7 +375,7 @@ public class IdcServiceImpl implements IdcService {
FileUtils.SaveFileAs(content, fileName);
FileUtils.SaveFileAs(content, backFileName);
ArrayList<String> saveFiles = new ArrayList<>();
Date startTime = new Date();
if(files!=null) {
int n=0;
@ -403,7 +402,7 @@ public class IdcServiceImpl implements IdcService {
boolean success = false;
if(isLastLevel()) {
success = analyMiddle("",json,files,true,true);
syncAddTaskStatus(json, 2, success);
syncAddTaskStatus(json,2,success,startTime,true);
if(!success) {
return ResultVOUtils.error(9000, "解析失败");
@ -414,11 +413,11 @@ public class IdcServiceImpl implements IdcService {
String host = getNextHost();
String result = relay(request.getHeader("reqNo"),content,saveFiles,host);
if(IDCUtils.isJson(result)) {
syncAddTaskStatus(json, 1, true);
syncAddTaskStatus(json,1,true,startTime,true);
BaseResponse object = JSON.parseObject(result,BaseResponse.class);
return object;
} else {
syncAddTaskStatus(json, 1, false);
syncAddTaskStatus(json,1,false,startTime,false);
return ResultVOUtils.error(9000, "转发失败");
}
@ -436,7 +435,6 @@ public class IdcServiceImpl implements IdcService {
}
@Override
public BaseResponse send(String messageType,String tableName,Map<String,Object> params) {
@ -448,9 +446,7 @@ public class IdcServiceImpl implements IdcService {
public void downloadFile(String fileName,HttpServletResponse response) {
OutputStream os;
String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : fileName.substring(0,1).equals("/") ? "" : "/";
if (!FileUtils.isFileExist(filePath + filePathSlash + fileName))
fileName = "11.jpg";
logger.info(filePath + filePathSlash + fileName);
try {
if(FileUtils.isFileExist(filePath+filePathSlash+fileName)) {
byte[] bytes = FileUtils.readFileByBytes(filePath+filePathSlash+fileName);
@ -468,39 +464,34 @@ public class IdcServiceImpl implements IdcService {
private void saveUploadStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params);
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_upload_status");
String sql = "insert into basic_upload_status " + DBAUtils.parseInsert(map, columns);
String sql = "replace basic_upload_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql);
}
private void saveExportStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params);
map.put("receiveStatus", "0");
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_export_status");
String sql = "insert into basic_export_status " + DBAUtils.parseInsert(map, columns);
String sql = "replace basic_export_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql);
}
private void saveDownloadStatus(Map<String,Object> params) {
Map<String,Object> map = new HashMap<String,Object>();
map.put("receiveStatus", "0");
map.putAll(params);
map.put("id", CustomUtil.getId());
map.put("updateTime", new Date());
Map<String,Object> columns = getColumn("basic_download_status");
String sql = "insert into basic_download_status " + DBAUtils.parseInsert(map, columns);
String sql = "replace basic_download_status "+DBAUtils.parseInsert(map, columns);
dbDao.save(sql);
}
private void saveIdcLog(String messageType,String taskId,String content,int offset,int total) {
Map<String,Object> map = new HashMap<String,Object>();
map.put("id", CustomUtil.getId());
@ -568,6 +559,7 @@ public class IdcServiceImpl implements IdcService {
for(int i=0;i<Math.ceil(total/limit)+1;i++) {
whereParams.replace("page", i *limit);
whereParams.replace("limit",limit);
Date startTime = new Date();
Map<String,Object> data = getData(messageType,tableName,params,whereParams);
String recordSql = "";
orderNum++;
@ -588,6 +580,7 @@ public class IdcServiceImpl implements IdcService {
}
recordSql+=!StringUtils.isEmpty(recordSql) ? "," : "";
recordSql+="('"+UUID.randomUUID().toString().replaceAll("-", "")+"','"+tableName+"','"+list.get(m).get(keyColumn)+"','"+isEnd+"',now())";
if(childNum>-1) {
for(int z=0;z<childNum+1;z++) {
String[] chidTnames = childs[z].split("/");
@ -646,7 +639,7 @@ public class IdcServiceImpl implements IdcService {
}
saveIdcLog(messageType,"",tableName +">success",i *limit,total);
}
syncAddTaskStatus(data, isUpload ? 1 : 0, success);
syncAddTaskStatus(data,isUpload ? 1 : 0 ,success,startTime,isUpload);
}
}
}
@ -657,8 +650,9 @@ public class IdcServiceImpl implements IdcService {
}
/*增加同步任务状态*/
private void syncAddTaskStatus(Map<String, Object> json, int scheduleType, boolean success) {
try {
private void syncAddTaskStatus(Map<String,Object> json,int scheduleType,boolean success,Date startTime,boolean isEnd) {
try
{
String content = JSON.toJSONString(json);
String datePath = DateUtil.formatDate(new Date(),"yyyy-MM-dd");
String fileName = filePath +datePath+"/"+json.get("messageType")+"-"+json.get("messageId")+".udi";
@ -674,11 +668,18 @@ public class IdcServiceImpl implements IdcService {
//type,transportType,superiorService,subordinateService,cacheFilePath
Map<String,Object> map = new HashMap<>();
map.put("type", json.get("messageType"));
map.put("id", json.get("messageId"));
if(json.get("id")==null)
map.put("id", CustomUtil.getId());
map.put("transportType", scheduleType == 0 ? "1" : "2");
map.put("scheduleType", scheduleType);
map.put("taskId", json.get("messageId"));
map.put("cacheFilePath", fileName);
map.put("status", success ? "1" : "0");
map.put("startTime", startTime!=null ? startTime : new Date());
map.put("updateTime", new Date());
if(isEnd)
map.put("endTime", new Date());
if(scheduleType==2) {
saveUploadStatus(map);
} else if (scheduleType==3) {
@ -956,11 +957,9 @@ public class IdcServiceImpl implements IdcService {
}
return success;
}
private boolean signleDownloadFile(String syncIp,String fileName) {
OkHttpClient client = new OkHttpClient().newBuilder()
.build();
;
.build();;
MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
RequestBody body = RequestBody.create(mediaType, "fileName="+fileName);
@ -993,6 +992,7 @@ public class IdcServiceImpl implements IdcService {
outputStream.flush();
} catch (Exception e) {
@ -1037,16 +1037,14 @@ public class IdcServiceImpl implements IdcService {
Map<String,Object> map = new HashMap<String,Object>();
map.putAll(params);
map.put("sql", sql);
List<Map<String,Object>> list = dbDao.list(map);
return list;
}
/*由表名获取数据*/
private Map<String,Object> getData(String messageType,String tableName,Map<String,Object> params,Map<String,Object> whereParams) {
List<Map<String,Object>> list = getList(tableName,whereParams);
Map<String,Object> map = new HashMap<String,Object>();
map.put("messageId", UUID.randomUUID().toString().replaceAll("-", ""));
map.put("messageId", CustomUtil.getId());
map.put("messageType", messageType);
map.put("apiCode", "common");
map.put("tableName", DBAUtils.tableAliasName(tableName));
@ -1060,6 +1058,8 @@ public class IdcServiceImpl implements IdcService {
}
private SystemParamConfigEntity getSystemParamConfig(String paramKey,String paramName,String defaultValue,String paramExplain) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(paramKey);
if(systemParamConfigEntity==null||(systemParamConfigEntity!=null&&StringUtils.isEmpty(systemParamConfigEntity.getParamKey()))) {
@ -1075,7 +1075,6 @@ public class IdcServiceImpl implements IdcService {
}
return systemParamConfigEntity;
}
private void writeFile(byte[] file, String filePath, String fileName) throws Exception {
File targetFile = new File(filePath);
if (!targetFile.exists()) {
@ -1100,8 +1099,7 @@ public class IdcServiceImpl implements IdcService {
for(int i=0;i<columnList.size();i++) {
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")?
"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();
if(map.get(attrName)==null) {
column.put("tableName", tname);
@ -1141,7 +1139,6 @@ public class IdcServiceImpl implements IdcService {
}
return updateTime;
}
private String setUpdateTime(String id,String updateTime) {
String sql = "";
Map<String,Object> map = dbDao.get("select * from idc_status where id='"+id+"'");
@ -1154,7 +1151,6 @@ public class IdcServiceImpl implements IdcService {
}
return updateTime;
}
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(100),statusTime datetime,PRIMARY KEY (id))");
@ -1170,7 +1166,6 @@ public class IdcServiceImpl implements IdcService {
}
}
private void alterTable(String tableName,String sql) {
Map<String,String> map = dbDao.getMysql(tableName);
if(!(map!=null&&map.get("tableName")!=null)) {

13
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
Unescape Escape View File

@ -103,6 +103,16 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
thrProductsAddDiEntity.setRegisterNo(productInfoEntity.getZczbhhzbapzbh());
thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
//设置编辑区参数
thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm());
thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm());
thrProductsAddDiEntity.setMeasname(thrDiProductsRequest.getMeasname());
thrProductsAddDiEntity.setManufactory(thrDiProductsRequest.getManufactory());
thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc());
thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms());
thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
thrProductsAddDiEntity.setCreateTime(date);
thrProductsAddDiEntity.setUpdateTime(new Date());
thrProductsAddDiEntity.setStatus(1); //未审核
@ -120,6 +130,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms());
udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
return udiInfoResponse;
}

54
src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -77,11 +77,57 @@
<select id="getRegistration" parameterType="com.glxp.api.req.purchase.FilterPoductRequest"
resultType="com.glxp.api.res.purchase.SupProductResponse">
SELECT sup_product.*,
sup_company.companyName
supName,
SELECT sup_product.id,
sup_product.productId,
sup_product.enterpriseId,
sup_product.recordCode,
sup_product.recordProductName,
sup_product.productManageType,
sup_product.recordPeopleName,
sup_product.recordPeopleArea,
sup_product.recordPeopleAreaCode,
sup_product.recordPeopleAddress,
sup_product.productType,
sup_product.productDirectoryCode,
sup_product.agentArea,
sup_product.agentAreaCode,
sup_product.agentAddress,
sup_product.instructions,
sup_product.productAddress,
sup_product.recordText,
sup_product.placeOrigin,
sup_product.productionRegion,
sup_product.productionCompanyName,
sup_product.afterSale,
sup_product.specification,
sup_product.structure,
sup_product.scope,
sup_product.other,
sup_product.filePath,
sup_product.manufacturerIdFk,
sup_product.customerId,
sup_product.auditStatus,
sup_product.auditComment,
sup_product.sptm,
sup_product.ybbm,
sup_product.measname,
sup_product.cpms,
sup_product.relIdFk,
sup_product.hchzsb,
sup_product.remark,
sup_product.createUser,
sup_product.createTime,
sup_product.updateUser,
sup_product.updateTime,
sup_product.manufactory,
sup_product.allowNoBatch,
sup_product.allowNoExpire,
sup_product.allowNoProduct,
sup_product.allowNoSerial,
sup_company.companyName supName,
sup_manufacturer.companyName manufacturerName,
sup_manufacturer.companyName
sup_manufacturer.companyName,
sup_manufacturer.agentName
FROM sup_product
inner join sup_company
on sup_product.customerId = sup_company.customerId

Write Preview
Loading…
Cancel
Save