()
+ .eq("street_Id", streetDO.getId())
+ .eq("direction", stockDO.getDirection()).last("limit 1"));
+ if (rfid == null) {
+ log.error("没有rfid，streetId:{}", streetDO.getId());
+ return false;
+ }
+ // 单线程同步扫描：连接、扫描、命中判断、关闭全部在当前线程内完成
+ RFIDSocket rfidSocket = new RFIDSocket(rfid.getIp(), rfid.getPort());
+ log.info("rfid调用，ip：{};port:{}", rfid.getIp(), rfid.getPort());
+ try {
+ rfidSocket.startCheck(stockDO.getDirection());
+ return rfidSocket.scanAndWait(wmsCode, time);
+ } finally {
+ rfidSocket.close();
+ }
}
}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarRequest.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarRequest.java
new file mode 100644
index 0000000..c5b51dd
--- /dev/null
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarRequest.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.camera.service.scan;
+
+import lombok.Data;
+
+/**
+ * PAVO2 雷达 HTTP 请求体
+ *
+ * 对应 PAVO2 HTTP 运行模式 POST 到根路径 {@code /} 的 JSON body（与 TCP 协议一致，不带结尾 '>'）。
+ */
+@Data
+public class RadarRequest {
+
+ /**
+ * 功能：count（盘点计数）/ check（检测）/ config（重载配置）/ ConfigureSpeed（标定速度剖面）
+ */
+ private String function;
+
+ /**
+ * 扫描动作：start / stop
+ */
+ private String scan;
+
+ /**
+ * 扫描时长（秒），到时自动停止；start 不带 scanTime 时需手动 stop 拿结果
+ */
+ private Integer scanTime;
+
+ /**
+ * 扫描范围（箱体尺寸）
+ */
+ private Box box;
+
+ /**
+ * 任务 id
+ */
+ private String task_id;
+
+ /**
+ * 箱体尺寸
+ */
+ @Data
+ public static class Box {
+ /**
+ * 长度（mm）
+ */
+ private Integer l;
+ /**
+ * 宽度（mm）
+ */
+ private Integer w;
+ /**
+ * 整堆高度（mm）
+ */
+ private Integer h;
+ /**
+ * 单层个数
+ */
+ private Integer maxPerLayer;
+ }
+}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarResponse.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarResponse.java
new file mode 100644
index 0000000..dbf1728
--- /dev/null
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarResponse.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.camera.service.scan;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * PAVO2 雷达 HTTP 响应体
+ *
+ * 响应 body 与 TCP 协议一致（不带结尾 '>'）。
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RadarResponse {
+
+ /**
+ * 是否成功
+ */
+ private boolean success;
+
+ /**
+ * 状态描述，如 scan not running
+ */
+ private String status;
+
+ /**
+ * 消息/错误信息
+ */
+ private String message;
+
+ /**
+ * 结果描述，如 scan not running
+ */
+ private String result;
+
+ private String pic;
+
+ /**
+ * 计数结果（count 功能返回）
+ */
+ private Integer count;
+
+ /**
+ * 任务 id
+ */
+ private String task_id;
+}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarScanServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarScanServiceImpl.java
new file mode 100644
index 0000000..fbc0a51
--- /dev/null
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/RadarScanServiceImpl.java
@@ -0,0 +1,276 @@
+package cn.iocoder.yudao.module.camera.service.scan;
+
+import cn.iocoder.yudao.module.camera.dal.dataobject.resources.URLResourcesDo;
+import cn.iocoder.yudao.module.camera.dal.dataobject.specificationConf.SpecificationConfDO;
+import cn.iocoder.yudao.module.camera.dal.dataobject.stock.StockDO;
+import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
+import cn.iocoder.yudao.module.camera.dal.entity.ScanData;
+import cn.iocoder.yudao.module.camera.service.radar.RadarDO;
+import cn.iocoder.yudao.module.camera.service.radar.RadarService;
+import cn.iocoder.yudao.module.camera.service.resources.URLResourcesService;
+import cn.iocoder.yudao.module.camera.service.specificationConf.SpecificationConfService;
+import cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf.CheckConfDO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * PAVO2 雷达 HTTP 接口实现
+ *
+ * PAVO2 雷达以 HTTP 运行模式对外提供接口，POST 到根路径 {@code /}，
+ * 请求体为与 TCP 协议完全相同的 JSON（不带结尾 '>'），响应 body 与 TCP 相同。
+ *
+ * 数据来源：
+ *
+ * - ip/端口：通过 {@link RadarService} 按巷道 id + 方向（stockDO.direction）查询 {@link RadarDO}
+ * - box 尺寸：通过 {@link SpecificationConfService} 按品规（stockDO.wmsItemCode）查询 {@link SpecificationConfDO}
+ *
+ */
+@Slf4j
+@Service("RadarScanService")
+public class RadarScanServiceImpl implements ScanService {
+
+ @Resource
+ private RadarService radarService;
+
+ @Resource
+ private SpecificationConfService specificationConfService;
+
+ @Resource
+ private RestTemplate restTemplate;
+
+ @Resource
+ URLResourcesService urlResourcesService;
+
+ @Override
+ public ScanData scan(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO ) {
+ RadarDO radar = getRadar(streetDO, stockDO);
+ if (radar == null) {
+ log.error("[radar] 未找到雷达配置, streetId={}, direction={}", streetDO.getId(), stockDO.getDirection());
+ return new ScanData();
+ }
+ String baseUrl = "http://" + radar.getIp() + ":" + radar.getPort();
+ // 默认盘点计数；若 stockDO 指定 scanType 为 check，则走检测
+ String function = "check".equalsIgnoreCase(stockDO.getScanType()) ? "check" : "count";
+ String taskId = stockDO.getTaskId() != null ? stockDO.getTaskId() : String.valueOf(stockDO.getId());
+
+ // 构建带 box 尺寸的 start 请求
+ RadarRequest start = buildBoxRequest(function, "start", taskId, stockDO,checkConfDO);
+ RadarResponse startResp = postJson(baseUrl + "/", start);
+
+ // stop 拿结果
+ RadarRequest stop = new RadarRequest();
+ stop.setFunction(function);
+ stop.setScan("stop");
+ stop.setTask_id(taskId);
+ RadarResponse stopResp = postJson(baseUrl + "/", stop);
+
+ return toScanData(stockDO, stopResp != null ? stopResp : startResp);
+ }
+ public ScanData scanCountStart(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
+ RadarResponse stopResp = countStart( streetDO,stockDO,checkConfDO);
+
+
+ return toScanData(stockDO, stopResp );
+ }
+ public ScanData scanCountStop(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
+ RadarDO radar = getRadar(streetDO, stockDO);
+ if (radar == null) {
+ log.error("[radar] 未找到雷达配置, streetId={}, direction={}", streetDO.getId(), stockDO.getDirection());
+ return new ScanData().setCode("Not found radar");
+ }
+ String baseUrl = "http://" + radar.getIp() + ":" + radar.getPort();
+ // 默认盘点计数；若 stockDO 指定 scanType 为 check，则走检测
+ String taskId = stockDO.getTaskId() != null ? stockDO.getTaskId() : String.valueOf(stockDO.getId());
+
+ // 构建带 box 尺寸的 start 请求
+ // stop 拿结果
+ RadarRequest stop = new RadarRequest();
+ stop.setFunction("count");
+ stop.setScan("stop");
+ stop.setTask_id(taskId);
+ RadarResponse stopResp = postJson(baseUrl + "/", stop);
+
+ return toScanData(stockDO, stopResp );
+ }
+
+
+
+
+
+// /**
+// * 盘点计数：start（固定时长，到时自动停止）
+// */
+// public RadarResponse countStart(StreetDO streetDO, StockDO stockDO, int scanTime) {
+// RadarRequest request = buildBoxRequest("count", "start", taskId(stockDO), stockDO);
+// request.setScanTime(scanTime);
+// return postJson(streetDO, stockDO, request);
+// }
+
+ /**
+ * 盘点计数：start（手动，等 stop 拿结果）
+ */
+ public RadarResponse countStart(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
+ RadarRequest request = buildBoxRequest("count", "start", taskId(stockDO), stockDO,checkConfDO);
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 盘点计数：stop（拿结果）
+ */
+ public RadarResponse countStop(StreetDO streetDO, StockDO stockDO) {
+ RadarRequest request = buildRequest("count", "stop", taskId(stockDO), stockDO);
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 检测：start（手动）
+ */
+ public RadarResponse checkStart(StreetDO streetDO, StockDO stockDO) {
+ RadarRequest request = buildRequest("check", "start", taskId(stockDO), stockDO);
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 检测：stop（拿结果）
+ */
+ public RadarResponse checkStop(StreetDO streetDO, StockDO stockDO) {
+ RadarRequest request = buildRequest("check", "stop", taskId(stockDO), stockDO);
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 重载 config/config
+ */
+ public RadarResponse reloadConfig(StreetDO streetDO, StockDO stockDO) {
+ RadarRequest request = new RadarRequest();
+ request.setFunction("config");
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 标定速度剖面
+ */
+ public RadarResponse configureSpeed(StreetDO streetDO, StockDO stockDO, int scanTime) {
+ RadarRequest request = new RadarRequest();
+ request.setFunction("ConfigureSpeed");
+ request.setScanTime(scanTime);
+ return postJson(streetDO, stockDO, request);
+ }
+
+ /**
+ * 构建带 box 尺寸的请求。box 数据来自品规配置（按 stockDO.wmsItemCode 匹配 type）。
+ */
+ private RadarRequest buildBoxRequest(String function, String scan, String taskId, StockDO stockDO, CheckConfDO checkConfDO ) {
+ RadarRequest request = new RadarRequest();
+ request.setFunction(function);
+ request.setScan(scan);
+ request.setTask_id(taskId);
+
+ SpecificationConfDO conf = specificationConfService.getOne(
+ new QueryWrapper()
+ .eq("type", stockDO.getWmsExtendInfo().get("category")).last("limit 1"));
+ if (conf != null) {
+ RadarRequest.Box box = new RadarRequest.Box();
+ box.setL(conf.getLength());
+ box.setW(conf.getWidth());
+ box.setH(conf.getHeight());
+ box.setMaxPerLayer(conf.getLayersNumber());
+ request.setBox(box);
+ }
+ return request;
+ }
+ /**
+ * 构建带 box 尺寸的请求。box 数据来自品规配置（按 stockDO.wmsItemCode 匹配 type）。
+ */
+ private RadarRequest buildRequest(String function, String scan, String taskId , StockDO stockDO) {
+ RadarRequest request = new RadarRequest();
+ request.setFunction(function);
+ request.setScan(scan);
+ request.setTask_id(taskId);
+
+
+ return request;
+ }
+
+ /**
+ * 根据巷道 id + 方向查询雷达配置（ip/端口）。
+ */
+ private RadarDO getRadar(StreetDO streetDO, StockDO stockDO) {
+ return radarService.getOne(new LambdaQueryWrapper()
+ .eq(RadarDO::getStreetId, streetDO.getId())
+ .eq(RadarDO::getDirection, stockDO.getDirection()));
+ }
+
+ private String baseUrl(StreetDO streetDO, StockDO stockDO) {
+ RadarDO radar = getRadar(streetDO, stockDO);
+ if (radar == null) {
+ return null;
+ }
+ return "http://" + radar.getIp() + ":" + radar.getPort();
+ }
+
+ private String taskId(StockDO stockDO) {
+ return stockDO.getTaskId() != null ? stockDO.getTaskId() : String.valueOf(stockDO.getId());
+ }
+
+ private RadarResponse postJson(StreetDO streetDO, StockDO stockDO, RadarRequest body) {
+ String url = baseUrl(streetDO, stockDO);
+ if (url == null) {
+ log.error("[radar] 未找到雷达配置, streetId={}, direction={}", streetDO.getId(), stockDO.getDirection());
+ return null;
+ }
+ return postJson(url + "/", body);
+ }
+
+ /**
+ * 向雷达发送 POST JSON 请求。
+ */
+ private RadarResponse postJson(String url, RadarRequest body) {
+ try {
+ // 将 body 序列化为 JSON 字节，显式设置 Content-Length，避免服务端返回 411 Length Required
+ ObjectMapper objectMapper = new ObjectMapper();
+ byte[] bodyBytes = objectMapper.writeValueAsBytes(body);
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.setContentLength(bodyBytes.length);
+ HttpEntity request = new HttpEntity<>(bodyBytes, headers);
+ RadarResponse resp = restTemplate.postForObject(url, request, RadarResponse.class);
+ log.info("[radar] url={} body={} resp={}", url, body, resp);
+ return resp;
+ } catch (Exception e) {
+ RadarResponse resp = new RadarResponse();
+ resp.setMessage("scan error");
+ log.error("[radar] request error, url={} body={}", url, body, e);
+ return resp;
+ }
+ }
+
+ /**
+ * 将雷达返回结果转换为 ScanData，结果放到 code 供上层与 wms 数量比对。
+ */
+ private ScanData toScanData(StockDO stockDO, RadarResponse resp) {
+ ScanData scanData = new ScanData();
+ if (resp != null) {
+ String code = resp.getCount() != null ? String.valueOf(resp.getCount())
+ : resp.getMessage();
+ scanData.setCode(code);
+ }
+ scanData.setId(stockDO.getId());
+ scanData.setDirection(stockDO.getDirection());
+ scanData.setUuid(stockDO.getCheckPic());
+ if (resp != null && resp.getPic() != null) {
+ urlResourcesService.save(URLResourcesDo.builder().url(resp.getPic()).uuid(stockDO.getCheckPic()).type("1").little("个数3d生成图").build());
+ }
+
+
+ return scanData;
+ }
+}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanGunScanServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanGunScanServiceImpl.java
index 5844ce6..f4c28e0 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanGunScanServiceImpl.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanGunScanServiceImpl.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.camera.dal.entity.ScanData;
import cn.iocoder.yudao.module.camera.service.sensorgun.CognexSocket;
import cn.iocoder.yudao.module.camera.service.sensorgun.SensorGunService;
import cn.iocoder.yudao.module.camera.service.sensorgun.SickSocket;
+import cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf.CheckConfDO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -81,9 +82,11 @@ public class ScanGunScanServiceImpl implements ScanService{
return bd.readLine();
}
@Override
- public ScanData scan(StreetDO streetDO, StockDO stockDO) {
+ public ScanData scan(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO ) {
ScanData scanData = new ScanData();
- SensorGunDO sensorGun = sensorService.getOne(new QueryWrapper().eq("street_id", streetDO.getId()).eq("direction", stockDO.getDirection()));
+ SensorGunDO sensorGun = sensorService.getOne(new QueryWrapper()
+ .eq("street_id", streetDO.getId())
+ .eq("direction", stockDO.getDirection()));
String trayCode = "";
if (sensorGun == null) {
log.error("no sensor gun config in database ,street id:{},direction:{}", streetDO.getId(), stockDO.getDirection());
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanService.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanService.java
index 32ea7b4..f623be4 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanService.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanService.java
@@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.camera.service.scan;
import cn.iocoder.yudao.module.camera.dal.dataobject.stock.StockDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
import cn.iocoder.yudao.module.camera.dal.entity.ScanData;
+import cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf.CheckConfDO;
public interface ScanService {
- ScanData scan(StreetDO streetDO, StockDO stockDO);
+ ScanData scan(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO );
}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java
index a22493d..cb230e2 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/ScanServiceFactory.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.camera.dal.entity.ScanData;
import cn.iocoder.yudao.module.camera.service.Hik3D.HikFlaskApiService;
import cn.iocoder.yudao.module.camera.service.scan.LxService.LxServiceApi;
import cn.iocoder.yudao.module.camera.service.scan.yoloCameraApi.YoloServiceImpl;
+import cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf.CheckConfDO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -27,6 +28,8 @@ public class ScanServiceFactory {
private HikFlaskApiService hikFlaskApiService;
@Resource
private QRCodeScanServiceImpl qrCodeScanService;
+ @Resource
+ private RadarScanServiceImpl radarScanService;
@Resource
LxServiceApi lxServiceApi;
@@ -35,65 +38,71 @@ public class ScanServiceFactory {
// 返回的ScanData的code会将作为扫描结果，如果和wms的一致，则记录为成功
// 图片保存将在scan方法中实现
- public ScanData scan(String type, StreetDO streetDO, StockDO stockDO) {
+ public ScanData scan(String type, StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO ) {
try {
-
switch (type) {
case "0":
return null;
// 扫码枪扫码
case "1":
log.info("扫码枪扫码");
- return scanGunScanService.scan(streetDO, stockDO);
+ return scanGunScanService.scan(streetDO, stockDO,checkConfDO);
// RFID扫码
case "2":
log.info("RFID扫码");
- return rfidScanService.scan(streetDO, stockDO);
+ return rfidScanService.scan(streetDO, stockDO,checkConfDO);
// 视觉扫码
case "3":
log.info("视觉扫码-分类");
- return yoloService.scanClassify(streetDO, stockDO);
+ return yoloService.scanClassify(streetDO,stockDO,checkConfDO);
// 3D扫码
case "4":
log.info("3D扫码");
- return pcdService.scan(streetDO, stockDO);
+ return pcdService.scan(streetDO, stockDO,checkConfDO);
// opencv扫码
case "5":
log.info("opencv扫码");
- return opencvService.scan(streetDO, stockDO);
+ return opencvService.scan(streetDO, stockDO,checkConfDO);
// hik3d识别扫码
case "6":
log.info("hik3d识别扫码");
- return hikFlaskApiService.scan(streetDO, stockDO);
+ return hikFlaskApiService.scan(streetDO, stockDO,checkConfDO);
// hik3d识别扫码存在
case "7":
log.info("hik3d识别扫码存在");
- return hikFlaskApiService.scanExist(streetDO, stockDO);
+ return hikFlaskApiService.scanExist(streetDO,stockDO,checkConfDO);
// hik3d识别扫码存在
case "8":
log.info("lx识别扫码存在");
- return yoloService.scanExist(streetDO, stockDO);
+ return yoloService.scanExist(streetDO,stockDO,checkConfDO);
// hik3d识别扫码存在
case "9":
log.info("yolo识别扫码-检测");
- return yoloService.scanDetect(streetDO, stockDO);
+ return yoloService.scanDetect(streetDO,stockDO,checkConfDO);
case "10":
log.info("lx接口品规");
- return lxServiceApi.categoryScan(streetDO, stockDO);// 二维码识别
+ return lxServiceApi.categoryScan(streetDO,stockDO,checkConfDO);// 二维码识别
case "11":
log.info("lx接口个数");
- return lxServiceApi.countScan(streetDO, stockDO);
+ return lxServiceApi.countScan(streetDO,stockDO,checkConfDO);
case "12":
log.info("lx货物码");
- return lxServiceApi.codeScan(streetDO, stockDO);
+ return lxServiceApi.codeScan(streetDO,stockDO,checkConfDO);
+ case "13":
+ log.info("雷达识别开始");
+ return radarScanService.scanCountStart(streetDO,stockDO,checkConfDO);
+
+ case "14":
+ log.info("雷达识别结束");
+ return radarScanService.scanCountStop(streetDO,stockDO,checkConfDO);
// 默认情况处理
default:
return new ScanData();
}
} catch (Exception e) {
log.error("scan error", e);
- return new ScanData();
+ return new ScanData().setCode("scan error");
}
}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/Pojo.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/Pojo.java
index 4b2bd39..28b06f7 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/Pojo.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/Pojo.java
@@ -12,6 +12,8 @@ public class Pojo {
private String determinePath;
//结果
private Boolean result;
+ private String code;
+ private String pic;
private String type;
private List detects;
private String path;
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/YoloServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/YoloServiceImpl.java
index 44ed450..5438926 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/YoloServiceImpl.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/scan/yoloCameraApi/YoloServiceImpl.java
@@ -6,13 +6,20 @@ import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
import cn.iocoder.yudao.module.camera.dal.entity.ScanData;
import cn.iocoder.yudao.module.camera.service.resources.URLResourcesService;
import cn.iocoder.yudao.module.camera.service.scan.ScanService;
+import cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf.CheckConfDO;
import cn.iocoder.yudao.module.system.service.dict.DictDataService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.*;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
import okhttp3.*;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.time.LocalDate;
@@ -25,63 +32,66 @@ import java.util.Objects;
@Slf4j
public class YoloServiceImpl implements ScanService {
- private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
@Resource
private OkHttpClient client;
-
+
+ @Resource
+ private RestTemplate restTemplate;
private final Gson gson;
-
+
public YoloServiceImpl() {
// 配置 Gson 支持 Java 8 时间类型
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
+
this.gson = new GsonBuilder()
- .registerTypeAdapter(LocalDate.class, (JsonSerializer) (date, type, jsonSerializationContext) ->
- new JsonPrimitive(date.format(dateFormatter)))
- .registerTypeAdapter(LocalDate.class, (JsonDeserializer) (json, type, jsonDeserializationContext) ->
- LocalDate.parse(json.getAsString(), dateFormatter))
- .registerTypeAdapter(LocalDateTime.class, (JsonSerializer) (dateTime, type, jsonSerializationContext) ->
- new JsonPrimitive(dateTime.format(dateTimeFormatter)))
- .registerTypeAdapter(LocalDateTime.class, (JsonDeserializer) (json, type, jsonDeserializationContext) ->
- LocalDateTime.parse(json.getAsString(), dateTimeFormatter))
+ .registerTypeAdapter(LocalDate.class, (JsonSerializer) (date, type, jsonSerializationContext) ->
+ new JsonPrimitive(date.format(dateFormatter)))
+ .registerTypeAdapter(LocalDate.class, (JsonDeserializer) (json, type, jsonDeserializationContext) ->
+ LocalDate.parse(json.getAsString(), dateFormatter))
+ .registerTypeAdapter(LocalDateTime.class, (JsonSerializer) (dateTime, type, jsonSerializationContext) ->
+ new JsonPrimitive(dateTime.format(dateTimeFormatter)))
+ .registerTypeAdapter(LocalDateTime.class, (JsonDeserializer) (json, type, jsonDeserializationContext) ->
+ LocalDateTime.parse(json.getAsString(), dateTimeFormatter))
.create();
}
@Resource
private DictDataService dictDataService;
+
@Override
- public ScanData scan(StreetDO streetDO, StockDO stockDO) {
+ public ScanData scan(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
return null;
}
/**
* 识别是否存在
+ *
* @param streetDO
* @param stockDO
* @return
*/
- public ScanData scanExist(StreetDO streetDO, StockDO stockDO) {
+ public ScanData scanExist(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
ScanData scanData = new ScanData();
- String urlPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
- String picPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
+ String urlPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
+ String picPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
try {
scanData.setCode("有货");
Pojo pojo = new Pojo();
pojo.setStreetId(streetDO.getPlcId());
pojo.setDirection(stockDO.getDirection());
- pojo = setHttp(pojo,urlPath+"/category/exist");
+ pojo = setHttp(pojo, urlPath + "/category/exist");
- log.info("lx3d拍照结果："+pojo.toString());
+ log.info("lx3d拍照结果：" + pojo.toString());
- if (pojo.getResult()!= null && pojo.getResult()) {
- }else {
- scanData.setCode( "无货");
- log.info("taskId："+stockDO.getTaskId()+" lx3d拍照结果："+pojo.toString());
- }
+ if (pojo.getResult() != null && pojo.getResult()) {
+ } else {
+ scanData.setCode("无货");
+ log.info("taskId：" + stockDO.getTaskId() + " lx3d拍照结果：" + pojo.toString());
+ }
// if (hikPythonEntity.getColors() != null && hikPythonEntity.getColors().size() > 0) {
// for (String color:hikPythonEntity.getColors()){
// if (color.startsWith(".")) {
@@ -93,7 +103,7 @@ public class YoloServiceImpl implements ScanService {
// }
return scanData;
} catch (IOException e) {
- log.error("识别异常",e);
+ log.error("识别异常", e);
System.out.println("识别异常");
e.printStackTrace();
throw new RuntimeException(e);
@@ -106,29 +116,30 @@ public class YoloServiceImpl implements ScanService {
/**
* 识别是否存在
+ *
* @param streetDO
* @param stockDO
* @return
*/
- public ScanData scanClassify(StreetDO streetDO, StockDO stockDO) {
+ public ScanData scanClassify(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
ScanData scanData = new ScanData();
- String urlPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
- String picPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
+ String urlPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
+ String picPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
try {
// scanData.setCode("有货");
Pojo pojo = new Pojo();
pojo.setStreetId(streetDO.getPlcId());
pojo.setDirection(stockDO.getDirection());
- pojo = setHttp(pojo,urlPath+"/yolo/classify");
+ pojo = setHttp(pojo, urlPath + "/yolo/classify");
- log.info("lx3d拍照结果："+pojo.toString());
+ log.info("lx3d拍照结果：" + pojo.toString());
scanData.setCode(pojo.getType());
- urlResourcesService.save(URLResourcesDo.builder().url(picPath+pojo.getPath()).uuid( stockDO.getCheckPic()).type("1").little("有无拍照").build());
+ urlResourcesService.save(URLResourcesDo.builder().url(picPath + pojo.getPath()).uuid(stockDO.getCheckPic()).type("1").little("有无拍照").build());
return scanData;
} catch (IOException e) {
- log.error("识别异常",e);
+ log.error("识别异常", e);
System.out.println("识别异常");
e.printStackTrace();
throw new RuntimeException(e);
@@ -138,27 +149,71 @@ public class YoloServiceImpl implements ScanService {
/**
* 识别是否存在
+ *
* @param streetDO
* @param stockDO
* @return
*/
- public ScanData scanDetect(StreetDO streetDO, StockDO stockDO) {
+ public ScanData scanDetect(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
ScanData scanData = new ScanData();
- String urlPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
- String picPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
- try {
+
+ String saveApiPath = dictDataService.parseDictData("base_conf", "data_api_path").getValue();
+
+ String savePath = dictDataService.parseDictData("camera_conf", "media_path").getValue();
+ String urlPath = "http://127.0.0.1:8097";
+ try {
// scanData.setCode("有货");
- Pojo pojo = new Pojo();
- pojo.setStreetId(streetDO.getPlcId());
- pojo.setDirection(stockDO.getDirection());
- pojo = setHttp(pojo,urlPath+"/yolo/detect");
+ Pojo pojo = new Pojo();
+
+ URLResourcesDo urlResourcesDo = urlResourcesService.getOne(
+ new QueryWrapper()
+ .eq("uuid",stockDO.getCheckPic())
+ .eq("type",1)
+ .eq("little","球机拍照").last("limit 1"));
+
+ pojo.setPic(urlResourcesDo.getUrl().replace(saveApiPath,savePath));
+
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(org.springframework.http.MediaType.APPLICATION_JSON);
+ HttpEntity entity = new HttpEntity<>(pojo, headers);
+ ResponseEntity response = restTemplate.exchange(
+ urlPath + "/yolo/detect", // 替换为你的 API 地址
+ HttpMethod.POST,
+ entity,
+ Pojo.class
+ );
+
+ log.info("盘点结果：" + pojo.toString());
+ if (response.getBody() != null) {
+ scanData.setCode(response.getBody().getCode());
+// 后端加.jpg 先写死就行
+ urlResourcesService.save(URLResourcesDo.builder().url(pojo.getPic().replace(savePath ,saveApiPath)+".jpg").uuid(stockDO.getCheckPic()).type("1").little("识别拍照").build());
+ }
+ return scanData;
+ } catch (Exception e) {
+ log.error("识别异常", e);
+ System.out.println("识别异常");
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+// return null;
+ }
- log.info("lx3d拍照结果："+pojo.toString());
- scanData.setCode(pojo.getType());
- urlResourcesService.save(URLResourcesDo.builder().url(picPath+pojo.getPath()).uuid( stockDO.getCheckPic()).type("1").little("有无拍照").build());
- return scanData;
+ public ScanData scanPicDetect(StreetDO streetDO, StockDO stockDO, CheckConfDO checkConfDO) {
+ ScanData scanData = new ScanData();
+ String urlPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
+ String picPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
+ try {
+// scanData.setCode("有货");
+ Pojo pojo = new Pojo();
+ pojo = setHttp(pojo, urlPath + "/yolo/detect");
+
+ log.info("lx3d拍照结果：" + pojo.toString());
+ scanData.setCode(pojo.getType());
+ urlResourcesService.save(URLResourcesDo.builder().url(picPath + pojo.getPath()).uuid(stockDO.getCheckPic()).type("1").little("有无拍照").build());
+ return scanData;
} catch (IOException e) {
- log.error("识别异常",e);
+ log.error("识别异常", e);
System.out.println("识别异常");
e.printStackTrace();
throw new RuntimeException(e);
@@ -166,28 +221,30 @@ public class YoloServiceImpl implements ScanService {
// return null;
}
+
/**
* 识别是否存在
+ *
* @param streetDO
* @param stockDO
* @return
*/
public ScanData scanningLxApiYolo(StreetDO streetDO, StockDO stockDO) {
ScanData scanData = new ScanData();
- String urlPath ="http://127.0.0.1:8097/judge/scan";
+ String urlPath = "http://127.0.0.1:8097/judge/scan";
try {
// scanData.setCode("有货");
Pojo pojo = new Pojo();
pojo.setStreetId(streetDO.getPlcId());
pojo.setDirection(stockDO.getDirection());
- pojo = setHttp(pojo,urlPath+"/yolo/detect");
+ pojo = setHttp(pojo, urlPath + "/yolo/detect");
- log.info("lx3d拍照结果："+pojo.toString());
+ log.info("lx3d拍照结果：" + pojo.toString());
scanData.setCode(pojo.getType());
- urlResourcesService.save(URLResourcesDo.builder().url(pojo.getPath()).uuid( stockDO.getCheckPic()).type("1").little("有无拍照").build());
+ urlResourcesService.save(URLResourcesDo.builder().url(pojo.getPath()).uuid(stockDO.getCheckPic()).type("1").little("有无拍照").build());
return scanData;
} catch (IOException e) {
- log.error("识别异常",e);
+ log.error("识别异常", e);
System.out.println("识别异常");
e.printStackTrace();
throw new RuntimeException(e);
@@ -196,18 +253,17 @@ public class YoloServiceImpl implements ScanService {
}
-
-
/**
* 识别是否存在
+ *
* @param streetDO
* @param stockDO
* @return
*/
public ScanData scanCameraDetect(StreetDO streetDO, StockDO stockDO) {
ScanData scanData = new ScanData();
- String urlPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
- String picPath ="http://"+streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
+ String urlPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "yoloApiPort").getValue();
+ String picPath = "http://" + streetDO.getPlcIp() + ":" + dictDataService.parseDictData("Hik3DApi", "picPath").getValue();
String realPath = dictDataService.getDictDataList("camera_conf").get("media_path").getValue();
@@ -215,28 +271,30 @@ public class YoloServiceImpl implements ScanService {
try {
// scanData.setCode("有货");
List urls = urlResourcesService.list(new LambdaQueryWrapper().eq(URLResourcesDo::getUuid, stockDO.getCheckPic()));
- for (URLResourcesDo url:urls) {
+ for (URLResourcesDo url : urls) {
Pojo pojo = new Pojo();
pojo.setStreetId(streetDO.getPlcId());
- pojo.setPath(realPath+url.getUrl().replace(saveApiPath,""));
+ pojo.setPath(realPath + url.getUrl().replace(saveApiPath, ""));
pojo.setDirection(stockDO.getDirection());
pojo = setHttp(pojo, urlPath + "/yolo/detect");
log.info("lx3d拍照结果：" + pojo.toString());
- if (pojo.getType()!= null && !pojo.getType().equals("")){
+ if (pojo.getType() != null && !pojo.getType().equals("")) {
scanData.setCode(pojo.getType());
}
}
// urlResourcesService.save(URLResourcesDo.builder().url(picPath+pojo.getPath()).uuid( stockDO.getCheckPic()).type("1").little("有无拍照").build());
return scanData;
} catch (IOException e) {
- log.error("识别异常",e);
+ log.error("识别异常", e);
System.out.println("识别异常");
e.printStackTrace();
throw new RuntimeException(e);
}
// return null;
}
+
+ private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
/**
* 调用 /api/picComputeAll 接口，批量处理所有设备图片
*/
@@ -244,6 +302,7 @@ public class YoloServiceImpl implements ScanService {
String json = gson.toJson(pojo);
+
RequestBody body = RequestBody.create(json, JSON);
Request request = new Request.Builder()
@@ -256,10 +315,10 @@ public class YoloServiceImpl implements ScanService {
System.out.println("Unexpected code " + response);
String responseBody = Objects.requireNonNull(response.body()).string();
- log.info("picComputeAll:{}",responseBody);
+ log.info("picComputeAll:{}", responseBody);
return gson.fromJson(responseBody, Pojo.class);
- }catch (Exception e){
- log.error("Error occurred while calling "+baseUrl, e);
+ } catch (Exception e) {
+ log.error("Error occurred while calling " + baseUrl, e);
return null;
}
}
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockService.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockService.java
index 47d4271..49d8b50 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockService.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockService.java
@@ -24,7 +24,7 @@ public interface StockService extends IService< StockDO> {
*
* @param taskId 任务ID=
*/
- void updateLastByTaskId(String taskId, String value,String column);
+ void updateLastByTaskId(Long taskId, String value,String column);
void updateStatusByFields(Long taskId, List value);
/**
* 创建盘点状态
@@ -68,4 +68,6 @@ public interface StockService extends IService< StockDO> {
EChartsOption laneInventoryStatistics();
List> laneInventoryStatisticsPie();
+
+ void truncate();
}
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockServiceImpl.java
index 7429021..01b152f 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockServiceImpl.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/stock/StockServiceImpl.java
@@ -5,12 +5,12 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.camera.controller.admin.stock.vo.StockPageReqVO;
import cn.iocoder.yudao.module.camera.controller.admin.stock.vo.StockSaveReqVO;
import cn.iocoder.yudao.module.camera.controller.admin.stock.vo.StockStreetList;
-import cn.iocoder.yudao.module.camera.dal.dataobject.checklog.CheckLogDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.stock.StockDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
import cn.iocoder.yudao.module.camera.dal.entity.echarts.Axis;
import cn.iocoder.yudao.module.camera.dal.entity.echarts.EChartsOption;
import cn.iocoder.yudao.module.camera.dal.entity.echarts.Series;
+import cn.iocoder.yudao.module.camera.dal.mysql.checklog.CheckLogMapper;
import cn.iocoder.yudao.module.camera.dal.mysql.stock.StockMapper;
import cn.iocoder.yudao.module.camera.service.checklog.CheckLogService;
import cn.iocoder.yudao.module.camera.service.street.StreetService;
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.STOCK_NOT_EXISTS;
@@ -55,8 +54,8 @@ public class StockServiceImpl extends ServiceImpl implement
}
@Override
- public void updateLastByTaskId(String taskId, String value,String column) {
- stockMapper.updateLastByTaskId(taskId, value,column);
+ public void updateLastByTaskId(Long id, String value,String column) {
+ stockMapper.updateLastByTaskId(id, value,column);
}
@Override
@@ -117,6 +116,8 @@ public class StockServiceImpl extends ServiceImpl implement
@Resource
CheckLogService checkLogService;
@Resource
+ private CheckLogMapper checkLogMapper;
+ @Resource
private DictDataService dictDataService;
@Override
public EChartsOption laneInventoryStatistics() {
@@ -124,9 +125,18 @@ public class StockServiceImpl extends ServiceImpl implement
eChartsOption.setXAxis(new Axis());
List bars = new ArrayList<>();
List streets = streetService.list();
- List stocks = checkLogService.list();
- Map> stocksMap = stocks.stream()
- .collect(Collectors.groupingBy(k ->k.getStatus().toString(),Collectors.groupingBy(CheckLogDO::getStreetId,Collectors.counting())));
+
+ // 数据库聚合统计：按 巷道 + 状态 分组，避免全表加载到内存
+ List> groupList = checkLogMapper.selectGroupCountByStreetIdAndStatus();
+ // 结构：status -> (streetId -> count)
+ Map> stocksMap = new HashMap<>();
+ for (Map row : groupList) {
+ Integer status = ((Number) row.get("status")).intValue();
+ Integer streetId = ((Number) row.get("street_id")).intValue();
+ Long count = ((Number) row.get("count")).longValue();
+ stocksMap.computeIfAbsent(status, k -> new HashMap<>()).put(streetId, count);
+ }
+
Map dictDataMap = dictDataService.getDictDataList("check_status");
Axis yAxis = new Axis();
yAxis.setType("category");
@@ -135,7 +145,6 @@ public class StockServiceImpl extends ServiceImpl implement
yAxis.getData().add(street.getName());
}
eChartsOption.setYAxis(yAxis);
- int max = 0;
for (String entry : dictDataMap.keySet()) {
Series bar = new Series();
bar.setName(entry);
@@ -153,12 +162,11 @@ public class StockServiceImpl extends ServiceImpl implement
case 3 -> bar.setColor("#5474c4");
default -> bar.setColor("");
}
+ Integer statusKey = Integer.parseInt(dictDataMap.get(entry).getValue());
+ Map statusMap = stocksMap.get(statusKey);
List values = new ArrayList<>();
for (StreetDO street : streets) {
- if (stocksMap.get(dictDataMap.get(entry).getValue())==null){
- values.add(null);
- }else values.add(stocksMap.get(dictDataMap.get(entry).getValue()).get(street.getId()));
-
+ values.add(statusMap == null ? null : statusMap.get(street.getId()));
}
bar.setData(values);
bars.add(bar);
@@ -172,23 +180,32 @@ public class StockServiceImpl extends ServiceImpl implement
}
@Override
public List> laneInventoryStatisticsPie() {
- EChartsOption eChartsOption = new EChartsOption();
- eChartsOption.setXAxis(new Axis());
- List bars = new ArrayList<>();
- List streets = streetService.list();
- List stocks = checkLogService.list();
- Map stocksMap = stocks.stream()
- .collect(Collectors.groupingBy(k ->k.getStatus().toString(),(Collectors.counting())));
+ // 数据库聚合统计：按 状态 分组，避免全表加载到内存
+ List> groupList = checkLogMapper.selectGroupCountByStatus();
+ // 结构：status -> count
+ Map stocksMap = new HashMap<>();
+ for (Map row : groupList) {
+ Integer status = ((Number) row.get("status")).intValue();
+ Long count = ((Number) row.get("count")).longValue();
+ stocksMap.put(status, count);
+ }
+
Map dictDataMap = dictDataService.getDictValueMap("check_status");
List> list = new ArrayList<>();
- for (String key :stocksMap.keySet()){
+ for (Map.Entry entry : stocksMap.entrySet()) {
Map map = new HashMap<>();
- map.put("name",dictDataMap.get(key).getLabel());
- map.put("value",stocksMap.get(key).toString());
+ DictDataDO dictDataDO = dictDataMap.get(String.valueOf(entry.getKey()));
+ map.put("name", dictDataDO != null ? dictDataDO.getLabel() : String.valueOf(entry.getKey()));
+ map.put("value", entry.getValue().toString());
list.add(map);
}
return list;
}
+ @Override
+ public void truncate() {
+ stockMapper.truncate();
+ }
+
}
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetService.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetService.java
index 14e7b87..ba920e4 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetService.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetService.java
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.camera.dal.dataobject.rfid.RfidDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.sensorgun.SensorGunDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.shelfCode.rfid.ShelfCodeDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
+import cn.iocoder.yudao.module.camera.service.radar.RadarDO;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
@@ -85,6 +86,7 @@ public interface StreetService extends IService {
List getLightSourceListByStreetId(Integer streetId);
List getRFIDListByStreetId(Integer streetId);
+ List getRadarListByStreetId(Integer streetId);
List getShelfCodeListByStreetId(Integer streetId);
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetServiceImpl.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetServiceImpl.java
index 9e03ead..3707188 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetServiceImpl.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/camera/service/street/StreetServiceImpl.java
@@ -12,11 +12,13 @@ import cn.iocoder.yudao.module.camera.dal.dataobject.sensorgun.SensorGunDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.shelfCode.rfid.ShelfCodeDO;
import cn.iocoder.yudao.module.camera.dal.dataobject.street.StreetDO;
import cn.iocoder.yudao.module.camera.dal.mysql.lightsource.LightSourceMapper;
+import cn.iocoder.yudao.module.camera.dal.mysql.rfid.RadarMapper;
import cn.iocoder.yudao.module.camera.dal.mysql.rfid.RfidMapper;
import cn.iocoder.yudao.module.camera.dal.mysql.sensorgun.SensorGunMapper;
import cn.iocoder.yudao.module.camera.dal.mysql.shelfCode.ShelfCodeMapper;
import cn.iocoder.yudao.module.camera.dal.mysql.street.StreetMapper;
import cn.iocoder.yudao.module.camera.service.camera.CameraService;
+import cn.iocoder.yudao.module.camera.service.radar.RadarDO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
@@ -48,6 +50,8 @@ public class StreetServiceImpl extends ServiceImpl imple
private LightSourceMapper lightSourceMapper;
@Resource
private RfidMapper rfidMapper;
+ @Resource
+ private RadarMapper radarMapper;
@Resource
private ShelfCodeMapper shelfCodeMapper;
@@ -69,6 +73,7 @@ public class StreetServiceImpl extends ServiceImpl imple
createSensorGunList(street.getId(), createReqVO.getSensorGuns());
createLightSourceList(street.getId(), createReqVO.getLightSources());
createRfidList(street.getId(), createReqVO.getRfids());
+ createRfidList(street.getId(), createReqVO.getRfids());
// 返回
return street.getId();
}
@@ -86,6 +91,7 @@ public class StreetServiceImpl extends ServiceImpl imple
updateSensorGunList(updateReqVO.getId(), updateReqVO.getSensorGuns());
updateRfidList(updateReqVO.getId(), updateReqVO.getRfids());
updateLightSourceList(updateReqVO.getId(), updateReqVO.getLightSources());
+ updateRadarList(updateReqVO.getId(), updateReqVO.getRadars());
}
@Override
@@ -100,6 +106,7 @@ public class StreetServiceImpl extends ServiceImpl imple
deleteSensorGunByStreetId(id);
deleteLightSourceByStreetId(id);
deleteRfidByStreetId(id);
+ deleteRadarByStreetId(id);
}
private void validateStreetExists(Integer id) {
@@ -181,6 +188,11 @@ public class StreetServiceImpl extends ServiceImpl imple
return rfidMapper.selectListByStreetId(streetId);
}
+ @Override
+ public List getRadarListByStreetId(Integer streetId){
+
+ return radarMapper.selectListByStreetId(streetId);
+ }
@Override
public List getShelfCodeListByStreetId(Integer streetId) {
@@ -197,12 +209,23 @@ public class StreetServiceImpl extends ServiceImpl imple
rfidMapper.insertBatch(list);
}
+ private void createRadarList(Integer streetId, List list) {
+ list.forEach(o -> o.setStreetId(streetId));
+ radarMapper.insertBatch(list);
+ }
+
private void updateRfidList(Integer streetId, List list) {
deleteRfidByStreetId(streetId);
list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
createRfidList(streetId, list);
}
+ private void updateRadarList(Integer streetId, List list) {
+ deleteRadarByStreetId(streetId);
+ list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
+ createRadarList(streetId, list);
+ }
+
private void updateLightSourceList(Integer streetId, List list) {
deleteLightSourceByStreetId(streetId);
list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
@@ -215,5 +238,8 @@ public class StreetServiceImpl extends ServiceImpl imple
private void deleteRfidByStreetId(Integer streetId) {
rfidMapper.deleteByStreetId(streetId);
}
+ private void deleteRadarByStreetId(Integer streetId) {
+ radarMapper.deleteByStreetId(streetId);
+ }
}
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfRespVO.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfRespVO.java
index 8c52da7..ca04778 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfRespVO.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfRespVO.java
@@ -41,6 +41,12 @@ public class CheckConfRespVO {
@ExcelProperty("是否启用")
private Boolean isEnable;
+
+ @Schema(description = "是否显示")
+ @ExcelProperty("是否显示")
+ private Boolean isDisplay;
+
+
@Schema(description = "上位状态码", example = "1")
@ExcelProperty(value = "上位状态码", converter = DictConvert.class)
@DictFormat("cssc_code") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfSaveReqVO.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfSaveReqVO.java
index 60fd342..a60cc51 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfSaveReqVO.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/controller/admin/checkconf/vo/CheckConfSaveReqVO.java
@@ -29,6 +29,13 @@ public class CheckConfSaveReqVO {
@Schema(description = "是否启用")
private Boolean isEnable;
+
+ /**
+ * 是否显示
+ */
+ @Schema(description = "是否显示")
+ private Boolean isDisplay;
+
@Schema(description = "上位状态码", example = "1")
private String checkType;
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/dal/dataobject/checkconf/CheckConfDO.java b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/dal/dataobject/checkconf/CheckConfDO.java
index 9d5e341..bb56b02 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/dal/dataobject/checkconf/CheckConfDO.java
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/java/cn/iocoder/yudao/module/logistics/dal/dataobject/checkconf/CheckConfDO.java
@@ -1,11 +1,11 @@
package cn.iocoder.yudao.module.logistics.dal.dataobject.checkconf;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+import org.glassfish.jaxb.core.v2.TODO;
/**
* 盘点配置 DO
@@ -53,6 +53,10 @@ public class CheckConfDO extends BaseDO {
* 是否启用
*/
private Boolean isEnable;
+ /**
+ * 是否显示
+ */
+ private Boolean isDisplay;
/**
* 上位状态码
*
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/OrderMapper.xml b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/OrderMapper.xml
index 3bb89cd..c48ee49 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/OrderMapper.xml
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/OrderMapper.xml
@@ -22,4 +22,12 @@
GROUP BY srm_number, DATE(create_time)
+
+
+
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/checklog/CheckLogMapper.xml b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/checklog/CheckLogMapper.xml
index 34c55d1..32a7a70 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/checklog/CheckLogMapper.xml
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/checklog/CheckLogMapper.xml
@@ -2,13 +2,16 @@
-
+
UPDATE logistics_check_log
-
- ${column} = #{value}
-
- WHERE id = (SELECT id FROM (SELECT id FROM logistics_check_log WHERE task_id = #{taskId} ORDER BY id DESC LIMIT 1) AS tmp)
+ SET extend_info = JSON_SET(
+ extend_info,
+ CONCAT('$.', #{column}),
+ #{value}
+ )
+ WHERE id = #{id};
+
@@ -16,19 +19,42 @@
UPDATE logistics_check_log
SET status = CASE
- WHEN
-
- ${field} IS NULL OR ${field} = ''
-
- THEN 0
- WHEN
-
- ${field} = wms_${field}
-
- THEN 2
- ELSE 1
+ WHEN
+
+ JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) IS NULL
+ OR JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) = ''
+
+ THEN 0
+ WHEN
+
+ JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) = JSON_EXTRACT(wms_extend_info, CONCAT('$.', #{field}))
+
+ THEN 2
+ ELSE 1
END
WHERE id = #{id}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/radar/RfidMapper.xml b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/radar/RfidMapper.xml
new file mode 100644
index 0000000..59bd0fb
--- /dev/null
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/radar/RfidMapper.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/stock/StockMapper.xml b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/stock/StockMapper.xml
index eb7138a..fd2fad5 100644
--- a/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/stock/StockMapper.xml
+++ b/yudao-module-logistics/yudao-module-logistics-biz/src/main/resources/mapper/stock/StockMapper.xml
@@ -4,11 +4,14 @@
+
UPDATE logistics_stock
-
- ${column} = #{value}
-
- WHERE id = (SELECT id FROM (SELECT id FROM logistics_stock WHERE task_id = #{taskId} ORDER BY id DESC LIMIT 1) AS tmp)
+ SET extend_info = JSON_SET(
+ extend_info,
+ CONCAT('$.', #{column}),
+ #{value}
+ )
+ WHERE id = #{id};
@@ -17,19 +20,25 @@
UPDATE logistics_stock
SET status = CASE
- WHEN
-
- ${field} IS NULL OR ${field} = ''
-
- THEN 0
- WHEN
-
- ${field} = wms_${field}
-
- THEN 2
- ELSE 1
+ WHEN
+
+ JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) IS NULL
+ OR JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) = ''
+
+ THEN 0
+ WHEN
+
+ JSON_EXTRACT(extend_info, CONCAT('$.', #{field})) = JSON_EXTRACT(wms_extend_info, CONCAT('$.', #{field}))
+
+ THEN 2
+ ELSE 1
END
WHERE id = #{id}
+
+
+ TRUNCATE TABLE logistics_stock
+
+
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index 3b0e421..2bc4e7d 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -133,10 +133,7 @@
-
-
-
-
+
org.dromara.hutool
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
index c88707c..94aeb8b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
@@ -94,4 +94,15 @@ public class UserProfileController {
return success(avatar);
}
+ @RequestMapping(value = "/updateFile",
+ method = {RequestMethod.POST, RequestMethod.PUT}) // 解决 uni-app 不支持 Put 上传文件的问题
+ @Operation(summary = "上传图像")
+ public CommonResult updateFileAvatar(@RequestParam("avatarFile") MultipartFile file) throws Exception {
+ if (file.isEmpty()) {
+ throw exception(FILE_IS_EMPTY);
+ }
+ String avatar = userService.updateFileAvatar( file.getInputStream());
+ return success(avatar);
+ }
+
}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
index 6345e22..7f5914b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
@@ -66,6 +66,8 @@ public interface AdminUserService {
*/
String updateUserAvatar(Long id, InputStream avatarFile) throws Exception;
+ String updateFileAvatar(InputStream avatarFile) throws Exception;
+
/**
* 修改密码
*
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
index efae327..f7c1c0c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
@@ -188,6 +188,14 @@ public class AdminUserServiceImpl implements AdminUserService {
return avatar;
}
+ @Override
+ public String updateFileAvatar(InputStream avatarFile) {
+ // 存储文件
+ String avatar = fileApi.createFile(IoUtil.readBytes(avatarFile));
+ // 更新路径
+ return avatar;
+ }
+
@Override
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_UPDATE_PASSWORD_SUB_TYPE, bizNo = "{{#id}}",
success = SYSTEM_USER_UPDATE_PASSWORD_SUCCESS)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/RedisUtil.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/RedisUtil.java
index f3361fa..8d40a60 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/RedisUtil.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/util/RedisUtil.java
@@ -160,6 +160,27 @@ public class RedisUtil {
}
}
+ /**
+ * 原子设置值（仅当 key 不存在时），常用于分布式锁
+ *
+ * @param key 键
+ * @param value 值
+ * @param time 过期时间(秒)，大于 0 才设置过期
+ * @return true 设置成功（拿到锁），false 已存在（未拿到锁）
+ */
+ public boolean setIfAbsent(String key, Object value, long time) {
+ try {
+ Boolean success = redisTemplate.opsForValue().setIfAbsent(key, value);
+ if (Boolean.TRUE.equals(success) && time > 0) {
+ redisTemplate.expire(key, time, TimeUnit.SECONDS);
+ }
+ return Boolean.TRUE.equals(success);
+ } catch (Exception e) {
+ log.error(key, e);
+ return false;
+ }
+ }
+
/**
* 递增 适用场景： https://blog.csdn.net/y_y_y_k_k_k_k/article/details/79218254 高并发生成订单号，秒杀类的业务逻辑等。。
*
diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml
index 37a3f2e..3f44da7 100644
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@@ -46,11 +46,13 @@ spring:
primary: master
datasource:
master:
- name: sy
- url: jdbc:mysql://192.168.100.99:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ name: sy-primary
+ url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&allowMultiQueries=true # MySQL Connector/J 8.X 连接的示例
username: root
- password: Leaper@123
+ password: root
+# password: Leaper@123
+
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
data:
@@ -63,7 +65,7 @@ spring:
max-wait: 5000ms # 增加获取连接的最大等待时间
shutdown-timeout: 1000ms # 增加关闭超时时间
timeout: 5000ms # 增加连接超时时间
- host: 192.168.100.99 # 地址
+ host: 192.168.1.21 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
# password: dev # 密码，建议生产环境开启
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 32d0321..98b4dbc 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -47,7 +47,7 @@ spring:
datasource:
master:
name: sy
- url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&allowMultiQueries=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://192.168.2.162:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 72ef5b2..4dfd628 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -5,10 +5,6 @@ spring:
profiles:
active: dev
- autoconfigure:
- exclude:
- - com.xingyuv.captcha.config.AjCaptchaServiceAutoConfiguration
-
main:
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -102,25 +98,6 @@ easy-trans:
is-enable-global: true # 启用全局翻译（拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置，或通过 @IgnoreTrans 忽略某个接口
is-enable-cloud: false # 禁用 TransType.RPC 微服务模式
---- #################### 验证码相关配置 ####################
-
-aj:
- captcha:
- jigsaw: classpath:images/jigsaw # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
- pic-click: classpath:images/pic-click # 滑动验证，底图路径，不配置将使用默认图片；以 classpath: 开头，取 resource 目录下路径
- cache-type: redis # 缓存 local/redis...
- cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
- timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
- type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
- water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
- interference-options: 0 # 滑动干扰项(0/1/2)
- req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
- req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定
- req-get-lock-seconds: 10 # 验证失败后，锁定时间间隔
- req-get-minute-limit: 30 # get 接口一分钟内请求数限制
- req-check-minute-limit: 60 # check 接口一分钟内请求数限制
- req-verify-minute-limit: 60 # verify 接口一分钟内请求数限制
-
--- #################### 消息队列相关 ####################
# rocketmq 配置项，对应 RocketMQProperties 配置类