From e72876114abf2aebf8d08692f2fcb98253d75bbb Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 18 Dec 2025 16:01:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver/controller/DriverController.java | 6 +- .../cst/driver/mapper/DriverMapper.java | 6 +- ...verDetailResult.java => DriverResult.java} | 2 +- .../cst/driver/service/DriverService.java | 6 +- .../service/impl/DriverServiceImpl.java | 6 +- .../project/controller/ProjectController.java | 6 +- .../cst/project/mapper/ProjectMapper.java | 4 +- ...ctDetailResult.java => ProjectResult.java} | 2 +- .../cst/project/service/ProjectService.java | 6 +- .../service/impl/ProjectServiceImpl.java | 22 ++-- .../station/controller/StationController.java | 8 +- .../cst/station/mapper/StationMapper.java | 7 + .../station/pojo/entity/StationEntity.java | 8 +- .../station/pojo/param/StationQueryParam.java | 27 ++++ .../station/pojo/result/StationResult.java | 123 ++++++++++++++++++ .../cst/station/service/StationService.java | 6 +- .../service/impl/StationServiceImpl.java | 39 +++--- .../mapper/cst/driver/DriverMapper.xml | 2 +- .../{ => cst}/order/OrderCargoPlaceMapper.xml | 0 .../order/OrderExpenseDetailMapper.xml | 0 .../order/OrderExpenseItemsMapper.xml | 0 .../mapper/{ => cst}/order/OrderMapper.xml | 0 .../{ => cst}/order/OrderTransMapper.xml | 0 .../mapper/cst/project/ProjectMapper.xml | 2 +- .../mapper/cst/station/StationMapper.xml | 41 ++++++ 25 files changed, 265 insertions(+), 64 deletions(-) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/{DriverDetailResult.java => DriverResult.java} (97%) rename njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/{ProjectDetailResult.java => ProjectResult.java} (98%) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java rename njzscloud-svr/src/main/resources/mapper/{ => cst}/order/OrderCargoPlaceMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{ => cst}/order/OrderExpenseDetailMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{ => cst}/order/OrderExpenseItemsMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{ => cst}/order/OrderMapper.xml (100%) rename njzscloud-svr/src/main/resources/mapper/{ => cst}/order/OrderTransMapper.xml (100%) create mode 100644 njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java index e279c3d..caae2d7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java @@ -5,7 +5,7 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; -import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverResult; import com.njzscloud.dispose.cst.driver.service.DriverService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -56,7 +56,7 @@ public class DriverController { * 详情 */ @GetMapping("/detail") - public R detail(@RequestParam("id") Long id) { + public R detail(@RequestParam("id") Long id) { return R.success(driverService.detail(id)); } @@ -64,7 +64,7 @@ public class DriverController { * 分页查询 */ @GetMapping("/paging") - public R> paging(PageParam pageParam, DriverQueryParam queryParam) { + public R> paging(PageParam pageParam, DriverQueryParam queryParam) { return R.success(driverService.paging(pageParam, queryParam)); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java index e38a86d..00d8da3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; -import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,8 +16,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DriverMapper extends BaseMapper { - Page paging(Page page, @Param("ew") QueryWrapper ew); + Page paging(Page page, @Param("ew") QueryWrapper ew); - DriverDetailResult getById(Long id); + DriverResult getById(Long id); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverResult.java similarity index 97% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverResult.java index 8946892..a0ccc43 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverResult.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class DriverDetailResult { +public class DriverResult { /** * 主键 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java index cb5ca2a..e271201 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java @@ -5,7 +5,7 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; -import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverResult; import java.util.List; @@ -21,9 +21,9 @@ public interface DriverService extends IService { void del(List ids); - DriverDetailResult detail(Long id); + DriverResult detail(Long id); - PageResult paging(PageParam pageParam, DriverQueryParam queryParam); + PageResult paging(PageParam pageParam, DriverQueryParam queryParam); } 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 e34071b..9000406 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 @@ -9,7 +9,7 @@ import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.mapper.DriverMapper; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; -import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverResult; import com.njzscloud.dispose.cst.driver.service.DriverService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -45,12 +45,12 @@ public class DriverServiceImpl extends ServiceImpl i } @Override - public DriverDetailResult detail(Long id) { + public DriverResult detail(Long id) { return baseMapper.getById(id); } @Override - public PageResult paging(PageParam pageParam, DriverQueryParam queryParam) { + public PageResult paging(PageParam pageParam, DriverQueryParam queryParam) { if (queryParam == null) { queryParam = new DriverQueryParam(); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/controller/ProjectController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/controller/ProjectController.java index c05823d..b0334f0 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/controller/ProjectController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/controller/ProjectController.java @@ -5,7 +5,7 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; import com.njzscloud.dispose.cst.project.pojo.param.ProjectQueryParam; -import com.njzscloud.dispose.cst.project.pojo.result.ProjectDetailResult; +import com.njzscloud.dispose.cst.project.pojo.result.ProjectResult; import com.njzscloud.dispose.cst.project.service.ProjectService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -57,7 +57,7 @@ public class ProjectController { * 详情 */ @GetMapping("/detail") - public R detail(@RequestParam("id") Long id) { + public R detail(@RequestParam("id") Long id) { return R.success(projectService.detail(id)); } @@ -65,7 +65,7 @@ public class ProjectController { * 分页查询 */ @GetMapping("/paging") - public R> paging(PageParam pageParam, ProjectQueryParam queryParam) { + public R> paging(PageParam pageParam, ProjectQueryParam queryParam) { return R.success(projectService.paging(pageParam, queryParam)); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/mapper/ProjectMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/mapper/ProjectMapper.java index c472c50..ae93d91 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/mapper/ProjectMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/mapper/ProjectMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; -import com.njzscloud.dispose.cst.project.pojo.result.ProjectDetailResult; +import com.njzscloud.dispose.cst.project.pojo.result.ProjectResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface ProjectMapper extends BaseMapper { - Page paging(Page page, @Param("ew") QueryWrapper ew); + Page paging(Page page, @Param("ew") QueryWrapper ew); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectResult.java similarity index 98% rename from njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectDetailResult.java rename to njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectResult.java index 7932e51..b0d0f4d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/result/ProjectResult.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -public class ProjectDetailResult { +public class ProjectResult { /** * 主键 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/ProjectService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/ProjectService.java index c8fb615..fb899e5 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/ProjectService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/ProjectService.java @@ -5,7 +5,7 @@ import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; import com.njzscloud.dispose.cst.project.pojo.param.ProjectQueryParam; -import com.njzscloud.dispose.cst.project.pojo.result.ProjectDetailResult; +import com.njzscloud.dispose.cst.project.pojo.result.ProjectResult; import java.util.List; @@ -21,9 +21,9 @@ public interface ProjectService extends IService { void del(List ids); - ProjectDetailResult detail(Long id); + ProjectResult detail(Long id); - PageResult paging(PageParam pageParam, ProjectQueryParam queryParam); + PageResult paging(PageParam pageParam, ProjectQueryParam queryParam); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java index 9484b81..df40003 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java @@ -17,7 +17,7 @@ import com.njzscloud.dispose.cst.org.service.OrgService; import com.njzscloud.dispose.cst.project.mapper.ProjectMapper; import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; import com.njzscloud.dispose.cst.project.pojo.param.ProjectQueryParam; -import com.njzscloud.dispose.cst.project.pojo.result.ProjectDetailResult; +import com.njzscloud.dispose.cst.project.pojo.result.ProjectResult; import com.njzscloud.dispose.cst.project.service.ProjectService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -57,19 +57,19 @@ public class ProjectServiceImpl extends ServiceImpl paging(PageParam pageParam, ProjectQueryParam queryParam) { + public PageResult paging(PageParam pageParam, ProjectQueryParam queryParam) { if (queryParam == null) { queryParam = new ProjectQueryParam(); } @@ -82,7 +82,7 @@ public class ProjectServiceImpl extends ServiceImpl page = pageParam.toPage(); page.addOrder(OrderItem.desc("p.create_time")); - Page paging = baseMapper.paging(page, ew); + Page paging = baseMapper.paging(page, ew); if (CollUtil.isNotEmpty(paging.getRecords())) { fillCustomerAndOrgInfo(paging.getRecords()); @@ -94,12 +94,12 @@ public class ProjectServiceImpl extends ServiceImpl records) { + private void fillCustomerAndOrgInfo(List records) { // 收集所有需要的 ID - Set transCustomerIds = records.stream().map(ProjectDetailResult::getTransCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); - Set fringeCustomerIds = records.stream().map(ProjectDetailResult::getFringeCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); - Set transOrgIds = records.stream().map(ProjectDetailResult::getTransOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); - Set fringeOrgIds = records.stream().map(ProjectDetailResult::getFringeOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set transCustomerIds = records.stream().map(ProjectResult::getTransCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set fringeCustomerIds = records.stream().map(ProjectResult::getFringeCustomerId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set transOrgIds = records.stream().map(ProjectResult::getTransOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); + Set fringeOrgIds = records.stream().map(ProjectResult::getFringeOrgId).filter(Objects::nonNull).collect(Collectors.toSet()); Set allCustomerIds = new HashSet<>(transCustomerIds); allCustomerIds.addAll(fringeCustomerIds); @@ -116,7 +116,7 @@ public class ProjectServiceImpl extends ServiceImpl it)); } - for (ProjectDetailResult item : records) { + for (ProjectResult item : records) { if (item.getTransCustomerId() != null) { item.setTransCustomerInfo(customerMap.get(item.getTransCustomerId())); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java index 3a64c81..4125bab 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java @@ -4,6 +4,8 @@ import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.pojo.param.StationQueryParam; +import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import com.njzscloud.dispose.cst.station.service.StationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -54,7 +56,7 @@ public class StationController { * 详情 */ @GetMapping("/detail") - public R detail(@RequestParam("id") Long id) { + public R detail(@RequestParam("id") Long id) { return R.success(stationService.detail(id)); } @@ -62,8 +64,8 @@ public class StationController { * 分页查询 */ @GetMapping("/paging") - public R> paging(PageParam pageParam, StationEntity stationEntity) { - return R.success(stationService.paging(pageParam, stationEntity)); + public R> paging(PageParam pageParam, StationQueryParam queryParam) { + return R.success(stationService.paging(pageParam, queryParam)); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java index 7beb53b..f58099a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java @@ -1,8 +1,12 @@ package com.njzscloud.dispose.cst.station.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 站点信息 @@ -10,6 +14,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface StationMapper extends BaseMapper { + + Page paging(Page page, @Param("ew") QueryWrapper ew); + } 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 bb81462..84de899 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,6 +1,5 @@ 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; @@ -10,7 +9,7 @@ import lombok.ToString; import lombok.experimental.Accessors; /** - * 站点信息 + * 站点信息实体（仅包含表字段） * @author ljw */ @Getter @@ -85,10 +84,5 @@ 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/pojo/param/StationQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java new file mode 100644 index 0000000..f49f8d5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/param/StationQueryParam.java @@ -0,0 +1,27 @@ +package com.njzscloud.dispose.cst.station.pojo.param; + +import lombok.Getter; +import lombok.Setter; + +/** + * 站点分页查询入参 + * + * @author ljw + */ +@Getter +@Setter +public class StationQueryParam { + + /** + * 是否删除； 0-->未删除、1-->已删除 + * 作为查询条件时，默认按未删除（0）处理 + */ + private Boolean deleted; + + /** + * 站点名称（模糊查询） + */ + private String stationName; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java new file mode 100644 index 0000000..30ddf4e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/result/StationResult.java @@ -0,0 +1,123 @@ +package com.njzscloud.dispose.cst.station.pojo.result; + +import com.njzscloud.dispose.cst.org.pojo.entity.OrgEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 站点详情 / 列表返回结果 + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class StationResult { + + /** + * 主键 + */ + private Long id; + + /** + * 组织信息 Id + */ + private Long orgId; + + /** + * 站点名称 + */ + private String stationName; + + /** + * 省；代码 + */ + private String province; + + /** + * 市；代码 + */ + private String city; + + /** + * 区县；代码 + */ + private String area; + + /** + * 乡镇街道；代码 + */ + private String town; + + /** + * 省；名称 + */ + private String provinceName; + + /** + * 市；名称 + */ + private String cityName; + + /** + * 区县；名称 + */ + private String areaName; + + /** + * 乡镇街道；名称 + */ + private String townName; + + /** + * 详细地址 + */ + private String address; + + /** + * 经度 + */ + private Double lng; + + /** + * 纬度 + */ + private Double lat; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id； sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + + /** + * 是否删除； 0-->未删除、1-->已删除 + */ + private Boolean deleted; + + /** + * 关联组织信息（返回用） + */ + private OrgEntity org; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java index 4fc012d..10a2a48 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.pojo.param.StationQueryParam; +import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import java.util.List; @@ -19,9 +21,9 @@ public interface StationService extends IService { void del(List ids); - StationEntity detail(Long id); + StationResult detail(Long id); - PageResult paging(PageParam pageParam, StationEntity stationEntity); + PageResult paging(PageParam pageParam, StationQueryParam queryParam); } 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 0cce6ea..c384f6f 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 @@ -1,5 +1,6 @@ package com.njzscloud.dispose.cst.station.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; @@ -11,6 +12,8 @@ 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.pojo.param.StationQueryParam; +import com.njzscloud.dispose.cst.station.pojo.result.StationResult; import com.njzscloud.dispose.cst.station.service.StationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,16 +40,12 @@ public class StationServiceImpl extends ServiceImpl paging(PageParam pageParam, StationEntity stationEntity) { - QueryWrapper ew = Wrappers.query().eq("deleted", 0); - if (stationEntity != null) { - String stationName = stationEntity.getStationName(); - // 添加站点名称的模糊查询，并判空 - ew.like(StrUtil.isNotBlank(stationName), "station_name", stationName); + public PageResult paging(PageParam pageParam, StationQueryParam queryParam) { + if (queryParam == null) { + queryParam = new StationQueryParam(); } + String stationName = queryParam.getStationName(); + + QueryWrapper ew = Wrappers.query().eq("deleted", Boolean.FALSE); + // 添加站点名称的模糊查询，并判空 + ew.like(StrUtil.isNotBlank(stationName), "station_name", stationName); pageParam.toPage().addOrder(OrderItem.desc("create_time")); - PageResult page = PageResult.of(this.page(pageParam.toPage(), ew)); - List records = page.getRecords(); + PageResult page = PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); + List records = page.getRecords(); if (records.isEmpty()) { return page; } List orgIds = records.stream() - .map(StationEntity::getOrgId) + .map(StationResult::getOrgId) .filter(Objects::nonNull) .toList(); if (!orgIds.isEmpty()) { diff --git a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml index 4374563..44fd8a2 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderCargoPlaceMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/order/OrderCargoPlaceMapper.xml rename to njzscloud-svr/src/main/resources/mapper/cst/order/OrderCargoPlaceMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderExpenseDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/order/OrderExpenseDetailMapper.xml rename to njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseDetailMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderExpenseItemsMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseItemsMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/order/OrderExpenseItemsMapper.xml rename to njzscloud-svr/src/main/resources/mapper/cst/order/OrderExpenseItemsMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/order/OrderMapper.xml rename to njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml similarity index 100% rename from njzscloud-svr/src/main/resources/mapper/order/OrderTransMapper.xml rename to njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml diff --git a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml index 1b66057..d605e86 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml new file mode 100644 index 0000000..16334f0 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id + , org_id, station_name, province, city, area, town, + province_name, city_name, area_name, town_name, address, lng, lat, + creator_id, modifier_id, create_time, modify_time, deleted + + + +