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

国家库同步下载，无法下载其他子级问题

Browse Source
zhairh
anthonywj 2 years ago
parent b2c98431c2
commit e941d115d1
5 changed files with 256 additions and 194 deletions
Show Stats Download Patch File Download Diff File

45
src/main/java/com/glxp/udidl/admin/controller/device/TestController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.udidl.admin.controller.device;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.glxp.udidl.admin.constant.Constant;
import com.glxp.udidl.admin.dao.udi.ProductInfoMapper; import com.glxp.udidl.admin.dao.udi.ProductInfoMapper;
import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity;
@ -11,13 +12,14 @@ import com.glxp.udidl.admin.req.ListPageRequest;
import com.glxp.udidl.admin.req.ProductInfoFilterRequest; import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
import com.glxp.udidl.admin.req.UdiCompanyRequest; import com.glxp.udidl.admin.req.UdiCompanyRequest;
import com.glxp.udidl.admin.res.BaseResponse; import com.glxp.udidl.admin.res.BaseResponse;
import com.glxp.udidl.admin.service.dataSync.DeviceSyncService; import com.glxp.udidl.admin.res.udid.DataSetResult;
import com.glxp.udidl.admin.service.dataSync.UdplatDownloadService; import com.glxp.udidl.admin.res.udid.DataSetSingleResult;
import com.glxp.udidl.admin.service.dataSync.UdplatSyncService; import com.glxp.udidl.admin.service.dataSync.*;
import com.glxp.udidl.admin.service.inout.DeviceService; import com.glxp.udidl.admin.service.inout.DeviceService;
import com.glxp.udidl.admin.service.inout.ProductInfoService; import com.glxp.udidl.admin.service.inout.ProductInfoService;
import com.glxp.udidl.admin.service.udi.UdiCompanyService; import com.glxp.udidl.admin.service.udi.UdiCompanyService;
import com.glxp.udidl.admin.thread.UdiTransferUtils; import com.glxp.udidl.admin.thread.UdiTransferUtils;
import com.glxp.udidl.admin.util.RedisUtil;
import com.glxp.udidl.admin.util.ResultVOUtils; import com.glxp.udidl.admin.util.ResultVOUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -169,4 +172,40 @@ public class TestController {
return ResultVOUtils.error(500, "未查询到数据"); return ResultVOUtils.error(500, "未查询到数据");
} }
@Resource
private DeviceDownloadService deviceDownloadService;
@Resource
private DeviceSaveService deviceSaveService;
@Resource
RedisUtil redisUtil;
@GetMapping("udidl/device/updateDi")
public BaseResponse updateDi(ListPageRequest listPageRequest) {
List<String> keys = productInfoDao.findAllNameCodes(listPageRequest);
int index = listPageRequest.getPage();
for (String key : keys) {
index++;
if (key.length() != 14)
continue;
DataSetSingleResult res = null;
try {
Thread.sleep(5 * 1000);
res = deviceDownloadService.downloadByDi(key);
if (res.getReturnCode() != 1) {
return ResultVOUtils.error(-1, res.getReturnMsg());
}
List<DataSetResult.DataSet> dataSets = new ArrayList<>();
dataSets.add(res.getDataSet());
int insertCount = deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE);
} catch (Exception e) {
e.printStackTrace();
redisUtil.set("updateDLLastCount", index + "");
return ResultVOUtils.error(500, res.getReturnMsg());
}
redisUtil.set("updateDLLastCount", index + "");
logger.info(listPageRequest.getPage() + "---" + listPageRequest.getLimit() + "----" + index);
}
return ResultVOUtils.success("总数=" + keys.size() + "\n");
}
} }

3
src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java
Unescape Escape View File

@ -37,6 +37,9 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfoEntity> {
List<String> findAllUuids(ListPageRequest listPageRequest); List<String> findAllUuids(ListPageRequest listPageRequest);
List<String> findAllNameCodes(ListPageRequest listPageRequest);
List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid); List<ProductInfoEntity> selectByUuid(@Param("uuid") String uuid);
List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest); List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);

226
src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
Unescape Escape View File

