接口文档更新

src/main/java/com/glxp/udidl/admin/controller/auth/AuthUdiTokenController.java

@@ -1,54 +0,0 @@
-package com.glxp.udidl.admin.controller.auth;
-
-import cn.hutool.core.util.StrUtil;
-import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
-import com.glxp.udidl.admin.entity.auth.AuthAdmin;
-import com.glxp.udidl.admin.req.udid.TokenRequest;
-import com.glxp.udidl.admin.res.BaseResponse;
-import com.glxp.udidl.admin.res.auth.LoginUserInfoResponse;
-import com.glxp.udidl.admin.service.dataSync.DeviceDownloadService;
-import com.glxp.udidl.admin.util.ResultVOUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-@RestController
-public class AuthUdiTokenController {
-
-
-    @Resource
-    DeviceDownloadService deviceDownloadService;
-
-
-    @AuthRuleAnnotation("")
-    @PostMapping("/admin/auth/udi/token")
-    public BaseResponse vailUdiToken(@RequestBody TokenRequest tokenRequest) {
-
-
-        if (StrUtil.isEmpty(tokenRequest.getTyshxydm())) {
-            return ResultVOUtils.error(500, "统一社会信用代码不能为空!");
-        }
-
-        if (StrUtil.isEmpty(tokenRequest.getAppId())) {
-            return ResultVOUtils.error(500, "appId不能为空!");
-        }
-
-        if (StrUtil.isEmpty(tokenRequest.getAppSecret())) {
-            return ResultVOUtils.error(500, "appSecret不能为空!");
-        }
-        String data = deviceDownloadService.getTokenNow(tokenRequest);
-        if (data.contains("验证成功")) {
-            return ResultVOUtils.success("验证成功!");
-        } else {
-            return ResultVOUtils.error(500, data);
-        }
-
-    }
-
-}

src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java

@@ -7,18 +7,24 @@ import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity;
 import com.glxp.udidl.admin.entity.udid.UdiEntity;
 import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
+import com.glxp.udidl.admin.req.SyncCompanyReuqest;
+import com.glxp.udidl.admin.req.SyncUdiRequest;
 import com.glxp.udidl.admin.req.UdiCompanyRequest;
 import com.glxp.udidl.admin.res.BaseResponse;
 import com.glxp.udidl.admin.res.PageSimpleResponse;
 import com.glxp.udidl.admin.res.udid.ProductInfoResponse;
 import com.glxp.udidl.admin.service.inout.ProductInfoService;
 import com.glxp.udidl.admin.service.udi.UdiCompanyService;
