From 644d4ba97ec848f5e568cb3f4282f24b97bee6a2 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 18 May 2022 22:39:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BA=93bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DownloadDeviceHelper.java | 33 ++- .../device/ProductInfoController.java | 22 +- .../controller/device/TestController.java | 40 ++- .../device/UdidlDeviceController.java | 12 +- .../udidl/admin/dao/udi/ProductInfoDao.java | 9 +- .../udidl/admin/dao/udi/UdiCompanyDao.java | 4 + .../udidl/admin/dao/udid/DeviceMapper.java | 2 + .../admin/entity/udi/ProductInfoEntity.java | 6 +- .../glxp/udidl/admin/entity/udid/Device.java | 19 ++ .../udidl/admin/entity/udid/DeviceEntity.java | 5 +- .../udidl/admin/req/UdiCompanyRequest.java | 1 + .../udidl/admin/res/udid/DataSetBean.java | 19 ++ .../udidl/admin/res/udid/DataSetResult.java | 20 +- .../DataSync/DeviceDownloadService.java | 103 ++++++- .../service/DataSync/DeviceSaveService.java | 31 ++- .../service/DataSync/DeviceSyncService.java | 173 +++++++----- .../admin/service/inout/DeviceService.java | 2 + .../service/inout/ProductInfoService.java | 6 +- .../service/inout/impl/DeviceServiceImpl.java | 5 + .../inout/impl/ProductInfoServiceImpl.java | 11 +- .../admin/service/udi/UdiCompanyService.java | 3 + .../udi/impl/UdiCompanyServiceImpl.java | 11 +- .../udidl/admin/thread/AsyncDownloadTask.java | 27 +- .../udidl/admin/thread/UdiCompanyTask.java | 2 + .../udidl/admin/thread/UdiTransferUtils.java | 3 + .../main/resources/application-dev.properties | 6 +- .../src/main/resources/logback-spring.xml | 2 +- .../mybatis/mapper/udi/ProductInfoDao.xml | 19 +- .../mybatis/mapper/udi/UdiCompanyDao.xml | 46 ++- .../mybatis/mapper/udid/DeviceMapper.xml | 263 +++++++++++------- 30 files changed, 657 insertions(+), 248 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/DownloadDeviceHelper.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/DownloadDeviceHelper.java index d2b8a0f..4584b07 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/DownloadDeviceHelper.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/DownloadDeviceHelper.java @@ -184,8 +184,33 @@ public class DownloadDeviceHelper { return result; } + + public int simpleDownloadDevices(ProductInfoService productInfoService, DeviceService deviceService, DeviceRequest deviceRequest) { + String response = HttpClient.post(url, deviceRequest); + int result = -1; + List dataSetBeanList = null; + MedicalResonse medicalResonse = null; + if (url.equals("sharing/get")) { + medicalResonse = (MedicalResonse) JSONObject.parseObject(response, MedicalResonse.class); + result = medicalResonse.getReturnCode(); + dataSetBeanList = medicalResonse.getDataSet(); + } + + if (dataSetBeanList != null && dataSetBeanList.size() > 0) { + for (int i = 0; i < dataSetBeanList.size(); i++) { + DataSetBean dataSetBean = dataSetBeanList.get(i); + Device device = WarehousBeanUtils.responseToDevice(dataSetBean); + } + } + if (Integer.parseInt(deviceRequest.getCurrentPageNumber()) >= medicalResonse.getTotalPageCount()) { + return -1; + } + return result; + } + //下载生产企业 - public int downloadProduct(ProductInfoService productInfoService, DeviceService deviceService, DeviceRequest deviceRequest) { + public int downloadProduct(ProductInfoService productInfoService, DeviceService deviceService, DeviceRequest + deviceRequest) { String response = HttpClient.post(url, deviceRequest); MedicalHistoryResonse medicalResonse = (MedicalHistoryResonse) JSONObject.parseObject(response, MedicalHistoryResonse.class); if (medicalResonse.getReturnCode() == 1) { @@ -272,7 +297,8 @@ public class DownloadDeviceHelper { } - public int downloadHistory(ProductInfoService productInfoService, DownloadHistoryRequest deviceHistoryRequest, DeviceService deviceService) { + public int downloadHistory(ProductInfoService productInfoService, DownloadHistoryRequest + deviceHistoryRequest, DeviceService deviceService) { String response = HttpClient.post("sharing/history/get", deviceHistoryRequest); MedicalHistoryResonse medicalResonse = (MedicalHistoryResonse) JSONObject.parseObject(response, MedicalHistoryResonse.class); if (medicalResonse.getReturnCode() == 1) { @@ -339,7 +365,8 @@ public class DownloadDeviceHelper { return 1; } - public int downloadBydi(DownloadDiRequest downloadDiRequest, DeviceService deviceService, ProductInfoService productInfoService) { + public int downloadBydi(DownloadDiRequest downloadDiRequest, DeviceService deviceService, ProductInfoService + productInfoService) { String response = HttpClient.post("sharing/single", downloadDiRequest); MedicalSingleResponse medicalResonse = (MedicalSingleResponse) JSONObject.parseObject(response, MedicalSingleResponse.class); if (medicalResonse.getReturnCode() == 1) { diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java index 8ba85af..208d82f 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java @@ -3,11 +3,15 @@ package com.glxp.udidl.admin.controller.device; import com.github.pagehelper.PageInfo; import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; +import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; import com.glxp.udidl.admin.entity.udid.UdiEntity; import com.glxp.udidl.admin.req.ProductInfoFilterRequest; +import com.glxp.udidl.admin.req.UdiCompanyRequest; import com.glxp.udidl.admin.res.PageSimpleResponse; import com.glxp.udidl.admin.res.udid.ProductInfoResponse; +import com.glxp.udidl.admin.service.DataSync.DeviceDownloadService; import com.glxp.udidl.admin.service.inout.ProductInfoService; +import com.glxp.udidl.admin.service.udi.UdiCompanyService; import com.glxp.udidl.admin.thread.AsyncDownloadTask; import com.glxp.udidl.admin.util.FilterUdiUtils; import com.glxp.udidl.common.res.BaseResponse; @@ -27,6 +31,8 @@ public class ProductInfoController { @Resource ProductInfoService productInfoService; @Resource + UdiCompanyService udiCompanyService; + @Resource AsyncDownloadTask asyncDownloadTask; @@ -123,6 +129,16 @@ public class ProductInfoController { } + //出入库同步下载 + @AuthRuleAnnotation("udidl_company_all") + @GetMapping("udidl/udiwms/syncCompany") + public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) { + + List udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); + return ResultVOUtils.success(udiCompanyEntities); + + } + //开放查询 查询只查询主DI， @AuthRuleAnnotation("udidl_productInfo_all") @@ -163,9 +179,9 @@ public class ProductInfoController { } } - if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) { - return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); - } +// if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("")) { +// return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); +// } productInfoFilterRequest.setIsNewest(1); productInfoFilterRequest.setDiType("1"); List productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java index 5cc689c..a5d0297 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java @@ -49,6 +49,7 @@ public class TestController { UdplatDownloadService udplatDownloadService; @Autowired UdplatSyncService udplatSyncService; + @GetMapping("udidl/device/transfer") public void transfer() { List keys = deviceService.findAllByZxxscpbs(); @@ -102,36 +103,51 @@ public class TestController { logger.info(month + "---按月开启下载"); asyncDownloadTask.downloadByMonth(month, page); } + + @GetMapping("udidl/device/dlBymonthTest") + public void dlBymonthTest(String month, int page) { + + logger.info(month + "---按月开启下载"); + asyncDownloadTask.downloadByMonthTest(month, page); + } + + @GetMapping("/test/getDistributor") - public String udplatTest(){ - return udplatDownloadService.getDistributor(); + public String udplatTest() { + return udplatDownloadService.getDistributor(); } + @GetMapping("/test/getManufactures") - public BaseResponse getManufactures(){ - return udplatDownloadService.getAllManufactures(); + public BaseResponse getManufactures() { + return udplatDownloadService.getAllManufactures(); } + @GetMapping("/test/udplat") - public BaseResponse udplatSync(){ - udplatSyncService.downloadAndSave("manual",""); - return ResultVOUtils.success("后台已开始下载！"); + public BaseResponse udplatSync() { + udplatSyncService.downloadAndSave("manual", ""); + return ResultVOUtils.success("后台已开始下载！"); } + @GetMapping("/test/udplatGoods") /* public UdplatResponse getGoods(){ return udplatDownloadService.getUdplatGoods(1,1000,null,null); }*/ - public ResponseEntity getGoods(){ - return udplatDownloadService.getUdplatGoods(1,100); + public ResponseEntity getGoods() { + return udplatDownloadService.getUdplatGoods(1, 100); } + @GetMapping("/test/getPurchaseOrders") - public ResponseEntity getPurchaseOrders(String orderCode){ + public ResponseEntity getPurchaseOrders(String orderCode) { return udplatDownloadService.getPurchaseOrders(orderCode); } + @GetMapping("/test/getPurchaseOrderDetals") - public ResponseEntity getPurchaseOrderDetals(Long orderId){ + public ResponseEntity getPurchaseOrderDetals(Long orderId) { return udplatDownloadService.getPurchaseOrderDetals(orderId); } + @GetMapping("/test/getDistributeOrderDetails") - public JSONObject getDistributeOrderDetails(Long orderId){ + public JSONObject getDistributeOrderDetails(Long orderId) { return udplatDownloadService.getDistributeOrderDetails(orderId); } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java index 00e6e87..d22f9a2 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java @@ -27,20 +27,29 @@ public class UdidlDeviceController { deviceSyncService.downloadUdi(startDate, endDate); return ResultVOUtils.success("后台已开始下载！"); } + @AuthRuleAnnotation("udidl_udidlDevice_all") @GetMapping("udidl/device/dlByDay") public BaseResponse dlByDay(String day) { logger.info(day + "---按天开启下载"); - deviceSyncService.downloadUdi(day,"manual"); + deviceSyncService.downloadUdi(day, "manual"); //asyncDownloadTask.downloadByDay(day); return ResultVOUtils.success("后台已开始下载！"); } + @AuthRuleAnnotation("udidl_udidlDevice_all") @PostMapping("udidl/device/dlByDi") public BaseResponse downloadByDi(String deviceId) { return deviceSyncService.downloadByDi(deviceId); } + @AuthRuleAnnotation("udidl_udidlDevice_all") + @GetMapping("udidl/device/serchDlByDi") + public BaseResponse serchDlByDi(String deviceId) { + return deviceSyncService.searchDlByDi(deviceId); + } + + /** * 获取产品标识详情 * @@ -52,6 +61,7 @@ public class UdidlDeviceController { public BaseResponse downloadSingle(String deviceId) { return deviceSyncService.downloadSingle(deviceId); } + @AuthRuleAnnotation("udidl_udidlDevice_all") @PostMapping("udidl/device/downloadHistory") public BaseResponse downloadHistory(String key) { diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoDao.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoDao.java index dd4506c..8a55716 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoDao.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoDao.java @@ -2,6 +2,7 @@ package com.glxp.udidl.admin.dao.udi; import com.glxp.udidl.admin.dto.device.ProductDetailModel; import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; +import com.glxp.udidl.admin.entity.udid.Device; import com.glxp.udidl.admin.req.ListPageRequest; import com.glxp.udidl.admin.req.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; @@ -21,7 +22,9 @@ public interface ProductInfoDao { List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); - List selectByUpdateTime(@Param("startDate") String startDate,@Param("endDate") String endDate);//按更新时间查询 + + List selectByUpdateTime(@Param("startDate") String startDate, @Param("endDate") String endDate);//按更新时间查询 + boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean deleteById(@Param("id") String id); @@ -45,5 +48,9 @@ public interface ProductInfoDao { List selectAllByUuid(@Param("ids") List ids); List findAllTyshxyh(); + List selectByDeviceRecordKey(String key); + + boolean updateCplx(ProductInfoEntity productInfoEntity); + } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.java index 0eb52bf..5f05e4c 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.java @@ -26,6 +26,10 @@ public interface UdiCompanyDao { boolean deleteAll(@Param("ids") List ids); boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); + List searchByName(String name);//公司名称搜索 + List syncDlCompany(UdiCompanyRequest udiCompanyRequest); + + } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java index c8b5779..8279525 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java @@ -60,4 +60,6 @@ public interface DeviceMapper { List findAllByZxxscpbs(); List findAllByZxxscpbsPage(ListPageRequest listPageRequest); + + boolean updateCplx(Device device); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java index 99be970..df9a4ee 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java @@ -52,6 +52,10 @@ public class ProductInfoEntity { private String expireDate; private Boolean isNewest; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + + + private String hchzsb; + private String cplx; } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java index f418b68..fb17c12 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java @@ -99,6 +99,25 @@ public class Device { private String lastModifyTime; private Date requestDate; + private String hchzsb; + private String cplx; + + public String getHchzsb() { + return hchzsb; + } + + public void setHchzsb(String hchzsb) { + this.hchzsb = hchzsb; + } + + public String getCplx() { + return cplx; + } + + public void setCplx(String cplx) { + this.cplx = cplx; + } + public Date getRequestDate() { return requestDate; } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/DeviceEntity.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/DeviceEntity.java index 3d3e88f..a99e4f9 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/DeviceEntity.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udid/DeviceEntity.java @@ -146,10 +146,13 @@ public class DeviceEntity { private String bssjzt; private boolean check; + + private String hchzsb; + private String cplx; private List contactlistList; private List deviceclinicals; private List devicepackages; private List devicestorages; - private List deviceHistories; + private List deviceHistories; } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java b/api-admin/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java index c459bdf..b1c8e58 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/req/UdiCompanyRequest.java @@ -10,5 +10,6 @@ public class UdiCompanyRequest extends ListPageRequest { private String provinceCode; private String cityCode; private String areaCode; + private String updateTime; } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetBean.java b/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetBean.java index 23ed3a0..003f1fe 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetBean.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetBean.java @@ -92,6 +92,8 @@ public class DataSetBean { private String ylqxzcrbarywmc; private String zxxsdyzsydydsl; private String tsrq; + private String hchzsb; + private String cplx; private String bszt; private String sfyzcbayz; @@ -102,6 +104,23 @@ public class DataSetBean { private List deviceStorage; private List contactList; + + public String getHchzsb() { + return hchzsb; + } + + public void setHchzsb(String hchzsb) { + this.hchzsb = hchzsb; + } + + public String getCplx() { + return cplx; + } + + public void setCplx(String cplx) { + this.cplx = cplx; + } + public String getDeviceHistoryRecordKey() { return deviceHistoryRecordKey; } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetResult.java b/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetResult.java index 7ea2f1e..96f7525 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetResult.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/res/udid/DataSetResult.java @@ -12,18 +12,20 @@ public class DataSetResult { private int totalPageCount; //总页数 private int totalRecordCount; //总记录数量 private DataSet dataSet; + @Data - public static class DataSet{ + public static class DataSet { private List deviceInfo; private List clinicalInfo; private List storageInfo; private List packingInfo; } + /** * 设备信息 */ @Data - public static class DeviceInfo{ + public static class DeviceInfo { private String deviceHistoryKey; private String deviceRecordKey; private int versionNumber; @@ -73,25 +75,28 @@ public class DataSetResult { private String bssjzt; //"标识数据状态 //文档有，接口返回无该字段 private String cplx; //"产品类型：1 器械，2 体外诊断试剂 - private String HCHZSB; //耗材或者设备:0 耗材， 1 设备 + private String hchzsb; //耗材或者设备:0 耗材， 1 设备 private List contactList; } + @Data - public static class ContactInfo{ + public static class ContactInfo { private String qylxryx; //企业联系人邮箱 1 private String qylxrdh; //企业联系人电话 private String qylxrcz; //企业联系人传真 } + @Data - public static class ClinicalInfo{ + public static class ClinicalInfo { private String deviceHistoryKey;//历史key private String deviceRecordKey; // 数据库记录 key private String lcsycclx; //尺寸类型 private String ccz; //尺寸值 private String ccdw; //计量单位 } + @Data - public static class StorageInfo{ + public static class StorageInfo { private String deviceHistoryKey;//历史key private String deviceRecordKey; // 数据库记录 key private String cchcztj; // 储存或操作条件 @@ -99,8 +104,9 @@ public class DataSetResult { private String zgz; //最高值 private String jldw; //计量单位 } + @Data - public static class PackingInfo{ + public static class PackingInfo { private String deviceHistoryKey;//历史key private String deviceRecordKey; // 数据库记录 key private String bzcpbs; //包装产品标识 diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceDownloadService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceDownloadService.java index b6e1987..12c9e9a 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceDownloadService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceDownloadService.java @@ -4,6 +4,8 @@ package com.glxp.udidl.admin.service.DataSync; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.glxp.udidl.admin.entity.info.CompanyEntity; +import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; +import com.glxp.udidl.admin.entity.udid.Device; import com.glxp.udidl.admin.entity.udid.JobLog; import com.glxp.udidl.admin.entity.udid.TokenEntity; import com.glxp.udidl.admin.req.udid.DeviceRequest; @@ -15,6 +17,8 @@ import com.glxp.udidl.admin.res.udid.DataSetResult; import com.glxp.udidl.admin.res.udid.DataSetSingleResult; import com.glxp.udidl.admin.res.udid.DataSetTotalResult; import com.glxp.udidl.admin.service.info.CompanyService; +import com.glxp.udidl.admin.service.inout.DeviceService; +import com.glxp.udidl.admin.service.inout.ProductInfoService; import com.glxp.udidl.admin.service.udi.JobLogService; import com.glxp.udidl.admin.service.udi.UdiCompanyService; import com.glxp.udidl.admin.util.DateUtil; @@ -49,6 +53,10 @@ public class DeviceDownloadService { JobLogService jobLogService; //日志 @Autowired DeviceSaveService deviceSaveService; + @Autowired + private DeviceService deviceService; + @Autowired + private ProductInfoService productInfoService; /*public DeviceDownloadService() { companyEntity = companyService.findCompany(); @@ -145,9 +153,9 @@ public class DeviceDownloadService { int page = 1; //int totalPage = 1; int totalRecordCount = 0; - boolean hasData=true;//是否还有数据，如无退出 + boolean hasData = true;//是否还有数据，如无退出 List dataSets = new ArrayList(); - while (hasData == true){ + while (hasData == true) { DataSetResult dataSetResult = getData(rangeValue, requestType, page); if (dataSetResult.getReturnCode() != 1 && reCount == 0) { token = ""; @@ -161,11 +169,10 @@ public class DeviceDownloadService { results.setMsg(msg); return results;//发生错误 退出 } else { - if (dataSetResult.getDataSet().getDeviceInfo() != null && dataSetResult.getDataSet().getDeviceInfo().size() > 0) - { + if (dataSetResult.getDataSet().getDeviceInfo() != null && dataSetResult.getDataSet().getDeviceInfo().size() > 0) { dataSets.add(dataSetResult.getDataSet()); totalRecordCount = dataSetResult.getTotalRecordCount(); - }else { //获取不到数据，退出循环 + } else { //获取不到数据，退出循环 hasData = false; break; } @@ -250,8 +257,8 @@ public class DeviceDownloadService { List data = result.getData(); data.addAll(res.getData()); result.setData(data); - System.out.println("历史记录："+res.getTotalRecordCount()+","+ res.realRecordCount()); - System.out.println("总记录："+result.getTotalRecordCount()+","+ result.realRecordCount()); + System.out.println("历史记录：" + res.getTotalRecordCount() + "," + res.realRecordCount()); + System.out.println("总记录：" + result.getTotalRecordCount() + "," + result.realRecordCount()); } } else { JobLog jobLog = new JobLog(); @@ -282,8 +289,8 @@ public class DeviceDownloadService { if (res.getCode() != 1) return res; if (res.getData() != null && res.getData().size() > 0) { - if( res.getTotalRecordCount() != res.realRecordCount()) - System.out.println("行数不一致："+res.getTotalRecordCount() +","+res.realRecordCount()); + if (res.getTotalRecordCount() != res.realRecordCount()) + System.out.println("行数不一致：" + res.getTotalRecordCount() + "," + res.realRecordCount()); result.setTotalRecordCount(result.getTotalRecordCount() + res.getTotalRecordCount()); List dataList = result.getData(); dataList.addAll(res.getData()); @@ -317,7 +324,7 @@ public class DeviceDownloadService { deviceHistoryRequest.setDataSet(dataSetBeans); List dataSets = new ArrayList(); boolean hasData = true; - while (hasData ==true){ + while (hasData == true) { deviceHistoryRequest.setCurrentPageNumber(page + ""); String response = ""; try { @@ -350,11 +357,10 @@ public class DeviceDownloadService { dataSets.add(dataSetResult.getDataList()); totalRecordCount = totalRecordCount+dataSetResult.getTotalRecordCount(); }else*/ - if (dataSetResult.getDataSet().getDeviceInfo() != null && dataSetResult.getDataSet().getDeviceInfo().size() > 0){ + if (dataSetResult.getDataSet().getDeviceInfo() != null && dataSetResult.getDataSet().getDeviceInfo().size() > 0) { dataSets.add(dataSetResult.getDataSet()); - totalRecordCount = totalRecordCount+dataSetResult.getTotalRecordCount(); - }else - { + totalRecordCount = totalRecordCount + dataSetResult.getTotalRecordCount(); + } else { hasData = false; break; } @@ -485,7 +491,7 @@ public class DeviceDownloadService { //存储数据 List dataSets = new ArrayList<>(); dataSets.add(dataSetResult.getDataSet()); - deviceSaveService.DeviceSave(dataSets,null); + deviceSaveService.DeviceSave(dataSets, null); } totalPage = dataSetResult.getTotalPageCount(); totalRecordCount = dataSetResult.getTotalRecordCount(); @@ -511,4 +517,71 @@ public class DeviceDownloadService { return ResultVOUtils.success(); } + + + //按月份下载 边下载边保存 + public BaseResponse downloadByMonthTest(String month, int page) { + try { + int totalPage = page; + int totalRecordCount = 0; + while (page <= totalPage) { + DataSetResult dataSetResult = getData(month, 2, page); + if (dataSetResult.getReturnCode() != 1) { + String msg = "下载到第" + page + "页发生错误"; + //发生错误，存储日志 + JobLog jobLog = new JobLog(); + jobLog.setDownloadType("manual"); + jobLog.setType("error"); + jobLog.setMsg(msg); + jobLog.setContent(dataSetResult.getReturnMsg()); + jobLog.setCreateTime(new Date()); + jobLogService.insert(jobLog); + return ResultVOUtils.error(-1, msg + ",错误信息：" + dataSetResult.getReturnMsg()); + } else if (dataSetResult.getDataSet().getDeviceInfo() != null && dataSetResult.getDataSet().getDeviceInfo().size() > 0) { + //存储数据 + List dataSets = new ArrayList<>(); + dataSets.add(dataSetResult.getDataSet()); + for (DataSetResult.DataSet ds : dataSets) { + for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { + Device device = new Device(); + device.setHchzsb(item.getHchzsb()); + device.setCplx(item.getCplx()); + device.setDevicerecordkey(item.getDeviceRecordKey()); + deviceService.updateCplx(device); + + + ProductInfoEntity productInfoEntity = new ProductInfoEntity(); + productInfoEntity.setHchzsb(item.getHchzsb()); + productInfoEntity.setCplx(item.getCplx()); + productInfoEntity.setDeviceRecordKey(item.getDeviceRecordKey()); + productInfoService.updateCplx(productInfoEntity); + + } + } + } + totalPage = dataSetResult.getTotalPageCount(); + totalRecordCount = dataSetResult.getTotalRecordCount(); + page++; + } + JobLog jobLog = new JobLog(); + jobLog.setType("info"); + jobLog.setDownloadType("manual"); + jobLog.setMsg("月份：" + month + ",执行成功！"); + jobLog.setCreateTime(new Date()); + jobLogService.insert(jobLog); + } catch (Exception e) { + e.printStackTrace(); + JobLog jobLog = new JobLog(); + jobLog.setDownloadType("manual"); + jobLog.setType("error"); + jobLog.setMsg("月份：" + month + ",执行失败:" + e.getMessage()); + jobLog.setContent(JSON.toJSONString(e.getStackTrace())); + jobLog.setCreateTime(new Date()); + jobLogService.insert(jobLog); + return ResultVOUtils.error(-1, jobLog.getMsg()); + } + + return ResultVOUtils.success(); + } + } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.java index 38b86ec..ef1c400 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.java @@ -96,9 +96,9 @@ public class DeviceSaveService { } //5 存储 Devicestorage - if(storageInfoAll != null && storageInfoAll.size()>0){ + if (storageInfoAll != null && storageInfoAll.size() > 0) { List storageInfos; - if(isHistory == true) + if (isHistory == true) storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). collect(Collectors.toList()); else @@ -121,14 +121,14 @@ public class DeviceSaveService { } //6 存储Devicepackage - if(packingInfoAll != null && packingInfoAll.size()>0){ - List packingInfos ; - if(isHistory == true) + if (packingInfoAll != null && packingInfoAll.size() > 0) { + List 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()); + collect(Collectors.toList()); if (packingInfos != null && packingInfos.size() > 0) { List devicepackageList = new ArrayList<>(); for (DataSetResult.PackingInfo packingInfo : packingInfos) { @@ -207,6 +207,8 @@ public class DeviceSaveService { device.setZxxsdyzsydydsl(dataSetBean.getZxxsdyzsydydsl()); device.setBssjzt(dataSetBean.getBssjzt()); device.setLastModifyTime(DateUtil.formatDateTime(new Date())); + device.setCplx(dataSetBean.getCplx()); + device.setHchzsb(dataSetBean.getHchzsb()); return device; } @@ -255,17 +257,18 @@ public class DeviceSaveService { UUID uuid = UUID.randomUUID(); return uuid.toString().replace("-", ""); } - private String getString(String s){ - if(s != null && s!= "") - return s.length()>255 ? s.substring(0,255) : s; + + private String getString(String s) { + if (s != null && s != "") + return s.length() > 255 ? s.substring(0, 255) : s; else return s; } - private Integer getInteger(String s){ - try - { + + private Integer getInteger(String s) { + try { return Integer.parseInt(s); - }catch(Exception e) { - return 0; + } catch (Exception e) { + return 0; } } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java index 7237996..268329b 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java @@ -1,13 +1,18 @@ package com.glxp.udidl.admin.service.DataSync; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; +import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; import com.glxp.udidl.admin.entity.udid.*; +import com.glxp.udidl.admin.req.ProductInfoFilterRequest; import com.glxp.udidl.admin.res.udid.DataSetResult; import com.glxp.udidl.admin.res.udid.DataSetSingleHistoryResult; import com.glxp.udidl.admin.res.udid.DataSetSingleResult; import com.glxp.udidl.admin.res.udid.DataSetTotalResult; +import com.glxp.udidl.admin.service.inout.ProductInfoService; import com.glxp.udidl.admin.service.udi.JobLogService; import com.glxp.udidl.admin.util.DateUtil; +import com.glxp.udidl.admin.util.FilterUdiUtils; import com.glxp.udidl.common.res.BaseResponse; import com.glxp.udidl.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; @@ -16,6 +21,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -29,8 +35,10 @@ public class DeviceSyncService { private DeviceDownloadService deviceDownloadService; @Autowired JobLogService jobLogService; //日志 + @Resource + ProductInfoService productInfoService; - public void downloadAndSave(String day,String downloadType){ + public void downloadAndSave(String day, String downloadType) { //1.下载唯一标识数据 DataSetTotalResult result; String rangeValue = ""; @@ -47,9 +55,9 @@ public class DeviceSyncService { jobLog.setMsg(result.getMsg()); jobLog.setCreateTime(new Date()); jobLogService.insert(jobLog); - return ; + return; } - int insertCount = deviceSaveService.DeviceSave(result.getData(),DateUtil.parseDate(rangeValue)); + int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue)); //2.下载历史记录 List keyList = new ArrayList(); for (DataSetResult.DataSet ds : result.getData()) { @@ -69,8 +77,8 @@ public class DeviceSyncService { List data = result.getData(); data.addAll(res.getData()); result.setData(data); - int hisInsertCount = deviceSaveService.DeviceSave(res.getData(),null); - insertCount = insertCount+hisInsertCount; + int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null); + insertCount = insertCount + hisInsertCount; } } else { JobLog jobLog = new JobLog(); @@ -90,7 +98,7 @@ public class DeviceSyncService { jobLog.setTotalCount(result.getTotalRecordCount()); jobLog.setRealCount(result.realRecordCount()); jobLog.setInsertCount(insertCount); - if(result.realRecordCount() != result.getTotalRecordCount()) { + if (result.realRecordCount() != result.getTotalRecordCount()) { jobLog.setType("warning"); jobLog.setMsg("接口总行数和实际行数不一致"); jobLog.setCreateTime(new Date()); @@ -101,8 +109,10 @@ public class DeviceSyncService { } jobLogService.insert(jobLog); } + /** * 下载1天数据，并保存 + * * @param day */ /* private void downloadUdi2(String day,String downloadType) { @@ -129,12 +139,11 @@ public class DeviceSyncService { } }*/ @Async - public void downloadUdi(String day,String downloadType){ - try - { - downloadAndSave(day,downloadType); + public void downloadUdi(String day, String downloadType) { + try { + downloadAndSave(day, downloadType); //downloadUdi2(day,downloadType); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); JobLog jobLog = new JobLog(); jobLog.setDownloadType(downloadType); @@ -149,114 +158,149 @@ public class DeviceSyncService { /** * 手动下载 + * * @param startDate * @param endDate * @return */ @Async - public BaseResponse downloadUdi(Date startDate, Date endDate){ - if(startDate.getTime() > endDate.getTime()) - return ResultVOUtils.error(-1,"起始日期不能大于结束日期!"); - Date fdate=startDate; - while (fdate.getTime()<=endDate.getTime()){ - String day=DateUtil.formatDate(fdate); - downloadUdi(day,"manual"); - fdate = DateUtil.addDays(fdate,1); - } - /*for (int i=0;fdate.getTime()<=endDate.getTime();i++){ - String day=DateUtil.formatDate(fdate); - downloadUdi(day,"manual"); - //System.out.println(fdate); - i++; - fdate = DateUtil.addDays(fdate,1); - }*/ + public BaseResponse downloadUdi(Date startDate, Date endDate) { + if (startDate.getTime() > endDate.getTime()) + return ResultVOUtils.error(-1, "起始日期不能大于结束日期!"); + Date fdate = startDate; + while (fdate.getTime() <= endDate.getTime()) { + String day = DateUtil.formatDate(fdate); + downloadUdi(day, "manual"); + fdate = DateUtil.addDays(fdate, 1); + } return ResultVOUtils.success("执行完成，详情请查看日志！"); } - public BaseResponse downloadByDi(String deviceId){ + + + public BaseResponse searchDlByDi(String deviceId) { + ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); + productInfoFilterRequest.setNameCode(deviceId); + List productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + if (CollUtil.isEmpty(productInfoEntityList)) { + DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); + if (result1.getReturnCode() != 1) + return ResultVOUtils.error(-1, result1.getReturnMsg()); + List dataSets = new ArrayList<>(); + dataSets.add(result1.getDataSet()); + deviceSaveService.DeviceSave(dataSets, new Date()); + productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + } + return ResultVOUtils.success(productInfoEntityList); + } + + public void dlHistory(DataSetSingleResult result1) { + + DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); + result.setDataSet(result1.getDataSet()); + if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { + List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); + if (keyList.size() > 0) { + DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); + result.setDataList(result2.getData()); + } + } + } + + + public BaseResponse downloadByDi(String deviceId) { DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); - if(result1.getReturnCode() != 1) - return ResultVOUtils.error(-1,result1.getReturnMsg()); + if (result1.getReturnCode() != 1) + return ResultVOUtils.error(-1, result1.getReturnMsg()); DataSetSingleHistoryResult result = new DataSetSingleHistoryResult(); result.setDataSet(result1.getDataSet()); - if(result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size()>0){ + if (result1.getDataSet().getDeviceInfo() != null && result1.getDataSet().getDeviceInfo().size() > 0) { List keyList = deviceDownloadService.getKeyList(result1.getDataSet()); - if(keyList.size()>0){ - DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); + if (keyList.size() > 0) { + DataSetTotalResult result2 = deviceDownloadService.getHistoryData(keyList); result.setDataList(result2.getData()); } } + List dataSets = new ArrayList<>(); + dataSets.add(result1.getDataSet()); + deviceSaveService.DeviceSave(dataSets, new Date()); return ResultVOUtils.success(result); } - public BaseResponse downloadSingle(String deviceId){ + + public BaseResponse downloadSingle(String deviceId) { DataSetSingleResult res = deviceDownloadService.downloadByDi(deviceId); - if(res.getReturnCode() != 1) - return ResultVOUtils.error(-1,res.getReturnMsg()); - return ResultVOUtils.success(Convert(res.getDataSet())); + if (res.getReturnCode() != 1) + return ResultVOUtils.error(-1, res.getReturnMsg()); + List dataSets = new ArrayList<>(); + dataSets.add(res.getDataSet()); + deviceSaveService.DeviceSave(dataSets, new Date()); + return ResultVOUtils.success(Convert(res.getDataSet())); } /** * 下载单个历史记录，并转换格式 + * * @param key * @return */ - public BaseResponse downloadHistory(String key){ + public BaseResponse downloadHistory(String key) { List keyList = new ArrayList<>(); keyList.add(key); DataSetTotalResult res = deviceDownloadService.getHistoryData(keyList); - if(res.getCode() != 1) - return ResultVOUtils.error(-1,res.getMsg()); + if (res.getCode() != 1) + return ResultVOUtils.error(-1, res.getMsg()); List result = new ArrayList<>(); - for(DataSetResult.DataSet ds: res.getData()) + for (DataSetResult.DataSet ds : res.getData()) result.addAll(Convert(ds)); return ResultVOUtils.success(result); } /** * 格式转换 + * * @param dataSet * @return */ - private List Convert(DataSetResult.DataSet dataSet){ + private List Convert(DataSetResult.DataSet dataSet) { List result = new ArrayList<>(); List deviceInfoList = dataSet.getDeviceInfo(); List clinicalInfos = dataSet.getClinicalInfo(); List storageInfos = dataSet.getStorageInfo(); List packingInfos = dataSet.getPackingInfo(); - if (deviceInfoList != null && deviceInfoList.size()>0){ - for(DataSetResult.DeviceInfo ds: deviceInfoList){ + if (deviceInfoList != null && deviceInfoList.size() > 0) { + for (DataSetResult.DeviceInfo ds : deviceInfoList) { DeviceEntity deviceEntity = new DeviceEntity(); BeanUtils.copyProperties(ds, deviceEntity); deviceEntity.setDevicerecordkey(ds.getDeviceRecordKey()); - deviceEntity.setVersionnumber(ds.getVersionNumber()+""); + deviceEntity.setVersionnumber(ds.getVersionNumber() + ""); deviceEntity.setVersionstatus(ds.getVersionStatus()); deviceEntity.setVersiontime(ds.getVersionTime()); deviceEntity.setContactlistList(convertList2List(ds.getContactList(), Contactlist.class)); - if(clinicalInfos != null && clinicalInfos.size()>0){ - List clinicalInfos1 = clinicalInfos.stream().filter(p->p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). + if (clinicalInfos != null && clinicalInfos.size() > 0) { + List clinicalInfos1 = clinicalInfos.stream().filter(p -> p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). collect(Collectors.toList()); - if(clinicalInfos1 != null && clinicalInfos1.size()>0){ + if (clinicalInfos1 != null && clinicalInfos1.size() > 0) { deviceEntity.setDeviceclinicals(convertList2List(clinicalInfos1, Deviceclinical.class)); - deviceEntity.getDeviceclinicals().forEach(p->p.setDevicerecordkey(ds.getDeviceRecordKey())); + deviceEntity.getDeviceclinicals().forEach(p -> p.setDevicerecordkey(ds.getDeviceRecordKey())); } } - if(storageInfos != null && storageInfos.size()>0){ - List storageInfos1 = storageInfos.stream().filter(p->p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). + if (storageInfos != null && storageInfos.size() > 0) { + List storageInfos1 = storageInfos.stream().filter(p -> p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). collect(Collectors.toList()); - if(storageInfos1 != null && storageInfos1.size()>0){ + if (storageInfos1 != null && storageInfos1.size() > 0) { deviceEntity.setDevicestorages(convertList2List(storageInfos1, Devicestorage.class)); - deviceEntity.getDevicestorages().forEach(p->p.setDevicerecordkey(ds.getDeviceRecordKey())); + deviceEntity.getDevicestorages().forEach(p -> p.setDevicerecordkey(ds.getDeviceRecordKey())); } } - if(packingInfos != null && packingInfos.size()>0){ - List packingInfos1 = packingInfos.stream().filter(p->p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). + if (packingInfos != null && packingInfos.size() > 0) { + List packingInfos1 = packingInfos.stream().filter(p -> p.getDeviceRecordKey().equals(ds.getDeviceRecordKey())). collect(Collectors.toList()); - if(packingInfos1 != null && packingInfos1.size()>0){ + if (packingInfos1 != null && packingInfos1.size() > 0) { deviceEntity.setDevicepackages(convertList2List(packingInfos1, Devicepackage.class)); - deviceEntity.getDevicepackages().forEach(p->p.setDevicerecordkey(ds.getDeviceRecordKey())); + deviceEntity.getDevicepackages().forEach(p -> p.setDevicerecordkey(ds.getDeviceRecordKey())); } } @@ -266,25 +310,28 @@ public class DeviceSyncService { } return result; } - private List convertList2List(List input,Class clzz){ + + private List convertList2List(List input, Class clzz) { List output = new ArrayList<>(); - if(!CollectionUtils.isEmpty(input)){ - for(E source:input){ + if (!CollectionUtils.isEmpty(input)) { + for (E source : input) { T target = BeanUtils.instantiate(clzz); - BeanUtils.copyProperties(source,target); + BeanUtils.copyProperties(source, target); output.add(target); } } - return output; + return output; } + /** * 下载从今天开始前几天的数据并保存 自动下载 + * * @param days */ public void downloadUdi(int days) { for (int i = 1; i <= days; i++) { String day = DateUtil.getLastDay(-i); - downloadUdi(day,"auto"); + downloadUdi(day, "auto"); } } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java index 5e2466d..4e7cb86 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java @@ -42,4 +42,6 @@ public interface DeviceService { List findAllByZxxscpbs(); List findAllByZxxscpbsPage(ListPageRequest listPageRequest); + + boolean updateCplx(Device device); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/ProductInfoService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/ProductInfoService.java index cd6a5f8..8c6d194 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/ProductInfoService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/ProductInfoService.java @@ -29,7 +29,9 @@ public interface ProductInfoService { List syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest); List findAll(ProductInfoFilterRequest productInfoFilterRequest); - List selectByUpdateTime(String startDate,String endDate);//按更新时间查询 + + List selectByUpdateTime(String startDate, String endDate);//按更新时间查询 + boolean insertProductInfo(ProductInfoEntity productInfoEntity); boolean updateProductByUuid(ProductInfoEntity productInfoEntity); @@ -40,5 +42,7 @@ public interface ProductInfoService { boolean updateProductInfo(ProductInfoEntity productInfoEntity); + boolean updateCplx(ProductInfoEntity productInfoEntity); + } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java index 3da8bf5..d25ce51 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java @@ -205,6 +205,11 @@ public class DeviceServiceImpl implements DeviceService { return deviceMapper.findAllByZxxscpbsPage(listPageRequest); } + @Override + public boolean updateCplx(Device device) { + return deviceMapper.updateCplx(device); + } + @Override public boolean insertDevice(Device device) { deviceMapper.insert(device); diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java index feb44af..77b3453 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java @@ -116,9 +116,11 @@ public class ProductInfoServiceImpl implements ProductInfoService { List data = productInfoDao.filterProductInfo(productInfoFilterRequest); return data; } - public List selectByUpdateTime(String startDate,String endDate){ - return productInfoDao.selectByUpdateTime(startDate,endDate); + + public List selectByUpdateTime(String startDate, String endDate) { + return productInfoDao.selectByUpdateTime(startDate, endDate); } + @Override public boolean insertProductInfo(ProductInfoEntity productInfoEntity) { return productInfoDao.insertProductInfo(productInfoEntity); @@ -134,6 +136,11 @@ public class ProductInfoServiceImpl implements ProductInfoService { return productInfoDao.updateProductInfo(productInfoEntity); } + @Override + public boolean updateCplx(ProductInfoEntity productInfoEntity) { + return productInfoDao.updateCplx(productInfoEntity); + } + @Override public boolean deleteById(String id) { return productInfoDao.deleteById(id); diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/UdiCompanyService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/UdiCompanyService.java index ba44774..6a5f0a7 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/UdiCompanyService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/UdiCompanyService.java @@ -24,5 +24,8 @@ public interface UdiCompanyService { boolean deleteAll(List ids); boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); + BaseResponse searchByName(String name);//公司名称搜索 + + List syncDlCompany(UdiCompanyRequest udiCompanyRequest); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.java index 27355c9..b703684 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.java @@ -62,8 +62,17 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) { return udiCompanyDao.updateUdiCompany(udiCompanyEntity); } - public BaseResponse searchByName(String name){ + + public BaseResponse searchByName(String name) { List result = udiCompanyDao.searchByName(name); return ResultVOUtils.success(result); } + + @Override + public List syncDlCompany(UdiCompanyRequest udiCompanyRequest) { + int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit() + 1; + udiCompanyRequest.setPage(offset); + return udiCompanyDao.syncDlCompany(udiCompanyRequest); + + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/thread/AsyncDownloadTask.java b/api-admin/src/main/java/com/glxp/udidl/admin/thread/AsyncDownloadTask.java index b91567f..05a5da0 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/thread/AsyncDownloadTask.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/thread/AsyncDownloadTask.java @@ -42,9 +42,9 @@ public class AsyncDownloadTask { @Async public void downloadByDi(String primaryDeviceId) { DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService,udiCompanyService); - TokenEntity token = downloadDeviceHelper.getToken(); + String token = deviceDownloadService.getToken(); DownloadDiRequest downloadDiRequest = new DownloadDiRequest(); - downloadDiRequest.setAccessToken(token.getAccessToken()); + downloadDiRequest.setAccessToken(token); downloadDiRequest.setPrimaryDeviceId(primaryDeviceId); downloadDeviceHelper.downloadBydi(downloadDiRequest, deviceService,productInfoService); } @@ -73,6 +73,29 @@ public class AsyncDownloadTask { } + @Async + public void downloadByMonthTest(String month,int page) { + deviceDownloadService.downloadByMonthTest(month,page); + + /*int curpage = page; + DownloadDeviceHelper downloadDeviceHelper = new DownloadDeviceHelper(companyService,udiCompanyService); + TokenEntity token = downloadDeviceHelper.getToken(); + while (true) { + DeviceRequest deviceRequest = new DeviceRequest(); + deviceRequest.setAccessToken(token.getAccessToken()); + deviceRequest.setRequestType("2"); + deviceRequest.setRangeValue(month); + deviceRequest.setCurrentPageNumber(curpage + ""); + int result = downloadDeviceHelper.downloadDevices(productInfoService, deviceService, deviceRequest); + if (result == -1) { + return;// ResultVOUtils.error(505, "下载出错"); + } + curpage++; + }*/ + } + + + //按天下载UDI , 手动下载 @Async public void downloadByDay(String day) { diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiCompanyTask.java b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiCompanyTask.java index 37e4e12..e32241b 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiCompanyTask.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiCompanyTask.java @@ -12,6 +12,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @Service @@ -39,6 +40,7 @@ public class UdiCompanyTask { udiCompanyEntity.setQylxrcz(contactlist.getQylxrcz()); udiCompanyEntity.setQylxrdh(contactlist.getQylxrdh()); udiCompanyEntity.setQylxryx(contactlist.getQylxryx()); + udiCompanyEntity.setUpdateTime(new Date()); } } udiCompanyService.insertUdiCompany(udiCompanyEntity); diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java index 1f48e6e..a1465fe 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java @@ -49,6 +49,8 @@ public class UdiTransferUtils { productInfoEntity.setCphhhbh(deviceEntity.getCphhhbh()); productInfoEntity.setCpms(deviceEntity.getCpms()); productInfoEntity.setCpbsbmtxmc(deviceEntity.getCpbsbmtxmc()); + productInfoEntity.setCplx(deviceEntity.getCplx()); + productInfoEntity.setHchzsb(deviceEntity.getHchzsb()); productInfoEntity.setVersionNumber(Integer.parseInt(deviceEntity.getVersionnumber())); if (deviceEntity.getSydycpbs() != null && !deviceEntity.getSydycpbs().equals("")) { @@ -191,6 +193,7 @@ public class UdiTransferUtils { if (udiCompanyEntitys == null || udiCompanyEntitys.size() == 0) { UdiCompanyEntity udiCompanyEntity = new UdiCompanyEntity(); udiCompanyEntity.setTyshxydm(productInfoEntity.getTyshxydm()); + udiCompanyEntity.setUpdateTime(new Date()); udiCompanyEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc()); udiCompanyEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc()); List contactlists = udiCompanyService.selectContactBykey(productInfoEntity.getDeviceRecordKey()); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 34f85ce..de35311 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,10 +1,10 @@ # 本地环境 server.port=9994 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udidl?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -#spring.datasource.password=mysql@2020 -spring.datasource.password=123456 +spring.datasource.password=mysql@2020 +#spring.datasource.password=123456 server.servlet.context-path= logging.level.com.glxp.udidl.admin.dao=debug # 跨域设置 diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml index 3952e0f..c031b06 100644 --- a/api-admin/src/main/resources/logback-spring.xml +++ b/api-admin/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ logback - +