@ -47,140 +47,140 @@ public class DeviceSaveService {
List<DataSetResult.ClinicalInfo> ClinicalInfoAll = ds.getClinicalInfo(); List<DataSetResult.ClinicalInfo> ClinicalInfoAll = ds.getClinicalInfo();
List<DataSetResult.StorageInfo> storageInfoAll = ds.getStorageInfo(); List<DataSetResult.StorageInfo> storageInfoAll = ds.getStorageInfo();
List<DataSetResult.PackingInfo> packingInfoAll = ds.getPackingInfo(); List<DataSetResult.PackingInfo> packingInfoAll = ds.getPackingInfo();
if (ds.getDeviceInfo() != null)
for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) {
for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { //1:判断数据是否存在
String uuid = null;
//1:判断数据是否存在 Device originDevice = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + "");
String uuid = null; if (dlType == Constant.DL_TYPE_ADD) {
Device originDevice = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""); if (originDevice != null)
if (dlType == Constant.DL_TYPE_ADD) { continue;
if (originDevice != null) }
continue;
}
//2,存储 deviceInfo //2,存储 deviceInfo
Device device = responseToDevice(item); Device device = responseToDevice(item);
Boolean isHistory = false; Boolean isHistory = false;
if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) { if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) {
isHistory = true; isHistory = true;
} }
if (requestDate != null) if (requestDate != null)
device.setRequestDate(requestDate); device.setRequestDate(requestDate);
//2.1 判断更新或者新增 //2.1 判断更新或者新增
if (dlType == Constant.DL_TYPE_ADD || originDevice == null) { if (dlType == Constant.DL_TYPE_ADD || originDevice == null) {
uuid = getUUId(); uuid = getUUId();
device.setUuid(uuid);
deviceService.insertDevice(device);
} else {
//2.2 判断字段是否与原来的一致，若不一致则更新
if (!device.equals(originDevice)) {
uuid = originDevice.getUuid();
device.setUuid(uuid); device.setUuid(uuid);
deviceService.updateDevice(device); deviceService.insertDevice(device);
} else { //，若一致则跳过 } else {
//2.2 判断字段是否与原来的一致，若不一致则更新
if (!device.equals(originDevice)) {
uuid = originDevice.getUuid();
device.setUuid(uuid);
deviceService.updateDevice(device);
} else { //，若一致则跳过
// uuid = getUUId(); // uuid = getUUId();
// device.setUuid(uuid); // device.setUuid(uuid);
// deviceService.insertDevice(device); // deviceService.insertDevice(device);
continue; continue;
} }
}
result++;
//3,存储ContactList
List<DataSetResult.ContactInfo> contactInfos = item.getContactList();
if (contactInfos != null && contactInfos.size() > 0) {
List<Contactlist> contactlistList = new ArrayList<>();
for (DataSetResult.ContactInfo contactInfo : contactInfos) {
Contactlist contactlist = responseToContactlist(contactInfo);
contactlist.setDevicerecordkey(device.getDevicerecordkey());
contactlist.setUuid(uuid);
contactlistList.add(contactlist);
} }
deviceService.deleteClinicalByUuid(uuid); result++;
deviceService.insertContactlist(contactlistList); //3,存储ContactList
} List<DataSetResult.ContactInfo> contactInfos = item.getContactList();
//4,存储 Deviceclinical if (contactInfos != null && contactInfos.size() > 0) {
if (ClinicalInfoAll != null && ClinicalInfoAll.size() > 0) { List<Contactlist> contactlistList = new ArrayList<>();
List<DataSetResult.ClinicalInfo> deviceclinicals; for (DataSetResult.ContactInfo contactInfo : contactInfos) {
if (isHistory == true) Contactlist contactlist = responseToContactlist(contactInfo);
deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). contactlist.setDevicerecordkey(device.getDevicerecordkey());
collect(Collectors.toList()); contactlist.setUuid(uuid);
else contactlistList.add(contactlist);
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);
if (isHistory == true)
deviceclinical.setDevicerecordkey(item.getDeviceHistoryKey());
else
deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
deviceclinical.setUuid(uuid);
deviceclinicalList.add(deviceclinical);
} }
deviceService.deleteClinicalByUuid(uuid); deviceService.deleteClinicalByUuid(uuid);
deviceService.insertDeviceClinical(deviceclinicalList); deviceService.insertContactlist(contactlistList);
} }
} //4,存储 Deviceclinical
if (ClinicalInfoAll != null && ClinicalInfoAll.size() > 0) {
//5 存储 Devicestorage List<DataSetResult.ClinicalInfo> deviceclinicals;
if (storageInfoAll != null && storageInfoAll.size() > 0) { if (isHistory == true)
List<DataSetResult.StorageInfo> storageInfos; deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())).
if (isHistory == true) collect(Collectors.toList());
storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). else
collect(Collectors.toList()); deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
else collect(Collectors.toList());
storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). List<Deviceclinical> deviceclinicalList = new ArrayList<>();
collect(Collectors.toList()); if (deviceclinicals != null && deviceclinicals.size() > 0) {
if (storageInfos != null && storageInfos.size() > 0) { for (DataSetResult.ClinicalInfo deviceClinical : deviceclinicals) {
List<Devicestorage> devicestorageList = new ArrayList<>(); Deviceclinical deviceclinical = responseToDeviceclinical(deviceClinical);
for (DataSetResult.StorageInfo storageInfo : storageInfos) { if (isHistory == true)
Devicestorage devicestorage = responseToDevicestorage(storageInfo); deviceclinical.setDevicerecordkey(item.getDeviceHistoryKey());
if (isHistory == true) else
devicestorage.setDevicerecordkey(item.getDeviceHistoryKey()); deviceclinical.setDevicerecordkey(device.getDevicerecordkey());
else deviceclinical.setUuid(uuid);
devicestorage.setDevicerecordkey(device.getDevicerecordkey()); deviceclinicalList.add(deviceclinical);
devicestorage.setUuid(uuid); }
devicestorageList.add(devicestorage); deviceService.deleteClinicalByUuid(uuid);
deviceService.insertDeviceClinical(deviceclinicalList);
} }
deviceService.deleteStorageByUuid(uuid);
deviceService.insertDevicestorage(devicestorageList);
} }
} //5 存储 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.deleteStorageByUuid(uuid);
deviceService.insertDevicestorage(devicestorageList);
}
//6 存储Devicepackage }
if (packingInfoAll != null && packingInfoAll.size() > 0) {
List<DataSetResult.PackingInfo> packingInfos; //6 存储Devicepackage
if (isHistory == true) if (packingInfoAll != null && packingInfoAll.size() > 0) {
packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). List<DataSetResult.PackingInfo> packingInfos;
collect(Collectors.toList()); if (isHistory == true)
else packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())).
packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). collect(Collectors.toList());
collect(Collectors.toList()); else
if (packingInfos != null && packingInfos.size() > 0) { packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())).
List<Devicepackage> devicepackageList = new ArrayList<>(); collect(Collectors.toList());
for (DataSetResult.PackingInfo packingInfo : packingInfos) { if (packingInfos != null && packingInfos.size() > 0) {
Devicepackage devicepackage = responseToDevicepackage(packingInfo); List<Devicepackage> devicepackageList = new ArrayList<>();
if (isHistory == true) for (DataSetResult.PackingInfo packingInfo : packingInfos) {
devicepackage.setDevicerecordkey(item.getDeviceHistoryKey()); Devicepackage devicepackage = responseToDevicepackage(packingInfo);
else if (isHistory == true)
devicepackage.setDevicerecordkey(device.getDevicerecordkey()); devicepackage.setDevicerecordkey(item.getDeviceHistoryKey());
devicepackage.setUuid(uuid); else
devicepackageList.add(devicepackage); devicepackage.setDevicerecordkey(device.getDevicerecordkey());
devicepackage.setUuid(uuid);
devicepackageList.add(devicepackage);
}
deviceService.deletePakcageByUuid(uuid);
deviceService.insertDevicepackage(devicepackageList);
} }
deviceService.deletePakcageByUuid(uuid);
deviceService.insertDevicepackage(devicepackageList);
} }
//7存储productInfo信息
productInfoSave(uuid);
} }
//7存储productInfo信息
productInfoSave(uuid);
}
} }
return result; return result;
} }

