root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 2 Wiki Activity

更改智慧码头token配置 售票身份证判空修改 #105

Merged
root merged 2 commits from cgt into master 2025-01-26 14:25:58 +08:00
Conversation 0 Commits 2 Files Changed 5 +10 -3
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/RegionCameraListDTO.java
View File

@ -19,6 +19,8 @@ public class RegionCameraListDTO {
private Integer leaf; private Integer leaf;
@Schema(description = "子区域") @Schema(description = "子区域")
private List<RegionCameraListDTO> children = new ArrayList<>(); private List<RegionCameraListDTO> children = new ArrayList<>();
@Schema(description = "查询数量")
private Long total;
@Schema(description = "摄像头列表") @Schema(description = "摄像头列表")
private List<CameraDTO> cameraList = new ArrayList<>(); private List<CameraDTO> cameraList = new ArrayList<>();
} }

2
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/checkticket/CheckTicketApi.java
View File

@ -53,7 +53,7 @@ public class CheckTicketApi {
@GetMapping("/getToken") @GetMapping("/getToken")
public Map<Object, Object> test(){ public Map<Object, Object> test(){
AuthLoginReqVO loginReqVO = new AuthLoginReqVO(); AuthLoginReqVO loginReqVO = new AuthLoginReqVO();
loginReqVO.setPassword("admin123"); loginReqVO.setPassword("mt@6688");
loginReqVO.setUsername("admin"); loginReqVO.setUsername("admin");
Map<Object, Object> token = loginClient.getToken(loginReqVO,"1"); Map<Object, Object> token = loginClient.getToken(loginReqVO,"1");
return token; return token;

3
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/saledata/SaleDataServiceImpl.java
View File

@ -209,7 +209,8 @@ public class SaleDataServiceImpl implements SaleDataService {
// 遍历销售数据列表 // 遍历销售数据列表
for (SaleData saleData : list) { for (SaleData saleData : list) {
String certificateno = saleData.getCertificateno(); String certificateno = saleData.getCertificateno();
if (certificateno == null || certificateno.length() != 18) { if(certificateno == null) continue;
if (certificateno.length() != 18) {
continue; continue;
} }
String region = IdCardUtil.getRegion(certificateno); String region = IdCardUtil.getRegion(certificateno);

2
ludu-module-hiking/ludu-module-hiking-api/src/main/java/cn/iocoder/yudao/module/hiking/api/region/dto/RegionCameraListDTO.java
View File

@ -20,6 +20,8 @@ public class RegionCameraListDTO {
private Integer leaf; private Integer leaf;
@Schema(description = "子区域") @Schema(description = "子区域")
private List<RegionCameraListDTO> children = new ArrayList<>(); private List<RegionCameraListDTO> children = new ArrayList<>();
@Schema(description = "查询数量")
private Long total;
@Schema(description = "摄像头列表") @Schema(description = "摄像头列表")
private List<CameraDTO> cameraList = new ArrayList<>(); private List<CameraDTO> cameraList = new ArrayList<>();
} }

4
ludu-module-hiking/ludu-module-hiking-biz/src/main/java/cn/iocoder/yudao/module/hiking/service/region/RegionServiceImpl.java
View File

@ -114,12 +114,14 @@ public class RegionServiceImpl implements RegionService {
temp.setRegionName(regionDO.getName()); temp.setRegionName(regionDO.getName());
temp.setParentIndexCode(regionDO.getParentIndexCode()); temp.setParentIndexCode(regionDO.getParentIndexCode());
temp.setLeaf(regionDO.getLeaf()); 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) { if(temp.getLeaf() == 1) {
cameraMapper.selectCameraByRegionIndexCodeAndCameraNamePage(temp.getRegionIndexCode(), cameraName, start, pageSize).forEach(cameraDO -> { cameraMapper.selectCameraByRegionIndexCodeAndCameraNamePage(temp.getRegionIndexCode(), cameraName, start, pageSize).forEach(cameraDO -> {
temp.getCameraList().add(BeanUtils.toBean(cameraDO, CameraDTO.class)); 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); regions.add(temp);
regionMap.put(regionDO.getIndexCode(), temp); regionMap.put(regionDO.getIndexCode(), temp);
} }