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-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); 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); }