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

1.修改json格式为udi格式

Browse Source
master
MrZhai 3 years ago
parent d5d7d0eadc
commit f106f2813c
6 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java
Unescape Escape View File

@ -110,7 +110,7 @@ public class CorpExportLogController {
CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity(); CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity();
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId(); String genKey = CustomUtil.getId();
String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息" + genKey + ".json"; String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息" + genKey + ".udi";
corpExportLogEntity.setGenKey(genKey); corpExportLogEntity.setGenKey(genKey);
corpExportLogEntity.setFilePath(fileName); corpExportLogEntity.setFilePath(fileName);
corpExportLogEntity.setUpdateTime(new Date()); corpExportLogEntity.setUpdateTime(new Date());
@ -118,7 +118,7 @@ public class CorpExportLogController {
corpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL); corpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
corpExportLogService.insertCorpExportLog(corpExportLogEntity); corpExportLogService.insertCorpExportLog(corpExportLogEntity);
basicGenExcelService.exportCorp(genKey, corpsExportRequest); basicGenExcelService.exportCorp(genKey, corpsExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!");
} }
//往来单位上传SMP，并创建生成记录 //往来单位上传SMP，并创建生成记录

13
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java
Unescape Escape View File

@ -4,7 +4,6 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.sale.admin.entity.basic.CorpImportDetailEntity; import com.glxp.sale.admin.entity.basic.CorpImportDetailEntity;
import com.glxp.sale.admin.entity.basic.CorpImportLogEntity; import com.glxp.sale.admin.entity.basic.CorpImportLogEntity;
@ -21,18 +20,14 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils; import com.glxp.sale.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -133,7 +128,7 @@ public class CorpImportLogController {
//解析数据 //解析数据
try { try {
String fileType = fileName.substring(fileName.lastIndexOf(".")); String fileType = fileName.substring(fileName.lastIndexOf("."));
if (".json".equals(fileType.toLowerCase())) { if (".udi".equals(fileType.toLowerCase())) {
String jsonData = IoUtil.read(file.getInputStream()).toString(); String jsonData = IoUtil.read(file.getInputStream()).toString();
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = JSONUtil.toList(jsonData, BasicUnitMaintainEntity.class); List<BasicUnitMaintainEntity> basicUnitMaintainEntities = JSONUtil.toList(jsonData, BasicUnitMaintainEntity.class);
@ -149,7 +144,7 @@ public class CorpImportLogController {
corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
corpImportLogService.updateImportLog(corpImportLogEntity); corpImportLogService.updateImportLog(corpImportLogEntity);
} else { } else {
return ResultVOUtils.error(500, "请上传json文件"); return ResultVOUtils.error(500, "请上传udi文件");
} }
} catch (Exception e) { } catch (Exception e) {
log.error("导入往来单位信息错误，文件名为：{}", fileName); log.error("导入往来单位信息错误，文件名为：{}", fileName);

4
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class UdiInfoExportLogController {
UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity(); UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity();
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId(); String genKey = CustomUtil.getId();
String fileName = "D:\\udiwms\\exportFile\\" + "器械信息" + genKey + ".json"; String fileName = "D:\\udiwms\\exportFile\\" + "器械信息" + genKey + ".udi";
udiInfoExportLogEntity.setGenKey(genKey); udiInfoExportLogEntity.setGenKey(genKey);
udiInfoExportLogEntity.setFilePath(fileName); udiInfoExportLogEntity.setFilePath(fileName);
udiInfoExportLogEntity.setUpdateTime(new Date()); udiInfoExportLogEntity.setUpdateTime(new Date());
@ -124,7 +124,7 @@ public class UdiInfoExportLogController {
udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL); udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
udiInfoExportLogService.insertUdiInfoExportLog(udiInfoExportLogEntity); udiInfoExportLogService.insertUdiInfoExportLog(udiInfoExportLogEntity);
basicGenExcelService.exportJsonUdiInfo(genKey, udiInfoExportRequest); basicGenExcelService.exportJsonUdiInfo(genKey, udiInfoExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); return ResultVOUtils.success("后台正在导出生成udi件，请稍后刷新查看!");
} }

12
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java
Unescape Escape View File

@ -18,9 +18,8 @@ import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils; import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
@ -29,10 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Date; import java.sql.Date;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -133,8 +129,8 @@ public class UdiInfoImportLogController {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
try { try {
String fileType = fileName.substring(fileName.lastIndexOf(".")); String fileType = fileName.substring(fileName.lastIndexOf("."));
if (!".json".equals(fileType.toLowerCase())) { if (!".udi".equals(fileType.toLowerCase())) {
return ResultVOUtils.error(500, "请上传json文件"); return ResultVOUtils.error(500, "请上传udi文件");
} }
//导入数据 //导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString(); String jsonData = IoUtil.read(file.getInputStream()).toString();

4
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java
Unescape Escape View File

@ -108,8 +108,8 @@ public class ThrCorpImportLogController {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
try { try {
String fileType = fileName.substring(fileName.lastIndexOf(".")); String fileType = fileName.substring(fileName.lastIndexOf("."));
if (!".json".equals(fileType.toLowerCase())) { if (!".udi".equals(fileType.toLowerCase())) {
return ResultVOUtils.error(500, "请上传json文件"); return ResultVOUtils.error(500, "请上传udi文件");
} }
//导入数据 //导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString(); String jsonData = IoUtil.read(file.getInputStream()).toString();

4
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java
Unescape Escape View File

@ -110,8 +110,8 @@ public class ThrProductsImportLogController {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
try { try {
String fileType = fileName.substring(fileName.lastIndexOf(".")); String fileType = fileName.substring(fileName.lastIndexOf("."));
if (!".json".equals(fileType.toLowerCase())) { if (!".udi".equals(fileType.toLowerCase())) {
return ResultVOUtils.error(500, "请上传json文件"); return ResultVOUtils.error(500, "请上传udi文件");
} }
//导入数据 //导入数据
String jsonData = IoUtil.read(file.getInputStream()).toString(); String jsonData = IoUtil.read(file.getInputStream()).toString();

Write Preview
Loading…
Cancel
Save