diff --git a/.gitignore b/.gitignore index 96b1264..2baca05 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /**/target /**/.DS_Store /**/.njzscloud-dispose +/接口文档 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/common/pojo/entity/BaseEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/common/pojo/entity/BaseEntity.java new file mode 100644 index 0000000..1cd2507 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/common/pojo/entity/BaseEntity.java @@ -0,0 +1,57 @@ +package com.njzscloud.dispose.common.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 通用基础字段 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class BaseEntity { + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id； sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除； 0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; +} + + 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 new file mode 100644 index 0000000..599f377 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.driver.controller; + +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.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.service.DriverService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 司机 + */ +@Slf4j +@RestController +@RequestMapping("/driver") +@RequiredArgsConstructor +public class DriverController { + + private final DriverService driverService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody DriverEntity driverEntity) { + driverService.add(driverEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody DriverEntity driverEntity) { + driverService.modify(driverEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + driverService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(driverService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, DriverEntity driverEntity) { + return R.success(driverService.paging(pageParam, driverEntity)); + } +} + + 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 new file mode 100644 index 0000000..64503c2 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.driver.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 司机 + */ +@Mapper +public interface DriverMapper extends BaseMapper { +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java new file mode 100644 index 0000000..b1a325a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java @@ -0,0 +1,73 @@ +package com.njzscloud.dispose.cst.driver.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; + +import java.time.LocalDateTime; + +/** + * 司机 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_driver") +public class DriverEntity extends BaseEntity { + + /** + * 归属用户 Id；sys_user.id + */ + private Long userId; + + /** + * 归属客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 归属公司 Id；cst_org.id + */ + private Long orgId; + + /** + * 驾驶证编号 + */ + private String drivingLicenceNo; + + /** + * 司机姓名 + */ + private String driverName; + + /** + * 手机号 + */ + private String phone; + + /** + * 驾驶证图片 + */ + private String drivingLicence; + + /** + * 驾驶证有效期开始 + */ + private LocalDateTime licenceStartTime; + + /** + * 驾驶证有效期结束 + */ + private LocalDateTime licenceEndTime; + + /** + * 忙碌中 + */ + private Boolean busy; +} + + 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 new file mode 100644 index 0000000..d77d998 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.driver.service; + +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.driver.pojo.entity.DriverEntity; + +import java.util.List; + +/** + * 司机 + */ +public interface DriverService extends IService { + + void add(DriverEntity driverEntity); + + void modify(DriverEntity driverEntity); + + void del(List ids); + + DriverEntity detail(Long id); + + PageResult paging(PageParam pageParam, DriverEntity driverEntity); +} + + 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 new file mode 100644 index 0000000..e24176a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.cst.driver.service.impl; + +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.driver.mapper.DriverMapper; +import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.service.DriverService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 司机 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class DriverServiceImpl extends ServiceImpl implements DriverService { + + @Override + public void add(DriverEntity driverEntity) { + this.save(driverEntity); + } + + @Override + public void modify(DriverEntity driverEntity) { + this.updateById(driverEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public DriverEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, DriverEntity driverEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(driverEntity))); + } +} + + 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 new file mode 100644 index 0000000..9bd65ac --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/controller/ProjectController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.project.controller; + +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.project.pojo.entity.ProjectEntity; +import com.njzscloud.dispose.cst.project.service.ProjectService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 项目信息 + */ +@Slf4j +@RestController +@RequestMapping("/project") +@RequiredArgsConstructor +public class ProjectController { + + private final ProjectService projectService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody ProjectEntity projectEntity) { + projectService.add(projectEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody ProjectEntity projectEntity) { + projectService.modify(projectEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + projectService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(projectService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, ProjectEntity projectEntity) { + return R.success(projectService.paging(pageParam, projectEntity)); + } +} + + 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 new file mode 100644 index 0000000..6fcca6e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/mapper/ProjectMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.project.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 项目信息 + */ +@Mapper +public interface ProjectMapper extends BaseMapper { +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java new file mode 100644 index 0000000..fbe79fc --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/entity/ProjectEntity.java @@ -0,0 +1,118 @@ +package com.njzscloud.dispose.cst.project.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; + +/** + * 项目信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_project") +public class ProjectEntity extends BaseEntity { + + /** + * 项目名称 + */ + private String projectName; + + /** + * 合同图片 + */ + private String contractPicture; + + /** + * 运输方客户 Id + */ + private Long transCustomerId; + + /** + * 运输方组织 Id + */ + private Long transOrgId; + + /** + * 产废方/购买方客户 Id + */ + private Long fringeCustomerId; + + /** + * 产废方/购买方组织 Id + */ + private Long fringeOrgId; + + /** + * 省；代码 + */ + 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; + + /** + * 合同有效期 + */ + private LocalDate contractStartDate; + + /** + * 合同有效期 + */ + private LocalDate contractEndDate; +} + + 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 new file mode 100644 index 0000000..0d4bcb5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/ProjectService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.project.service; + +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.project.pojo.entity.ProjectEntity; + +import java.util.List; + +/** + * 项目信息 + */ +public interface ProjectService extends IService { + + void add(ProjectEntity projectEntity); + + void modify(ProjectEntity projectEntity); + + void del(List ids); + + ProjectEntity detail(Long id); + + PageResult paging(PageParam pageParam, ProjectEntity projectEntity); +} + + 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 new file mode 100644 index 0000000..e5dc91e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.cst.project.service.impl; + +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.project.mapper.ProjectMapper; +import com.njzscloud.dispose.cst.project.pojo.entity.ProjectEntity; +import com.njzscloud.dispose.cst.project.service.ProjectService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 项目信息 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class ProjectServiceImpl extends ServiceImpl implements ProjectService { + + @Override + public void add(ProjectEntity projectEntity) { + this.save(projectEntity); + } + + @Override + public void modify(ProjectEntity projectEntity) { + this.updateById(projectEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public ProjectEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, ProjectEntity projectEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(projectEntity))); + } +} + + 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 new file mode 100644 index 0000000..d705b7d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/controller/StationController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.station.controller; + +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.service.StationService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 站点信息 + */ +@Slf4j +@RestController +@RequestMapping("/station") +@RequiredArgsConstructor +public class StationController { + + private final StationService stationService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody StationEntity stationEntity) { + stationService.add(stationEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody StationEntity stationEntity) { + stationService.modify(stationEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + stationService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(stationService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, StationEntity stationEntity) { + return R.success(stationService.paging(pageParam, stationEntity)); + } +} + + 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 new file mode 100644 index 0000000..0b38abd --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/mapper/StationMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.station.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 站点信息 + */ +@Mapper +public interface StationMapper extends BaseMapper { +} + + 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 new file mode 100644 index 0000000..fe427f0 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/pojo/entity/StationEntity.java @@ -0,0 +1,85 @@ +package com.njzscloud.dispose.cst.station.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 站点信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_station") +public class StationEntity extends BaseEntity { + + /** + * 组织信息 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; +} + 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 new file mode 100644 index 0000000..9d4503d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/StationService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.station.service; + +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 java.util.List; + +/** + * 站点信息 + */ +public interface StationService extends IService { + + void add(StationEntity stationEntity); + + void modify(StationEntity stationEntity); + + void del(List ids); + + StationEntity detail(Long id); + + PageResult paging(PageParam pageParam, StationEntity stationEntity); +} + + 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 new file mode 100644 index 0000000..cd3e101 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/station/service/impl/StationServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.cst.station.service.impl; + +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.station.mapper.StationMapper; +import com.njzscloud.dispose.cst.station.pojo.entity.StationEntity; +import com.njzscloud.dispose.cst.station.service.StationService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 站点信息 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class StationServiceImpl extends ServiceImpl implements StationService { + + @Override + public void add(StationEntity stationEntity) { + this.save(stationEntity); + } + + @Override + public void modify(StationEntity stationEntity) { + this.updateById(stationEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public StationEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, StationEntity stationEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(stationEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java new file mode 100644 index 0000000..377a03f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/controller/TruckController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.cst.truck.controller; + +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.truck.pojo.entity.TruckEntity; +import com.njzscloud.dispose.cst.truck.service.TruckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 车辆信息 + */ +@Slf4j +@RestController +@RequestMapping("/truck") +@RequiredArgsConstructor +public class TruckController { + + private final TruckService truckService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody TruckEntity truckEntity) { + truckService.add(truckEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody TruckEntity truckEntity) { + truckService.modify(truckEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + truckService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(truckService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, TruckEntity truckEntity) { + return R.success(truckService.paging(pageParam, truckEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/mapper/TruckMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/mapper/TruckMapper.java new file mode 100644 index 0000000..2f69dca --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/mapper/TruckMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.cst.truck.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.cst.truck.pojo.entity.TruckEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 车辆信息 + */ +@Mapper +public interface TruckMapper extends BaseMapper { +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/entity/TruckEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/entity/TruckEntity.java new file mode 100644 index 0000000..b3d4d4c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/pojo/entity/TruckEntity.java @@ -0,0 +1,98 @@ +package com.njzscloud.dispose.cst.truck.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; + +/** + * 车辆信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("cst_truck") +public class TruckEntity extends BaseEntity { + + /** + * 归属客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 归属组织 + */ + private Long orgId; + + /** + * 车牌 + */ + private String licensePlate; + + /** + * 行驶证图片 + */ + private String truckLicense; + + /** + * 车架号 + */ + private String vnCode; + + /** + * 合格证图片 + */ + private String qualification; + + /** + * 最大载重；单位：千克 + */ + private Integer carryingCapacity; + + /** + * 皮重；单位：千克 + */ + private Integer tareWeight; + + /** + * 行驶证有效期 + */ + private LocalDate licenseStartDate; + + /** + * 行驶证有效期 + */ + private LocalDate licenseEndDate; + + /** + * 合格证有效期 + */ + private LocalDate qualificationStartDate; + + /** + * 合格证有效期 + */ + private LocalDate qualificationEndDate; + + /** + * 车辆类型 + */ + private String truckCategory; + + /** + * 车辆图片 + */ + private String picture; + + /** + * 忙碌中 + */ + private Boolean busy; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java new file mode 100644 index 0000000..1a01fdf --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/TruckService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.cst.truck.service; + +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.truck.pojo.entity.TruckEntity; + +import java.util.List; + +/** + * 车辆信息 + */ +public interface TruckService extends IService { + + void add(TruckEntity truckEntity); + + void modify(TruckEntity truckEntity); + + void del(List ids); + + TruckEntity detail(Long id); + + PageResult paging(PageParam pageParam, TruckEntity truckEntity); +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java new file mode 100644 index 0000000..17339c2 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.cst.truck.service.impl; + +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.truck.mapper.TruckMapper; +import com.njzscloud.dispose.cst.truck.pojo.entity.TruckEntity; +import com.njzscloud.dispose.cst.truck.service.TruckService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 车辆信息 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class TruckServiceImpl extends ServiceImpl implements TruckService { + + @Override + public void add(TruckEntity truckEntity) { + this.save(truckEntity); + } + + @Override + public void modify(TruckEntity truckEntity) { + this.updateById(truckEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public TruckEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, TruckEntity truckEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(truckEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java new file mode 100644 index 0000000..662c5d9 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/controller/BillController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.finance.bill.controller; + +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.finance.bill.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.bill.service.BillService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 对账单 + */ +@Slf4j +@RestController +@RequestMapping("/bill") +@RequiredArgsConstructor +public class BillController { + + private final BillService billService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody BillEntity billEntity) { + billService.add(billEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody BillEntity billEntity) { + billService.modify(billEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + billService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(billService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, BillEntity billEntity) { + return R.success(billService.paging(pageParam, billEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java new file mode 100644 index 0000000..6aed50a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/mapper/BillMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.dispose.finance.bill.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 对账单 + */ +@Mapper +public interface BillMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java new file mode 100644 index 0000000..2baef80 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/pojo/entity/BillEntity.java @@ -0,0 +1,89 @@ +package com.njzscloud.dispose.finance.bill.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 对账单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("fin_bill") +public class BillEntity extends BaseEntity { + + /** + * 用户 Id + */ + private Long userId; + + /** + * 客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 组织 Id + */ + private Long orgId; + + /** + * 账户类型；account_type，GeRen-->个人、QiYe-->企业 + */ + private String accountType; + + /** + * 账期 + */ + private LocalDate billPeriod; + + /** + * 账单开始时间 + */ + private LocalDate startTime; + + /** + * 账单结束时间 + */ + private LocalDate endTime; + + /** + * 订单数 + */ + private Integer orderCount; + + /** + * 总车数 + */ + private Integer carCount; + + /** + * 总质量 + */ + private Integer totalWeight; + + /** + * 优惠金额 + */ + private BigDecimal discountMoney; + + /** + * 账单金额 + */ + private BigDecimal totalMoney; + + /** + * 备注 + */ + private String memo; + +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java new file mode 100644 index 0000000..45aca2b --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/BillService.java @@ -0,0 +1,41 @@ +package com.njzscloud.dispose.finance.bill.service; + +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.finance.bill.pojo.entity.BillEntity; + +import java.util.List; + +/** + * 对账单 + */ +public interface BillService extends IService { + + /** + * 新增 + */ + void add(BillEntity billEntity); + + /** + * 修改 + */ + void modify(BillEntity billEntity); + + /** + * 删除 + */ + void del(List ids); + + /** + * 详情 + */ + BillEntity detail(Long id); + + /** + * 分页查询 + */ + PageResult paging(PageParam pageParam, BillEntity billEntity); +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java new file mode 100644 index 0000000..8dda668 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/bill/service/impl/BillServiceImpl.java @@ -0,0 +1,67 @@ +package com.njzscloud.dispose.finance.bill.service.impl; + +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.finance.bill.mapper.BillMapper; +import com.njzscloud.dispose.finance.bill.pojo.entity.BillEntity; +import com.njzscloud.dispose.finance.bill.service.BillService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 对账单 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class BillServiceImpl extends ServiceImpl implements BillService { + + /** + * 新增 + */ + @Override + public void add(BillEntity billEntity) { + this.save(billEntity); + } + + /** + * 修改 + */ + @Override + public void modify(BillEntity billEntity) { + this.updateById(billEntity); + } + + /** + * 删除 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + @Override + public BillEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + @Override + public PageResult paging(PageParam pageParam, BillEntity billEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(billEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java new file mode 100644 index 0000000..b9cf3c4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/controller/ExpenseItemController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.finance.expenseItem.controller; + +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.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 收费项目 + */ +@Slf4j +@RestController +@RequestMapping("/expense_item") +@RequiredArgsConstructor +public class ExpenseItemController { + + private final ExpenseItemService expenseItemService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody ExpenseItemEntity expenseItemEntity) { + expenseItemService.add(expenseItemEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody ExpenseItemEntity expenseItemEntity) { + expenseItemService.modify(expenseItemEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + expenseItemService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(expenseItemService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, ExpenseItemEntity expenseItemEntity) { + return R.success(expenseItemService.paging(pageParam, expenseItemEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java new file mode 100644 index 0000000..db73776 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/mapper/ExpenseItemMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.dispose.finance.expenseItem.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 收费项目 + */ +@Mapper +public interface ExpenseItemMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java new file mode 100644 index 0000000..f1547e5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/pojo/entity/ExpenseItemEntity.java @@ -0,0 +1,106 @@ +package com.njzscloud.dispose.finance.expenseItem.pojo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * 收费项目 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("fin_expense_item") +public class ExpenseItemEntity extends BaseEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 收费项目类型，QiTa-->其他、ChanPin-->产品、YunFei-->运费 + */ + private String expenseItemCategory; + + /** + * 付费项名称 + */ + private String expenseItemName; + + /** + * 计费策略；字典代码：expense_strategy + */ + private String expenseStrategy; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 税率 + */ + private BigDecimal taxRate; + + /** + * 付费方；字典代码：payer + */ + private String payer; + + /** + * 单价；单位：元，弹性模式-->每档价格 + */ + private BigDecimal unitPrice; + + /** + * 起步价；单位：元，<= 起步量 固定费用 + */ + private BigDecimal initialPrice; + + /** + * 起步量 + */ + private Integer initialQuantity; + + /** + * 每档的量 + */ + private Integer everyQuantity; + + /** + * 适用用户；结构类型：{strategy: None | All | Specify,ids:long[]} + */ + private String userScope; + + /** + * 适用站点；结构类型：{strategy: None | All | Specify,ids:long[]} + */ + private String stationScope; + + /** + * 适用产品；结构类型：{strategy: None | All | Specify,ids:long[]} + */ + private String goodsScope; + + /** + * 是否可用；0-->否、1-->是 + */ + private Boolean canuse; + + /** + * 备注 + */ + private String memo; + +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java new file mode 100644 index 0000000..ae6810a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/ExpenseItemService.java @@ -0,0 +1,40 @@ +package com.njzscloud.dispose.finance.expenseItem.service; + +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.finance.expenseItem.pojo.entity.ExpenseItemEntity; + +import java.util.List; + +/** + * 收费项目 + */ +public interface ExpenseItemService extends IService { + + /** + * 新增 + */ + void add(ExpenseItemEntity expenseItemEntity); + + /** + * 修改 + */ + void modify(ExpenseItemEntity expenseItemEntity); + + /** + * 删除 + */ + void del(List ids); + + /** + * 详情 + */ + ExpenseItemEntity detail(Long id); + + /** + * 分页查询 + */ + PageResult paging(PageParam pageParam, ExpenseItemEntity expenseItemEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java new file mode 100644 index 0000000..16b7bf4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/expenseItem/service/impl/ExpenseItemServiceImpl.java @@ -0,0 +1,67 @@ +package com.njzscloud.dispose.finance.expenseItem.service.impl; + +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.finance.expenseItem.mapper.ExpenseItemMapper; +import com.njzscloud.dispose.finance.expenseItem.pojo.entity.ExpenseItemEntity; +import com.njzscloud.dispose.finance.expenseItem.service.ExpenseItemService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 收费项目 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class ExpenseItemServiceImpl extends ServiceImpl implements ExpenseItemService { + + /** + * 新增 + */ + @Override + public void add(ExpenseItemEntity expenseItemEntity) { + this.save(expenseItemEntity); + } + + /** + * 修改 + */ + @Override + public void modify(ExpenseItemEntity expenseItemEntity) { + this.updateById(expenseItemEntity); + } + + /** + * 删除 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + @Override + public ExpenseItemEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + @Override + public PageResult paging(PageParam pageParam, ExpenseItemEntity expenseItemEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(expenseItemEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java new file mode 100644 index 0000000..604b99d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/controller/MoneyAccountController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.finance.moneyAccount.controller; + +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.finance.moneyAccount.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 资金账户表 + */ +@Slf4j +@RestController +@RequestMapping("/money_account") +@RequiredArgsConstructor +public class MoneyAccountController { + + private final MoneyAccountService moneyAccountService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody MoneyAccountEntity moneyAccountEntity) { + moneyAccountService.add(moneyAccountEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody MoneyAccountEntity moneyAccountEntity) { + moneyAccountService.modify(moneyAccountEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + moneyAccountService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(moneyAccountService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, MoneyAccountEntity moneyAccountEntity) { + return R.success(moneyAccountService.paging(pageParam, moneyAccountEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java new file mode 100644 index 0000000..9585019 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/mapper/MoneyAccountMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.dispose.finance.moneyAccount.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 资金账户表 + */ +@Mapper +public interface MoneyAccountMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java new file mode 100644 index 0000000..d0cec5f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/pojo/entity/MoneyAccountEntity.java @@ -0,0 +1,58 @@ +package com.njzscloud.dispose.finance.moneyAccount.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * 资金账户表 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("fin_money_account") +public class MoneyAccountEntity extends BaseEntity { + + /** + * 账户编号 + */ + private String sn; + + /** + * 账户类型；account_type，GeRen-->个人、QiYe-->企业 + */ + private String accountType; + + /** + * 用户 Id + */ + private Long userId; + + /** + * 客户 Id + */ + private Long customerId; + + /** + * 组织 Id + */ + private Long orgId; + + /** + * 营收余额 + */ + private BigDecimal revenue; + + /** + * 充值余额 + */ + private BigDecimal recharge; + +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java new file mode 100644 index 0000000..5f25066 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/MoneyAccountService.java @@ -0,0 +1,40 @@ +package com.njzscloud.dispose.finance.moneyAccount.service; + +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.finance.moneyAccount.pojo.entity.MoneyAccountEntity; + +import java.util.List; + +/** + * 资金账户表 + */ +public interface MoneyAccountService extends IService { + + /** + * 新增 + */ + void add(MoneyAccountEntity moneyAccountEntity); + + /** + * 修改 + */ + void modify(MoneyAccountEntity moneyAccountEntity); + + /** + * 删除 + */ + void del(List ids); + + /** + * 详情 + */ + MoneyAccountEntity detail(Long id); + + /** + * 分页查询 + */ + PageResult paging(PageParam pageParam, MoneyAccountEntity moneyAccountEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java new file mode 100644 index 0000000..40a16a6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyAccount/service/impl/MoneyAccountServiceImpl.java @@ -0,0 +1,67 @@ +package com.njzscloud.dispose.finance.moneyAccount.service.impl; + +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.finance.moneyAccount.mapper.MoneyAccountMapper; +import com.njzscloud.dispose.finance.moneyAccount.pojo.entity.MoneyAccountEntity; +import com.njzscloud.dispose.finance.moneyAccount.service.MoneyAccountService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 资金账户表 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class MoneyAccountServiceImpl extends ServiceImpl implements MoneyAccountService { + + /** + * 新增 + */ + @Override + public void add(MoneyAccountEntity moneyAccountEntity) { + this.save(moneyAccountEntity); + } + + /** + * 修改 + */ + @Override + public void modify(MoneyAccountEntity moneyAccountEntity) { + this.updateById(moneyAccountEntity); + } + + /** + * 删除 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + @Override + public MoneyAccountEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + @Override + public PageResult paging(PageParam pageParam, MoneyAccountEntity moneyAccountEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(moneyAccountEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java new file mode 100644 index 0000000..c46a8c6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/controller/MoneyFlowController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.finance.moneyFlow.controller; + +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.finance.moneyFlow.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 资金流水 + */ +@Slf4j +@RestController +@RequestMapping("/money_flow") +@RequiredArgsConstructor +public class MoneyFlowController { + + private final MoneyFlowService moneyFlowService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody MoneyFlowEntity moneyFlowEntity) { + moneyFlowService.add(moneyFlowEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody MoneyFlowEntity moneyFlowEntity) { + moneyFlowService.modify(moneyFlowEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + moneyFlowService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(moneyFlowService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, MoneyFlowEntity moneyFlowEntity) { + return R.success(moneyFlowService.paging(pageParam, moneyFlowEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java new file mode 100644 index 0000000..29c0e9c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/mapper/MoneyFlowMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.dispose.finance.moneyFlow.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 资金流水 + */ +@Mapper +public interface MoneyFlowMapper extends BaseMapper { +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java new file mode 100644 index 0000000..fc41922 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/pojo/entity/MoneyFlowEntity.java @@ -0,0 +1,68 @@ +package com.njzscloud.dispose.finance.moneyFlow.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * 资金流水 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("fin_money_flow") +public class MoneyFlowEntity extends BaseEntity { + + /** + * 订单 Id + */ + private Long orderId; + + /** + * 订单编号 + */ + private String orderSn; + + /** + * 车次 + */ + private Integer trainNum; + + /** + * 资金账户 Id；fin_money_account.id + */ + private Long moneyAccountId; + + /** + * 变动前余额 + */ + private BigDecimal boforeBalance; + + /** + * 变动金额；有正负 + */ + private BigDecimal delta; + + /** + * 变动后余额 + */ + private BigDecimal afterBalance; + + /** + * 变动类型；字典代码：money_change_category + */ + private String moneyChangeCategory; + + /** + * 备注 + */ + private String memo; + +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java new file mode 100644 index 0000000..3b59d15 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/MoneyFlowService.java @@ -0,0 +1,40 @@ +package com.njzscloud.dispose.finance.moneyFlow.service; + +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.finance.moneyFlow.pojo.entity.MoneyFlowEntity; + +import java.util.List; + +/** + * 资金流水 + */ +public interface MoneyFlowService extends IService { + + /** + * 新增 + */ + void add(MoneyFlowEntity moneyFlowEntity); + + /** + * 修改 + */ + void modify(MoneyFlowEntity moneyFlowEntity); + + /** + * 删除 + */ + void del(List ids); + + /** + * 详情 + */ + MoneyFlowEntity detail(Long id); + + /** + * 分页查询 + */ + PageResult paging(PageParam pageParam, MoneyFlowEntity moneyFlowEntity); +} + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java new file mode 100644 index 0000000..1d9dab3 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/finance/moneyFlow/service/impl/MoneyFlowServiceImpl.java @@ -0,0 +1,67 @@ +package com.njzscloud.dispose.finance.moneyFlow.service.impl; + +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.finance.moneyFlow.mapper.MoneyFlowMapper; +import com.njzscloud.dispose.finance.moneyFlow.pojo.entity.MoneyFlowEntity; +import com.njzscloud.dispose.finance.moneyFlow.service.MoneyFlowService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 资金流水 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class MoneyFlowServiceImpl extends ServiceImpl implements MoneyFlowService { + + /** + * 新增 + */ + @Override + public void add(MoneyFlowEntity moneyFlowEntity) { + this.save(moneyFlowEntity); + } + + /** + * 修改 + */ + @Override + public void modify(MoneyFlowEntity moneyFlowEntity) { + this.updateById(moneyFlowEntity); + } + + /** + * 删除 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + @Override + public MoneyFlowEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + @Override + public PageResult paging(PageParam pageParam, MoneyFlowEntity moneyFlowEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(moneyFlowEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java new file mode 100644 index 0000000..bf8ad0d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/controller/GoodsController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.goods.goods.controller; + +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.goods.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.goods.service.GoodsService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 产品 + */ +@Slf4j +@RestController +@RequestMapping("/goods") +@RequiredArgsConstructor +public class GoodsController { + + private final GoodsService goodsService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody GoodsEntity goodsEntity) { + goodsService.add(goodsEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody GoodsEntity goodsEntity) { + goodsService.modify(goodsEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + goodsService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(goodsService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, GoodsEntity goodsEntity) { + return R.success(goodsService.paging(pageParam, goodsEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java new file mode 100644 index 0000000..03860ad --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/mapper/GoodsMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.goods.goods.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 产品 + */ +@Mapper +public interface GoodsMapper extends BaseMapper { +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java new file mode 100644 index 0000000..a98bef0 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/pojo/entity/GoodsEntity.java @@ -0,0 +1,81 @@ +package com.njzscloud.dispose.goods.goods.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 产品 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("gds_goods") +public class GoodsEntity extends BaseEntity { + + /** + * 产品类型 Id + */ + private Long goodsCategoryId; + + /** + * 商品编码 + */ + private String sn; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 规格 + */ + private String specParams; + + /** + * 图片 + */ + private String picture; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 是否为成品；0-->否、1-->是 + */ + private Boolean fg; + + /** + * 是否为半成品；0-->否、1-->是 + */ + private Boolean sfg; + + /** + * 是否为原料；0-->否、1-->是 + */ + private Boolean rg; + + /** + * 排序 + */ + private Integer sort; + + /** + * 是否可用；0-->否、1-->是 + */ + private Boolean canuse; + + /** + * 备注 + */ + private String memo; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java new file mode 100644 index 0000000..85d1af7 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/GoodsService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.goods.goods.service; + +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.goods.goods.pojo.entity.GoodsEntity; + +import java.util.List; + +/** + * 产品 + */ +public interface GoodsService extends IService { + + void add(GoodsEntity goodsEntity); + + void modify(GoodsEntity goodsEntity); + + void del(List ids); + + GoodsEntity detail(Long id); + + PageResult paging(PageParam pageParam, GoodsEntity goodsEntity); +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java new file mode 100644 index 0000000..e12194b --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goods/service/impl/GoodsServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.goods.goods.service.impl; + +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.goods.goods.mapper.GoodsMapper; +import com.njzscloud.dispose.goods.goods.pojo.entity.GoodsEntity; +import com.njzscloud.dispose.goods.goods.service.GoodsService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 产品 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class GoodsServiceImpl extends ServiceImpl implements GoodsService { + + @Override + public void add(GoodsEntity goodsEntity) { + this.save(goodsEntity); + } + + @Override + public void modify(GoodsEntity goodsEntity) { + this.updateById(goodsEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public GoodsEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, GoodsEntity goodsEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(goodsEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java new file mode 100644 index 0000000..b630a35 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/controller/GoodsCategoryController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.goods.goodscategory.controller; + +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.goods.goodscategory.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 产品分类 + */ +@Slf4j +@RestController +@RequestMapping("/goods_category") +@RequiredArgsConstructor +public class GoodsCategoryController { + + private final GoodsCategoryService goodsCategoryService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody GoodsCategoryEntity goodsCategoryEntity) { + goodsCategoryService.add(goodsCategoryEntity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody GoodsCategoryEntity goodsCategoryEntity) { + goodsCategoryService.modify(goodsCategoryEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + goodsCategoryService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(goodsCategoryService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity) { + return R.success(goodsCategoryService.paging(pageParam, goodsCategoryEntity)); + } +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java new file mode 100644 index 0000000..daf7abb --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/mapper/GoodsCategoryMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.goods.goodscategory.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 产品分类 + */ +@Mapper +public interface GoodsCategoryMapper extends BaseMapper { +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java new file mode 100644 index 0000000..7152522 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/pojo/entity/GoodsCategoryEntity.java @@ -0,0 +1,41 @@ +package com.njzscloud.dispose.goods.goodscategory.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.dispose.common.pojo.entity.BaseEntity; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 产品分类 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("gds_goods_category") +public class GoodsCategoryEntity extends BaseEntity { + + /** + * 业务类型；字典代码：biz_type + */ + private String bizType; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 图片 + */ + private String picture; + + /** + * 排序 + */ + private Integer sort; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java new file mode 100644 index 0000000..de8873e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/GoodsCategoryService.java @@ -0,0 +1,26 @@ +package com.njzscloud.dispose.goods.goodscategory.service; + +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.goods.goodscategory.pojo.entity.GoodsCategoryEntity; + +import java.util.List; + +/** + * 产品分类 + */ +public interface GoodsCategoryService extends IService { + + void add(GoodsCategoryEntity goodsCategoryEntity); + + void modify(GoodsCategoryEntity goodsCategoryEntity); + + void del(List ids); + + GoodsCategoryEntity detail(Long id); + + PageResult paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity); +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java new file mode 100644 index 0000000..cdb4dc6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/goods/goodscategory/service/impl/GoodsCategoryServiceImpl.java @@ -0,0 +1,52 @@ +package com.njzscloud.dispose.goods.goodscategory.service.impl; + +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.goods.goodscategory.mapper.GoodsCategoryMapper; +import com.njzscloud.dispose.goods.goodscategory.pojo.entity.GoodsCategoryEntity; +import com.njzscloud.dispose.goods.goodscategory.service.GoodsCategoryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 产品分类 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class GoodsCategoryServiceImpl extends ServiceImpl implements GoodsCategoryService { + + @Override + public void add(GoodsCategoryEntity goodsCategoryEntity) { + this.save(goodsCategoryEntity); + } + + @Override + public void modify(GoodsCategoryEntity goodsCategoryEntity) { + this.updateById(goodsCategoryEntity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + @Override + public GoodsCategoryEntity detail(Long id) { + return this.getById(id); + } + + @Override + public PageResult paging(PageParam pageParam, GoodsCategoryEntity goodsCategoryEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(goodsCategoryEntity))); + } +} + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml new file mode 100644 index 0000000..5fb58b9 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, user_id, customer_id, org_id, driving_licence_no, driver_name, phone, + driving_licence, licence_start_time, licence_end_time, busy, + creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, user_id, customer_id, org_id, driving_licence_no, driver_name, phone, driving_licence, + licence_start_time, licence_end_time, busy, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml new file mode 100644 index 0000000..f735c0c --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/project/ProjectMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, project_name, contract_picture, trans_customer_id, trans_org_id, + fringe_customer_id, fringe_org_id, province, city, area, town, + province_name, city_name, area_name, town_name, address, lng, lat, + contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, project_name, contract_picture, trans_customer_id, trans_org_id, fringe_customer_id, fringe_org_id, + province, city, area, town, province_name, city_name, area_name, town_name, address, lng, lat, + contract_start_date, contract_end_date, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + 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..d25901b --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/station/StationMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml new file mode 100644 index 0000000..898860d --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/cst/truck/TruckMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, customer_id, org_id, license_plate, truck_license, vn_code, qualification, + carrying_capacity, tare_weight, license_start_date, license_end_date, + qualification_start_date, qualification_end_date, truck_category, picture, busy, + creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml new file mode 100644 index 0000000..6dcfef3 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/finance/bill/BillMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, user_id, customer_id, org_id, account_type, bill_period, start_time, end_time, + order_count, car_count, total_weight, discount_money, total_money, memo, + creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml new file mode 100644 index 0000000..6a4fbc8 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/finance/expenseItem/ExpenseItemMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, expense_item_category, expense_item_name, expense_strategy, unit, tax_rate, payer, + unit_price, initial_price, initial_quantity, every_quantity, user_scope, station_scope, + goods_scope, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml new file mode 100644 index 0000000..c1ea83f --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/finance/moneyAccount/MoneyAccountMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + id, sn, account_type, user_id, customer_id, org_id, revenue, recharge, + creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml b/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml new file mode 100644 index 0000000..14a186a --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/finance/moneyFlow/MoneyFlowMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, order_id, order_sn, train_num, money_account_id, bofore_balance, delta, after_balance, + money_change_category, memo, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml b/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml new file mode 100644 index 0000000..e2a3404 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/goods/goods/GoodsMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, goods_category_id, sn, goods_name, spec_params, picture, unit, + fg, sfg, rg, sort, canuse, memo, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/goods/goodsCategory/GoodsCategoryMapper.xml b/njzscloud-svr/src/main/resources/mapper/goods/goodsCategory/GoodsCategoryMapper.xml new file mode 100644 index 0000000..df8be17 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/goods/goodsCategory/GoodsCategoryMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + id, biz_type, category_name, picture, sort, creator_id, modifier_id, create_time, modify_time, deleted + + + + + + + +