代码备份

src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java

@@ -2,11 +2,13 @@ package com.glxp.api.controller.trace;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.config.rabbit.TopicRabbitConfig;
 import com.glxp.api.entity.trace.TraceManuCodeRelEntity;
 import com.glxp.api.entity.trace.TraceManuOrderEntity;
 import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
@@ -20,7 +22,9 @@ import com.glxp.api.service.trace.TraceTaskNoticeService;
 import com.glxp.api.service.trace.TraceTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,6 +47,7 @@ import java.util.List;
 @ApiIgnore
 @RestController
 @Slf4j
+@RequiredArgsConstructor
 public class TraceManuOrderController {
     @Resource
     TraceManuOrderService traceManuOrderService;
@@ -50,6 +55,19 @@ public class TraceManuOrderController {
     TraceManuCodeRelService traceManuCodeRelService;
     @Resource
     TraceTaskService traceTaskService;
+    @Resource
+    private final RabbitTemplate rabbitTemplate;
+
+
+    @GetMapping("udi/trace/manu/order/sendUdi")
+    public BaseResponse sendUdi(@RequestBody TraceManuOrderUploadRequest traceManuOrderUploadRequest) {
+        String messageJson = JSON.toJSONString(traceManuOrderUploadRequest);
+        System.out.println(messageJson);
+        rabbitTemplate.convertAndSend("trace.topic.exchange", TopicRabbitConfig.common, messageJson);
+        return ResultVOUtils.success("发送成功");
+    }
+
+
 
     @ApiOperation(value = "查询追溯单据列表",response = TraceManuOrderResponse.class)
     @AuthRuleAnnotation("udi/trace/manu/order/filter")
@@ -113,4 +131,5 @@ public class TraceManuOrderController {
         return ResultVOUtils.success("成功");
     }
 
+
 }

src/main/java/com/glxp/api/entity/trace/MqTraceMessage.java

@@ -1,36 +1,46 @@
 package com.glxp.api.entity.trace;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@ApiModel(value = "Mq跟踪消息")
 public class MqTraceMessage implements Serializable {
 
     /**
      * 消息创建时间
      */
+    @ApiModelProperty(value = "消息创建时间")
     private Date createTime;
     /**
      * 报备企业ID唯一键
      */
+    @ApiModelProperty(value = "报备企业ID唯一键")
     private Long companyId;
     /**
      * 报备企业统一社会信用号
      */
+    @ApiModelProperty(value = "报备企业统一社会信用号")
     private String cerditNo;
 
     /**
      * 任务类型   1:提交生产信息和出入库信息；2：提交出入库信息
      */
+    @ApiModelProperty(value = "任务类型   1:提交生产信息和出入库信息；2：提交出入库信息")
     private Integer taskType;
 
     /**
      * 任务ID识别号(查询记录号)  调用接口后需回传
      */
+    @ApiModelProperty(value = "任务ID识别号(查询记录号)  调用接口后需回传")
     private Long taskId;
+    @ApiModelProperty(value = "消息ID")
     private String messageId;
+    @ApiModelProperty(value = "key")
     private String key;
 
 

src/main/java/com/glxp/api/req/trace/TraceManuOrderRequest.java

@@ -1,87 +1,105 @@
 package com.glxp.api.req.trace;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
+@ApiModel("追踪制造订单请求")
 public class TraceManuOrderRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /**
      * 生产订单号
      */
+    @ApiModelProperty(value = "生产订单号")
     private String billNo;
 
     /**
      * 订单日期
      */
+    @ApiModelProperty(value = "订单日期")
     private String billDate;
 
     /**
      * 产品名称
      */
+    @ApiModelProperty(value = "产品名称")
     private String cpmctymc;
 
     /**
      * 规格型号
      */
+    @ApiModelProperty(value = "规格型号")
     private String ggxh;
 
     /**
      * 产品描述
      */
+    @ApiModelProperty(value = "产品描述")
     private String cpms;
 
     /**
      * 注册/备案证号
      */
+    @ApiModelProperty(value = "注册/备案证号")
     private String zczbhhzbapzbh;
 
     /**
      * DI
      */
+    @ApiModelProperty(value = "DI")
     private String nameCode;
 
     /**
      * 国家库UUID
      */
+    @ApiModelProperty(value = "国家库UUID")
     private String uuid;
 
     /**
      * 医疗器械注册人
      */
+    @ApiModelProperty(value = "医疗器械注册人")
     private String ylqxzcrbarmc;
 
     /**
      * 生产企业
      */
+    @ApiModelProperty(value = "生产企业")
     private String manufactory;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * 企业信息ID外键
      */
+    @ApiModelProperty(value = "企业信息ID外键")
     private Long companyIdFk;
 
     /**
      * 上传者ID
      */
+    @ApiModelProperty(value = "上传者ID")
     private Long uploadUser;
 
     /**
      * 查询记录号
      */
+    @ApiModelProperty(value = "查询记录号")
     private String recordCode;
 
     /**
      * 所属企业
      */
+    @ApiModelProperty(value = "所属企业")
     private String companyName;
 }

src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java

@@ -1,16 +1,25 @@
 package com.glxp.api.req.trace;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("追踪订单详情请求")
 public class TraceOrderDetailRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "UDI码，即医疗器械唯一识别码")
     private String udiCode;