21
src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java
Unescape Escape View File

@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.PushBuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -159,9 +160,7 @@ public class DeviceSyncService {
} }
public BaseResponse searchDlByDi(String deviceId) { public BaseResponse searchDlByDi(String deviceId) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); List<ProductInfoEntity> productInfoEntityList = searchByDI(deviceId);
productInfoFilterRequest.setNameCode(deviceId);
List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
if (CollUtil.isEmpty(productInfoEntityList)) { if (CollUtil.isEmpty(productInfoEntityList)) {
DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId);
if (result1.getReturnCode() != 1) if (result1.getReturnCode() != 1)
@ -171,7 +170,7 @@ public class DeviceSyncService {
List<DataSetResult.DataSet> dataSets = new ArrayList<>(); List<DataSetResult.DataSet> dataSets = new ArrayList<>();
dataSets.add(result1.getDataSet()); dataSets.add(result1.getDataSet());
deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE);
productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); productInfoEntityList = searchByDI(deviceId);
} else { } else {
return ResultVOUtils.error(501, "医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传"); return ResultVOUtils.error(501, "医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传");
} }
@ -180,6 +179,20 @@ public class DeviceSyncService {
return ResultVOUtils.success(productInfoEntityList); return ResultVOUtils.success(productInfoEntityList);
} }
public List<ProductInfoEntity> searchByDI(String deviceId) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
productInfoFilterRequest.setNameCode(deviceId);
productInfoFilterRequest.setIsNewest(1);
List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
if (CollUtil.isNotEmpty(productInfoEntityList)) {
ProductInfoFilterRequest request = new ProductInfoFilterRequest();
request.setUuid(productInfoEntityList.get(0).getUuid());
productInfoEntityList = productInfoService.findAll(request);
}
return productInfoEntityList;
}
public BaseResponse searchDlByUuid(String uuid) { public BaseResponse searchDlByUuid(String uuid) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
productInfoFilterRequest.setUuid(uuid); productInfoFilterRequest.setUuid(uuid);

155
src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml
Unescape Escape View File

@ -98,7 +98,7 @@
resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
select * select *
from productinfo where from productinfo where
uuid in ( uuid in (
<foreach collection="ids" item="item" index="index" <foreach collection="ids" item="item" index="index"
separator=","> separator=",">
#{item} #{item}
@ -116,7 +116,8 @@
<!-- CHAR_LENGTH(nameCode) <![CDATA[ >= ]]> 14--> <!-- CHAR_LENGTH(nameCode) <![CDATA[ >= ]]> 14-->
<select id="filterUdiByCreditNo" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest" <select id="filterUdiByCreditNo" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest"
resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
select * from productinfo select *
from productinfo
<where> <where>
<if test="tyshxydm != '' and tyshxydm != null"> <if test="tyshxydm != '' and tyshxydm != null">
AND tyshxydm = #{tyshxydm} AND tyshxydm = #{tyshxydm}
@ -166,9 +167,9 @@
<select id="filterUuidByCreditNo" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest" <select id="filterUuidByCreditNo" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest"
resultType="java.lang.String"> resultType="java.lang.String">
select p.uuid from productinfo p select p.uuid from productinfo p
INNER JOIN INNER JOIN
(select deviceRecordKey, max(versionNumber) versionNumber (select deviceRecordKey, max(versionNumber) versionNumber
from productinfo from productinfo
<where> <where>
<if test="tyshxydm != '' and tyshxydm != null"> <if test="tyshxydm != '' and tyshxydm != null">
@ -185,8 +186,8 @@
</if> </if>
</where> </where>
GROUP BY deviceRecordKey) GROUP BY deviceRecordKey)
a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
group by uuid group by uuid
</select> </select>
<select id="filterUdi" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest" <select id="filterUdi" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest"
resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
@ -377,65 +378,64 @@
<insert id="insertProductInfo" keyProperty="id" parameterType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> <insert id="insertProductInfo" keyProperty="id" parameterType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
REPLACE REPLACE
INTO productinfo INTO productinfo
(nameCode, packRatio, packLevel, bhxjsl, (nameCode, packRatio, packLevel, bhxjsl,
bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy,
thirdProductName, thirdProductName,
cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm,
versionNumber versionNumber
, diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, , diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, hchzsb, cplx,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs, ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, hchzsb, cplx, sfwblztlcp, cgzmraqxgxx,
sfwwjbz,syqsfxyjxmj,mjfs,qtxxdwzlj,categoryName) sfbjwycxsy, zdcfsycs,
values ( sfwwjbz, syqsfxyjxmj, mjfs, qtxxdwzlj, categoryName)
#{nameCode}, values (#{nameCode},
#{packRatio}, #{packRatio},
#{packLevel}, #{packLevel},
#{bhxjsl}, #{bhxjsl},
#{bhzxxsbzsl}, #{bhzxxsbzsl},
#{zxxsbzbhsydysl}, #{zxxsbzbhsydysl},
#{bhxjcpbm}, #{bhxjcpbm},
#{bzcj}, #{bzcj},
#{thirdProductNo}, #{thirdProductNo},
#{addType}, #{addType},
#{deviceRecordKey}, #{deviceRecordKey},
#{isUseDy}, #{isUseDy},
#{thirdProductName}, #{thirdProductName},
#{cpmctymc}, #{cpmctymc},
#{cplb}, #{cplb},
#{flbm}, #{flbm},
#{ggxh}, #{ggxh},
#{qxlb}, #{qxlb},
#{tyshxydm}, #{tyshxydm},
#{ylqxzcrbarmc}, #{ylqxzcrbarmc},
#{zczbhhzbapzbh}, #{zczbhhzbapzbh},
#{ylqxzcrbarywmc}, #{ylqxzcrbarywmc},
#{uuid}, #{uuid},
#{sjcpbm}, #{sjcpbm},
#{versionNumber}, #{versionNumber},
#{diType}, #{diType},
#{scbssfbhph}, #{scbssfbhph},
#{scbssfbhxlh}, #{scbssfbhxlh},
#{scbssfbhscrq}, #{scbssfbhscrq},
#{scbssfbhsxrq}, #{scbssfbhsxrq},
#{ybbm}, #{ybbm},
#{spmc}, #{spmc},
#{cphhhbh}, #{cphhhbh},
#{cpms}, #{cpms},
#{cpbsbmtxmc}, #{cpbsbmtxmc},
#{isNewest}, #{isNewest},
#{updateTime}, #{updateTime},
#{hchzsb}, #{hchzsb},
#{cplx}, #{cplx},
#{sfwblztlcp}, #{sfwblztlcp},
#{cgzmraqxgxx}, #{cgzmraqxgxx},
#{sfbjwycxsy}, #{sfbjwycxsy},
#{zdcfsycs}, #{zdcfsycs},
#{sfwwjbz}, #{sfwwjbz},
#{syqsfxyjxmj}, #{syqsfxyjxmj},
#{mjfs}, #{mjfs},
#{qtxxdwzlj}, #{qtxxdwzlj},
#{categoryName} #{categoryName})
)
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -569,7 +569,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
categoryName=#{categoryName}, categoryName=#{categoryName},
</if> </if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -643,8 +642,6 @@
<if test="categoryName != null"> <if test="categoryName != null">
categoryName=#{categoryName}, categoryName=#{categoryName},
</if> </if>
</set> </set>
WHERE uuid = #{uuid} WHERE uuid = #{uuid}
</update> </update>
@ -655,8 +652,17 @@
SELECT uuid SELECT uuid
from device from device
group by uuid group by uuid
limit #{page}, #{limit} limit #{page}, #{limit}
</select>
<select id="findAllNameCodes" parameterType="com.glxp.udidl.admin.req.ListPageRequest"
resultType="java.lang.String">
SELECT nameCode
from productinfo
group by nameCode
limit #{page}, #{limit}
</select> </select>
<select id="findAllTyshxyh" resultType="java.lang.String"> <select id="findAllTyshxyh" resultType="java.lang.String">
SELECT tyshxydm SELECT tyshxydm
from productinfo from productinfo
@ -686,16 +692,17 @@
<insert id="updateProductInfoData" parameterType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> <insert id="updateProductInfoData" parameterType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
REPLACE REPLACE
INTO productinfo INTO productinfo
(id, nameCode, packRatio, packLevel, bhxjsl, (id, nameCode, packRatio, packLevel, bhxjsl,
bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy,
thirdProductName, thirdProductName,
cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm,
versionNumber versionNumber
, diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, , diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, hchzsb, cplx, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, hchzsb, cplx, sfwblztlcp, cgzmraqxgxx,
zdcfsycs, sfbjwycxsy,
sfwwjbz, syqsfxyjxmj, mjfs, qtxxdwzlj, categoryName) zdcfsycs,
sfwwjbz, syqsfxyjxmj, mjfs, qtxxdwzlj, categoryName)
values (#{id}, values (#{id},
#{nameCode}, #{nameCode},
#{packRatio}, #{packRatio},

Write Preview
Loading…
Cancel
Save