From 5f14c3613d7feba4c89ac14fe2b74a91489590d8 Mon Sep 17 00:00:00 2001
From: ovo <ovo@ovo.com>
Date: Fri, 18 Oct 2024 21:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E5=BA=86=E9=A1=B9=E7=9B=AEday2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/enter/CqEnterController.java   | 24 +++----------------
 .../modules/iCq/controller/enter/to/FTo.java  |  2 --
 .../resources/mapper/iCq/CqEnterMapper.xml    |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
index 4975421..d3bb0e7 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
@@ -1,39 +1,19 @@
 package net.shapelight.modules.iCq.controller.enter;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.minio.MinioClient;
-import io.minio.PutObjectOptions;
 import io.swagger.annotations.Api;
-import io.swagger.models.auth.In;
 import lombok.RequiredArgsConstructor;
-import net.shapelight.common.config.MinioConfig;
 import net.shapelight.common.utils.R;
-import net.shapelight.common.utils.SnowflakeIdWorker;
-import net.shapelight.common.utils.UUIDUtil;
 import net.shapelight.modules.iCq.controller.enter.to.FTo;
 import net.shapelight.modules.iCq.controller.enter.vo.FirstVo;
 import net.shapelight.modules.iCq.controller.enter.vo.PeronType;
 import net.shapelight.modules.iCq.controller.enter.vo.TypeRules;
-import net.shapelight.modules.iCq.controller.member.dto.VisitorDto;
-import net.shapelight.modules.iCq.controller.member.vo.MemberListVo;
-import net.shapelight.modules.iCq.dal.dataobject.member.TenPersonEntity;
-import net.shapelight.modules.iCq.dal.dataobject.video.FileEntity;
 import net.shapelight.modules.iCq.dal.mysql.enter.CqEnterMapper;
 import net.shapelight.modules.iCq.dal.mysql.member.CqMemberMapper;
-import net.shapelight.modules.iCq.dal.mysql.video.CqFileMapper;
 import net.shapelight.modules.iCq.dal.mysql.video.CqSafeVideoMapper;
-import net.shapelight.modules.ten.service.TenPersonService;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 
 @RestController
@@ -52,6 +32,9 @@ public class CqEnterController {
     @GetMapping("list")
     public R find(String operator, String cellId){
 
+        System.out.println("cellId = " + cellId);
+
+
         List<FTo> fTo = cqEnterMapper.classifiedQuery(cellId);
         System.out.println(fTo);
 
@@ -59,7 +42,6 @@ public class CqEnterController {
 
         for (FTo f : fTo) {
             FirstVo firstVo = new FirstVo();
-
             firstVo.setOrgId(f.getCellId());
             firstVo.setUnitName(safeVideoMapper.findTheNameById(f.getCellId()));
             firstVo.setPerson(operator);
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/to/FTo.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/to/FTo.java
index b40e67f..cbb1999 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/to/FTo.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/to/FTo.java
@@ -12,8 +12,6 @@ import java.util.Date;
 public class FTo {
 
     private String cellId;
-
-
     private Date operateTime;
 
 }
diff --git a/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml b/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
index d8b05c2..7e9a527 100644
--- a/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
+++ b/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
@@ -17,7 +17,7 @@
             ten_enter_config_cell
         WHERE 1 = 1
         <if test="cellId != null and cellId != ''">
-            AND cell_id = #{uploader}
+            AND cell_id = #{cellId}
         </if>
         GROUP BY
             cell_id ;