代码更新备份

src/main/java/com/glxp/api/config/rabbit/TopicRabbitConfig.java

@@ -13,6 +13,7 @@ public class TopicRabbitConfig {
 
     //绑定键
     public final static String common = "topic.common";
+    public final static String common1 = "topic.common1";
     public final static String trace = "topic.trace";
 
     public final static String publicer = "topic.all";

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

@@ -7,6 +7,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.config.rabbit.TopicRabbitConfig;
 import com.glxp.api.entity.trace.MqTraceMessage;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -65,5 +66,8 @@ public class TestController {
     }
 
 
+
+
+
 }
 

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

@@ -87,9 +87,7 @@ public class TraceOrderController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.getById(traceOrderUploadRequest.getTaskId());
-
         TraceOrderEntity traceOrderEntity = new TraceOrderEntity();
         BeanUtils.copyProperties(traceOrderUploadRequest, traceOrderEntity);
         traceOrderEntity.setCompanyIdFk(taskNoticeEntity.getCompanyIdFk());
@@ -97,6 +95,7 @@ public class TraceOrderController extends BaseController {
         traceOrderEntity.setId(IdUtil.getSnowflakeNextId());
         traceOrderEntity.setUpdateTime(new Date());
         traceOrderService.save(traceOrderEntity);
+        System.out.println("成功");
         return ResultVOUtils.success("成功");
     }
 }

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

@@ -50,6 +50,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
 @Api(tags = "UDI追溯相关接口")
 @ApiIgnore
 @RestController
@@ -89,6 +90,7 @@ public class UdiTraceController extends BaseController {
     @GetMapping("/udi/trace/source/sendUDI")
     public BaseResponse sendUdi(@RequestBody TraceRecordRequest traceRecordRequest) {
         String messageJson = JSON.toJSONString(traceRecordRequest);
+        System.out.println(messageJson);
         rabbitTemplate.convertAndSend("trace.topic.exchange", TopicRabbitConfig.common, messageJson);
         return ResultVOUtils.success("发送成功");
     }
@@ -121,6 +123,7 @@ public class UdiTraceController extends BaseController {
             }
 
             //2.查询源头企业
+            System.out.println(udiEntity.getUdi());
             userCompanyEntity = basicUdiRelService.findByNameCode(udiEntity.getUdi());
             if (userCompanyEntity == null) {
                 return ResultVOUtils.error(500, "生产企业未关联该产品信息！");

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

@@ -16,8 +16,6 @@
         LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
         LEFT JOIN trace_record_log tr ON tr.recordCode = tmo.recordCode
         LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-        WHERE trd.batchNo IS NOT NULL
-
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and mid.recordCode = #{recordCode}
@@ -41,6 +39,7 @@
                 and zczbhhzbapzbh = #{zczbhhzbapzbh}
             </if>
         </where>
+        AND trd.batchNo IS NOT NULL
     </select>
     <select id="filterTraces1" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">