创建任务，以及任务公告代码

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

@@ -5,8 +5,12 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.trace.TraceRecordRequest;
+import com.glxp.api.service.basic.BasicUdiRelService;
 import com.glxp.api.service.trace.TraceRecordService;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +26,8 @@ public class UdiTraceController extends BaseController {
 
     @Resource
     TraceRecordService traceRecordService;
+    @Resource
+    BasicUdiRelService basicUdiRelService;
 
     /**
      * 源头追溯查询
@@ -36,6 +42,20 @@ public class UdiTraceController extends BaseController {
 
         if (traceRecordRequest.getTraceType() == Constant.UDI_TRACE) {
 
+            //1.校验UDI码格式
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(traceRecordRequest.getUdiCode());
+            if (udiEntity == null) {
+                return ResultVOUtils.error(500, "UDI码格式错误");
+            }
+
+            //2.查询源头企业
+            UserCompanyEntity userCompanyEntity = basicUdiRelService.findByNameCode(udiEntity.getUdi());
+            if (userCompanyEntity == null) {
+                return ResultVOUtils.error(500, "生产企业未关联该产品信息！");
+            }
+
+
+
         } else if (traceRecordRequest.getTraceType() == Constant.UDI_BATCHNO) {
 
         } else {

src/main/java/com/glxp/api/dao/basic/BasicUdiRelMapper.java

@@ -2,9 +2,11 @@ package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.basic.BasicUdiRelEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.BasicUdiRelResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,4 +15,7 @@ public interface BasicUdiRelMapper extends BaseMapper<BasicUdiRelEntity> {
 
 
     List<BasicUdiRelResponse> filterList(FilterUdiRelRequest filterUdiRelRequest);
+
+
+    UserCompanyEntity findByNameCode(@Param("nameCode") String nameCode);
 }

src/main/java/com/glxp/api/entity/basic/BasicUdiProductEntity.java

@@ -10,6 +10,9 @@ import java.util.Date;
 
 import lombok.Data;
 
+/**
+ * UDI医疗器械信息字典表
+ */
 @Data
 @TableName(value = "basic_udi_product")
 public class BasicUdiProductEntity implements Serializable {

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

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

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

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 
 /**
-    * 任务公告表
+ * 任务公告表
-    */
+ */
 @Data
 @TableName(value = "trace_task_notice")
 public class TraceTaskNoticeEntity implements Serializable {
@@ -19,8 +22,8 @@ public class TraceTaskNoticeEntity implements Serializable {
     /**
      * 查询记录表ID外键
      */
-    @TableField(value = "traceRecordIdFk")
+    @TableField(value = "recordCode")
-    private Long traceRecordIdFk;
+    private Long recordCode;
 
     /**
      * 任务类型1：关联关系；2：入库；3：出库
@@ -30,22 +33,76 @@ public class TraceTaskNoticeEntity implements Serializable {
 
     /**
      * 任务状态（未处理/正在处理（任务被下载）/
-已处理（任务已提交）
+     * 已处理（任务已提交）
      */
     @TableField(value = "`status`")
     private Byte status;
 
     /**
-     * 统一社会信用号
+     * 企业信息ID外键
+     */
+    @TableField(value = "companyIdFk")
+    private Long companyIdFk;
+
+    /**
+     * 医疗器械注册人
+     */
+    @TableField(value = "ylqxzcrbarmc")
+    private String ylqxzcrbarmc;
+
+    /**
+     * 医疗器械注册人统一社会信用号
      */
     @TableField(value = "creditNum")
     private String creditNum;
 
     /**
-     * 企业信息ID外键
+     * 产品名称
      */
-    @TableField(value = "companyIdFk")
+    @TableField(value = "cpmctymc")
-    private Long companyIdFk;
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    private String batchNo;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    private String serialNo;
+
+    /**
+     * 查询UDI码
+     */
+    @TableField(value = "udiCode")
+    private String udiCode;
+    /**
+     * 任务创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 任务更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
 
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/res/trace/TraceTaskDlResponse.java

@@ -0,0 +1,82 @@
+package com.glxp.api.res.trace;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 客户端查询任务列表实体类
+ */
+@Data
+public class TraceTaskDlResponse {
+
+    /**
+     * 按UDI码查询出入库信息
+     */
+    private String udiCode;
+
+    /**
+     * 查询记录表ID外键
+     */
+    private Long recordCode;
+
+    /**
+     * 任务类型1：关联nte：入库；3：出库
+     */
+    private Integer taskType;
+    /**
+     * DI标识列表，多级包装会有多个DI
+     */
+    private List<String> diList;
+
+    /**
+     * 企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 医疗器械注册人统一社会信用号
+     */
+    private String creditNum;
+
+    /**
+     * 产品名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 任务时间
+     */
+    private Date createTime;
+
+}

src/main/java/com/glxp/api/service/basic/BasicUdiProductService.java

@@ -3,7 +3,6 @@ package com.glxp.api.service.basic;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
-import com.glxp.api.res.basic.BasicUdiRelResponse;
 
 import java.util.List;
 

src/main/java/com/glxp/api/service/basic/BasicUdiRelService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.BasicUdiRelResponse;
 import org.springframework.stereotype.Service;
@@ -28,4 +29,10 @@ public class BasicUdiRelService extends ServiceImpl<BasicUdiRelMapper, BasicUdiR
         }
         return basicUdiRelMapper.filterList(filterUdiRelRequest);
     }
+
+
+    public UserCompanyEntity findByNameCode(String nameCode) {
+        return basicUdiRelMapper.findByNameCode(nameCode);
+    }
+
 }

src/main/java/com/glxp/api/service/basic/impl/BasicUdiProductServiceImpl.java

@@ -1,9 +1,10 @@
-package com.glxp.api.service.basic;
+package com.glxp.api.service.basic.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.basic.BasicUdiRelEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.service.basic.BasicUdiProductService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.BasicUdiProductMapper;

src/main/java/com/glxp/api/service/trace/TraceTaskNoticeService.java

@@ -1,8 +1,10 @@
 package com.glxp.api.service.trace;
 
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.dao.trace.TraceTaskNoticeMapper;
-public interface TraceTaskNoticeService extends IService<TraceTaskNoticeEntity>{
+@Service
-
+public class TraceTaskNoticeService extends ServiceImpl<TraceTaskNoticeMapper, TraceTaskNoticeEntity> {
 
 }

src/main/java/com/glxp/api/service/trace/UdiTraceService.java

@@ -0,0 +1,38 @@
+package com.glxp.api.service.trace;
+
+import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
+import com.glxp.api.service.basic.BasicUdiProductService;
+import com.glxp.api.service.basic.BasicUdiRelService;
+import com.glxp.api.util.udi.FilterUdiUtils;
+
+import javax.annotation.Resource;
+
+@Resource
+public class UdiTraceService {
+
+
+    @Resource
+    BasicUdiProductService basicUdiProductService;
+    @Resource
+    BasicUdiRelService basicUdiRelService;
+
+    public String vailUdiCode(String udiCode) {
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(udiCode);
+        if (udiEntity == null) {
+            return "UDI码格式错误";
+        }
+        return null;
+    }
+
+    /**
+     * 查询源头企业
+     *
+     * @param udiEntity
+     */
+    public UserCompanyEntity findSourceCompamy(UdiEntity udiEntity) {
+        String nameCode = udiEntity.getUdi();
+        UserCompanyEntity userCompanyEntity = basicUdiRelService.findByNameCode(nameCode);
+        return userCompanyEntity;
+    }
+}

src/main/java/com/glxp/api/service/trace/impl/TraceManuCodeRelServiceImpl.java

@@ -1,8 +1,9 @@
-package com.glxp.api.service.trace;
+package com.glxp.api.service.trace.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.req.trace.TraceManuDetailRequest;
 import com.glxp.api.res.trace.TraceManuCodeRellResponse;
+import com.glxp.api.service.trace.TraceManuCodeRelService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.entity.trace.TraceManuCodeRelEntity;

src/main/java/com/glxp/api/service/trace/impl/TraceOrderServiceImpl.java

@@ -1,9 +1,10 @@
-package com.glxp.api.service.trace;
+package com.glxp.api.service.trace.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.service.trace.TraceOrderService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.trace.TraceOrderMapper;
@@ -14,7 +15,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Service
-public class TraceOrderServiceImpl extends ServiceImpl<TraceOrderMapper, TraceOrderEntity> implements TraceOrderService{
+public class TraceOrderServiceImpl extends ServiceImpl<TraceOrderMapper, TraceOrderEntity> implements TraceOrderService {
 
     @Resource
     TraceOrderMapper traceOrderMapper;

src/main/java/com/glxp/api/service/trace/impl/TraceTaskNoticeServiceImpl.java

@@ -1,12 +0,0 @@
-package com.glxp.api.service.trace.impl;
-
-import com.glxp.api.service.trace.TraceTaskNoticeService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.entity.trace.TraceTaskNoticeEntity;
-import com.glxp.api.dao.trace.TraceTaskNoticeMapper;
-
-@Service
-public class TraceTaskNoticeServiceImpl extends ServiceImpl<TraceTaskNoticeMapper, TraceTaskNoticeEntity> implements TraceTaskNoticeService {
-
-}

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_cpt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml

@@ -93,4 +93,15 @@
         </where>
         ORDER BY bur.updateTime DESC
     </select>
+
+
+    <select id="findByNameCode" parameterType="java.lang.String"
+            resultType="com.glxp.api.entity.sup.UserCompanyEntity">
+        select user_company.*
+        from basic_udi_rel
+                     INNER JOIN basic_udi_product on basic_udi_rel.uuid = basic_udi_product.uuid
+                     INNER JOIN user_company on basic_udi_rel.companyIdFk = user_company.id
+        where basic_udi_product.nameCode = #{nameCode}
+        limit 1
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.trace.TraceTaskNoticeMapper">
+
 </mapper>