+    @ApiModelProperty(value = "注册/备案人名称")
     private String ylqxzcrbarmc;
+    @ApiModelProperty(value = "产品名称，通用名称")
     private String cpmctymc;
+    @ApiModelProperty(value = "规格型号")
     private String ggxh;
+    @ApiModelProperty(value = "标识")
     private String nameCode;
+    @ApiModelProperty(value = "批次号")
     private String batchNo;
+    @ApiModelProperty(value = "公司名称")
     private String companyName;
 }

src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java

@@ -1,112 +1,134 @@
 package com.glxp.api.req.trace;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
+@ApiModel("追踪订单请求")
 @Data
 public class TraceOrderRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "主键")
     private Long id;
 
     /**
      * 单据号
      */
+    @ApiModelProperty(value = "单据号")
     private String billNo;
 
     /**
      * 单据时间
      */
+    @ApiModelProperty(value = "单据时间")
     private String billDate;
 
     /**
      * 1:入库；2：出库
      */
+    @ApiModelProperty(value = "1:入库；2：出库")
     private Byte inOutType;
 
     /**
      * 单据类型
      */
+    @ApiModelProperty(value = "单据类型")
     private String billType;
 
     /**
      * 发货企业
      */
+    @ApiModelProperty(value = "发货企业")
     private String fromCorp;
 
     /**
      * 发货企业统一社会信用号
      */
+    @ApiModelProperty(value = "发货企业统一社会信用号")
     private String fromCorpCreditNum;
 
     /**
      * 收货企业
      */
+    @ApiModelProperty(value = "收货企业")
     private String toCorp;
 
     /**
      * 收货企业统一社会信用号
      */
+    @ApiModelProperty(value = "收货企业统一社会信用号")
     private String toCorpCreditNum;
 
     /**
      * 单据创建者
      */
+    @ApiModelProperty(value = "单据创建者")
     private Long createUser;
 
     /**
      * 企业信息ID外键
      */
+    @ApiModelProperty(value = "企业信息ID外键")
     private Long companyIdFk;
 
     /**
      * 客户端类型
      */
+    @ApiModelProperty(value = "客户端类型")
     private Integer clientType;
 
     /**
      * 退货原因（退货时填写）
      */
+    @ApiModelProperty(value = "退货原因（退货时填写）")
     private String returnReason;
 
     /**
      * 销毁原因（销毁时填写）
      */
+    @ApiModelProperty(value = "销毁原因（销毁时填写）")
     private String destoryReason;
 
     /**
      * 执行销毁人（销毁时填写）
      */
+    @ApiModelProperty(value = "执行销毁人（销毁时填写）")
     private String excuseUser;
 
     /**
      * 执行销毁人证件号（销毁时填写）
      */
+    @ApiModelProperty(value = "执行销毁人证件号（销毁时填写）")
     private String excuseCode;
 
     /**
      * 监督人姓名【销毁出库时填写】
      */
+    @ApiModelProperty(value = "监督人姓名【销毁出库时填写】")
     private String superviserUser;
 
     /**
      * 监督人证件号【销毁出库时填写】
      */
+    @ApiModelProperty(value = "监督人证件号【销毁出库时填写】")
     private String superviserCode;
 
     /**
      * 上传着ID
      */
+    @ApiModelProperty(value = "上传着ID")
     private Long uploadUser;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 }

src/main/java/com/glxp/api/req/trace/TraceProductRecordRequest.java

@@ -1,14 +1,20 @@
 package com.glxp.api.req.trace;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("追踪产品记录请求")
 public class TraceProductRecordRequest extends ListPageRequest {
-
+    @ApiModelProperty(value = "注册/备案人名称")
     private String ylqxzcrbarmc;
+    @ApiModelProperty(value = "产品名称，通用名称")
     private String cpmctymc;
+    @ApiModelProperty(value = "规格型号")
     private String ggxh;
+    @ApiModelProperty(value = "批次号")
     private String batchNo;
 
 }