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

获取历史记录接口修改

Browse Source
master
hongtianzai 3 years ago
parent 8b4a1f7782
commit 805459f3ad
2 changed files with 90 additions and 49 deletions
Show Stats Download Patch File Download Diff File

5
api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetResult.java
Unescape Escape View File

@ -24,7 +24,7 @@ public class DataSetResult {
*/
@Data
public static class DeviceInfo{
private String deviceHistoryRecordKey;
private String deviceHistoryKey;
private String deviceRecordKey;
private int versionNumber;
private String versionStatus;
@ -84,6 +84,7 @@ public class DataSetResult {
}
@Data
public static class ClinicalInfo{
private String deviceHistoryKey;//历史key
private String deviceRecordKey; // 数据库记录 key
private String lcsycclx; //尺寸类型
private String ccz; //尺寸值
@ -91,6 +92,7 @@ public class DataSetResult {
}
@Data
public static class StorageInfo{
private String deviceHistoryKey;//历史key
private String deviceRecordKey; // 数据库记录 key
private String cchcztj; // 储存或操作条件
private String zdz; //最低值
@ -99,6 +101,7 @@ public class DataSetResult {
}
@Data
public static class PackingInfo{
private String deviceHistoryKey;//历史key
private String deviceRecordKey; // 数据库记录 key
private String bzcpbs; //包装产品标识
private String bznhxyjbzcpbs; //包装内含下一级包装产品标识

134
api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.java
Unescape Escape View File

@ -32,20 +32,30 @@ public class DeviceSaveService {
/**
* 存储设备信息
*
* @param dataSets
* @return 返回存储条数
*/
public int DeviceSave(List<DataSetResult.DataSet> dataSets,Date requestDate) {
int result=0;
public int DeviceSave(List<DataSetResult.DataSet> dataSets, Date requestDate) {
int result = 0;
for (DataSetResult.DataSet ds : dataSets) {
List<DataSetResult.ClinicalInfo> ClinicalInfoAll = ds.getClinicalInfo();
List<DataSetResult.StorageInfo> storageInfoAll = ds.getStorageInfo();
List<DataSetResult.PackingInfo> packingInfoAll = ds.getPackingInfo();
for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) {
//1:判断数据是否存在
if (deviceService.selectisSame(item.getDeviceRecordKey(), item.getVersionNumber() + "") != null)
continue;
Device device = responseToDevice(item);
String uuid = getUUId();
Boolean isHistory = false;
if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) {
isHistory = true;
System.out.println(JSON.toJSONString(ds));
}
device.setUuid(uuid);
if(requestDate != null)
if (requestDate != null)
device.setRequestDate(requestDate);
//2,存储 deviceInfo
deviceService.insertDevice(device);
@ -63,55 +73,77 @@ public class DeviceSaveService {
deviceService.insertContactlist(contactlistList);
}
//4,存储 Deviceclinical
List<DataSetResult.ClinicalInfo> deviceclinicals = ds.getClinicalInfo().stream().filter(p->p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
if(ds.getClinicalInfo().size()>0){
System.out.println("getClinicalInfo:"+JSON.toJSON(ds.getClinicalInfo()));
System.out.println("deviceclinicals:"+JSON.toJSON(deviceclinicals));
}
List<Deviceclinical> deviceclinicalList = new ArrayList<>();
if (deviceclinicals != null && deviceclinicals.size() > 0) {
for (DataSetResult.ClinicalInfo deviceClinical : deviceclinicals) {
if (ClinicalInfoAll != null && ClinicalInfoAll.size() > 0) {
List<DataSetResult.ClinicalInfo> deviceclinicals;
if (isHistory == true)
deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())).
collect(Collectors.toList());
else
deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
List<Deviceclinical> deviceclinicalList = new ArrayList<>();
if (deviceclinicals != null && deviceclinicals.size() > 0) {
for (DataSetResult.ClinicalInfo deviceClinical : deviceclinicals) {
Deviceclinical deviceclinical = responseToDeviceclinical(deviceClinical);
deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
if (isHistory == true)
deviceclinical.setDevicerecordkey(item.getDeviceHistoryKey());
else
deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
deviceclinical.setUuid(uuid);
deviceclinicalList.add(deviceclinical);
}
deviceService.insertDeviceClinical(deviceclinicalList);
}
System.out.println("deviceclinicalList:"+JSON.toJSON(deviceclinicalList));
deviceService.insertDeviceClinical(deviceclinicalList);
}
//5 存储 Devicestorage
List<DataSetResult.StorageInfo> storageInfoes = ds.getStorageInfo().stream().filter(p->p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
/*if(ds.getStorageInfo().size()>0){
System.out.println(item.getDeviceRecordKey());
System.out.println("getDeviceInfo:"+JSON.toJSON(ds.getDeviceInfo()));
System.out.println("getStorageInfo:"+JSON.toJSON(ds.getStorageInfo()));
System.out.println("storageInfoes:"+JSON.toJSON(storageInfoes));
}*/
if (storageInfoes != null && storageInfoes.size() > 0) {
List<Devicestorage> devicestorageList = new ArrayList<>();
for (DataSetResult.StorageInfo storageInfo : storageInfoes) {
Devicestorage devicestorage = responseToDevicestorage(storageInfo);
devicestorage.setDevicerecordkey(device.getDevicerecordkey());
devicestorage.setUuid(uuid);
devicestorageList.add(devicestorage);
if(storageInfoAll != null && storageInfoAll.size()>0){
List<DataSetResult.StorageInfo> storageInfos;
if(isHistory == true)
storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())).
collect(Collectors.toList());
else
storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
if (storageInfos != null && storageInfos.size() > 0) {
List<Devicestorage> devicestorageList = new ArrayList<>();
for (DataSetResult.StorageInfo storageInfo : storageInfos) {
Devicestorage devicestorage = responseToDevicestorage(storageInfo);
if (isHistory == true)
devicestorage.setDevicerecordkey(item.getDeviceHistoryKey());
else
devicestorage.setDevicerecordkey(device.getDevicerecordkey());
devicestorage.setUuid(uuid);
devicestorageList.add(devicestorage);
}
deviceService.insertDevicestorage(devicestorageList);
}
//System.out.println(JSON.toJSON("devicestorage"+devicestorageList));
deviceService.insertDevicestorage(devicestorageList);
}
//6 存储Devicepackage
List<DataSetResult.PackingInfo> packingInfoes = ds.getPackingInfo().stream().filter(p->p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
if (packingInfoes != null && packingInfoes.size() > 0) {
List<Devicepackage> devicepackageList = new ArrayList<>();
for (DataSetResult.PackingInfo packingInfo : packingInfoes) {
Devicepackage devicepackage = responseToDevicepackage(packingInfo);
devicepackage.setDevicerecordkey(device.getDevicerecordkey());
devicepackage.setUuid(uuid);
devicepackageList.add(devicepackage);
if(packingInfoAll != null && packingInfoAll.size()>0){
List<DataSetResult.PackingInfo> packingInfos ;
if(isHistory == true)
packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())).
collect(Collectors.toList());
else
packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
collect(Collectors.toList());
if (packingInfos != null && packingInfos.size() > 0) {
List<Devicepackage> devicepackageList = new ArrayList<>();
for (DataSetResult.PackingInfo packingInfo : packingInfos) {
Devicepackage devicepackage = responseToDevicepackage(packingInfo);
if (isHistory == true)
devicepackage.setDevicerecordkey(item.getDeviceHistoryKey());
else
devicepackage.setDevicerecordkey(device.getDevicerecordkey());
devicepackage.setUuid(uuid);
devicepackageList.add(devicepackage);
}
deviceService.insertDevicepackage(devicepackageList);
}
deviceService.insertDevicepackage(devicepackageList);
}
//7存储productInfo信息
@ -129,7 +161,7 @@ public class DeviceSaveService {
*/
private Device responseToDevice(DataSetResult.DeviceInfo dataSetBean) {
Device device = new Device();
//device.setDevicehistoryrecordkey(dataSetBean.getDeviceHistoryRecordKey());
device.setDevicehistoryrecordkey(dataSetBean.getDeviceHistoryKey());
device.setDevicerecordkey(dataSetBean.getDeviceRecordKey());
device.setBtcpbs(dataSetBean.getBtcpbs());
device.setBtcpbsyzxxsdycpbssfyz(dataSetBean.getBtcpbsyzxxsdycpbssfyz());
@ -178,21 +210,24 @@ public class DeviceSaveService {
device.setLastModifyTime(DateUtil.formatDateTime(new Date()));
return device;
}
private Contactlist responseToContactlist(DataSetResult.ContactInfo contactInfo ) {
private Contactlist responseToContactlist(DataSetResult.ContactInfo contactInfo) {
Contactlist contactlist = new Contactlist();
contactlist.setQylxrcz(contactInfo.getQylxrcz());
contactlist.setQylxrdh(contactInfo.getQylxrdh());
contactlist.setQylxryx(contactInfo.getQylxryx());
return contactlist;
}
public Deviceclinical responseToDeviceclinical(DataSetResult.ClinicalInfo clinicalInfo) {
public Deviceclinical responseToDeviceclinical(DataSetResult.ClinicalInfo clinicalInfo) {
Deviceclinical deviceclinical = new Deviceclinical();
deviceclinical.setLcsycclx(clinicalInfo.getLcsycclx());
deviceclinical.setCcz(clinicalInfo.getCcz());
deviceclinical.setCcdw(clinicalInfo.getCcdw());
return deviceclinical;
}
public Devicestorage responseToDevicestorage(DataSetResult.StorageInfo storageInfo) {
public Devicestorage responseToDevicestorage(DataSetResult.StorageInfo storageInfo) {
Devicestorage devicestorage = new Devicestorage();
devicestorage.setCchcztj(storageInfo.getCchcztj());
devicestorage.setJldw(storageInfo.getJldw());
@ -200,6 +235,7 @@ public class DeviceSaveService {
devicestorage.setZdz(storageInfo.getZdz());
return devicestorage;
}
public Devicepackage responseToDevicepackage(DataSetResult.PackingInfo packingInfo) {
Devicepackage devicepackage = new Devicepackage();
devicepackage.setBzcpbs(packingInfo.getBzcpbs());
@ -208,11 +244,13 @@ public class DeviceSaveService {
devicepackage.setBznhxyjcpbssl(Integer.parseInt(packingInfo.getBznhxyjcpbssl()));
return devicepackage;
}
private void productInfoSave(String uuid){
if(udiTransferUtils == null)
private void productInfoSave(String uuid) {
if (udiTransferUtils == null)
udiTransferUtils = new UdiTransferUtils();
udiTransferUtils.transUdi(deviceService, productInfoService, uuid, udiCompanyService);
}
private String getUUId() {
UUID uuid = UUID.randomUUID();
return uuid.toString().replace("-", "");

Write Preview
Loading…
Cancel
Save