From 77fd99919f4bbe7fc7144e0a079f7587c60defc2 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 25 Aug 2023 19:15:24 +0800
Subject: [PATCH] result

---
 .../java/com/iflytop/nuclear/controller/CheckController.java   | 10 ++++++++--
 .../com/iflytop/nuclear/controller/NuclearCoreController.java  |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/iflytop/nuclear/controller/CheckController.java b/src/main/java/com/iflytop/nuclear/controller/CheckController.java
index ae5f404..414f75b 100644
--- a/src/main/java/com/iflytop/nuclear/controller/CheckController.java
+++ b/src/main/java/com/iflytop/nuclear/controller/CheckController.java
@@ -104,8 +104,14 @@ public class CheckController {
             result = 2;
         }else {
             String firstSign = one.getFirstSign();
-            if (firstSign.equals(resultSerial)) {
-                result = 1;
+            if (firstSign.length() <= 4) {
+                if (firstSign.equals(resultSerial)) {
+                    result = 1;
+                }
+            }else {
+                if (firstSign.substring(firstSign.length() - 4).equals(resultSerial)) {
+                    result = 1;
+                }
             }
         }
         // result_img为本地图片，需要读取到而后转为base64存储在数据库中
diff --git a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
index 84c914d..24255a0 100644
--- a/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
+++ b/src/main/java/com/iflytop/nuclear/controller/NuclearCoreController.java
@@ -43,7 +43,9 @@ public class NuclearCoreController {
             for (NuclearCore l : list) {
                 int id = l.getId();
                 // 根据id获取曝光时间等
-                Camera byId = cameraService.getById(id);
+                QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("coreid", id);
+                Camera byId = cameraService.getOne(queryWrapper);
                 NuclearStation nuclearStation = nuclearStationService.getById(l.getStationId());
                 if(nuclearStation != null) {
                     l.setStationName(nuclearStation.getName());