From e9cf599dcff62cbe38d043b09971828ed20fb799 Mon Sep 17 00:00:00 2001 From: punchhhh <87906027+punchhhh@users.noreply.github.com> Date: Sun, 26 Jan 2025 12:56:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=99=BA=E6=85=A7?= =?UTF-8?q?=E7=A0=81=E5=A4=B4token=E9=85=8D=E7=BD=AE=20=20=20=E5=94=AE?= =?UTF-8?q?=E7=A5=A8=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=88=A4=E7=A9=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/controller/app/checkticket/CheckTicketApi.java | 2 +- .../datacenter/service/saledata/SaleDataServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java index 7bbfa5f79..7a15a8a16 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java @@ -53,7 +53,7 @@ public class CheckTicketApi { @GetMapping("/getToken") public Map test(){ AuthLoginReqVO loginReqVO = new AuthLoginReqVO(); - loginReqVO.setPassword("admin123"); + loginReqVO.setPassword("mt@6688"); loginReqVO.setUsername("admin"); Map token = loginClient.getToken(loginReqVO,"1"); return token; diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java index 3534665d8..02bbbae05 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java @@ -209,7 +209,8 @@ public class SaleDataServiceImpl implements SaleDataService { // 遍历销售数据列表 for (SaleData saleData : list) { String certificateno = saleData.getCertificateno(); - if (certificateno == null || certificateno.length() != 18) { + if(certificateno == null) continue; + if (certificateno.length() != 18) { continue; } String region = IdCardUtil.getRegion(certificateno); -- 2.45.2 From fed667d49c1fa578d072760ae76167c75c7127b6 Mon Sep 17 00:00:00 2001 From: punchhhh <87906027+punchhhh@users.noreply.github.com> Date: Sun, 26 Jan 2025 14:14:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=82=B9=E6=B7=BB=E5=8A=A0total?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/camera/vo/RegionCameraListDTO.java | 2 ++ .../module/hiking/api/region/dto/RegionCameraListDTO.java | 2 ++ .../yudao/module/hiking/service/region/RegionServiceImpl.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/RegionCameraListDTO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/RegionCameraListDTO.java index 26f02f3ff..b069e8da2 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/RegionCameraListDTO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/RegionCameraListDTO.java @@ -19,6 +19,8 @@ public class RegionCameraListDTO { private Integer leaf; @Schema(description = "子区域") private List children = new ArrayList<>(); + @Schema(description = "查询数量") + private Long total; @Schema(description = "摄像头列表") private List cameraList = new ArrayList<>(); } diff --git a/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/region/dto/RegionCameraListDTO.java b/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/region/dto/RegionCameraListDTO.java index 7e6e7c4f5..97100b4a2 100644 --- a/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/region/dto/RegionCameraListDTO.java +++ b/ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/region/dto/RegionCameraListDTO.java @@ -20,6 +20,8 @@ public class RegionCameraListDTO { private Integer leaf; @Schema(description = "子区域") private List children = new ArrayList<>(); + @Schema(description = "查询数量") + private Long total; @Schema(description = "摄像头列表") private List cameraList = new ArrayList<>(); } diff --git a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java index d8244283a..6fd53499e 100644 --- a/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java +++ b/ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java @@ -114,12 +114,14 @@ public class RegionServiceImpl implements RegionService { temp.setRegionName(regionDO.getName()); temp.setParentIndexCode(regionDO.getParentIndexCode()); temp.setLeaf(regionDO.getLeaf()); - System.out.println("regionDO.getLeaf(): " + regionDO.getLeaf() + " temp.getLeaf(): " + temp.getLeaf()); +// System.out.println("regionDO.getLeaf(): " + regionDO.getLeaf() + " temp.getLeaf(): " + temp.getLeaf()); if(temp.getLeaf() == 1) { cameraMapper.selectCameraByRegionIndexCodeAndCameraNamePage(temp.getRegionIndexCode(), cameraName, start, pageSize).forEach(cameraDO -> { temp.getCameraList().add(BeanUtils.toBean(cameraDO, CameraDTO.class)); + temp.setTotal(cameraMapper.selectCameraByRegionIndexCodeAndCameraNameTotal(temp.getRegionIndexCode(), cameraName)); }); } +// System.out.println(temp.getRegionName() +"----::::::total:::::---"+ temp.getTotal()); regions.add(temp); regionMap.put(regionDO.getIndexCode(), temp); } -- 2.45.2