From f8b557ee7e7cc7349da63f896d65384405e0fd10 Mon Sep 17 00:00:00 2001 From: hongtianzai Date: Fri, 21 Jan 2022 09:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E5=85=89=E9=87=87=E8=B4=AD=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=9F=BA=E7=A1=80=E5=BA=93=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/TestController.java | 10 ++- .../udplat/UdplatDistributorController.java | 35 +++++++++ .../udplat/UdplatGoodsController.java | 11 +++ .../udplat/UdplatGoodsMatchController.java | 24 ++++++ .../udplat/UdplatHospitalController.java | 32 ++++++++ .../udplat/UdplatLogController.java | 24 ++++++ .../udplat/UdplatManufactureController.java | 32 ++++++++ .../dao/udplat/UdplatDistributorMapper.java | 24 ++++++ .../admin/dao/udplat/UdplatGoodsMapper.java | 2 + .../dao/udplat/UdplatGoodsMatchMapper.java | 20 +++++ .../dao/udplat/UdplatHospitalMapper.java | 22 ++++++ .../admin/dao/udplat/UdplatLogMapper.java | 22 ++++++ .../dao/udplat/UdplatManufactureMapper.java | 22 ++++++ .../udidl/admin/dto/udplat/BaseParam.java | 12 +++ .../dto/udplat/UdplatDistributorModel.java | 21 +++++ .../dto/udplat/UdplatGoodsMatchModel.java | 21 +++++ .../admin/dto/udplat/UdplatHospitalModel.java | 34 ++++++++ .../dto/udplat/UdplatManufactureModel.java | 21 +++++ .../entity/udplat/UdplatDistributor.java | 50 ++++++++++++ .../admin/entity/udplat/UdplatGoods.java | 3 + .../admin/entity/udplat/UdplatGoodsMatch.java | 49 ++++++++++++ .../admin/entity/udplat/UdplatHospital.java | 59 ++++++++++++++ .../udidl/admin/entity/udplat/UdplatLog.java | 64 +++++++++++++++ .../entity/udplat/UdplatManufacture.java | 49 ++++++++++++ .../service/DataSync/DeviceSaveService.java | 11 ++- .../DataSync/UdplatDownloadService.java | 68 ++++++++++++++++ .../udplat/UdplatDistributorService.java | 19 +++++ .../udplat/UdplatGoodsMatchService.java | 8 ++ .../service/udplat/UdplatGoodsService.java | 2 + .../service/udplat/UdplatHospitalService.java | 12 +++ .../service/udplat/UdplatLogService.java | 10 +++ .../udplat/UdplatManufactureService.java | 12 +++ .../impl/UdplatDistributorServiceImpl.java | 70 +++++++++++++++++ .../impl/UdplatGoodsMatchServiceImpl.java | 37 +++++++++ .../udplat/impl/UdplatGoodsServiceImpl.java | 42 +++++++++- .../impl/UdplatHospitalServiceImpl.java | 74 ++++++++++++++++++ .../udplat/impl/UdplatLogServiceImpl.java | 39 +++++++++ .../impl/UdplatManufactureServiceImpl.java | 70 +++++++++++++++++ .../main/resources/application-dev.properties | 1 + .../mapper/udplat/UdplatDistributorMapper.xml | 62 +++++++++++++++ .../mapper/udplat/UdplatGoodsMapper.xml | 21 +++++ .../mapper/udplat/UdplatGoodsMatchMapper.xml | 50 ++++++++++++ .../mapper/udplat/UdplatHospitalMapper.xml | 72 +++++++++++++++++ .../mybatis/mapper/udplat/UdplatLogMapper.xml | 68 ++++++++++++++++ .../mapper/udplat/UdplatManufactureMapper.xml | 64 +++++++++++++++ .../target/classes/application-dev.properties | 1 + .../controller/device/TestController.class | Bin 5232 -> 5562 bytes .../service/DataSync/DeviceSaveService.class | Bin 15506 -> 15558 bytes 48 files changed, 1468 insertions(+), 8 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatDistributorController.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsMatchController.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatHospitalController.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatLogController.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatManufactureController.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatDistributorMapper.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMatchMapper.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatHospitalMapper.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatLogMapper.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatManufactureMapper.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/BaseParam.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatDistributorModel.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchModel.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatHospitalModel.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatManufactureModel.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatDistributor.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoodsMatch.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatHospital.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatLog.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatManufacture.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/UdplatDownloadService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatDistributorService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsMatchService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatHospitalService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatLogService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatManufactureService.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatDistributorServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsMatchServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatHospitalServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatLogServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatManufactureServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/udplat/UdplatHospitalMapper.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/udplat/UdplatLogMapper.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/udplat/UdplatManufactureMapper.xml 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 745d285..6c2d66b 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 @@ -4,6 +4,7 @@ import com.glxp.udidl.admin.dao.udi.ProductInfoDao; import com.glxp.udidl.admin.entity.udid.Device; import com.glxp.udidl.admin.req.ListPageRequest; import com.glxp.udidl.admin.service.DataSync.DeviceSyncService; +import com.glxp.udidl.admin.service.DataSync.UdplatDownloadService; import com.glxp.udidl.admin.service.inout.DeviceService; import com.glxp.udidl.admin.service.inout.ProductInfoService; import com.glxp.udidl.admin.service.udi.UdiCompanyService; @@ -41,7 +42,8 @@ public class TestController { //DownloadProductInfoTask downloadTask3; @Autowired DeviceSyncService deviceSyncService; - + @Autowired + UdplatDownloadService udplatDownloadService; @GetMapping("udidl/device/transfer") public void transfer() { List keys = deviceService.findAllByZxxscpbs(); @@ -95,8 +97,10 @@ public class TestController { logger.info(month + "---按月开启下载"); asyncDownloadTask.downloadByMonth(month, page); } - - + @GetMapping("/test/getDistributor") + public String udplatTest(){ + return udplatDownloadService.getDistributor(); + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatDistributorController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatDistributorController.java new file mode 100644 index 0000000..ba8df2a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatDistributorController.java @@ -0,0 +1,35 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatDistributorModel; +import com.glxp.udidl.admin.service.udplat.UdplatDistributorService; +import com.glxp.udidl.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 配送企业 + */ +@RestController +@RequestMapping("/udplat/distributor") +public class UdplatDistributorController { + @Autowired + private UdplatDistributorService udplatDistributorService; + + @AuthRuleAnnotation("udidl_udplatDistributor_all") + @PostMapping("/list") + public BaseResponse getList(@RequestBody BaseParam param){ + return udplatDistributorService.getList(param); + } + @AuthRuleAnnotation("udidl_udplatDistributor_all") + @PostMapping("/import") + public BaseResponse imports(@RequestBody List models){ + return udplatDistributorService.imports(models); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsController.java index 02c6876..3d2c5cf 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsController.java @@ -1,21 +1,32 @@ package com.glxp.udidl.admin.controller.udplat; import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.admin.service.udplat.UdplatGoodsService; import com.glxp.udidl.common.res.BaseResponse; import com.glxp.udidl.common.util.ResultVOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +/** + *目录清单 + */ @RestController @RequestMapping("udplat/goods") public class UdplatGoodsController { @Autowired private UdplatGoodsService udplatGoodsService; + @AuthRuleAnnotation("udidl_udplatGoods_all") + @PostMapping("/list") + public BaseResponse getList(@RequestBody BaseParam param) + { + return udplatGoodsService.getList(param); + } @AuthRuleAnnotation("udidl_udplatGoods_all") @PostMapping("/inport") public BaseResponse importExcel(MultipartFile file,int type){ diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsMatchController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsMatchController.java new file mode 100644 index 0000000..ef00a0f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatGoodsMatchController.java @@ -0,0 +1,24 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel; +import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService; +import com.glxp.udidl.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/udplat/goodsMatch") +public class UdplatGoodsMatchController { + @Autowired + private UdplatGoodsMatchService udplatGoodsMatchService; + + @AuthRuleAnnotation("udidl_udplatGoodsMatch_all") + @PostMapping("/save") + public BaseResponse Save(@RequestBody UdplatGoodsMatchModel model){ + return udplatGoodsMatchService.Save(model); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatHospitalController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatHospitalController.java new file mode 100644 index 0000000..4fe7a94 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatHospitalController.java @@ -0,0 +1,32 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatHospitalModel; +import com.glxp.udidl.admin.service.udplat.UdplatHospitalService; +import com.glxp.udidl.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/udplat/hospital") +public class UdplatHospitalController { + @Autowired + private UdplatHospitalService udplatHospitalService; + + @AuthRuleAnnotation("udidl_udplatHospital_all") + @PostMapping("/list") + public BaseResponse getList(@RequestBody BaseParam param){ + return udplatHospitalService.getList(param); + } + @AuthRuleAnnotation("udidl_udplatHospital_all") + @PostMapping("/import") + public BaseResponse imports(@RequestBody List models){ + return udplatHospitalService.imports(models); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatLogController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatLogController.java new file mode 100644 index 0000000..3a9ba8d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatLogController.java @@ -0,0 +1,24 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.req.udid.JobLogFilterRequest; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; +import com.glxp.udidl.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/udplat/log") +public class UdplatLogController { + @Autowired + UdplatLogService udplatLogService; + + @AuthRuleAnnotation("udidl_udplatLog_all") + @PostMapping("/list") + public BaseResponse getList(@RequestBody JobLogFilterRequest param){ + return udplatLogService.getList(param); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatManufactureController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatManufactureController.java new file mode 100644 index 0000000..92edd09 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatManufactureController.java @@ -0,0 +1,32 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatManufactureModel; +import com.glxp.udidl.admin.service.udplat.UdplatManufactureService; +import com.glxp.udidl.common.res.BaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/udplat/manufacture") +public class UdplatManufactureController { + @Autowired + private UdplatManufactureService udplatManufactureService; + + @AuthRuleAnnotation("udidl_udplatManufacture_all") + @PostMapping("/list") + public BaseResponse getList(@RequestBody BaseParam param){ + return udplatManufactureService.getList(param); + } + @AuthRuleAnnotation("udidl_udplatManufacture_all") + @PostMapping("/import") + public BaseResponse imports(@RequestBody List models){ + return udplatManufactureService.imports(models); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatDistributorMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatDistributorMapper.java new file mode 100644 index 0000000..4de246d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatDistributorMapper.java @@ -0,0 +1,24 @@ +package com.glxp.udidl.admin.dao.udplat; + +//import com.glxp.udidl.admin.entity.udplat.UdplatDistributor; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.entity.udplat.UdplatDistributor; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UdplatDistributorMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UdplatDistributor record); + + UdplatDistributor selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatDistributor record); + List list(BaseParam param); + UdplatDistributor selectByDistributorId(String id); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMapper.java index abf125e..9c1a822 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMapper.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMapper.java @@ -1,5 +1,6 @@ package com.glxp.udidl.admin.dao.udplat; +import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.admin.entity.udplat.UdplatGoods; import org.apache.ibatis.annotations.Mapper; @@ -16,4 +17,5 @@ public interface UdplatGoodsMapper { List selectAll(); int update(UdplatGoods record); + List list(BaseParam param); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMatchMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMatchMapper.java new file mode 100644 index 0000000..30a9cc2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatGoodsMatchMapper.java @@ -0,0 +1,20 @@ +package com.glxp.udidl.admin.dao.udplat; + +import com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UdplatGoodsMatchMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UdplatGoodsMatch record); + + UdplatGoodsMatch selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatGoodsMatch record); + UdplatGoodsMatch selectByDeviceRecordKey(String id); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatHospitalMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatHospitalMapper.java new file mode 100644 index 0000000..1ed9e32 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatHospitalMapper.java @@ -0,0 +1,22 @@ +package com.glxp.udidl.admin.dao.udplat; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.entity.udplat.UdplatHospital; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UdplatHospitalMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UdplatHospital record); + + UdplatHospital selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatHospital record); + List list(BaseParam param); + UdplatHospital selectByPurchaseId(String id); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatLogMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatLogMapper.java new file mode 100644 index 0000000..99ba304 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatLogMapper.java @@ -0,0 +1,22 @@ +package com.glxp.udidl.admin.dao.udplat; + +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.req.udid.JobLogFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UdplatLogMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UdplatLog record); + + UdplatLog selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatLog record); + List list(JobLogFilterRequest jobLogFilterRequest); + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatManufactureMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatManufactureMapper.java new file mode 100644 index 0000000..582d061 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/udplat/UdplatManufactureMapper.java @@ -0,0 +1,22 @@ +package com.glxp.udidl.admin.dao.udplat; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.entity.udplat.UdplatManufacture; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UdplatManufactureMapper { + int deleteByPrimaryKey(Integer id); + + int insert(UdplatManufacture record); + + UdplatManufacture selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatManufacture record); + List list(BaseParam param); + UdplatManufacture selectByManufactureId(String id); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/BaseParam.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/BaseParam.java new file mode 100644 index 0000000..ea1a7a9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/BaseParam.java @@ -0,0 +1,12 @@ +package com.glxp.udidl.admin.dto.udplat; + +import com.glxp.udidl.admin.req.ListPageRequest; +import lombok.Data; + + +@Data +public class BaseParam extends ListPageRequest { + private String startDate;//开始日期 + private String endDate;//结束日期 + private String name;//名称，支持模糊查询 +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatDistributorModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatDistributorModel.java new file mode 100644 index 0000000..4d6f5de --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatDistributorModel.java @@ -0,0 +1,21 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +@Data +public class UdplatDistributorModel { + /** + * 配送企业id + */ + private String distributorId; + + /** + * 配送企业编码 + */ + private String distributorCode; + + /** + * 配送企业名称 + */ + private String distributorName; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchModel.java new file mode 100644 index 0000000..b0f87c6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchModel.java @@ -0,0 +1,21 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +@Data +public class UdplatGoodsMatchModel { + /** + * 产品ID + */ + private String deviceRecordKey; + + /** + * 配送目录id + */ + private Integer deliveryGoodId; + + /** + * 医保编码 + */ + private String medicalCode; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatHospitalModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatHospitalModel.java new file mode 100644 index 0000000..fb128f2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatHospitalModel.java @@ -0,0 +1,34 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +/** + * 医疗机构批量增加导入实体 + */ +@Data +public class UdplatHospitalModel { + /** + * 医疗机构ID + */ + private String purchaseId; + + /** + * 医疗机构编码 + */ + private String purchaseCode; + + /** + * 医疗机构名称 + */ + private String purchaseName; + + /** + * 医疗机构区域名称 + */ + private String purchaseArea; + + /** + * 医疗机构区域ID + */ + private String purchaseAreaId; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatManufactureModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatManufactureModel.java new file mode 100644 index 0000000..e2872ae --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatManufactureModel.java @@ -0,0 +1,21 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +@Data +public class UdplatManufactureModel { + /** + * 生产企业id + */ + private String manufactureId; + + /** + * 生产企业编码 + */ + private String manufactureCode; + + /** + * 生产企业名称 + */ + private String manufactureName; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatDistributor.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatDistributor.java new file mode 100644 index 0000000..9cff509 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatDistributor.java @@ -0,0 +1,50 @@ +package com.glxp.udidl.admin.entity.udplat; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 配送企业 + * + * @author hong + * @date 2022/01/19 + */ +@Data +public class UdplatDistributor { + /** + * + */ + private Integer id; + + /** + * 配送企业id + */ + private String distributorId; + + /** + * 配送企业编码 + */ + private String distributorCode; + + /** + * 配送企业名称 + */ + private String distributorName; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java index 2d710a5..dd75f8a 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java @@ -1,5 +1,6 @@ package com.glxp.udidl.admin.entity.udplat; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -37,6 +38,8 @@ public class UdplatGoods { private String proxyName;//申报企业名称/ varchar(50) private Integer onlineStatus;//挂网状态 1挂网2挂网状态为空 6 撤销申报 private String medicalCode;//医保编码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date createTime;//创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date updateTime;//最后更新时间 } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoodsMatch.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoodsMatch.java new file mode 100644 index 0000000..edf900d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoodsMatch.java @@ -0,0 +1,49 @@ +package com.glxp.udidl.admin.entity.udplat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 产品，配送目录，医保对照表 + * + * @author hong + * @date 2022/01/19 + */ +@Data +public class UdplatGoodsMatch { + /** + * + */ + private Integer id; + + /** + * 产品ID + */ + private String deviceRecordKey; + + /** + * 配送目录id + */ + private Integer deliveryGoodId; + + /** + * 医保编码 + */ + private String medicalCode; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatHospital.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatHospital.java new file mode 100644 index 0000000..c57d21d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatHospital.java @@ -0,0 +1,59 @@ +package com.glxp.udidl.admin.entity.udplat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 医疗机构 + * + * @author hong + * @date 2022/01/19 + */ +@Data +public class UdplatHospital { + /** + * + */ + private Integer id; + + /** + * 医疗机构ID + */ + private String purchaseId; + + /** + * 医疗机构编码 + */ + private String purchaseCode; + + /** + * 医疗机构名称 + */ + private String purchaseName; + + /** + * 医疗机构区域名称 + */ + private String purchaseArea; + + /** + * 医疗机构区域ID + */ + private String purchaseAreaId; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatLog.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatLog.java new file mode 100644 index 0000000..acbfb3c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatLog.java @@ -0,0 +1,64 @@ +package com.glxp.udidl.admin.entity.udplat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 阳光采购平台日志 + * + * @author hong + * @date 2022/01/19 + */ +@Data +public class UdplatLog { + /** + * + */ + private Integer id; + + /** + * 类型: error; info; warning ... + */ + private String type; + + /** + * 下载类型：auto(自动下载),manual(手动下载),import 接口导入 + */ + private String downloadType; + + /** + * 表名 + */ + private String tbName; + + /** + * 日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date actionDate; + + /** + * 更新行数 + */ + private Integer totalCount; + + /** + * 提示信息 + */ + private String msg; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** + * 内容 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private String content; + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatManufacture.java b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatManufacture.java new file mode 100644 index 0000000..0f6a959 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatManufacture.java @@ -0,0 +1,49 @@ +package com.glxp.udidl.admin.entity.udplat; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 生产企业清单 + * + * @author hong + * @date 2022/01/19 + */ +@Data +public class UdplatManufacture { + /** + * + */ + private Integer id; + + /** + * 生产企业id + */ + private String manufactureId; + + /** + * 生产企业编码 + */ + private String manufactureCode; + + /** + * 生产企业名称 + */ + private String manufactureName; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date updateTime; + + +} \ No newline at end of file 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 bb95f12..81e3d46 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 @@ -1,6 +1,5 @@ package com.glxp.udidl.admin.service.DataSync; -import com.alibaba.fastjson.JSON; import com.glxp.udidl.admin.entity.udid.*; import com.glxp.udidl.admin.res.udid.DataSetResult; import com.glxp.udidl.admin.service.inout.DeviceService; @@ -52,7 +51,7 @@ public class DeviceSaveService { Boolean isHistory = false; if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) { isHistory = true; - System.out.println(JSON.toJSONString(ds)); + //System.out.println(JSON.toJSONString(ds)); } device.setUuid(uuid); if (requestDate != null) @@ -198,7 +197,7 @@ public class DeviceSaveService { device.setYbbm(dataSetBean.getYbbm()); device.setYlqxzcrbarmc(dataSetBean.getYlqxzcrbarmc()); device.setYlqxzcrbarywmc(dataSetBean.getYlqxzcrbarywmc()); - device.setZczbhhzbapzbh(dataSetBean.getZczbhhzbapzbh()); + device.setZczbhhzbapzbh(getString(dataSetBean.getZczbhhzbapzbh())); device.setZdcfsycs(dataSetBean.getZdcfsycs()); device.setYflbm(dataSetBean.getYflbm()); device.setZxxsdycpbs(dataSetBean.getZxxsdycpbs()); @@ -255,5 +254,9 @@ 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; + else return s; + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/UdplatDownloadService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/UdplatDownloadService.java new file mode 100644 index 0000000..ecc112f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/UdplatDownloadService.java @@ -0,0 +1,68 @@ +package com.glxp.udidl.admin.service.DataSync; + +import com.glxp.udidl.admin.util.Md5Utils; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; + +@Service +public class UdplatDownloadService { + private String host="http://120.32.125.20";//"http://pre.udplat.org/deal"; + private String appId="10000090"; + private String secretKey="XTMNpBExNF66bS4"; + private String userName="诏安县医院"; + private long getTime(){ + return System.currentTimeMillis(); + } + private String getSign(String time){ + TreeMap map= new TreeMap<>(); + map.put("appId",appId); + map.put("userName", URLEncoder.encode(userName)); + map.put("time",time); + map.put("secretKey",secretKey); + StringBuffer sb = new StringBuffer(); + for(Map.Entry entry:map.entrySet()){ + sb.append(entry.getKey()+"="+entry.getValue()); + sb.append("&"); + } + String str = sb.toString(); + String str0 = str.substring(0,str.length()-1); + System.out.println("签名前："+str0); + String result = Md5Utils.stringToMD5(str0); + System.out.println("签名："+result); + return result; + } + private Map getHeader(){ + Map map = new HashMap<>(); + String time = getTime()+""; + time = time.substring(0,time.length()-3); + map.put("appId",appId); + map.put("userName", userName); + map.put("time",time); + map.put("secretKey",secretKey); + map.put("sign",getSign(time)); + return map; + } + public String getDistributor(){ + String url="/hsapi/purchase/distributors"; + String result = post(url,getHeader(),null); + return result; + } + private String post(String url, Map headerMap, Object jsonObject) { + HttpHeaders httpHeaders = new HttpHeaders(); + for (Map.Entry stringStringEntry : headerMap.entrySet()) { + httpHeaders.add(stringStringEntry.getKey(), stringStringEntry.getValue()); + } + httpHeaders.add("Content-Type", "application/json"); + HttpEntity httpEntity = new HttpEntity(jsonObject, httpHeaders); + RestTemplate restTemplate = new RestTemplate(); + String result = restTemplate.postForObject(host+url, httpEntity, String.class); + return result; + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatDistributorService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatDistributorService.java new file mode 100644 index 0000000..22cafa8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatDistributorService.java @@ -0,0 +1,19 @@ +package com.glxp.udidl.admin.service.udplat; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatDistributorModel; +import com.glxp.udidl.common.res.BaseResponse; + +import java.util.List; + +public interface UdplatDistributorService { + BaseResponse getList(BaseParam param); + BaseResponse imports(List models); + /*int insert(UdplatDistributor record); + + UdplatDistributor selectByPrimaryKey(Integer id); + + List selectAll(); + + int updateByPrimaryKey(UdplatDistributor record);*/ +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsMatchService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsMatchService.java new file mode 100644 index 0000000..6f744b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsMatchService.java @@ -0,0 +1,8 @@ +package com.glxp.udidl.admin.service.udplat; + +import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel; +import com.glxp.udidl.common.res.BaseResponse; + +public interface UdplatGoodsMatchService { + BaseResponse Save(UdplatGoodsMatchModel model); +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsService.java index ef75e03..d981264 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatGoodsService.java @@ -1,10 +1,12 @@ package com.glxp.udidl.admin.service.udplat; +import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.common.res.BaseResponse; import java.io.InputStream; public interface UdplatGoodsService { + BaseResponse getList(BaseParam param); /** * excel导入 * @param is diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatHospitalService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatHospitalService.java new file mode 100644 index 0000000..51ca4ca --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatHospitalService.java @@ -0,0 +1,12 @@ +package com.glxp.udidl.admin.service.udplat; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatHospitalModel; +import com.glxp.udidl.common.res.BaseResponse; + +import java.util.List; + +public interface UdplatHospitalService { + BaseResponse getList(BaseParam param); + BaseResponse imports(List models); +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatLogService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatLogService.java new file mode 100644 index 0000000..9efc8cb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatLogService.java @@ -0,0 +1,10 @@ +package com.glxp.udidl.admin.service.udplat; + +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.req.udid.JobLogFilterRequest; +import com.glxp.udidl.common.res.BaseResponse; + +public interface UdplatLogService { + BaseResponse getList(JobLogFilterRequest param); + int insert(UdplatLog udplatLog); +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatManufactureService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatManufactureService.java new file mode 100644 index 0000000..ffe9f68 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/UdplatManufactureService.java @@ -0,0 +1,12 @@ +package com.glxp.udidl.admin.service.udplat; + +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatManufactureModel; +import com.glxp.udidl.common.res.BaseResponse; + +import java.util.List; + +public interface UdplatManufactureService { + BaseResponse getList(BaseParam param); + BaseResponse imports(List models); +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatDistributorServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatDistributorServiceImpl.java new file mode 100644 index 0000000..e0e1c30 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatDistributorServiceImpl.java @@ -0,0 +1,70 @@ +package com.glxp.udidl.admin.service.udplat.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.glxp.udidl.admin.dao.udplat.UdplatDistributorMapper; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatDistributorModel; +import com.glxp.udidl.admin.entity.udplat.UdplatDistributor; +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.res.PageSimpleResponse; +import com.glxp.udidl.admin.service.udplat.UdplatDistributorService; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; +import com.glxp.udidl.admin.util.BeanUtils; +import com.glxp.udidl.admin.util.DateUtil; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class UdplatDistributorServiceImpl implements UdplatDistributorService { + @Autowired + private UdplatDistributorMapper mapper; + @Autowired + private UdplatLogService logService; + @Override + public BaseResponse getList(BaseParam param) { + PageHelper.startPage(param.getPage(), param.getLimit()); + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = mapper.list(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Override + public BaseResponse imports(List models) { + if (models != null && models.size() > 0) { + for (UdplatDistributorModel item : models) { + UdplatDistributor entity = mapper.selectByDistributorId(item.getDistributorId()); + if (entity == null) { + BeanUtils.copyProperties(item, entity); + entity.setCreateTime(new Date()); + mapper.insert(entity); + }else + { + BeanUtils.copyProperties(item, entity); + entity.setUpdateTime(new Date()); + mapper.updateByPrimaryKey(entity); + } + } + } + UdplatLog udplatLog = new UdplatLog(); + udplatLog.setDownloadType("import"); + udplatLog.setTbName("udplat_distributor"); + udplatLog.setType("info"); + udplatLog.setMsg("执行成功！"); + udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate())); + udplatLog.setTotalCount(models.size()); + udplatLog.setCreateTime(new Date()); + logService.insert(udplatLog); + return ResultVOUtils.success(); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsMatchServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsMatchServiceImpl.java new file mode 100644 index 0000000..b902e20 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsMatchServiceImpl.java @@ -0,0 +1,37 @@ +package com.glxp.udidl.admin.service.udplat.impl; + +import com.glxp.udidl.admin.dao.udplat.UdplatGoodsMatchMapper; +import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel; +import com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch; +import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +@Service +public class UdplatGoodsMatchServiceImpl implements UdplatGoodsMatchService { + @Autowired + private UdplatGoodsMatchMapper udplatGoodsMatchMapper; + + @Override + public BaseResponse Save(UdplatGoodsMatchModel model) { + UdplatGoodsMatch udplatGoodsMatch = udplatGoodsMatchMapper.selectByDeviceRecordKey(model.getDeviceRecordKey()); + if(udplatGoodsMatch == null){ + udplatGoodsMatch = new UdplatGoodsMatch(); + BeanUtils.copyProperties(model,udplatGoodsMatch); + udplatGoodsMatch.setCreateTime(new Date()); + udplatGoodsMatchMapper.insert(udplatGoodsMatch); + }else + { + udplatGoodsMatch.setDeliveryGoodId(model.getDeliveryGoodId()); + udplatGoodsMatch.setMedicalCode(model.getMedicalCode()); + udplatGoodsMatch.setUpdateTime(new Date()); + udplatGoodsMatchMapper.updateByPrimaryKey(udplatGoodsMatch); + } + return ResultVOUtils.success(); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsServiceImpl.java index bbc01ce..6ef5e94 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatGoodsServiceImpl.java @@ -1,11 +1,18 @@ package com.glxp.udidl.admin.service.udplat.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.glxp.udidl.admin.dao.udplat.UdplatGoodsMapper; +import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.admin.dto.udplat.DeliveryGoods; import com.glxp.udidl.admin.dto.udplat.HospitalGoods; import com.glxp.udidl.admin.entity.udplat.UdplatGoods; +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.res.PageSimpleResponse; import com.glxp.udidl.admin.service.udplat.UdplatGoodsService; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; import com.glxp.udidl.admin.util.BeanUtils; +import com.glxp.udidl.admin.util.DateUtil; import com.glxp.udidl.common.res.BaseResponse; import com.glxp.udidl.common.util.ExcelUtil; import com.glxp.udidl.common.util.ResultVOUtils; @@ -14,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.InputStream; +import java.util.Date; import java.util.List; @Service @@ -21,6 +29,20 @@ import java.util.List; public class UdplatGoodsServiceImpl implements UdplatGoodsService { @Autowired private UdplatGoodsMapper udplatGoodsMapper; + @Autowired + private UdplatLogService logService; + + public BaseResponse getList(BaseParam param){ + PageHelper.startPage(param.getPage(), param.getLimit()); + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = udplatGoodsMapper.list(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } @Override public BaseResponse importExcel(InputStream is, int type) { List list; @@ -37,6 +59,14 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService { return ResultVOUtils.error(-1,"文件类型不匹配！"); return save(list); }catch (Exception e){ + UdplatLog udplatLog = new UdplatLog(); + udplatLog.setDownloadType("import"); + udplatLog.setTbName("udplat_goods"); + udplatLog.setType("error"); + udplatLog.setMsg(e.getMessage()); + udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate())); + udplatLog.setCreateTime(new Date()); + logService.insert(udplatLog); return ResultVOUtils.error(-1,"转换格式出错:"+e.getMessage()); } @@ -53,7 +83,6 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService { private BaseResponse save(List list){ if(list == null || list.size()<1) return ResultVOUtils.error(-1,"无数据！"); - //log.info("数据："+JSONUtil.toJsonStr(list)); int count=0; for(UdplatGoods item:list){ String goodId = item.getDeliveryGoodId(); @@ -63,12 +92,23 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService { if(goods != null) { BeanUtils.copyProperties(item,goods); + goods.setUpdateTime(new Date()); udplatGoodsMapper.update(goods); }else item.setUuid(BeanUtils.getUUId()); + item.setCreateTime(new Date()); udplatGoodsMapper.insert(item); count++; } + UdplatLog udplatLog = new UdplatLog(); + udplatLog.setDownloadType("import"); + udplatLog.setTbName("udplat_goods"); + udplatLog.setType("info"); + udplatLog.setMsg("执行成功！"); + udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate())); + udplatLog.setTotalCount(count); + udplatLog.setCreateTime(new Date()); + logService.insert(udplatLog); return ResultVOUtils.success(count); } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatHospitalServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatHospitalServiceImpl.java new file mode 100644 index 0000000..c0f03a0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatHospitalServiceImpl.java @@ -0,0 +1,74 @@ +package com.glxp.udidl.admin.service.udplat.impl; + + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.glxp.udidl.admin.dao.udplat.UdplatHospitalMapper; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatHospitalModel; +import com.glxp.udidl.admin.entity.udplat.UdplatHospital; +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.res.PageSimpleResponse; +import com.glxp.udidl.admin.service.udplat.UdplatHospitalService; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; +import com.glxp.udidl.admin.util.BeanUtils; +import com.glxp.udidl.admin.util.DateUtil; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class UdplatHospitalServiceImpl implements UdplatHospitalService { + + @Autowired + private UdplatHospitalMapper mapper; + @Autowired + private UdplatLogService logService; + @Override + public BaseResponse getList(BaseParam param) { + PageHelper.startPage(param.getPage(), param.getLimit()); + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = mapper.list(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Override + public BaseResponse imports(List models) { + if (models != null && models.size() > 0) { + for (UdplatHospitalModel item : models) { + UdplatHospital entity = mapper.selectByPurchaseId(item.getPurchaseId()); + if (entity == null) { + BeanUtils.copyProperties(item, entity); + entity.setCreateTime(new Date()); + mapper.insert(entity); + }else + { + BeanUtils.copyProperties(item, entity); + entity.setUpdateTime(new Date()); + mapper.updateByPrimaryKey(entity); + } + } + } + UdplatLog udplatLog = new UdplatLog(); + udplatLog.setDownloadType("import"); + udplatLog.setTbName("udplat_hospital"); + udplatLog.setType("info"); + udplatLog.setMsg("执行成功！"); + udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate())); + udplatLog.setTotalCount(models.size()); + udplatLog.setCreateTime(new Date()); + logService.insert(udplatLog); + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatLogServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatLogServiceImpl.java new file mode 100644 index 0000000..af1c01c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatLogServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.udidl.admin.service.udplat.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.glxp.udidl.admin.dao.udplat.UdplatLogMapper; +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.req.udid.JobLogFilterRequest; +import com.glxp.udidl.admin.res.PageSimpleResponse; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; +import com.glxp.udidl.admin.util.DateUtil; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class UdplatLogServiceImpl implements UdplatLogService { + @Autowired + private UdplatLogMapper mapper; + @Override + public BaseResponse getList(JobLogFilterRequest param) { + PageHelper.startPage(param.getPage(), param.getLimit()); + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = mapper.list(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Override + public int insert(UdplatLog udplatLog) { + return mapper.insert(udplatLog); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatManufactureServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatManufactureServiceImpl.java new file mode 100644 index 0000000..246e4df --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/udplat/impl/UdplatManufactureServiceImpl.java @@ -0,0 +1,70 @@ +package com.glxp.udidl.admin.service.udplat.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.glxp.udidl.admin.dao.udplat.UdplatManufactureMapper; +import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.UdplatManufactureModel; +import com.glxp.udidl.admin.entity.udplat.UdplatLog; +import com.glxp.udidl.admin.entity.udplat.UdplatManufacture; +import com.glxp.udidl.admin.res.PageSimpleResponse; +import com.glxp.udidl.admin.service.udplat.UdplatLogService; +import com.glxp.udidl.admin.service.udplat.UdplatManufactureService; +import com.glxp.udidl.admin.util.BeanUtils; +import com.glxp.udidl.admin.util.DateUtil; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class UdplatManufactureServiceImpl implements UdplatManufactureService { + @Autowired + private UdplatManufactureMapper mapper; + @Autowired + private UdplatLogService logService; + @Override + public BaseResponse getList(BaseParam param) { + PageHelper.startPage(param.getPage(), param.getLimit()); + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = mapper.list(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @Override + public BaseResponse imports(List models) { + if (models != null && models.size() > 0) { + for (UdplatManufactureModel item : models) { + UdplatManufacture entity = mapper.selectByManufactureId(item.getManufactureId()); + if (entity == null) { + BeanUtils.copyProperties(item, entity); + entity.setCreateTime(new Date()); + mapper.insert(entity); + }else + { + BeanUtils.copyProperties(item, entity); + entity.setUpdateTime(new Date()); + mapper.updateByPrimaryKey(entity); + } + } + } + UdplatLog udplatLog = new UdplatLog(); + udplatLog.setDownloadType("import"); + udplatLog.setTbName("udplat_manufacture"); + udplatLog.setType("info"); + udplatLog.setMsg("执行成功！"); + udplatLog.setActionDate(DateUtil.parseDate(DateUtil.getDate())); + udplatLog.setTotalCount(models.size()); + udplatLog.setCreateTime(new Date()); + logService.insert(udplatLog); + return ResultVOUtils.success(); + } +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 524e87d..82dfb3c 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -16,5 +16,6 @@ UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server #UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:9997 config.downloadPath=E:/temp config.openAuth=true +config. spring.servlet.multipart.max-file-size=100MB spring.servlet.multipart.max-request-size=1000MB \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml new file mode 100644 index 0000000..a703877 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + delete + from udplat_distributor + where id = #{id,jdbcType=INTEGER} + + + insert into udplat_distributor (id, distributorId, distributorCode, + distributorName, createTime) + values (#{id,jdbcType=INTEGER}, #{distributorId,jdbcType=INTEGER}, #{distributorCode,jdbcType=VARCHAR}, + #{distributorName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}) + + + update udplat_distributor + set distributorId = #{distributorId,jdbcType=INTEGER}, + distributorCode = #{distributorCode,jdbcType=VARCHAR}, + distributorName = #{distributorName,jdbcType=VARCHAR}, + updateTime = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml index bdb7d9b..b968248 100644 --- a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml @@ -119,4 +119,25 @@ changedContent, changedTime, proxyName, onlineStatus, medicalCode, createTime, updateTime from udplat_goods + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml new file mode 100644 index 0000000..45ce69f --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + delete from udplat_goods_match + where id = #{id,jdbcType=INTEGER} + + + insert into udplat_goods_match (id, deviceRecordKey, deliveryGoodId, + medicalCode, createTime + ) + values (#{id,jdbcType=INTEGER}, #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodId,jdbcType=INTEGER}, + #{medicalCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP} + ) + + + update udplat_goods_match + set deviceRecordKey = #{deviceRecordKey,jdbcType=VARCHAR}, + + deliveryGoodId = #{deliveryGoodId,jdbcType=INTEGER}, + + + medicalCode = #{medicalCode,jdbcType=VARCHAR}, + + updateTime = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatHospitalMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatHospitalMapper.xml new file mode 100644 index 0000000..53432d6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatHospitalMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + delete from udplat_hospital + where id = #{id,jdbcType=INTEGER} + + + insert into udplat_hospital (id, purchaseId, purchaseCode, + purchaseName, purchaseArea, purchaseAreaId, + createTime, updateTime) + values (#{id,jdbcType=INTEGER}, #{purchaseId,jdbcType=VARCHAR}, #{purchaseCode,jdbcType=VARCHAR}, + #{purchaseName,jdbcType=VARCHAR}, #{purchaseArea,jdbcType=VARCHAR}, #{purchaseAreaId,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) + + + update udplat_hospital + set purchaseId = #{purchaseId,jdbcType=VARCHAR}, + purchaseCode = #{purchaseCode,jdbcType=VARCHAR}, + purchaseName = #{purchaseName,jdbcType=VARCHAR}, + purchaseArea = #{purchaseArea,jdbcType=VARCHAR}, + purchaseAreaId = #{purchaseAreaId,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateTime = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatLogMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatLogMapper.xml new file mode 100644 index 0000000..2da6acf --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatLogMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + delete from udplat_log + where id = #{id,jdbcType=INTEGER} + + + insert into udplat_log (id, type, downloadType, + tbName, actionDate, totalCount, + msg, createTime, content + ) + values (#{id,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{downloadType,jdbcType=VARCHAR}, + #{tbName,jdbcType=VARCHAR}, #{actionDate,jdbcType=TIMESTAMP}, #{totalCount,jdbcType=INTEGER}, + #{msg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR} + ) + + + update udplat_log + set type = #{type,jdbcType=VARCHAR}, + downloadType = #{downloadType,jdbcType=VARCHAR}, + tbName = #{tbName,jdbcType=VARCHAR}, + actionDate = #{actionDate,jdbcType=TIMESTAMP}, + totalCount = #{totalCount,jdbcType=INTEGER}, + msg = #{msg,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + content = #{content,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatManufactureMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatManufactureMapper.xml new file mode 100644 index 0000000..1a566b8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatManufactureMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + delete from udplat_manufacture + where id = #{id,jdbcType=INTEGER} + + + insert into udplat_manufacture (id, manufactureId, manufactureCode, + manufactureName, createTime, updateTime + ) + values (#{id,jdbcType=INTEGER}, #{manufactureId,jdbcType=INTEGER}, #{manufactureCode,jdbcType=VARCHAR}, + #{manufactureName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + update udplat_manufacture + set manufactureId = #{manufactureId,jdbcType=INTEGER}, + manufactureCode = #{manufactureCode,jdbcType=VARCHAR}, + manufactureName = #{manufactureName,jdbcType=VARCHAR}, + createTime = #{createTime,jdbcType=TIMESTAMP}, + updateTime = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + + + \ No newline at end of file diff --git a/api-admin/target/classes/application-dev.properties b/api-admin/target/classes/application-dev.properties index 524e87d..82dfb3c 100644 --- a/api-admin/target/classes/application-dev.properties +++ b/api-admin/target/classes/application-dev.properties @@ -16,5 +16,6 @@ UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server #UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:9997 config.downloadPath=E:/temp config.openAuth=true +config. spring.servlet.multipart.max-file-size=100MB spring.servlet.multipart.max-request-size=1000MB \ No newline at end of file diff --git a/api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class b/api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class index f79f61e8dcbecdaec973765a3bbcb0fc75788da9..5ea75456878e63e6f231a028b6b61781bf14bcaa 100644 GIT binary patch delta 1785 zcmaKsYgANK6vuz}^0=2fXJJ5wO0ujaCSy23hy_AXl!7p6U{;_uz(^#4!GO{Wsmz{Q z-K?bd)5;#u7%G~D_O$oAZ+-J~pIzl@pF1!Tu=+6P?(^UK?ET;Wv(NmsaAZ;6iPIxT zfkOUpSVU(Expeu6(Cwp#Ek3r=tC!m??y$Ji!H&h;r33HQ+dge=^U=>e4)=1O!*=f1 zjvdV+GA{8B5+S@up&9&jqp4O(Y zL8)6~W@lG~BB9#e_NKs^>7t^(gft^@uf?0ud5NQ@&xz%#3wK4_el>gM*@1|dftGNj zqO~j1+1l70>F9L-Ox~1p8J8;-6R>zo@izM`_A1`tT}h>QkM|XW47nXv#nJ*UR$RiR ziVuh?idbr~U-2Qs76%juIb<=SILr~nM;ujLNS;BayIy71D?a8EgM_@iJZ+9Dj&aB! zQT85iT=6Mw7N03T=L-YtYDreGrB6ifu3f)!H|!@^#XWl{v)<%B?u z*|L}Gl(k%TnwBBoB>w@7Au&v@kX5rp_+KfjiUm-?RkAaeI33kR)q9 z4h77Yo=T*PGU-E~okxOTnJj08SV-Ym7DxP*R7tj#g6aw}q*|;RK~gdQA)Igv*0Ek>DR;N0Z}9kKV@c&&VNyr7RP~EQ0THE2WT~Mc&eJdV zy@8t~E?e$w{LX`M#=%K<4jLK1b49}6_(a39QzGq{h((oBIV3+*I-fcPO*D(o(lZzpe!I=o7osaUZQu@dO(Jp5&>3jkNeg zt4};_*%VMflfOKZ~ zIo{?S%Ra}uyr){n`+VT|kdH!_te!iQS&mBPIzHwTCsXEFK6UKpfaNnsI~|sTj!q6a zGJNhRW168bYuQFb^Ot_?a$s`$80XL{NnhP z#45v_@OLvlJQkmrv>bID9oTnx%#UCy zgj++Jb%I(i0FPB6C}6`nEGtydT!91LDX!nMmdi}+aH1iOM8rH(Rc#0cC=)qL3i_L}_W|2VivLuY?xZKKK`& Cf7wX@ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.class b/api-admin/target/classes/com/glxp/udidl/admin/service/DataSync/DeviceSaveService.class index 2aa81c56f18e508255aaa328f5642a74a10c54fb..8293b92cd859d9684a318eddb04b053f99c8db5b 100644 GIT binary patch delta 4997 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