From aa7e48e0c3bb800bae361aca11f5164c950855c8 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 23 五月 2024 13:40:58 +0800
Subject: [PATCH] #海康摄像头
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index 194311c..c20a0d4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -1,7 +1,5 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.entity.Parameter;
@@ -18,9 +16,9 @@
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.*;
@RestController
@@ -30,6 +28,9 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+
+ @Value("${wcs.url}")
+ private String WCS_URL;
@RequestMapping(value = "/locMast/{id}/auth")
@ManagerAuth
@@ -56,6 +57,9 @@
}
if (!Cools.isEmpty(param.get("loc_no"))) {
wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
+ }
+ if (!Cools.isEmpty(param.get("loc_sts"))) {
+ wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
}
return R.ok(locMastService.page(new Page<>(curr, limit), wrapper));
}
@@ -179,4 +183,21 @@
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @GetMapping("/locMast/picUrl")
+ @ManagerAuth
+ public R getPicUrl(@RequestParam String locNo) {
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocNo, locNo)
+ .eq(LocMast::getHostId, getHostId()));
+ if (locMast == null) {
+ return R.error();
+ }
+
+ String pic = locMast.getPic();
+ ArrayList<String> list = new ArrayList<>();
+ list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
+ list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ return R.ok().add(list);
+ }
+
}
--
Gitblit v1.9.1