+import com.glxp.udidl.admin.util.BeanUtils;
 import com.glxp.udidl.admin.util.FilterUdiUtils;
 import com.glxp.udidl.admin.util.ResultVOUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -37,9 +43,11 @@ public class ProductInfoController {
     //手持枪扫码查询
     @ApiOperation(value = "手持枪扫码查询", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/findBydi")
+    @ApiImplicitParams({@ApiImplicitParam(name = "nameCode", value = "UDI码", required = true)})
     @GetMapping("udidl/device/findBydi")
-    public BaseResponse findProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse findProductInfo(String nameCode) {
-        String key = productInfoFilterRequest.getNameCode();
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        String key = nameCode;
         if (key != null) {
             key = FilterUdiUtils.getDiStr(key);
             productInfoFilterRequest.setNameCode(key);
@@ -73,9 +81,11 @@ public class ProductInfoController {
     //管理平台扫码查询
     @ApiOperation(value = "管理平台扫码查询", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/wms/findBydi")
+    @ApiImplicitParams({@ApiImplicitParam(name = "nameCode", value = "UDI码", required = true)})
     @GetMapping("udidl/wms/findBydi")
-    public BaseResponse findBydiWms(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse findBydiWms(String nameCode) {
-        String key = productInfoFilterRequest.getNameCode();
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        String key = nameCode;
         if (FilterUdiUtils.vailDiEmpty(key) != null) {
             return FilterUdiUtils.vailDiEmpty(key);
         }
@@ -83,6 +93,7 @@ public class ProductInfoController {
         if (udiEntity == null) {
             return ResultVOUtils.error(500, "UDI码格式错误！");
         }
+        productInfoFilterRequest.setNameCode(udiEntity.getUdi());
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         ProductInfoResponse productInfoResponse = new ProductInfoResponse();
         if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
@@ -115,32 +126,33 @@ public class ProductInfoController {
     }
 
     //UDI自助平台/UDI管理系统/DI同步下载
-    @ApiOperation(value = "出入库同步下载", response = ProductInfoEntity.class)
+    @ApiOperation(value = "UDI自助平台DI同步下载更新", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/udiwms/syncUdi")
     @GetMapping("udidl/udiwms/syncUdi")
-    public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse syncUdi(SyncUdiRequest syncUdiRequest) {
-
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        BeanUtils.copyProperties(productInfoFilterRequest, syncUdiRequest);
         if (productInfoFilterRequest.getPage() == null || productInfoFilterRequest.getLimit() == null)
             return ResultVOUtils.error(500, "分页参数不能为空");
-//
-//        if (StrUtil.isEmpty(productInfoFilterRequest.getUpdateTime())) {
-//            return ResultVOUtils.error(500, "最后更新时间不能为空！");
-//        }
-
         List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
         return ResultVOUtils.success(productInfoEntityList);
     }
 
     //UDI自助平台/UDI管理系统/企业信息同步下载
+    @ApiOperation(value = "UDI自助平台企业同步下载更新", response = UdiCompanyEntity.class)
     @AuthRuleAnnotation("udidl_company_all")
     @GetMapping("udidl/udiwms/syncCompany")
-    public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) {
+    public BaseResponse syncCompany(SyncCompanyReuqest syncCompanyReuqest) {
+        UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest();
+        BeanUtils.copyProperties(syncCompanyReuqest, udiCompanyRequest);
         if (udiCompanyRequest.getPage() == null || udiCompanyRequest.getLimit() == null)
             return ResultVOUtils.error(500, "分页参数不能为空");
         List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest);
         return ResultVOUtils.success(udiCompanyEntities);
     }
 
+
+    @ApiIgnore
     @ApiOperation(value = "根据主DI查询产品信息", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/filterUdi")
     @GetMapping("udidl/device/filterUdi")
@@ -184,7 +196,7 @@ public class ProductInfoController {
     }
 
 
-    @ApiOperation(value = "查询全部产品信息接口", response = ProductInfoEntity.class)
+    @ApiOperation(value = "UDI自助平台DI查询接口", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/filterAllUdi")
     @GetMapping("udidl/device/filterAllUdi")
     public BaseResponse filterAllUdi(ProductInfoFilterRequest productInfoFilterRequest) {
@@ -285,25 +297,32 @@ public class ProductInfoController {
     }
 
     @ApiOperation(value = "根据UUID查询产品信息", response = ProductInfoEntity.class)
+    @ApiImplicitParams({@ApiImplicitParam(name = "uuid", value = "同一产品同一版本号唯一主键", required = true)})
     @AuthRuleAnnotation("udidl/device/filterByUuid")
     @GetMapping("udidl/device/filterByUuid")
-    public BaseResponse filterByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse filterByUuid(String uuid) {
 
-        if (StrUtil.isEmpty(productInfoFilterRequest.getUuid())) {
+        if (StrUtil.isEmpty(uuid)) {
             return ResultVOUtils.error(500, "查询条件不能为空！");
         }
+
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        productInfoFilterRequest.setUuid(uuid);
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         return ResultVOUtils.success(productInfoEntityList);
     }
 
     @ApiOperation(value = "根据最小标识查询产品信息", response = ProductInfoEntity.class)
+    @ApiImplicitParams({@ApiImplicitParam(name = "nameCode", value = "最小销售产品标识", required = true)})
     @AuthRuleAnnotation("udidl/device/filterByNameCode")
     @GetMapping("udidl/device/filterByNameCode")
-    public BaseResponse filterByNameCode(ProductInfoFilterRequest productInfoFilterRequest) {
+    public BaseResponse filterByNameCode(String nameCode) {
 
-        if (StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
+        if (StrUtil.isEmpty(nameCode)) {
             return ResultVOUtils.error(500, "查询条件不能为空！");
         }
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        productInfoFilterRequest.setNameCode(nameCode);
 
         return ResultVOUtils.success(productInfoService.findLastVersion(productInfoFilterRequest));
     }

src/main/java/com/glxp/udidl/admin/controller/device/UdiCompanyController.java

@@ -6,18 +6,21 @@ import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity;
 import com.glxp.udidl.admin.enums.ResultEnum;
+import com.glxp.udidl.admin.req.FilterCompanyDiRequest;
 import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
 import com.glxp.udidl.admin.req.UdiCompanyRequest;
 import com.glxp.udidl.admin.res.BaseResponse;
 import com.glxp.udidl.admin.res.PageSimpleResponse;
 import com.glxp.udidl.admin.service.inout.ProductInfoService;
 import com.glxp.udidl.admin.service.udi.UdiCompanyService;
+import com.glxp.udidl.admin.util.BeanUtils;
 import com.glxp.udidl.admin.util.ResultVOUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -45,7 +48,7 @@ public class UdiCompanyController {
         return ResultVOUtils.success(udiCompanyEntities);
     }
 
-    @ApiOperation(value = "查询指定企业的产品信息", response = ProductInfoEntity.class)
+    @ApiIgnore
     @AuthRuleAnnotation("udi/company/filtertByTD")
     @GetMapping("udi/company/filtertByTD")
     public BaseResponse filtertByTD(ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
@@ -57,13 +60,15 @@ public class UdiCompanyController {
     }
 
     @ApiOperation(value = "查询企业最新的产品信息", response = ProductInfoEntity.class)
-    //udi查询app接口，获取企业最新DI
     @AuthRuleAnnotation("udi/company/filtertUdi")
     @GetMapping("udi/company/filtertUdi")
-    public BaseResponse filtertUdi(ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+    public BaseResponse filtertUdi(FilterCompanyDiRequest filterCompanyDiRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        BeanUtils.copyProperties(filterCompanyDiRequest, productInfoFilterRequest);
         if (StrUtil.isNotEmpty(productInfoFilterRequest.getTyshxydm())) {
             return ResultVOUtils.error(500, "统一社会信用代码不能为空！");
         }

src/main/java/com/glxp/udidl/admin/controller/device/UdiCooperController.java

@@ -11,11 +11,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 //协调平台API
+@ApiIgnore
 @Api(tags = "协调平台接口")
 @RestController
 public class UdiCooperController {

src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java

@@ -26,10 +26,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.Date;
 
+@ApiIgnore
 @Api(tags = "下载医疗器械信息接口")
 @RestController
 public class UdidlDeviceController {

src/main/java/com/glxp/udidl/admin/controller/info/CompanyController.java

@@ -1,8 +1,11 @@
 package com.glxp.udidl.admin.controller.info;
 
+import cn.hutool.core.util.StrUtil;
 import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udidl.admin.entity.info.CompanyEntity;
+import com.glxp.udidl.admin.req.udid.TokenRequest;
 import com.glxp.udidl.admin.res.BaseResponse;
+import com.glxp.udidl.admin.service.dataSync.DeviceDownloadService;
 import com.glxp.udidl.admin.service.info.CompanyService;
 import com.glxp.udidl.admin.util.ResultVOUtils;
 import io.swagger.annotations.Api;
@@ -22,18 +25,50 @@ public class CompanyController {
 
     @Resource
     private CompanyService companyService;
+    @Resource
+    DeviceDownloadService deviceDownloadService;
 
     @ApiOperation(value = "查询企业信息", response = CompanyEntity.class)
+    @ApiImplicitParams({@ApiImplicitParam(name = "tyshxydm", value = "统一社会信用代码", required = true)})
     @AuthRuleAnnotation("warehouse/info/company")
     @GetMapping("/warehouse/info/company")
-    public BaseResponse getCompanyInfo() {
+    public BaseResponse getCompanyInfo(String tyshxydm) {
-        CompanyEntity companyEntity = companyService.findCompany();
+        if (StrUtil.isEmpty(tyshxydm)) {
+            return ResultVOUtils.error(500, "统一社会信用代码不能为空！");
+        }
+        CompanyEntity companyEntity = companyService.findByTyshxydm(tyshxydm);
         if (companyEntity != null) {
             return ResultVOUtils.success(companyEntity);
         }
         return ResultVOUtils.error(500, "企业信息为空");
     }
 
+    @ApiOperation(value = "验证应用码和授权码是否可用")
+    @AuthRuleAnnotation("admin/auth/udi/token")
+    @PostMapping("/admin/auth/udi/token")
+    public BaseResponse vailUdiToken(@RequestBody TokenRequest tokenRequest) {
+
+
+        if (StrUtil.isEmpty(tokenRequest.getTyshxydm())) {
+            return ResultVOUtils.error(500, "统一社会信用代码不能为空!");
+        }
+
+        if (StrUtil.isEmpty(tokenRequest.getAppId())) {
+            return ResultVOUtils.error(500, "appId不能为空!");
+        }
+
+        if (StrUtil.isEmpty(tokenRequest.getAppSecret())) {
+            return ResultVOUtils.error(500, "appSecret不能为空!");
+        }
+        String data = deviceDownloadService.getTokenNow(tokenRequest);
+        if (data.contains("验证成功")) {
+            return ResultVOUtils.success("验证成功!");
+        } else {
+            return ResultVOUtils.error(500, data);
+        }
+
+    }
+
     @ApiOperation(value = "修改企业信息")
     @AuthRuleAnnotation("warehouse/info/modifyCompany")
     @PostMapping("/warehouse/info/modifyCompany")
@@ -45,7 +80,7 @@ public class CompanyController {
     @ApiOperation(value = "测试国家UDI库接口连通性")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "appId", value = "appId", required = true),
-            @ApiImplicitParam(name = "appSecret", value = "秘钥", required = true),
+            @ApiImplicitParam(name = "appSecret", value = "appSecret", required = true),
             @ApiImplicitParam(name = "companyName", value = "公司名称", required = true),
             @ApiImplicitParam(name = "creditNum", value = "统一社会信用代码", required = true),
             @ApiImplicitParam(name = "dataSource", value = "账号数据来源：1.UDIMS，2.UDI自助平台", required = true)

src/main/java/com/glxp/udidl/admin/controller/info/JobLogController.java

@@ -11,8 +11,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Api(tags = "任务日志接口")
+@ApiIgnore
 @RestController
 @RequestMapping("/jobLog")
 public class JobLogController {

src/main/java/com/glxp/udidl/admin/controller/udplat/ThirdApiController.java

@@ -14,8 +14,9 @@ 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;
+import springfox.documentation.annotations.ApiIgnore;
 
-@Api(tags = "第三方接口")
+@Api(tags = "阳光采购平台第三方接口")
 @RestController
 public class ThirdApiController {
 

src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatHospitalController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-@Api(tags = "医疗机构信息接口")
+@Api(tags = "阳光采购平台医疗机构信息接口")
 @RestController
 @RequestMapping("/udplat/hospital")
 public class UdplatHospitalController {

src/main/java/com/glxp/udidl/admin/controller/udplat/UdplatManufactureController.java

@@ -14,7 +14,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
-@Api(tags = "生产企业信息接口")
+
+@Api(tags = "阳光采购平台生产企业信息接口")
 @RestController
 @RequestMapping("/udplat/manufacture")
 public class UdplatManufactureController {

src/main/java/com/glxp/udidl/admin/dto/udplat/UdplatGoodsMatchListModel.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @ApiModel(value = "阳光采购平台产品对照信息")
 public class UdplatGoodsMatchListModel {
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;//uuid
 
     @ApiModelProperty(value = "最小销售单元产品标识")

src/main/java/com/glxp/udidl/admin/entity/info/CompanyEntity.java

@@ -33,13 +33,13 @@ public class CompanyEntity {
     @ApiModelProperty(value = "企业类别：1.生产企业，2.流通企业，3.医疗机构")
     private String classes;     //企业类别         //企业类别：1.生产企业，2.流通企业，3.医疗机构
 
-    @ApiModelProperty(value = "appId")
+    @ApiModelProperty(value = "应用码")
     private String appId;
 
-    @ApiModelProperty(value = "秘钥")
+    @ApiModelProperty(value = "应用授权码")
     private String appSecret;
 
-    @ApiModelProperty(value = "统一社会信用代码")
+    @ApiModelProperty(value = "统一社会信用代码",required = true)
     private String tyshxydm;    //统一社会信用代码
 
     @ApiModelProperty(value = "账号数据来源：1.UDIMS，2.UDI自助平台")

src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Date;
 
@@ -11,10 +12,10 @@ import java.util.Date;
 @ApiModel(value = "产品信息实体")
 public class ProductInfoEntity {
 
-    @ApiModelProperty(value = "产品id")
+    @ApiModelProperty(value = "主键ID")
     private Integer id;
 
-    @ApiModelProperty(value = "最小销售标识")
+    @ApiModelProperty(value = "最小销售产品标识（DI)")
     private String nameCode;
 
     @ApiModelProperty(value = "包装比例")
@@ -41,19 +42,19 @@ public class ProductInfoEntity {
     @ApiModelProperty(value = "包装层级")
     private String bzcj;
 
-    @ApiModelProperty(value = "第三方产品编码")
+    @ApiModelProperty(value = "第三方产品编码", hidden = true)
     private String thirdProductNo;
 
-    @ApiModelProperty(value = "第三方产品名称")
+    @ApiModelProperty(value = "第三方产品名称", hidden = true)
     private String thirdProductName;
 
-    @ApiModelProperty(value = "产品分类 1.器械，2，药品")
+    @ApiModelProperty(value = "产品分类 1.器械，2，药品", hidden = true)
     private String addType;
 
     @ApiModelProperty(value = "国家库记录ID")
     private String deviceRecordKey;
 
-    @ApiModelProperty(value = "以使用单元数量入库")
+    @ApiModelProperty(value = "以使用单元数量入库", hidden = true)
     private Integer isUseDy;
 
     @ApiModelProperty(value = "产品通用名称")
@@ -86,7 +87,7 @@ public class ProductInfoEntity {
     @ApiModelProperty(value = "使用单元产品标识")
     private String sydycpbs;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     @ApiModelProperty(value = "历史版本号，最高为最新")

src/main/java/com/glxp/udidl/admin/entity/udi/UdiCompanyEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.entity.udi;
 
+import com.github.xiaoymin.knife4j.annotations.Ignore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/glxp/udidl/admin/entity/udid/Contactlist.java

@@ -21,7 +21,7 @@ public class Contactlist {
     @ApiModelProperty(value = "器械联系人邮箱")
     private String qylxryx;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     public Integer getId() {

src/main/java/com/glxp/udidl/admin/entity/udid/Device.java

@@ -9,7 +9,7 @@ import java.util.Date;
 public class Device {
 
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     @ApiModelProperty(value = "主键编号")

src/main/java/com/glxp/udidl/admin/entity/udid/DeviceEntity.java

@@ -10,7 +10,7 @@ import java.util.List;
 @ApiModel(value = "医疗器械信息")
 public class DeviceEntity {
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     @ApiModelProperty(value = "主键编号")

src/main/java/com/glxp/udidl/admin/entity/udid/Deviceclinical.java

@@ -21,7 +21,7 @@ public class Deviceclinical {
     @ApiModelProperty(value = "尺寸单位")
     private String ccdw;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     public Integer getId() {

src/main/java/com/glxp/udidl/admin/entity/udid/Devicepackage.java

@@ -24,7 +24,7 @@ public class Devicepackage {
     @ApiModelProperty(value = "主键编号")
     private String devicerecordkey;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     public Integer getId() {

src/main/java/com/glxp/udidl/admin/entity/udid/Devicestorage.java

@@ -24,7 +24,7 @@ public class Devicestorage {
     @ApiModelProperty(value = "最高值")
     private String zgz;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     public Integer getId() {

src/main/java/com/glxp/udidl/admin/entity/udplat/UdplatGoods.java

@@ -14,7 +14,7 @@ public class UdplatGoods {
     @ApiModelProperty(value = "产品ID")
     private Long id;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     @ApiModelProperty(value = "配送目录ID")

src/main/java/com/glxp/udidl/admin/req/FilterCompanyDiRequest.java

@@ -0,0 +1,48 @@
+package com.glxp.udidl.admin.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "查询企业相关产品信息")
+public class FilterCompanyDiRequest extends ListPageRequest {
+
+
+    @ApiModelProperty(value = "最小销售产品标识（DI）")
+    private String nameCode;
+
+    @ApiModelProperty(value = "国家库数据库记录key")
+    private String deviceRecordKey;
+
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
+    private String uuid;
+
+    @ApiModelProperty(value = "产品通用名称")
+    private String cpmctymc;
+
+    @ApiModelProperty(value = "医疗器械注册备案人名称")
+    private String ylqxzcrbarmc;
+
+    @ApiModelProperty(value = "规格型号")
+    private String ggxh;
+
+    @ApiModelProperty(value = "统一社会信用代码", required = true)
+    private String tyshxydm;
+
+    @ApiModelProperty(value = "是否查询历史产品信息记录")
+    private boolean showHis;
+
+    @ApiModelProperty(value = "标识类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识")
+    private String diType;
+
+    @ApiModelProperty(value = "是否最新")
+    private Integer isNewest;
+
+    @ApiModelProperty(value = "注册/备案证号")
+    private String zczbhhzbapzbh;
+
+    @ApiModelProperty(value = "更新时间")
+    private String updateTime;
+
+}

src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java

@@ -8,34 +8,29 @@ import lombok.Data;
 @ApiModel(value = "产品信息查询参数实体")
 public class ProductInfoFilterRequest extends ListPageRequest {
 
-    @ApiModelProperty(value = "产品标识")
+    @ApiModelProperty(value = "最小销售产品标识（DI）")
     private String nameCode;
 
-    @ApiModelProperty(value = "第三方产品编号")
+    @ApiModelProperty(value = "国家库数据库记录key")
-    private String thirdProductNo;
-
-    @ApiModelProperty(value = "")
     private String deviceRecordKey;
 
-    @ApiModelProperty(value = "uuid")
+    @ApiModelProperty(value = "同一产品同一版本号唯一主键")
     private String uuid;
 
     @ApiModelProperty(value = "产品通用名称")
     private String cpmctymc;
 
-    @ApiModelProperty(value = "医疗器械注册备案人名称")
+    @ApiModelProperty(value = "医疗器械注册备案人名称", required = true)
     private String ylqxzcrbarmc;
 
     @ApiModelProperty(value = "规格型号")
     private String ggxh;
 
-    @ApiModelProperty(value = "统一社会信用代码")
+    @ApiModelProperty(value = "统一社会信用代码", required = true)
     private String tyshxydm;
 
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "是否查询历史产品信息记录")
-    private String authCode;
+    private boolean showHis;
-
-    private boolean isShowHis;
 
     @ApiModelProperty(value = "标识类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识")
     private String diType;

src/main/java/com/glxp/udidl/admin/req/SyncCompanyReuqest.java

@@ -0,0 +1,12 @@
+package com.glxp.udidl.admin.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SyncCompanyReuqest {
+
+    @ApiModelProperty(value = "更新时间", required = true)
+    private String updateTime;
+
+}

src/main/java/com/glxp/udidl/admin/req/SyncUdiRequest.java

@@ -0,0 +1,17 @@
+package com.glxp.udidl.admin.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SyncUdiRequest extends ListPageRequest {
+    @ApiModelProperty(value = "医疗器械注册备案人名称")
+    private String ylqxzcrbarmc;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String tyshxydm;
+
+    @ApiModelProperty(value = "更新时间", required = true)
+    private String updateTime;
+
+}

src/main/java/com/glxp/udidl/admin/req/udid/TokenRequest.java

@@ -1,13 +1,16 @@
 package com.glxp.udidl.admin.req.udid;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class TokenRequest {
-
+    @ApiModelProperty(value = "应用码", required = true)
     private String appId;
+    @ApiModelProperty(value = "应用授权码", required = true)
     private String appSecret;
+    @ApiModelProperty(value = "统一社会信用代码", required = true)
     @JSONField(name = "TYSHXYDM")
     private String tyshxydm;//统一社会信用代码 必须大写
 }