From e6aa88d55291e7268ef9e7c9554cf3690cf2ca6e Mon Sep 17 00:00:00 2001
From: ovo <ovo@ovo.com>
Date: Sat, 19 Oct 2024 20:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E5=BA=86=E9=A1=B9=E7=9B=AEday3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/iCq/controller/enter/CqEnterController.java       | 4 ++--
 .../net/shapelight/modules/iCq/controller/enter/to/FTo.java   | 2 +-
 .../shapelight/modules/iCq/controller/enter/vo/FirstVo.java   | 2 +-
 .../shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java | 2 +-
 4 files changed, 5 insertions(+), 5 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 a30f075..302f01a 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
@@ -30,7 +30,7 @@ public class CqEnterController {
 
 
     @GetMapping("list")
-    public R find(String operator, String cellId){
+    public R find(String operator, long cellId){
         System.out.println("cellId = " + cellId);
 
         List<FTo> fTo = cqEnterMapper.classifiedQuery(cellId);
@@ -40,7 +40,7 @@ public class CqEnterController {
 
         for (FTo f : fTo) {
             FirstVo firstVo = new FirstVo();
-            firstVo.setOrgId(f.getCellId());
+            firstVo.setCellId(f.getCellId());
             firstVo.setUnitName(safeVideoMapper.findTheNameById(f.getCellId()));
             firstVo.setPerson(operator);
             firstVo.setConfigurationTime(f.getOperateTime());
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 cbb1999..ca76bf0 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
@@ -11,7 +11,7 @@ import java.util.Date;
 @NoArgsConstructor
 public class FTo {
 
-    private String cellId;
+    private long cellId;
     private Date operateTime;
 
 }
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/vo/FirstVo.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/vo/FirstVo.java
index 88fa819..80f2fec 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/vo/FirstVo.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/vo/FirstVo.java
@@ -10,7 +10,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class FirstVo {
-    private String orgId;
+    private long cellId;
     private String unitName;
     private String person;
     private Date configurationTime;
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
index d87264f..b3136b1 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
 public interface CqEnterMapper extends BaseMapper<TenEnterConfigEntity> {
 
 
-    List<FTo> classifiedQuery(@Param("cellId")String cellId);
+    List<FTo> classifiedQuery(@Param("cellId")long cellId);
 
     List<PeronType> getPersonType();