diff --git a/api-admin/pom.xml b/api-admin/pom.xml index aa0ef25..f678928 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -145,6 +145,16 @@ pagehelper-spring-boot-autoconfigure 1.2.5 + + + com.glxp + api-swagger + 0.0.1 + diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/FileInfoController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/FileInfoController.java index adc0fa9..f498325 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/FileInfoController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/FileInfoController.java @@ -7,11 +7,9 @@ import com.glxp.udidl.admin.service.info.FileInfoService; import com.glxp.udidl.common.res.BaseResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; -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.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.Date; @RestController @@ -31,5 +29,8 @@ public class FileInfoController { public BaseResponse exportToFile(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { return productInfoDlService.ExportToFile(startDate, endDate, "manual"); } - + @GetMapping("/getFile") + public void getFile(HttpServletResponse response, String fileName){ + fileInfoService.getFile(response,fileName); + } } 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 7976adb..5cc689c 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 @@ -102,10 +102,10 @@ public class TestController { logger.info(month + "---按月开启下载"); asyncDownloadTask.downloadByMonth(month, page); } - /* @GetMapping("/test/getDistributor") + @GetMapping("/test/getDistributor") public String udplatTest(){ return udplatDownloadService.getDistributor(); - }*/ + } @GetMapping("/test/getManufactures") public BaseResponse getManufactures(){ return udplatDownloadService.getAllManufactures(); diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/sys/SysMenuController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/sys/SysMenuController.java new file mode 100644 index 0000000..3883ea2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/sys/SysMenuController.java @@ -0,0 +1,43 @@ +package com.glxp.udidl.admin.controller.sys; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.sys.SysMenuModel; +import com.glxp.udidl.admin.service.sys.SysMenuService; +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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("sys/menu") +public class SysMenuController { + @Autowired + SysMenuService sysMenuService; + + @AuthRuleAnnotation("sys_menu_all") + @PostMapping("/list") + public BaseResponse getList(){ + return sysMenuService.getMenuTree(); + } + @AuthRuleAnnotation("sys_menu_all") + @PostMapping("/insert") + public BaseResponse insert(SysMenuModel model){ + return sysMenuService.insert(model); + } + @AuthRuleAnnotation("sys_menu_all") + @PostMapping("update") + public BaseResponse update(SysMenuModel model){ + return sysMenuService.update(model); + } + @AuthRuleAnnotation("sys_menu_all") + @PostMapping("/detail") + public BaseResponse detail(Integer id){ + return sysMenuService.detail(id); + } + @AuthRuleAnnotation("sys_menu_all") + @PostMapping("/delete") + public BaseResponse delete(Integer id){ + return sysMenuService.delete(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/ThirdApiController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/ThirdApiController.java new file mode 100644 index 0000000..cc371bc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/udplat/ThirdApiController.java @@ -0,0 +1,36 @@ +package com.glxp.udidl.admin.controller.udplat; + +import com.glxp.udidl.admin.annotation.AuthRuleAnnotation; +import com.glxp.udidl.admin.dto.udplat.ProductParam; +import com.glxp.udidl.admin.dto.udplat.UnitsParam; +import com.glxp.udidl.admin.service.udplat.UdplatDistributorService; +import com.glxp.udidl.admin.service.udplat.UdplatGoodsService; +import com.glxp.udidl.common.res.BaseResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.RestController; +@Api(tags = "第三方接口") +@RestController +public class ThirdApiController { + @Autowired + UdplatDistributorService udplatDistributorService; + @Autowired + UdplatGoodsService udplatGoodsService; + + @ApiOperation("获取往来单位信息") + @AuthRuleAnnotation("third_api_all") + @PostMapping("/udiwms/erp/getUnits") + public BaseResponse getUnitsList(@RequestBody UnitsParam param){ + return udplatDistributorService.getUnitsList(param); + } + @ApiOperation("获取产品信息") + @AuthRuleAnnotation("third_api_all") + @PostMapping("/udiwms/erp/getProducts") + public BaseResponse getProducts(@RequestBody ProductParam param) + { + return udplatGoodsService.getProducts(param); + } +} 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 index c5e12d7..2a1ce1f 100644 --- 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 @@ -6,11 +6,9 @@ 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 org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -32,4 +30,9 @@ public class UdplatDistributorController { public BaseResponse imports(@RequestBody List models){ return udplatDistributorService.save(models,"import"); } + @AuthRuleAnnotation("udidl_udplatDistributor_all") + @GetMapping("/export") + public void export(HttpServletResponse response){ + udplatDistributorService.exportToFile(response); + } } 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 02bddde..c38cae0 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,17 +1,14 @@ 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.DeliveryGoods; import com.glxp.udidl.admin.dto.udplat.HospitalGoods; +import com.glxp.udidl.admin.dto.udplat.UdplatGoodsParam; 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.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -27,12 +24,12 @@ public class UdplatGoodsController { @AuthRuleAnnotation("udidl_udplatGoods_all") @PostMapping("/list") - public BaseResponse getList(@RequestBody BaseParam param) + public BaseResponse getList(@RequestBody UdplatGoodsParam param) { return udplatGoodsService.getList(param); } @AuthRuleAnnotation("udidl_udplatGoods_all") - @PostMapping("/inport") + @PostMapping("/import") public BaseResponse importExcel(MultipartFile file,int type){ try { @@ -52,4 +49,17 @@ public class UdplatGoodsController { public BaseResponse importDeliveryGoods(@RequestBody List list){ return udplatGoodsService.importDeliveryGoods(list); } + @AuthRuleAnnotation("udidl_udplatGoods_all") + @PostMapping("/export") + public BaseResponse exportToFile(@RequestBody UdplatGoodsParam param) { + return udplatGoodsService.exportToFile(param); + } + /*public void export(HttpServletResponse response){ + udplatGoodsService.exportToFile(response); + }*/ + @AuthRuleAnnotation("udidl_udplatGoods_all") + @PostMapping("/detail") + public BaseResponse detail(Integer id){ + return udplatGoodsService.selectById(id); + } } 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 index 8fd1024..5cefd2c 100644 --- 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 @@ -3,6 +3,7 @@ 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.dto.udplat.UdplatGoodsMatchParam; +import com.glxp.udidl.admin.service.udi.UdiCompanyService; import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService; import com.glxp.udidl.common.res.BaseResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +18,8 @@ import org.springframework.web.bind.annotation.RestController; public class UdplatGoodsMatchController { @Autowired private UdplatGoodsMatchService udplatGoodsMatchService; - + @Autowired + private UdiCompanyService udiCompanyService; @AuthRuleAnnotation("udidl_udplatGoodsMatch_all") @PostMapping("/save") public BaseResponse save(@RequestBody UdplatGoodsMatchModel model){ @@ -41,4 +43,9 @@ public class UdplatGoodsMatchController { public BaseResponse getProductInfoByUuid(String uuid){ return udplatGoodsMatchService.getProductInfoByUuid(uuid); } + @AuthRuleAnnotation("udidl_udplatGoodsMatch_all") + @PostMapping("/searchByName") + public BaseResponse searchByName(String name){ + return udiCompanyService.searchByName(name); + } } 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 index 39c5c4f..49a7bb5 100644 --- 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 @@ -6,11 +6,9 @@ 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 org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; @RestController @@ -29,4 +27,9 @@ public class UdplatHospitalController { public BaseResponse imports(@RequestBody List models){ return udplatHospitalService.save(models,"import"); } + @AuthRuleAnnotation("udidl_udplatHospital_all") + @GetMapping("/export") + public void export(HttpServletResponse response){ + udplatHospitalService.exportToFile(response); + } } 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 index f587649..5185d65 100644 --- 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 @@ -6,11 +6,9 @@ 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 org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; @RestController @@ -29,4 +27,9 @@ public class UdplatManufactureController { public BaseResponse imports(@RequestBody List models){ return udplatManufactureService.save(models,"import"); } + @AuthRuleAnnotation("udidl_udplatManufacture_all") + @GetMapping("/export") + public void export(HttpServletResponse response){ + udplatManufactureService.exportToFile(response); + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dao/sys/SysMenuMapper.java b/api-admin/src/main/java/com/glxp/udidl/admin/dao/sys/SysMenuMapper.java index 58f6cea..db36dcb 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dao/sys/SysMenuMapper.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dao/sys/SysMenuMapper.java @@ -16,4 +16,5 @@ public interface SysMenuMapper { List selectAll(); int updateByPrimaryKey(SysMenu record); + int getChildCount(Integer parentId); } \ No newline at end of file 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 fe77b2b..0eb52bf 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,6 @@ public interface UdiCompanyDao { boolean deleteAll(@Param("ids") List ids); boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); - + List searchByName(String name);//公司名称搜索 } 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 index 4de246d..7229fc7 100644 --- 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 @@ -3,6 +3,7 @@ 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.dto.udplat.UnitsListModel; import com.glxp.udidl.admin.entity.udplat.UdplatDistributor; import org.apache.ibatis.annotations.Mapper; @@ -21,4 +22,5 @@ public interface UdplatDistributorMapper { int updateByPrimaryKey(UdplatDistributor record); List list(BaseParam param); UdplatDistributor selectByDistributorId(String id); + List getUnitsList(String key); } \ 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 0ea7473..f70eb73 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,6 +1,8 @@ package com.glxp.udidl.admin.dao.udplat; -import com.glxp.udidl.admin.dto.udplat.BaseParam; +import com.glxp.udidl.admin.dto.udplat.ProductListModel; +import com.glxp.udidl.admin.dto.udplat.ProductParam; +import com.glxp.udidl.admin.dto.udplat.UdplatGoodsParam; import com.glxp.udidl.admin.entity.udplat.UdplatGoods; import org.apache.ibatis.annotations.Mapper; @@ -14,8 +16,10 @@ public interface UdplatGoodsMapper { UdplatGoods selectByGoodsId(String deliveryGoodId); UdplatGoods selectByProjectGoodsCode(String projectGoodsCode); + UdplatGoods selectById(Integer id); List selectAll(); int update(UdplatGoods record); - List list(BaseParam param); + List list(UdplatGoodsParam param); + List getProducts(ProductParam param); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/MenuTreeModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/MenuTreeModel.java new file mode 100644 index 0000000..52d12a6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/MenuTreeModel.java @@ -0,0 +1,39 @@ +package com.glxp.udidl.admin.dto.sys; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class MenuTreeModel { + /** + * 编号 + */ + private Integer id; + + /** + * 菜单名称 + */ + private String name; + /** + * 菜单类型M: 目录, C: 菜单,F: 资源 + */ + private String type; + + /** + * 权限标识 + */ + private String perms; + + /** + * 状态（0启用 1禁用） + */ + private String status; + + /** + * 创建时间 + */ + private Date createTime; + private List children; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/SysMenuModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/SysMenuModel.java new file mode 100644 index 0000000..fec85cd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/sys/SysMenuModel.java @@ -0,0 +1,39 @@ +package com.glxp.udidl.admin.dto.sys; + +import lombok.Data; + +/** + * 菜单功能维护实体 + */ +@Data +public class SysMenuModel { + /** + * 编号 + */ + private Integer id; + + /** + * 菜单名称 + */ + private String name; + + /** + * 父菜单ID + */ + private Integer parentId; + + /** + * 菜单类型M: 目录, C: 菜单,F: 资源 + */ + private String type; + + /** + * 权限标识 + */ + private String perms; + + /** + * 状态（0启用 1禁用） + */ + private String status; +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductListModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductListModel.java new file mode 100644 index 0000000..3ac379f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductListModel.java @@ -0,0 +1,15 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +@Data +public class ProductListModel { + private String code; + private String name; + private String measname;//计量单位 + private String model;//型号 + private String spec;//规格 + private String registerNo;//注册证号 + private String manufactureId;//生成企业ID + private String manufactory;//生产企业 +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductParam.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductParam.java new file mode 100644 index 0000000..9ec746a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/ProductParam.java @@ -0,0 +1,10 @@ +package com.glxp.udidl.admin.dto.udplat; + +import com.glxp.udidl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ProductParam extends ListPageRequest { + private String code;//产品编码 + private String name;//产品名称 +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchParam.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchParam.java index b96cb61..2d258cb 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchParam.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchParam.java @@ -5,7 +5,10 @@ import lombok.Data; @Data public class UdplatGoodsMatchParam extends BaseParam{ private String nameCode; - + private String udi; + private String ylqxzcrbarmc;//注册/备案人名称(医疗器械注册人) + private String ggxh;//规格型号 + private String zczbhhzbapzbh;//注册/备案证号 private int goodsMatchType;//产品目录 0:全部 1:已对照 2：未对照 private int medicalMatchType;//医保编码 0:全部 1:已对照 2：未对照 } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsModel.java index 5ef8328..14c2014 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsModel.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsModel.java @@ -21,7 +21,7 @@ public class UdplatGoodsModel { private String packMaterial;//包材/varchar(255) private String regNum;//注册证编号/varchar(255) private String regName;//注册证名称/varchar(255) - private String regValidTo;//注册证有效期截止时间/varchar(255) + private Date regValidTo;//注册证有效期截止时间/varchar(255) private String unionProjectId;//联采项目ID/bigint(20) private String unionProjectName;//采购项目名称/varchar(255) private double salePrice;//价格/decimal(18,4) diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsParam.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsParam.java new file mode 100644 index 0000000..353c70c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsParam.java @@ -0,0 +1,12 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +@Data +public class UdplatGoodsParam extends BaseParam{ + private String manufactureName;//生产企业 + private String distributorName;//配送企业 + private String regNum;//注册证号 + private String model;//型号 + private String spec;//规格 +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsListModel.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsListModel.java new file mode 100644 index 0000000..c05d536 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsListModel.java @@ -0,0 +1,17 @@ +package com.glxp.udidl.admin.dto.udplat; + +import lombok.Data; + +/** + * 往来单位 + */ +@Data +public class UnitsListModel { + private String id;//往来单位ID（必须返回） + private String name;//往来单位名称（必须返回） + private String spell;//拼音简写 + private String addr;//地址 + private String creditNo;//注册证号 + private String contact;//联系人 + private String mobile;//电话，手机号 +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsParam.java b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsParam.java new file mode 100644 index 0000000..85c652a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/dto/udplat/UnitsParam.java @@ -0,0 +1,11 @@ +package com.glxp.udidl.admin.dto.udplat; + +import com.glxp.udidl.admin.req.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class UnitsParam extends ListPageRequest { + @ApiModelProperty("关键字查询") + private String key; +} 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 7864760..74217c7 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 @@ -24,6 +24,7 @@ public class UdplatGoods { private String packMaterial;//包材/varchar(255) private String regNum;//注册证编号/varchar(255) private String regName;//注册证名称/varchar(255) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date regValidTo;//注册证有效期截止时间/varchar(255) private String unionProjectId;//联采项目ID/bigint(20) private String unionProjectName;//采购项目名称/varchar(255) @@ -34,6 +35,7 @@ public class UdplatGoods { private String goodsSource;//数据来源/int(11)(取值：1.集中采购 2.耗材联采 3.医院HIS/医疗机构新增 4.备案采购 9. 阳光采购10. 新型冠状病毒相关检测试剂省级集中采购14. 限新冠病毒核酸快速检测采购使用) private String stockStatus;//缺货状态（1有货、2缺货）/int private String changedContent;//更新内容 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date changedTime;//更新时间 private String proxyName;//申报企业名称/ varchar(50) private String onlineStatus;//挂网状态 1挂网2挂网状态为空 6 撤销申报 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 index c8080ae..ae118a6 100644 --- 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 @@ -89,12 +89,12 @@ public class UdplatDownloadService { map.put("sign",getSign(mapParam)); return map; } - /*public String getDistributor(){ + public String getDistributor(){ Map map=new HashMap<>(); String url="/hsapi/purchase/distributors"; String result = post3(url,getHeader(map),null,null); return result; - }*/ + } public BaseResponse getAllDistributors(){ List result = new ArrayList<>(); int page = 1; diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/info/FileInfoService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/info/FileInfoService.java index 2274143..cc54e9b 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/info/FileInfoService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/info/FileInfoService.java @@ -4,6 +4,8 @@ import com.glxp.udidl.admin.entity.info.FileInfoEntity; import com.glxp.udidl.admin.req.ListPageRequest; import com.glxp.udidl.common.res.BaseResponse; +import javax.servlet.http.HttpServletResponse; + public interface FileInfoService { /** * 分页查询 @@ -18,4 +20,6 @@ public interface FileInfoService { * @return */ int insert(FileInfoEntity fileInfoEntity); + BaseResponse saveToFile(String content,String fileName); + void getFile(HttpServletResponse response,String fileName); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.java index 3872bff..8748a14 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.java @@ -2,22 +2,27 @@ package com.glxp.udidl.admin.service.info.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.glxp.udidl.admin.config.GlobalConfig; import com.glxp.udidl.admin.dao.info.FileInfoDao; import com.glxp.udidl.admin.entity.info.FileInfoEntity; import com.glxp.udidl.admin.req.ListPageRequest; import com.glxp.udidl.admin.res.PageSimpleResponse; import com.glxp.udidl.admin.service.info.FileInfoService; +import com.glxp.udidl.admin.util.FileUtils; 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 javax.servlet.http.HttpServletResponse; import java.util.List; @Service public class FileInfoServiceImpl implements FileInfoService { @Autowired private FileInfoDao fileInfoDao; + @Autowired + GlobalConfig globalConfig; public BaseResponse getList(ListPageRequest param){ PageHelper.startPage(param.getPage(),param.getLimit()); List list = fileInfoDao.list(); @@ -30,4 +35,15 @@ public class FileInfoServiceImpl implements FileInfoService { public int insert(FileInfoEntity fileInfoEntity){ return fileInfoDao.insert(fileInfoEntity); } + public BaseResponse saveToFile(String content,String fileName){ + String fullPath = globalConfig.getDownloadPath()+"/"+fileName; + String res = FileUtils.exportToFile(content,fullPath); + if(!res.equals("success")) + return ResultVOUtils.error(-1,res); + return ResultVOUtils.success("/file/getFile?fileName="+fileName); + } + public void getFile(HttpServletResponse response, String fileName){ + String fullPath=globalConfig.getDownloadPath()+"/"+fileName; + FileUtils.getFile(response,fullPath); + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/SysMenuService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/SysMenuService.java new file mode 100644 index 0000000..533f434 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/SysMenuService.java @@ -0,0 +1,12 @@ +package com.glxp.udidl.admin.service.sys; + +import com.glxp.udidl.admin.dto.sys.SysMenuModel; +import com.glxp.udidl.common.res.BaseResponse; + +public interface SysMenuService { + BaseResponse getMenuTree(); + BaseResponse insert(SysMenuModel model); + BaseResponse update(SysMenuModel model); + BaseResponse detail(Integer id); + BaseResponse delete(Integer id); +} diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/impl/SysMenuServiceImpl.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/impl/SysMenuServiceImpl.java new file mode 100644 index 0000000..fdb2416 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/sys/impl/SysMenuServiceImpl.java @@ -0,0 +1,72 @@ +package com.glxp.udidl.admin.service.sys.impl; + +import com.glxp.udidl.admin.dao.sys.SysMenuMapper; +import com.glxp.udidl.admin.dto.sys.MenuTreeModel; +import com.glxp.udidl.admin.dto.sys.SysMenuModel; +import com.glxp.udidl.admin.entity.sys.SysMenu; +import com.glxp.udidl.admin.service.sys.SysMenuService; +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.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class SysMenuServiceImpl implements SysMenuService { + @Autowired + SysMenuMapper sysMenuMapper; + + @Override + public BaseResponse getMenuTree() { + List menus = sysMenuMapper.selectAll(); + List resutl = getChild(menus, 0); + return ResultVOUtils.success(resutl); + } + public BaseResponse insert(SysMenuModel model){ + SysMenu sysMenu = new SysMenu(); + BeanUtils.copyProperties(model,sysMenu); + sysMenu.setCreateTime(new Date()); + sysMenuMapper.insert(sysMenu); + return ResultVOUtils.success(); + } + public BaseResponse update(SysMenuModel model){ + SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(model.getId()); + if(sysMenu == null) + return ResultVOUtils.error(-1,"找不到记录"); + BeanUtils.copyProperties(model,sysMenu); + sysMenuMapper.updateByPrimaryKey(sysMenu); + return ResultVOUtils.success(); + } + public BaseResponse detail(Integer id){ + SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(id); + if(sysMenu == null) + return ResultVOUtils.error(-1,"找不到记录"); + return ResultVOUtils.success(sysMenu); + } + public BaseResponse delete(Integer id){ + if(sysMenuMapper.getChildCount(id)>0) + return ResultVOUtils.error(-1,"存在子级，请先删除子级！"); + sysMenuMapper.deleteByPrimaryKey(id); + return ResultVOUtils.success(); + } + private List getChild(List menus, Integer pId) { + List result = new ArrayList<>(); + List list = menus.stream().filter(p -> p.getParentId().equals(pId)).collect(Collectors.toList()); + if (list != null && list.size() > 0) { + for (SysMenu item : list) { + MenuTreeModel treeModel = new MenuTreeModel(); + BeanUtils.copyProperties(item, treeModel); + List child = getChild(menus, treeModel.getId()); + if (child != null && child.size() > 0) + treeModel.setChildren(child); + result.add(treeModel); + } + } + return result; + } +} 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 bc80934..ba44774 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 @@ -3,6 +3,7 @@ package com.glxp.udidl.admin.service.udi; import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; import com.glxp.udidl.admin.entity.udid.Contactlist; import com.glxp.udidl.admin.req.UdiCompanyRequest; +import com.glxp.udidl.common.res.BaseResponse; import java.util.List; @@ -23,5 +24,5 @@ public interface UdiCompanyService { boolean deleteAll(List ids); boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); - + BaseResponse searchByName(String name);//公司名称搜索 } 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 0a07b31..27355c9 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 @@ -6,6 +6,8 @@ import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; import com.glxp.udidl.admin.entity.udid.Contactlist; import com.glxp.udidl.admin.req.UdiCompanyRequest; import com.glxp.udidl.admin.service.udi.UdiCompanyService; +import com.glxp.udidl.common.res.BaseResponse; +import com.glxp.udidl.common.util.ResultVOUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -60,4 +62,8 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) { return udiCompanyDao.updateUdiCompany(udiCompanyEntity); } + public BaseResponse searchByName(String name){ + List result = udiCompanyDao.searchByName(name); + return ResultVOUtils.success(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 index 54c7ff0..6964c6f 100644 --- 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 @@ -2,13 +2,17 @@ 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.admin.dto.udplat.UnitsParam; import com.glxp.udidl.common.res.BaseResponse; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface UdplatDistributorService { BaseResponse getList(BaseParam param); BaseResponse save(List models,String type); + void exportToFile(HttpServletResponse response); + BaseResponse getUnitsList(UnitsParam param); /*int insert(UdplatDistributor record); UdplatDistributor selectByPrimaryKey(Integer id); 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 cfddada..6a6746d 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,16 +1,14 @@ package com.glxp.udidl.admin.service.udplat; -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.dto.udplat.UdplatGoodsModel; +import com.glxp.udidl.admin.dto.udplat.*; import com.glxp.udidl.common.res.BaseResponse; +import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.util.List; public interface UdplatGoodsService { - BaseResponse getList(BaseParam param); + BaseResponse getList(UdplatGoodsParam param); /** * excel导入 * @param is @@ -39,4 +37,8 @@ public interface UdplatGoodsService { * @return */ BaseResponse importDeliveryGoods(List list); + void exportToFile(HttpServletResponse response); + BaseResponse exportToFile(UdplatGoodsParam param);//导出生成文件 + BaseResponse selectById(Integer id); + BaseResponse getProducts(ProductParam param); } 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 index 8e3db41..177ec34 100644 --- 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 @@ -4,9 +4,11 @@ import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.admin.dto.udplat.UdplatHospitalModel; import com.glxp.udidl.common.res.BaseResponse; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface UdplatHospitalService { BaseResponse getList(BaseParam param); BaseResponse save(List models,String type); + void exportToFile(HttpServletResponse response); } 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 index faba0fe..108d079 100644 --- 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 @@ -4,9 +4,11 @@ import com.glxp.udidl.admin.dto.udplat.BaseParam; import com.glxp.udidl.admin.dto.udplat.UdplatManufactureModel; import com.glxp.udidl.common.res.BaseResponse; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface UdplatManufactureService { BaseResponse getList(BaseParam param); BaseResponse save(List models,String type); + void exportToFile(HttpServletResponse response); } 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 index b2d9ecd..675c918 100644 --- 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 @@ -1,10 +1,13 @@ package com.glxp.udidl.admin.service.udplat.impl; +import com.alibaba.fastjson.JSONObject; 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.dto.udplat.UnitsListModel; +import com.glxp.udidl.admin.dto.udplat.UnitsParam; import com.glxp.udidl.admin.entity.udplat.UdplatDistributor; import com.glxp.udidl.admin.entity.udplat.UdplatLog; import com.glxp.udidl.admin.res.PageSimpleResponse; @@ -12,11 +15,13 @@ 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.admin.util.FileUtils; 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 javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; @@ -68,4 +73,18 @@ public class UdplatDistributorServiceImpl implements UdplatDistributorService { logService.insert(udplatLog); return ResultVOUtils.success(); } + @Override + public void exportToFile(HttpServletResponse response){ + List list = mapper.selectAll(); + FileUtils.exportToFile(response, JSONObject.toJSONString(list),"配送企业"); + } + public BaseResponse getUnitsList(UnitsParam param){ + PageHelper.startPage(param.getPage(), param.getLimit()); + List list = mapper.getUnitsList(param.getKey()); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } } 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 index df3ce56..fef7c8e 100644 --- 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 @@ -9,10 +9,12 @@ import com.glxp.udidl.admin.dto.device.ProductGoodsMatchModel; import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchListModel; import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchModel; import com.glxp.udidl.admin.dto.udplat.UdplatGoodsMatchParam; +import com.glxp.udidl.admin.entity.udid.UdiEntity; import com.glxp.udidl.admin.entity.udplat.UdplatGoodsMatch; import com.glxp.udidl.admin.res.PageSimpleResponse; import com.glxp.udidl.admin.service.udplat.UdplatGoodsMatchService; 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; @@ -46,6 +48,13 @@ public class UdplatGoodsMatchServiceImpl implements UdplatGoodsMatchService { return ResultVOUtils.success(); } public BaseResponse getList(UdplatGoodsMatchParam param){ + String key = param.getUdi(); + UdiEntity udiEntity = null; + if (key != null && key != "") { + udiEntity = FilterUdiUtils.getUdi(key); + key = udiEntity.getUdi(); + param.setNameCode(key); + } PageHelper.startPage(param.getPage(), param.getLimit()); if (param.getEndDate() != null && !param.getEndDate().isEmpty()) param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); 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 acd9061..f0daf28 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,20 +1,20 @@ package com.glxp.udidl.admin.service.udplat.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; 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.dto.udplat.UdplatGoodsModel; +import com.glxp.udidl.admin.dto.udplat.*; 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.info.FileInfoService; 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.admin.util.FileUtils; import com.glxp.udidl.common.res.BaseResponse; import com.glxp.udidl.common.util.ExcelUtil; import com.glxp.udidl.common.util.ResultVOUtils; @@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; import java.io.InputStream; import java.util.Date; import java.util.List; @@ -33,8 +34,10 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService { private UdplatGoodsMapper udplatGoodsMapper; @Autowired private UdplatLogService logService; + @Autowired + private FileInfoService fileInfoService; - public BaseResponse getList(BaseParam param) { + public BaseResponse getList(UdplatGoodsParam 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))); @@ -262,6 +265,36 @@ public class UdplatGoodsServiceImpl implements UdplatGoodsService { udplatGoods.setMedicalCode(deliveryGoods.getMedicalCode()); return udplatGoods; } + @Override + public void exportToFile(HttpServletResponse response){ + List list = udplatGoodsMapper.selectAll(); + FileUtils.exportToFile(response, JSONObject.toJSONString(list),"产品目录"); + } + + @Override + public BaseResponse exportToFile(UdplatGoodsParam param) { + if (param.getEndDate() != null && !param.getEndDate().isEmpty()) + param.setEndDate(DateUtil.formatDate(DateUtil.addDays(DateUtil.parseDate(param.getEndDate()), 1))); + List list = udplatGoodsMapper.list(param); + return fileInfoService.saveToFile(JSONObject.toJSONString(list),"产品目录.json"); + } + + public + BaseResponse selectById(Integer id){ + UdplatGoods result = udplatGoodsMapper.selectById(id); + if(result == null) + return ResultVOUtils.error(-1,"找不到记录！"); + return ResultVOUtils.success(result); + } + public BaseResponse getProducts(ProductParam param){ + PageHelper.startPage(param.getPage(), param.getLimit()); + List list = udplatGoodsMapper.getProducts(param); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } /*private BaseResponse save(List list){ if(list == null || list.size()<1) return ResultVOUtils.error(-1,"无数据！"); 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 index 2d43847..213a8f0 100644 --- 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 @@ -1,6 +1,7 @@ package com.glxp.udidl.admin.service.udplat.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.glxp.udidl.admin.dao.udplat.UdplatHospitalMapper; @@ -13,11 +14,13 @@ 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.admin.util.FileUtils; 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 javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; @@ -70,6 +73,10 @@ public class UdplatHospitalServiceImpl implements UdplatHospitalService { logService.insert(udplatLog); return ResultVOUtils.success(); } - + @Override + public void exportToFile(HttpServletResponse response){ + List list = mapper.selectAll(); + FileUtils.exportToFile(response, JSONObject.toJSONString(list),"医疗机构"); + } } 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 index 786ce73..c257e1a 100644 --- 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 @@ -1,5 +1,6 @@ package com.glxp.udidl.admin.service.udplat.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.glxp.udidl.admin.dao.udplat.UdplatManufactureMapper; @@ -12,11 +13,13 @@ 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.admin.util.FileUtils; 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 javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; @@ -69,4 +72,9 @@ public class UdplatManufactureServiceImpl implements UdplatManufactureService { logService.insert(udplatLog); return ResultVOUtils.success(); } + @Override + public void exportToFile(HttpServletResponse response){ + List list = mapper.selectAll(); + FileUtils.exportToFile(response, JSONObject.toJSONString(list),"生产企业"); + } } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/util/FileUtils.java b/api-admin/src/main/java/com/glxp/udidl/admin/util/FileUtils.java new file mode 100644 index 0000000..d9ee8e8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/udidl/admin/util/FileUtils.java @@ -0,0 +1,74 @@ +package com.glxp.udidl.admin.util; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + +public class FileUtils { + public static void exportToFile(HttpServletResponse response,String str,String fileName){ + response.setCharacterEncoding("utf-8"); + response.setContentType("application/octet-stream"); + response.setHeader("content-type","application/octet-stream"); + response.addHeader("Content-Disposition","attachment;filename="+genAttachmentFileName(fileName,"default")+".json"); + BufferedOutputStream buff=null; + ServletOutputStream outStr = null; + try{ + outStr = response.getOutputStream(); + buff = new BufferedOutputStream(outStr); + buff.write(str.getBytes(StandardCharsets.UTF_8)); + buff.flush(); + buff.close(); + }catch (Exception e){ + + }finally { + try{ + buff.close();; + outStr.close(); + }catch (Exception e){} + + } + } + public static String exportToFile(String str,String path){ + try + { + BufferedWriter bw = new BufferedWriter(new FileWriter(path,false)); + bw.write(str) ; + bw.newLine(); + bw.close(); + }catch (Exception e){ + return e.getMessage(); + } + return "success"; + } + public static void getFile(HttpServletResponse response,String path){ + try { + InputStream inputStream = new FileInputStream(path);// 文件的存放路径 + response.reset(); + response.setContentType("application/octet-stream"); + String filename = new File(path).getName(); + response.addHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(filename, "UTF-8")); + ServletOutputStream outputStream = response.getOutputStream(); + byte[] b = new byte[1024]; + int len; + //从输入流中读取一定数量的字节，并将其存储在缓冲区字节数组中，读到末尾返回-1 + while ((len = inputStream.read(b)) > 0) { + outputStream.write(b, 0, len); + } + inputStream.close(); + }catch (Exception e){ + + } + + } + private static String genAttachmentFileName(String cnName,String defaultName){ + try{ + cnName = new String(cnName.getBytes("gb2312"),"ISO8859-1"); + + }catch (Exception e){ + cnName = defaultName; + } + return cnName; + } +} diff --git a/api-admin/src/main/resources/mybatis/mapper/sys/SysMenuMapper.xml b/api-admin/src/main/resources/mybatis/mapper/sys/SysMenuMapper.xml index aef8dba..7c2999d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/sys/SysMenuMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/sys/SysMenuMapper.xml @@ -28,8 +28,7 @@ parent_id = #{parentId,jdbcType=INTEGER}, type = #{type,jdbcType=CHAR}, perms = #{perms,jdbcType=VARCHAR}, - status = #{status,jdbcType=CHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} + status = #{status,jdbcType=CHAR} where id = #{id,jdbcType=INTEGER} + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/udi/UdiCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/udi/UdiCompanyDao.xml index 9064cc2..fb28912 100644 --- a/api-admin/src/main/resources/mybatis/mapper/udi/UdiCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/udi/UdiCompanyDao.xml @@ -39,7 +39,9 @@ - + REPLACE INTO udicompany diff --git a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml index 402ebd6..9e08fc0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatDistributorMapper.xml @@ -59,4 +59,12 @@ from udplat_distributor where distributorId = #{id} + \ 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 4375071..8ea0877 100644 --- a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMapper.xml @@ -110,6 +110,9 @@ from udplat_goods where deliveryGoodsId = #{deliveryGoodsId} + - select id, uuid, deliveryGoodsId, projectGoodsCode, deliveryGoodsCode, manufactureId, - manufactureName, distributorId, distributorName, productName, compId, + manufactureName, distributorId, distributorName, productName, compId,model,spec, prodMaterial, packMaterial, regNum, regName, regValidTo, unionProjectId, unionProjectName, salePrice, priceUnitText, topSalePrice, settlePayPrice, goodsSource, stockStatus, changedContent, changedTime, proxyName, onlineStatus, medicalCode, createTime, updateTime from udplat_goods + + and manufactureName like concat('%',#{manufactureName},'%') + + + and distributorName like concat('%',#{distributorName},'%') + + + + and regNum like concat('%',#{regNum},'%') + + + and model like concat('%',#{model},'%') + + + and spec like concat('%',#{spec},'%') + and productName like concat('%',#{name},'%') - and createTime >= #{startDate} + and updateTime >= #{startDate} - and createTime <= #{endDate} + and updateTime <= #{endDate} + + + /* order by if(ISNULL(updateTime),createTime,updateTime) DESC*/ + + \ 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 index 833df11..2a3c528 100644 --- a/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml +++ b/api-admin/src/main/resources/mybatis/mapper/udplat/UdplatGoodsMatchMapper.xml @@ -1,79 +1,95 @@ - - - - - - - - - - delete from udplat_goods_match - where id = #{id,jdbcType=INTEGER} - - - insert into udplat_goods_match (id, deviceRecordKey, deliveryGoodsId, - medicalCode, createTime - ) - values (#{id,jdbcType=INTEGER}, #{deviceRecordKey,jdbcType=VARCHAR}, #{deliveryGoodsId,jdbcType=VARCHAR}, - #{medicalCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP} - ) - - - update udplat_goods_match - set deviceRecordKey = #{deviceRecordKey,jdbcType=VARCHAR}, - - projectGoodsCode = #{deliveryGoodsId,jdbcType=VARCHAR}, - - - medicalCode = #{medicalCode,jdbcType=VARCHAR}, - - updateTime = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - - - - + select id, deviceRecordKey, deliveryGoodsId, medicalCode, createTime, updateTime + from udplat_goods_match + where id = #{id,jdbcType=INTEGER} + + + + - + \ No newline at end of file diff --git a/api-admin/target/classes/com/glxp/udidl/admin/controller/device/FileInfoController.class b/api-admin/target/classes/com/glxp/udidl/admin/controller/device/FileInfoController.class index ed4dd74..c4b2fa7 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/controller/device/FileInfoController.class and b/api-admin/target/classes/com/glxp/udidl/admin/controller/device/FileInfoController.class differ 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 b464eef..e83d8f9 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class and b/api-admin/target/classes/com/glxp/udidl/admin/controller/device/TestController.class differ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.class b/api-admin/target/classes/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.class index 2c56ac0..a6acc56 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.class and b/api-admin/target/classes/com/glxp/udidl/admin/dao/udi/UdiCompanyDao.class differ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/service/info/FileInfoService.class b/api-admin/target/classes/com/glxp/udidl/admin/service/info/FileInfoService.class index 62bab6c..f5e2093 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/service/info/FileInfoService.class and b/api-admin/target/classes/com/glxp/udidl/admin/service/info/FileInfoService.class differ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.class b/api-admin/target/classes/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.class index 83748df..8f013ef 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.class and b/api-admin/target/classes/com/glxp/udidl/admin/service/info/impl/FileInfoServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/service/udi/UdiCompanyService.class b/api-admin/target/classes/com/glxp/udidl/admin/service/udi/UdiCompanyService.class index 704b8f2..27b285b 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/service/udi/UdiCompanyService.class and b/api-admin/target/classes/com/glxp/udidl/admin/service/udi/UdiCompanyService.class differ diff --git a/api-admin/target/classes/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.class b/api-admin/target/classes/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.class index e05ecc4..182acde 100644 Binary files a/api-admin/target/classes/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.class and b/api-admin/target/classes/com/glxp/udidl/admin/service/udi/impl/UdiCompanyServiceImpl.class differ diff --git a/api-admin/target/classes/mybatis/mapper/udi/UdiCompanyDao.xml b/api-admin/target/classes/mybatis/mapper/udi/UdiCompanyDao.xml index 9064cc2..fb28912 100644 --- a/api-admin/target/classes/mybatis/mapper/udi/UdiCompanyDao.xml +++ b/api-admin/target/classes/mybatis/mapper/udi/UdiCompanyDao.xml @@ -39,7 +39,9 @@ - + REPLACE INTO udicompany diff --git a/api-common/src/main/java/com/glxp/udidl/common/res/BaseResponse.java b/api-common/src/main/java/com/glxp/udidl/common/res/BaseResponse.java index d0a183e..0bf4e05 100644 --- a/api-common/src/main/java/com/glxp/udidl/common/res/BaseResponse.java +++ b/api-common/src/main/java/com/glxp/udidl/common/res/BaseResponse.java @@ -8,6 +8,7 @@ import lombok.Data; */ @Data public class BaseResponse { + public boolean success(){return this.code.equals(20000);} private Integer code; diff --git a/api-common/target/classes/com/glxp/udidl/common/res/BaseResponse.class b/api-common/target/classes/com/glxp/udidl/common/res/BaseResponse.class index ed4aff9..cf6704f 100644 Binary files a/api-common/target/classes/com/glxp/udidl/common/res/BaseResponse.class and b/api-common/target/classes/com/glxp/udidl/common/res/BaseResponse.class differ diff --git a/api-swagger/pom.xml b/api-swagger/pom.xml new file mode 100644 index 0000000..41dd9ba --- /dev/null +++ b/api-swagger/pom.xml @@ -0,0 +1,25 @@ + + + + udidl + com.glxp + 0.0.1 + + 4.0.0 + + api-swagger + + + 8 + 8 + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.2 + + + \ No newline at end of file diff --git a/api-swagger/src/main/java/com/glxp/udidl/swagger/config/SwaggerConfig.java b/api-swagger/src/main/java/com/glxp/udidl/swagger/config/SwaggerConfig.java new file mode 100644 index 0000000..44507ad --- /dev/null +++ b/api-swagger/src/main/java/com/glxp/udidl/swagger/config/SwaggerConfig.java @@ -0,0 +1,34 @@ +package com.glxp.udidl.swagger.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class SwaggerConfig { + @Bean(value = "defaultApi2") + public Docket defaultApi2(){ + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + //.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + .apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build(); + } + private ApiInfo apiInfo(){ + return new ApiInfoBuilder() + .title("第三方服务") + .description("接口文档") + //.contact() + .version("1.0") + .build(); + } +} diff --git a/pom.xml b/pom.xml index 962e4bd..51e3352 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ api-admin api-common + api-swagger pom