From ec68e8fc3ef562b9e8672c6246750e5f06325bb2 Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 12 Dec 2025 17:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E3=80=81=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DriverServiceImpl.java | 2 +- .../station/pojo/entity/StationEntity.java | 8 ++++ .../service/impl/StationServiceImpl.java | 44 ++++++++++++++++++- .../src/main/resources/application-dev.yml | 2 + 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java index fc0c33a..e71f0db 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java @@ -51,6 +51,6 @@ public class DriverServiceImpl extends ServiceImpl i public PageResult paging(PageParam pageParam, DriverEntity driverEntity) { Page page = pageParam.toPage(); page.addOrder(OrderItem.desc("cd.create_time")); - return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query(driverEntity))); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query(driverEntity))); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java index 2f0cede..8aad912 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java @@ -1,7 +1,9 @@ package com.njzscloud.dispose.cst.station.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -82,5 +84,11 @@ public class StationEntity extends BaseEntity { * 纬度 */ private Double lat; + + /** + * 关联组织信息（返回用） + */ + @TableField(exist = false) + private OrgEntity org; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java index 8333491..2e3d291 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import com.njzscloud.dispose.cst.org.service.OrgService; import com.njzscloud.dispose.cst.station.mapper.StationMapper; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; import com.njzscloud.dispose.cst.station.service.StationService; @@ -13,9 +15,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 站点信息 + * * @author ljw */ @Slf4j @@ -23,31 +29,65 @@ import java.util.List; @RequiredArgsConstructor public class StationServiceImpl extends ServiceImpl implements StationService { + private final OrgService orgService; + @Override + @Transactional(rollbackFor = Exception.class) public void add(StationEntity stationEntity) { + OrgEntity org = stationEntity.getOrg(); + orgService.save(org); + stationEntity.setOrgId(org.getId()); this.save(stationEntity); } @Override + @Transactional(rollbackFor = Exception.class) public void modify(StationEntity stationEntity) { + orgService.updateById(stationEntity.getOrg()); this.updateById(stationEntity); } @Override @Transactional(rollbackFor = Exception.class) public void del(List ids) { + List stations = this.listByIds(ids); this.removeBatchByIds(ids); + List orgIds = stations.stream() + .map(StationEntity::getOrgId) + .filter(Objects::nonNull).toList(); + if (!orgIds.isEmpty()) { + orgService.removeBatchByIds(orgIds); + } } @Override public StationEntity detail(Long id) { - return this.getById(id); + StationEntity station = this.getById(id); + if (station != null && station.getOrgId() != null) { + station.setOrg(orgService.getById(station.getOrgId())); + } + return station; } @Override public PageResult paging(PageParam pageParam, StationEntity stationEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(stationEntity))); + PageResult page = PageResult.of(this.page(pageParam.toPage(), Wrappers.query(stationEntity))); + List records = page.getRecords(); + if (records.isEmpty()) { + return page; + } + List orgIds = records.stream() + .map(StationEntity::getOrgId) + .filter(Objects::nonNull) + .toList(); + if (!orgIds.isEmpty()) { + Map orgMap = orgService.listByIds(orgIds).stream() + .collect(Collectors.toMap(OrgEntity::getId, it -> it)); + records.forEach(station -> station.setOrg(orgMap.get(station.getOrgId()))); + } + return page; } + } diff --git a/njzscloud-svr/src/main/resources/application-dev.yml b/njzscloud-svr/src/main/resources/application-dev.yml index 6f36984..cb2ae70 100644 --- a/njzscloud-svr/src/main/resources/application-dev.yml +++ b/njzscloud-svr/src/main/resources/application-dev.yml @@ -8,6 +8,8 @@ spring: - /oss/** - /endpoint/reload - /permission/refresh_cache + - /static/** + - /** oss: type: ali