追溯查询模块代码提交

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

@@ -1,18 +1,21 @@
 package com.glxp.api.controller.trace;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 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.controller.BaseController;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderUploadRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceOrderResponse;
 import com.glxp.api.service.trace.TraceOrderService;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
@@ -37,6 +40,22 @@ public class TraceOrderController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("udi/trace/order/filter")
     public BaseResponse getTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) {
+        /*if ((traceOrderDetailRequest.getUdiCode() == null || traceOrderDetailRequest.getUdiCode().equals("")) &&
+                (traceOrderDetailRequest.getYlqxzcrbarmc() == null || traceOrderDetailRequest.getYlqxzcrbarmc().equals("")) &&
+                (traceOrderDetailRequest.getCpmctymc() == null || traceOrderDetailRequest.getCpmctymc().equals("")) &&
+                (traceOrderDetailRequest.getGgxh() == null || traceOrderDetailRequest.getGgxh().equals("")) &&
+                (traceOrderDetailRequest.getNameCode() == null || traceOrderDetailRequest.getNameCode().equals("")) &&
+                (traceOrderDetailRequest.getBatchNo() == null || traceOrderDetailRequest.getBatchNo().equals("")) &&
+                (traceOrderDetailRequest.getCompanyName() == null || traceOrderDetailRequest.getCompanyName().equals(""))
+        ) {
+            return ResultVOUtils.error(500, "查询条件不能为空！");
+        }*/
+        if (StrUtil.isNotEmpty(traceOrderDetailRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(traceOrderDetailRequest.getUdiCode());
+            if (udiEntity == null) {
+                return ResultVOUtils.error(500, "无效UDI码！");
+            }
+        }
         List<TraceOrderResponse> traceOrderResponses = traceOrderService.queryTraceOrderList(traceOrderDetailRequest);
         PageInfo<TraceOrderResponse> pageInfo = new PageInfo<>(traceOrderResponses);
         PageSimpleResponse<TraceOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();