by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:638a98a4c6d638dd00103448246fe6655b182bc5
Branches Tags
by2025:master by2025:prod by2025:main
...
compare: by2025:ef0976c6213abbdf41ceada40d60d83e19f9030c
Branches Tags
by2025:master by2025:prod by2025:main

2 Commits
638a98a4c6 ... ef0976c621

Author SHA1 Message Date
yuyongle
ef0976c621 Merge remote-tracking branch 'origin/master' 2025-08-26 09:50:12 +08:00
yuyongle
e949122b37 修改了车辆收费bug 2025-08-26 09:47:32 +08:00
2 changed files with 4 additions and 3 deletions
Expand all files Collapse all files

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java
View File

@@ -81,8 +81,9 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
Page<CostCarChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<CostCarChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList()); // List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList());
// List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList); // List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList);
List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList(); List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList();
List<String> roomNames = roomService.queryRoomNameList(idList); // List<String> roomNames = roomService.queryRoomNameList(idList);
result.getRecords().stream().forEach(s -> { result.getRecords().stream().forEach(s -> {
if (CollUtil.isNotEmpty(residentPeoplelist)) { if (CollUtil.isNotEmpty(residentPeoplelist)) {
ResidentPerson residentPerson = residentPeoplelist.stream() ResidentPerson residentPerson = residentPeoplelist.stream()

4
ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties
View File

@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
db.num=1 db.num=1
### Connect URL of DB: ### Connect URL of DB:
db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.url.0=jdbc:mysql://192.168.159.129:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
db.user.0=root db.user.0=root
db.password.0=By@2025! db.password.0=123456
### the maximum retry times for push ### the maximum retry times for push
nacos.config.push.maxRetryTime=50 nacos.config.push.maxRetryTime=50