lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础代码生成

localizer
lzq 2025-09-12 00:13:23 +08:00
parent f3a0686397
commit d802ce5523
119 changed files with 1347 additions and 7091 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
njzscloud-common/njzscloud-common-oss/src/main/java/com/njzscloud/common/oss/service/AliService.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.core.ex.SysThrowable;
import com.njzscloud.common.core.tuple.Tuple2;
import com.njzscloud.common.mvc.util.FileResponseUtil;
import com.njzscloud.common.oss.util.AliOSS;
@ -11,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
@ -44,15 +44,17 @@ public class AliService implements OSSService {
}
@Override
public void uploadFile(MultipartFile file) {
public String uploadFile(MultipartFile file) {
String contentType = file.getContentType();
String originalFilename = file.getOriginalFilename();
String objectName = IdUtil.fastSimpleUUID() + "." + FileUtil.extName(originalFilename);
try {
InputStream inputStream = file.getInputStream();
AliOSS.uploadFile(objectName, contentType, inputStream);
} catch (IOException e) {
return AliOSS.uploadFile(objectName, contentType, inputStream);
} catch (SysThrowable e) {
throw e;
} catch (Exception e) {
log.error("上传文件失败", e);
throw Exceptions.error("上传文件失败");
}

10
njzscloud-common/njzscloud-common-oss/src/main/java/com/njzscloud/common/oss/service/MinioService.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.core.ex.SysThrowable;
import com.njzscloud.common.core.tuple.Tuple2;
import com.njzscloud.common.mvc.util.FileResponseUtil;
import com.njzscloud.common.oss.util.Minio;
@ -11,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
@ -44,15 +44,17 @@ public class MinioService implements OSSService {
}
@Override
public void uploadFile(MultipartFile file) {
public String uploadFile(MultipartFile file) {
String contentType = file.getContentType();
String originalFilename = file.getOriginalFilename();
String objectName = IdUtil.fastSimpleUUID() + "." + FileUtil.extName(originalFilename);
try {
InputStream inputStream = file.getInputStream();
Minio.uploadFile(objectName, contentType, inputStream);
} catch (IOException e) {
return Minio.uploadFile(objectName, contentType, inputStream);
} catch (SysThrowable e) {
throw e;
} catch (Exception e) {
log.error("上传文件失败", e);
throw Exceptions.error("上传文件失败");
}

2
njzscloud-common/njzscloud-common-oss/src/main/java/com/njzscloud/common/oss/service/OSSService.java
View File

@ -28,5 +28,5 @@ public interface OSSService {
*/
void obtainFile(String bucketName, String objectName, HttpServletResponse response);
void uploadFile(MultipartFile file);
String uploadFile(MultipartFile file);
}

3
njzscloud-common/njzscloud-common-oss/src/main/java/com/njzscloud/common/oss/util/AliOSS.java
View File

@ -117,11 +117,12 @@ public final class AliOSS {
}
}
public static void uploadFile(String objectName, String contentType, InputStream inputStream) {
public static String uploadFile(String objectName, String contentType, InputStream inputStream) {
try {
ObjectMetadata objectMetadata = new ObjectMetadata();
if (StrUtil.isNotBlank(contentType)) objectMetadata.setContentType(contentType);
CLIENT.putObject(BUCKET_NAME, objectName, inputStream, objectMetadata);
return "/" + BUCKET_NAME + "/" + objectName;
} catch (OSSException oe) {
log.error("阿里云上传文件失败,错误信息：{}、错误码：{}、请求标识：{}、主机标识：{}、存储桶：{}、对象名称：{}",
oe.getErrorMessage(),

5
njzscloud-common/njzscloud-common-oss/src/main/java/com/njzscloud/common/oss/util/Minio.java
View File

@ -158,13 +158,14 @@ public final class Minio {
}
}
public static void uploadFile(String objectName, String contentType, InputStream inputStream) {
Minio.execSync(() -> CLIENT.putObject(PutObjectArgs.builder()
public static String uploadFile(String objectName, String contentType, InputStream inputStream) {
Minio.exec(() -> CLIENT.putObject(PutObjectArgs.builder()
.bucket(BUCKET_NAME)
.object(objectName)
.contentType(contentType)
.stream(inputStream, -1, 1024 * 1024)
.build()));
return "/" + BUCKET_NAME + "/" + objectName;
}
public interface MinioExec<T> {

10
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/AuditStatus.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/contant/AuditStatus.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.project.contant;
package com.njzscloud.supervisory.biz.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
@ -12,10 +12,12 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum AuditStatus implements DictStr {
DaiShenHe("DaiShenHe", "待审核"),
QuDaiShenHe("QuDaiShenHe", "待区级审核"),
ShiDaiShenHe("ShiDaiShenHe", "待市级审核"),
TongGuo("TongGuo", "通过"),
BoHui("BoHui", "驳回"),
YiCheXiao("YiCheXiao", "已撤销");
YiCheXiao("YiCheXiao", "已撤销"),
;
private final String val;
private final String txt;
}
}

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/contant/InformCategory.java
View File

@ -1,22 +0,0 @@
package com.njzscloud.supervisory.biz.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：inform_category
* 字典名称：举报类型
*/
@Getter
@RequiredArgsConstructor
public enum InformCategory implements DictStr {
HeiChe("HeiChe", "黑车举报"),
TouDao("TouDao", "偷盗举报"),
FeiFaCheLiang("FeiFaCheLiang", "非法车辆举报"),
FeiFaChuZhi("FeiFaChuZhi", "非法处置举报"),
WeiZhang("WeiZhang", "违章举报"),
;
private final String val;
private final String txt;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/contant/ProcessStatus.java
View File

@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum ProcessStatus implements DictStr {
DaiChuLi("DaiChuLi", "待处理"),
YiChuLi("YiChuLi", "已处理"),
YiChuLi("YiChuLi", "待处理"),
HuLue("HuLue", "忽略");
private final String val;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizCompanyController.java
View File

@ -3,13 +3,13 @@ package com.njzscloud.supervisory.biz.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.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
import com.njzscloud.supervisory.biz.pojo.result.MatchingBizCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.service.BizCompanyService;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

83
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizContractController.java
View File

@ -1,83 +0,0 @@
package com.njzscloud.supervisory.biz.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.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import com.njzscloud.supervisory.biz.service.BizContractService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 合同报备
*/
@Slf4j
@RestController
@RequestMapping("/biz_contract")
@RequiredArgsConstructor
public class BizContractController {
private final BizContractService bizContractService;
/**
* 新增
*
* @param bizContractEntity 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody BizContractEntity bizContractEntity) {
bizContractService.add(bizContractEntity);
return R.success();
}
/**
* 修改
*
* @param bizContractEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody BizContractEntity bizContractEntity) {
bizContractService.modify(bizContractEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
bizContractService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return BizContractEntity 结果
*/
@GetMapping("/detail")
public R<BizContractEntity> detail(@RequestParam Long id) {
return R.success(bizContractService.detail(id));
}
/**
* 分页查询
*
* @param searchContractParam 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizContractEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<SearchContractResult>> paging(PageParam pageParam, SearchContractParam searchContractParam) {
return R.success(bizContractService.paging(pageParam, searchContractParam));
}
}

81
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizInformController.java
View File

@ -1,81 +0,0 @@
package com.njzscloud.supervisory.biz.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.supervisory.biz.pojo.entity.BizInformEntity;
import com.njzscloud.supervisory.biz.service.BizInformService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 举报
*/
@Slf4j
@RestController
@RequestMapping("/biz_inform")
@RequiredArgsConstructor
public class BizInformController {
private final BizInformService bizInformService;
/**
* 新增
*
* @param bizInformEntity 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody BizInformEntity bizInformEntity) {
bizInformService.add(bizInformEntity);
return R.success();
}
/**
* 修改
*
* @param bizInformEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody BizInformEntity bizInformEntity) {
bizInformService.modify(bizInformEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
bizInformService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return BizInformEntity 结果
*/
@GetMapping("/detail")
public R<BizInformEntity> detail(@RequestParam Long id) {
return R.success(bizInformService.detail(id));
}
/**
* 分页查询
*
* @param bizInformEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizInformEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<BizInformEntity>> paging(PageParam pageParam, BizInformEntity bizInformEntity) {
return R.success(bizInformService.paging(pageParam, bizInformEntity));
}
}

60
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizScopeController.java
View File

@ -1,60 +0,0 @@
package com.njzscloud.supervisory.biz.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.supervisory.biz.pojo.entity.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.service.BizScopeService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 服务区域
*/
@Slf4j
@RestController
@RequestMapping("/biz_scope")
@RequiredArgsConstructor
public class BizScopeController {
private final BizScopeService bizScopeService;
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
bizScopeService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return BizScopeEntity 结果
*/
@GetMapping("/detail")
public R<SearchBizScopeResult> detail(@RequestParam Long id) {
return R.success(bizScopeService.detail(id));
}
/**
* 分页查询
*
* @param bizScopeEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizScopeEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<BizScopeEntity>> paging(PageParam pageParam, BizScopeEntity bizScopeEntity) {
return R.success(bizScopeService.paging(pageParam, bizScopeEntity));
}
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizTruckController.java
View File

@ -3,11 +3,11 @@ package com.njzscloud.supervisory.biz.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.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import com.njzscloud.supervisory.biz.service.BizTruckService;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

81
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizViolateRuleStrategyController.java
View File

@ -1,81 +0,0 @@
package com.njzscloud.supervisory.biz.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.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import com.njzscloud.supervisory.biz.service.BizViolateRuleStrategyService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 违规策略
*/
@Slf4j
@RestController
@RequestMapping("/biz_violate_rule_strategy")
@RequiredArgsConstructor
public class BizViolateRuleStrategyController {
private final BizViolateRuleStrategyService bizViolateRuleStrategyService;
/**
* 新增
*
* @param bizViolateRuleStrategyEntity 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
bizViolateRuleStrategyService.add(bizViolateRuleStrategyEntity);
return R.success();
}
/**
* 修改
*
* @param bizViolateRuleStrategyEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
bizViolateRuleStrategyService.modify(bizViolateRuleStrategyEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
bizViolateRuleStrategyService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return BizViolateRuleStrategyEntity 结果
*/
@GetMapping("/detail")
public R<BizViolateRuleStrategyEntity> detail(@RequestParam(required = false, defaultValue = "1") Long id) {
return R.success(bizViolateRuleStrategyService.detail(id));
}
/**
* 分页查询
*
* @param bizViolateRuleStrategyEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizViolateRuleStrategyEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<BizViolateRuleStrategyEntity>> paging(PageParam pageParam, BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
return R.success(bizViolateRuleStrategyService.paging(pageParam, bizViolateRuleStrategyEntity));
}
}

88
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizViolateRuleTruckController.java
View File

@ -1,88 +0,0 @@
package com.njzscloud.supervisory.biz.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.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ProcessViolateRuleTruckParam;
import com.njzscloud.supervisory.biz.service.BizViolateRuleTruckService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 违规车辆列表
*/
@Slf4j
@RestController
@RequestMapping("/biz_violate_rule_truck")
@RequiredArgsConstructor
public class BizViolateRuleTruckController {
private final BizViolateRuleTruckService bizViolateRuleTruckService;
/**
* 新增
*
* @param bizViolateRuleTruckEntity 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
bizViolateRuleTruckService.add(bizViolateRuleTruckEntity);
return R.success();
}
/**
* 修改
*
* @param bizViolateRuleTruckEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
bizViolateRuleTruckService.modify(bizViolateRuleTruckEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
bizViolateRuleTruckService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return BizViolateRuleTruckEntity 结果
*/
@GetMapping("/detail")
public R<BizViolateRuleTruckEntity> detail(@RequestParam Long id) {
return R.success(bizViolateRuleTruckService.detail(id));
}
/**
* 分页查询
*
* @param bizViolateRuleTruckEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizViolateRuleTruckEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<BizViolateRuleTruckEntity>> paging(PageParam pageParam, BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
return R.success(bizViolateRuleTruckService.paging(pageParam, bizViolateRuleTruckEntity));
}
@PostMapping("/process")
public R<?> process(@RequestBody ProcessViolateRuleTruckParam processViolateRuleTruckParam) {
bizViolateRuleTruckService.process(processViolateRuleTruckParam);
return R.success();
}
}

19
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizContractMapper.java
View File

@ -1,19 +0,0 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 合同报备
*/
@Mapper
public interface BizContractMapper extends BaseMapper<BizContractEntity> {
IPage<SearchContractResult> paging(Page<Object> page, @Param("ew") QueryWrapper<SearchContractResult> ew);
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizInformMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizInformEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 举报
*/
@Mapper
public interface BizInformMapper extends BaseMapper<BizInformEntity> {
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizScopeMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizScopeEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 服务区域
*/
@Mapper
public interface BizScopeMapper extends BaseMapper<BizScopeEntity> {
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizViolateRuleStrategyMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 违规策略
*/
@Mapper
public interface BizViolateRuleStrategyMapper extends BaseMapper<BizViolateRuleStrategyEntity> {
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizViolateRuleTruckMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.biz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 违规车辆列表
*/
@Mapper
public interface BizViolateRuleTruckMapper extends BaseMapper<BizViolateRuleTruckEntity> {
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java
View File

@ -2,8 +2,8 @@ package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

106
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizInformEntity.java
View File

@ -1,106 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.biz.contant.InformCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/**
* 举报
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
@TableName(value = "biz_inform", autoResultMap = true)
public class BizInformEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 举报类型
*/
private InformCategory informCategory;
/**
* 车牌
*/
private String licensePlate;
/**
* 详细地址
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 发现时间
*/
private LocalDateTime discoverTime;
/**
* 图片
*/
@TableField(typeHandler = JsonTypeHandler.class)
private List<String> photos;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 创建人 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;
}

91
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizScopeEntity.java
View File

@ -1,91 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/**
* 服务区域
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("biz_scope")
public class BizScopeEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
/**
* 省; 名称
*/
private String province;
/**
* 市; 名称
*/
private String city;
/**
* 区; 名称
*/
private String county;
/**
* 街道; 名称
*/
private String street;
/**
* 创建人 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;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizTruckEntity.java
View File

@ -2,7 +2,7 @@ package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

39
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizViolateRuleStrategyEntity.java
View File

@ -1,39 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 违规策略
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
@TableName("biz_violate_rule_strategy")
public class BizViolateRuleStrategyEntity {
/**
* Id
*/
private Long id;
/**
* 异常停留时间
*/
private Boolean unusualStopTime;
/**
* 轨迹突变
*/
private Boolean trajectoryMutation;
/**
* 信号中断
*/
private Boolean offline;
}

127
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizViolateRuleTruckEntity.java
View File

@ -1,127 +0,0 @@
package com.njzscloud.supervisory.biz.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)
@TableName("biz_violate_rule_truck")
public class BizViolateRuleTruckEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
*
*/
private Long projectId;
/**
*
*/
private String projectName;
/**
*
*/
private Long producerId;
/**
*
*/
private String producerName;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 清运公司 Id; biz_company.id
*/
private Long clearanceCompanyId;
/**
*
*/
private String clearanceCompanyName;
/**
* 消纳场 Id; biz_company.id
*/
private Long consumptionCompanyId;
/**
*
*/
private String consumptionCompanyName;
/**
*
*/
private LocalDateTime reportTime;
/**
*
*/
private String violateRuleReason;
/**
* 处理状态; 字典编号：process_status
*/
private String processStatus;
/**
* 处理结果
*/
private String processResult;
/**
* 创建人 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;
}

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AddBizCompanyParam.java
View File

@ -96,9 +96,4 @@ public class AddBizCompanyParam {
* 联系电话
*/
private String phoneNum;
/**
* 服务范围
*/
private List<AddBizScopeParam> scopeList;
}

53
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/AddBizScopeParam.java
View File

@ -1,53 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 服务区域
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddBizScopeParam {
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
/**
* 省; 名称
*/
private String province;
/**
* 市; 名称
*/
private String city;
/**
* 区; 名称
*/
private String county;
/**
* 街道; 名称
*/
private String street;
}

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyBizCompanyParam.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -118,9 +118,4 @@ public class ModifyBizCompanyParam {
* 审核状态; 字典代码：audit_status
*/
private AuditStatus auditStatus;
/**
* 服务范围
*/
private List<ModifyScopeParam> scopeList;
}

50
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ModifyScopeParam.java
View File

@ -1,50 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
* 服务区域
*/
@Getter
@Setter
@Accessors(chain = true)
public class ModifyScopeParam {
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
/**
* 省; 名称
*/
private String province;
/**
* 市; 名称
*/
private String city;
/**
* 区; 名称
*/
private String county;
/**
* 街道; 名称
*/
private String street;
}

26
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/ProcessViolateRuleTruckParam.java
View File

@ -1,26 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 违规车辆列表
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ProcessViolateRuleTruckParam {
/**
* Id
*/
private Long id;
/**
* 处理结果
*/
private String processResult;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchCompanyParam.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

20
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchContractParam.java
View File

@ -1,20 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
* 合同报备
*/
@Getter
@Setter
@Accessors(chain = true)
public class SearchContractParam {
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
private String companyName;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchTruckParam.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.biz.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/MatchingBizCompanyResult.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -119,7 +119,4 @@ public class MatchingBizCompanyResult {
* 审核状态; 字典代码：audit_status
*/
private AuditStatus auditStatus;
private List<SearchBizScopeResult> scopeList;
}

54
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchBizScopeResult.java
View File

@ -1,54 +0,0 @@
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 服务区域
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchBizScopeResult {
private Long id;
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
/**
* 省; 名称
*/
private String province;
/**
* 市; 名称
*/
private String city;
/**
* 区; 名称
*/
private String county;
/**
* 街道; 名称
*/
private String street;
}

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchCompanyResult.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -114,9 +114,4 @@ public class SearchCompanyResult {
* 审核状态; 字典代码：audit_status
*/
private AuditStatus auditStatus;
/**
* 服务范围
*/
private List<SearchBizScopeResult> scopeList;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchTruckResult.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.biz.pojo.result;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

18
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
View File

@ -11,17 +11,15 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizCompanyMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyScopeParam;
import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
import com.njzscloud.supervisory.biz.pojo.result.MatchingBizCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -37,8 +35,6 @@ import java.util.List;
@Service
@RequiredArgsConstructor
public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyEntity> implements IService<BizCompanyEntity> {
private final BizScopeService bizScopeService;
/**
* 新增
*
@ -77,13 +73,6 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
Long userId = oldData.getUserId();
Long companyId = oldData.getId();
List<ModifyScopeParam> scopeList = modifyBizCompanyParam.getScopeList();
for (ModifyScopeParam modifyScopeParam : scopeList) {
modifyScopeParam.setBizObj(bizObj)
.setUserId(userId)
.setCompanyId(companyId);
}
bizScopeService.modify(scopeList);
}
@Transactional(rollbackFor = Exception.class)
@ -130,10 +119,7 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
default:
throw Exceptions.exception("不允许查询");
}
List<SearchBizScopeResult> scopeResultList = null;
if (bizObj != BizObj.ShiGongDanWei) scopeResultList = bizScopeService.list(id);
return BeanUtil.copyProperties(bizCompanyEntity, SearchCompanyResult.class)
.setScopeList(scopeResultList);
return BeanUtil.copyProperties(bizCompanyEntity, SearchCompanyResult.class);
}
/**

91
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizContractService.java
View File

@ -1,91 +0,0 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
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.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizContractMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizContractEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchContractParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchContractResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 合同报备
*/
@Slf4j
@Service
public class BizContractService extends ServiceImpl<BizContractMapper, BizContractEntity> implements IService<BizContractEntity> {
/**
* 新增
*
* @param bizContractEntity 数据
*/
public void add(BizContractEntity bizContractEntity) {
UserDetail userDetail = SecurityUtil.loginUser();
Long userId = userDetail.getUserId();
bizContractEntity.setUserId(userId);
this.save(bizContractEntity);
}
/**
* 修改
*
* @param bizContractEntity 数据
*/
public void modify(BizContractEntity bizContractEntity) {
this.updateById(bizContractEntity);
}
/**
* 删除
*
* @param ids Ids
*/
@Transactional(rollbackFor = Exception.class)
public void del(List<Long> ids) {
this.removeBatchByIds(ids);
}
/**
* 详情
*
* @param id Id
* @return BizContractEntity 结果
*/
public BizContractEntity detail(Long id) {
return this.getById(id);
}
/**
* 分页查询
*
* @param searchContractParam 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizContractEntity&gt; 分页结果
*/
public PageResult<SearchContractResult> paging(PageParam pageParam, SearchContractParam searchContractParam) {
UserDetail userDetail = SecurityUtil.loginUser();
Long userId = userDetail.getUserId();
String bizObjStr = userDetail.getBizObj();
BizObj bizObj = searchContractParam.getBizObj();
String companyName = searchContractParam.getCompanyName();
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<SearchContractResult>query()
.and(bizObj != null, it -> it.eq("b.biz_obj", bizObj))
.eq(BizObj.QingYunGongSi.getVal().equals(bizObjStr) || BizObj.XiaoNaCang.getVal().equals(bizObjStr), "a.user_id", userId)
.like(StrUtil.isNotBlank(companyName), "b.company_name", companyName)
));
}
}

80
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizInformService.java
View File

@ -1,80 +0,0 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
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.supervisory.biz.contant.InformCategory;
import com.njzscloud.supervisory.biz.mapper.BizInformMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizInformEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 举报
*/
@Slf4j
@Service
public class BizInformService extends ServiceImpl<BizInformMapper, BizInformEntity> implements IService<BizInformEntity> {
/**
* 新增
*
* @param bizInformEntity 数据
*/
public void add(BizInformEntity bizInformEntity) {
this.save(bizInformEntity);
}
/**
* 修改
*
* @param bizInformEntity 数据
*/
public void modify(BizInformEntity bizInformEntity) {
this.updateById(bizInformEntity);
}
/**
* 删除
*
* @param ids Ids
*/
@Transactional(rollbackFor = Exception.class)
public void del(List<Long> ids) {
this.removeBatchByIds(ids);
}
/**
* 详情
*
* @param id Id
* @return BizInformEntity 结果
*/
public BizInformEntity detail(Long id) {
return this.getById(id);
}
/**
* 分页查询
*
* @param bizInformEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizInformEntity&gt; 分页结果
*/
public PageResult<BizInformEntity> paging(PageParam pageParam, BizInformEntity bizInformEntity) {
InformCategory informCategory = bizInformEntity.getInformCategory();
String contacts = bizInformEntity.getContacts();
String licensePlate = bizInformEntity.getLicensePlate();
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizInformEntity>lambdaQuery()
.eq(informCategory != null, BizInformEntity::getInformCategory, informCategory)
.like(StrUtil.isNotBlank(contacts), BizInformEntity::getContacts, contacts)
.like(StrUtil.isNotBlank(licensePlate), BizInformEntity::getLicensePlate, licensePlate)));
}
}

104
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizScopeService.java
View File

@ -1,104 +0,0 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
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.supervisory.biz.mapper.BizScopeMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizScopeEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddBizScopeParam;
import com.njzscloud.supervisory.biz.pojo.param.ModifyScopeParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizScopeResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务区域
*/
@Slf4j
@Service
public class BizScopeService extends ServiceImpl<BizScopeMapper, BizScopeEntity> implements IService<BizScopeEntity> {
/**
* 新增
*
* @param addBizScopeParams 数据
*/
@Transactional(rollbackFor = Exception.class)
public void add(List<AddBizScopeParam> addBizScopeParams) {
List<BizScopeEntity> collect = addBizScopeParams.stream()
.map(it -> BeanUtil.copyProperties(it, BizScopeEntity.class))
.collect(Collectors.toList());
this.saveBatch(collect);
}
/**
* 修改
*
* @param bizScopeEntity 数据
*/
@Transactional(rollbackFor = Exception.class)
public void modify(List<ModifyScopeParam> modifyScopeParams) {
Long companyId = modifyScopeParams.get(0).getCompanyId();
this.remove(Wrappers.<BizScopeEntity>lambdaQuery()
.eq(BizScopeEntity::getCompanyId, companyId));
List<BizScopeEntity> collect = modifyScopeParams.stream()
.map(it -> BeanUtil.copyProperties(it, BizScopeEntity.class))
.collect(Collectors.toList());
this.saveBatch(collect);
}
/**
* 删除
*
* @param ids Ids
*/
@Transactional(rollbackFor = Exception.class)
public void del(List<Long> ids) {
this.removeBatchByIds(ids);
}
/**
* 详情
*
* @param id Id
* @return BizScopeEntity 结果
*/
public SearchBizScopeResult detail(Long id) {
BizScopeEntity bizScopeEntity = this.getById(id);
return BeanUtil.copyProperties(bizScopeEntity, SearchBizScopeResult.class);
}
/**
* 详情
*
* @param companyId Id
* @return BizScopeEntity 结果
*/
public List<SearchBizScopeResult> list(Long companyId) {
List<BizScopeEntity> bizScopeEntities = this.list(Wrappers.<BizScopeEntity>lambdaQuery()
.eq(BizScopeEntity::getCompanyId, companyId));
return bizScopeEntities.stream()
.map(it -> BeanUtil.copyProperties(it, SearchBizScopeResult.class))
.collect(Collectors.toList());
}
/**
* 分页查询
*
* @param bizScopeEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizScopeEntity&gt; 分页结果
*/
public PageResult<BizScopeEntity> paging(PageParam pageParam, BizScopeEntity bizScopeEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizScopeEntity>query(bizScopeEntity)));
}
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java
View File

@ -12,12 +12,12 @@ import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.mapper.BizTruckMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.biz.pojo.result.SearchTruckResult;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

82
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizViolateRuleStrategyService.java
View File

@ -1,82 +0,0 @@
package com.njzscloud.supervisory.biz.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
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.supervisory.biz.mapper.BizViolateRuleStrategyMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleStrategyEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 违规策略
*/
@Slf4j
@Service
public class BizViolateRuleStrategyService extends ServiceImpl<BizViolateRuleStrategyMapper, BizViolateRuleStrategyEntity> implements IService<BizViolateRuleStrategyEntity> {
/**
* 新增
*
* @param bizViolateRuleStrategyEntity 数据
*/
public void add(BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
this.save(bizViolateRuleStrategyEntity);
}
/**
* 修改
*
* @param bizViolateRuleStrategyEntity 数据
*/
public void modify(BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
boolean exists = this.exists(Wrappers.<BizViolateRuleStrategyEntity>lambdaQuery().eq(BizViolateRuleStrategyEntity::getId, 1L));
if (!exists) {
this.save(bizViolateRuleStrategyEntity);
} else {
bizViolateRuleStrategyEntity.setId(1L);
this.updateById(bizViolateRuleStrategyEntity);
}
}
/**
* 删除
*
* @param ids Ids
*/
@Transactional(rollbackFor = Exception.class)
public void del(List<Long> ids) {
this.removeBatchByIds(ids);
}
/**
* 详情
*
* @param id Id
* @return BizViolateRuleStrategyEntity 结果
*/
public BizViolateRuleStrategyEntity detail(Long id) {
BizViolateRuleStrategyEntity ruleStrategyEntity = this.getById(id);
if (ruleStrategyEntity == null) {
this.save(new BizViolateRuleStrategyEntity());
}
return ruleStrategyEntity;
}
/**
* 分页查询
*
* @param bizViolateRuleStrategyEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizViolateRuleStrategyEntity&gt; 分页结果
*/
public PageResult<BizViolateRuleStrategyEntity> paging(PageParam pageParam, BizViolateRuleStrategyEntity bizViolateRuleStrategyEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizViolateRuleStrategyEntity>query(bizViolateRuleStrategyEntity)));
}
}

84
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizViolateRuleTruckService.java
View File

@ -1,84 +0,0 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
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.supervisory.biz.contant.ProcessStatus;
import com.njzscloud.supervisory.biz.mapper.BizViolateRuleTruckMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizViolateRuleTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.ProcessViolateRuleTruckParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 违规车辆列表
*/
@Slf4j
@Service
public class BizViolateRuleTruckService extends ServiceImpl<BizViolateRuleTruckMapper, BizViolateRuleTruckEntity> implements IService<BizViolateRuleTruckEntity> {
/**
* 新增
*
* @param bizViolateRuleTruckEntity 数据
*/
public void add(BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
this.save(bizViolateRuleTruckEntity);
}
/**
* 修改
*
* @param bizViolateRuleTruckEntity 数据
*/
public void modify(BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
this.updateById(bizViolateRuleTruckEntity);
}
/**
* 删除
*
* @param ids Ids
*/
@Transactional(rollbackFor = Exception.class)
public void del(List<Long> ids) {
this.removeBatchByIds(ids);
}
/**
* 详情
*
* @param id Id
* @return BizViolateRuleTruckEntity 结果
*/
public BizViolateRuleTruckEntity detail(Long id) {
return this.getById(id);
}
/**
* 分页查询
*
* @param bizViolateRuleTruckEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;BizViolateRuleTruckEntity&gt; 分页结果
*/
public PageResult<BizViolateRuleTruckEntity> paging(PageParam pageParam, BizViolateRuleTruckEntity bizViolateRuleTruckEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<BizViolateRuleTruckEntity>query(bizViolateRuleTruckEntity)));
}
public void process(ProcessViolateRuleTruckParam processViolateRuleTruckParam) {
String processResult = processViolateRuleTruckParam.getProcessResult();
boolean notBlank = StrUtil.isNotBlank(processResult);
this.update(Wrappers.<BizViolateRuleTruckEntity>lambdaUpdate()
.set(notBlank, BizViolateRuleTruckEntity::getProcessResult, processResult)
.set(BizViolateRuleTruckEntity::getProcessStatus, notBlank ? ProcessStatus.YiChuLi : ProcessStatus.HuLue)
.eq(BizViolateRuleTruckEntity::getId, processViolateRuleTruckParam.getId())
);
}
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/pojo/entity/DeviceInfoEntity.java
View File

@ -58,7 +58,7 @@ public class DeviceInfoEntity {
/**
* 站点; 字典代码：station
*/
private String station;
private Long stationId;
/**
* 车道; 字典代码：lane

24
njzscloud-svr/src/main/java/com/njzscloud/supervisory/goods/contant/MoneyStrategy.java 100644
View File

@ -0,0 +1,24 @@
package com.njzscloud.supervisory.goods.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：money_strategy
* 字典名称：计费策略
*/
@Getter
@RequiredArgsConstructor
public enum MoneyStrategy implements DictStr {
Dun("Dun", "按吨"),
Fang("Fang", "按方"),
Juli("Juli", "按距离"),
Che("Che", "按车"),
TanXing("TanXing", "弹性"),
;
private final String val;
private final String txt;
}

21
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/contant/BillStatus.java 100644
View File

@ -0,0 +1,21 @@
package com.njzscloud.supervisory.money.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：bill_status
* 字典名称：账单状态
*/
@Getter
@RequiredArgsConstructor
public enum BillStatus implements DictStr {
DaiQueRen("DaiQueRen", "待确认"),
YiQueRen("YiQueRen", "已确认"),
;
private final String val;
private final String txt;
}

19
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/contant/InvoiceStatus.java 100644
View File

@ -0,0 +1,19 @@
package com.njzscloud.supervisory.money.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：invoice_status
* 字典名称：开票状态
*/
@Getter
@RequiredArgsConstructor
public enum InvoiceStatus implements DictStr {
DaiKaiPiao("DaiKaiPiao", "待开票"),
YiKaiPiao("YiKaiPiao", "已开票"),
;
private final String val;
private final String txt;
}

23
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/contant/MoneyChangeCategory.java 100644
View File

@ -0,0 +1,23 @@
package com.njzscloud.supervisory.money.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：money_change_category
* 字典名称：资金变动类型
*/
@Getter
@RequiredArgsConstructor
public enum MoneyChangeCategory implements DictStr {
ChongZhi("ChongZhi", "充值"),
PinTaiDaKuan("PinTaiDaKuan", "平台打款"),
DingDanTiaoZhang("DingDanTiaoZhang", "订单调账"),
DingDanKouKuan("DingDanKouKuan", "订单扣款"),
;
private final String val;
private final String txt;
}

20
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/contant/OrderCategory.java 100644
View File

@ -0,0 +1,20 @@
package com.njzscloud.supervisory.order.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：order_category
* 字典名称：订单类型
*/
@Getter
@RequiredArgsConstructor
public enum OrderCategory implements DictStr {
PuTong("PuTong", "普通订单"),
DuanBoRu("DuanBoRu", "短驳入"),
DuanBoChu("DuanBoChu", "短驳出"),
;
private final String val;
private final String txt;
}

27
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/contant/OrderStatus.java 100644
View File

@ -0,0 +1,27 @@
package com.njzscloud.supervisory.order.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：order_status
* 字典名称：订单状态
*/
@Getter
@RequiredArgsConstructor
public enum OrderStatus implements DictStr {
YiYuYue("YiYuYue", "已预约"),
DaiPaiDan("DaiPaiDan", "待派单"),
DaiJieDan("DaiJieDan", "待接单"),
YiJieDan("YiJieDan", "已接单"),
QingYunZhong("QingYunZhong", "清运中"),
YiJinChang("YiJinChang", "已进场"),
YiChuChang("YiChuChang", "已出场"),
YiWanCheng("YiWanCheng", "已完成"),
YiQuXiao("YiQuXiao", "已取消"),
;
private final String val;
private final String txt;
}

20
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/contant/PayerCategory.java 100644
View File

@ -0,0 +1,20 @@
package com.njzscloud.supervisory.order.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：payer_category
* 字典名称：支付方类型
*/
@Getter
@RequiredArgsConstructor
public enum PayerCategory implements DictStr {
GeRen("GeRen", "个人"),
QiYe("QiYe", "企业"),
PinTai("PinTai", "平台"),
;
private final String val;
private final String txt;
}

20
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/contant/PaymentStatus.java 100644
View File

@ -0,0 +1,20 @@
package com.njzscloud.supervisory.order.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：payment_status
* 字典名称：支付状态
*/
@Getter
@RequiredArgsConstructor
public enum PaymentStatus implements DictStr {
WeiZhiFu("WeiZhiFu", "未支付"),
YiZhiFu("YiZhiFu", "已支付"),
YiTuiKuan("YiTuiKuan", "已退款"),
;
private final String val;
private final String txt;
}

0
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/.gitkeep
View File

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/BookingStatus.java
View File

@ -1,22 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：booking_status
* 字典名称：预约状态
*/
@Getter
@RequiredArgsConstructor
public enum BookingStatus implements DictStr {
YiTiJiao("YiTiJiao", "已提交"),
QingYunZhong("QingYunZhong", "清运中"),
YiJieShu("YiJieShu", "已结束"),
YiQuXiao("YiQuXiao", "已取消");
private final String val;
private final String txt;
}

21
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/ClearanceStatus.java
View File

@ -1,21 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：clearance_statue
* 字典名称：清运状态
*/
@Getter
@RequiredArgsConstructor
public enum ClearanceStatus implements DictStr {
WeiKaiShi("WeiKaiShi", "未开始"),
ChengYunZhong("ChengYunZhong", "承运中"),
YiQuXiao("YiQuXiao", "已取消"),
YiWanCheng("YiWanCheng", "已完成");
private final String val;
private final String txt;
}

21
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/DispatchingStatus.java
View File

@ -1,21 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：dispatching_status
* 字典名称：派车状态
*/
@Getter
@RequiredArgsConstructor
public enum DispatchingStatus implements DictStr {
DaiPaiChe("DaiPaiChe", "代派车"),
YiPaiChe("YiPaiChe", "已派车"),
ShenQingZhong("ShenQingZhong", "申请中");
private final String val;
private final String txt;
}

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/GarbageCategory.java
View File

@ -1,22 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：garbage_category
* 字典名称：垃圾类型
*/
@Getter
@RequiredArgsConstructor
public enum GarbageCategory implements DictStr {
ChaiQianLaJi("ChaiQianLaJi", "拆迁垃圾"),
YuanLinLaJi("YuanLinLaJi", "园林垃圾"),
ChenFuLaJi("ChenFuLaJi", "陈腐垃圾"),
ZhuangXiuLaJi("ZhuangXiuLaJi", "装修垃圾");
private final String val;
private final String txt;
}

21
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/ProgressStage.java
View File

@ -1,21 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：progress_stage
* 字典名称：施工进度
*/
@Getter
@RequiredArgsConstructor
public enum ProgressStage implements DictStr {
WeiKaiShi("WeiKaiShi", "未开始"),
JinXingZhong("JinXingZhong", "进行中"),
YiZanTing("YiZanTing", "已暂停"),
YiJieShu("YiJieShu", "已结束");
private final String val;
private final String txt;
}

19
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/contant/ProjectSource.java
View File

@ -1,19 +0,0 @@
package com.njzscloud.supervisory.project.contant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
* 字典代码：project_source
* 字典名称：项目来源
*/
@Getter
@RequiredArgsConstructor
public enum ProjectSource implements DictStr {
YuYue("YuYue", "预约订单"),
ZhaoBiao("ZhaoBiao", "招标");
private final String val;
private final String txt;
}

146
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectBookingController.java
View File

@ -1,146 +0,0 @@
package com.njzscloud.supervisory.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.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectBookingParam;
import com.njzscloud.supervisory.project.pojo.param.ModifyProjectBookingParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectDispatchingParam;
import com.njzscloud.supervisory.project.pojo.result.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectBookingResult;
import com.njzscloud.supervisory.project.pojo.result.StatisticsResult;
import com.njzscloud.supervisory.project.service.ProjectBookingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 预约订单
*/
@Slf4j
@RestController
@RequestMapping("/project_booking")
@RequiredArgsConstructor
public class ProjectBookingController {
private final ProjectBookingService projectBookingService;
/**
* 新增
*
* @param addProjectBookingParam 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody AddProjectBookingParam addProjectBookingParam) {
projectBookingService.add(addProjectBookingParam);
return R.success();
}
/**
* 修改
*
* @param modifyProjectBookingParam 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody ModifyProjectBookingParam modifyProjectBookingParam) {
projectBookingService.modify(modifyProjectBookingParam);
return R.success();
}
/**
* 撤销
*
* @param id Id
*/
@GetMapping("/cancel")
public R<?> cancel(@RequestParam Long id) {
projectBookingService.cancel(id);
return R.success();
}
/**
* 完成
*
* @param id Id
*/
@GetMapping("/complete")
public R<?> complete(@RequestParam Long id) {
projectBookingService.complete(id);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
projectBookingService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return ProjectBookingEntity 结果
*/
@GetMapping("/detail")
public R<SearchProjectBookingResult> detail(@RequestParam Long id) {
return R.success(projectBookingService.detail(id));
}
/**
* 分页查询
*
* @param projectBookingEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;ProjectBookingEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<SearchProjectBookingResult>> paging(PageParam pageParam, ProjectBookingEntity projectBookingEntity) {
return R.success(projectBookingService.paging(pageParam, projectBookingEntity));
}
/**
* 请求派车
*/
@GetMapping("/req_dispatching")
public R<?> reqDispatching(@RequestParam Long id, @RequestParam Integer truckQuantity) {
projectBookingService.reqDispatching(id, truckQuantity);
return R.success();
}
/**
* 派车
*
* @param projectDispatchingParam 数据
*/
@PostMapping("/dispatching")
public R<?> dispatching(@RequestBody ProjectDispatchingParam projectDispatchingParam) {
projectBookingService.dispatching(projectDispatchingParam);
return R.success();
}
@PostMapping("/dispatching_change")
public R<?> dispatchingChange(@RequestBody ProjectDispatchingParam projectDispatchingParam) {
projectBookingService.dispatchingChange(projectDispatchingParam);
return R.success();
}
@GetMapping("/bill")
public R<?> searchBill(Long bookingId) {
SearchBillResult billResult = projectBookingService.searchBill(bookingId);
return R.success(billResult);
}
@GetMapping("/statistics")
public R<StatisticsResult> statistics(@RequestParam(required = false) Integer year) {
return R.success(projectBookingService.statistics(year));
}
}

124
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectClearanceDetailController.java
View File

@ -1,124 +0,0 @@
package com.njzscloud.supervisory.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.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectClearanceDetailReportParam;
import com.njzscloud.supervisory.project.pojo.param.SearchProjectClearanceDetailParam;
import com.njzscloud.supervisory.project.pojo.result.SearchPermitResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectClearanceDetailResult;
import com.njzscloud.supervisory.project.pojo.result.SearchWaybillResult;
import com.njzscloud.supervisory.project.service.ProjectClearanceDetailService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 清运明细
*/
@Slf4j
@RestController
@RequestMapping("/project_clearance_detail")
@RequiredArgsConstructor
public class ProjectClearanceDetailController {
private final ProjectClearanceDetailService projectClearanceDetailService;
/**
* 新增
*
* @param addProjectClearanceDetailParam 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody AddProjectClearanceDetailParam addProjectClearanceDetailParam) {
projectClearanceDetailService.add(addProjectClearanceDetailParam);
return R.success();
}
/**
* 修改
*
* @param projectClearanceDetailEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody ProjectClearanceDetailEntity projectClearanceDetailEntity) {
projectClearanceDetailService.modify(projectClearanceDetailEntity);
return R.success();
}
/**
* 开始清运
*/
@GetMapping("/start_cleaning")
public R<?> startCleaning(Long id) {
projectClearanceDetailService.startCleaning(id);
return R.success();
}
/**
* 消纳场上报
*/
@PostMapping("/report")
public R<?> report(
@RequestParam(required = false, defaultValue = "1") Integer action,
@RequestBody ProjectClearanceDetailReportParam projectClearanceDetailReportParam) {
projectClearanceDetailService.report(action, projectClearanceDetailReportParam);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
projectClearanceDetailService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return ProjectClearanceDetailEntity 结果
*/
@GetMapping("/detail")
public R<ProjectClearanceDetailEntity> detail(@RequestParam Long id) {
return R.success(projectClearanceDetailService.detail(id));
}
/**
* 分页查询
*/
@GetMapping("/paging")
public R<PageResult<SearchProjectClearanceDetailResult>> paging(PageParam pageParam, SearchProjectClearanceDetailParam searchProjectClearanceDetailParam) {
return R.success(projectClearanceDetailService.paging(pageParam, searchProjectClearanceDetailParam));
}
@GetMapping("/history")
public R<PageResult<SearchProjectClearanceDetailResult>> history(PageParam pageParam, @RequestParam Long truckId) {
return R.success(projectClearanceDetailService.history(pageParam, truckId));
}
/**
* 运单
*/
@GetMapping("/waybill")
public R<SearchWaybillResult> waybill(String licensePlate) {
return R.success(projectClearanceDetailService.waybill(licensePlate));
}
/**
* 清运许可
*/
@GetMapping("/permit")
public R<SearchPermitResult> permit(String licensePlate) {
return R.success(projectClearanceDetailService.permit(licensePlate));
}
}

109
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectFilingController.java
View File

@ -1,109 +0,0 @@
package com.njzscloud.supervisory.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.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.pojo.param.AddProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.param.ModifyProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.param.SearchProjectFilingParam;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectFilingResult;
import com.njzscloud.supervisory.project.service.ProjectFilingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 项目备案信息
*/
@Slf4j
@RestController
@RequestMapping("/project_filing")
@RequiredArgsConstructor
public class ProjectFilingController {
private final ProjectFilingService projectFilingService;
/**
* 新增
*
* @param addProjectFilingParam 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody AddProjectFilingParam addProjectFilingParam) {
projectFilingService.add(addProjectFilingParam);
return R.success();
}
/**
* 修改
*
* @param modifyProjectFilingParam 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody ModifyProjectFilingParam modifyProjectFilingParam) {
projectFilingService.modify(modifyProjectFilingParam);
return R.success();
}
/**
* 撤销
*
* @param id Id
*/
@GetMapping("/cancel")
public R<?> cancel(@RequestParam Long id) {
projectFilingService.cancel(id);
return R.success();
}
/**
* 审核
*
* @param id Id
*/
@GetMapping("/audit")
public R<?> audit(@RequestParam Long id, @RequestParam AuditStatus auditStatus,
@RequestParam(required = false, defaultValue = "") String auditMemo) {
projectFilingService.audit(id, auditStatus, auditMemo);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
projectFilingService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return ProjectFilingEntity 结果
*/
@GetMapping("/detail")
public R<SearchProjectFilingResult> detail(@RequestParam Long id) {
return R.success(projectFilingService.detail(id));
}
/**
* 分页查询
*
* @param searchProjectFilingParam 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;ProjectFilingEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<SearchProjectFilingResult>> paging(PageParam pageParam, SearchProjectFilingParam searchProjectFilingParam) {
return R.success(projectFilingService.paging(pageParam, searchProjectFilingParam));
}
}

87
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectGpsDataController.java
View File

@ -1,87 +0,0 @@
package com.njzscloud.supervisory.project.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.project.pojo.entity.ProjectGpsDataEntity;
import com.njzscloud.supervisory.project.service.ProjectGpsDataService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 车辆 GPS 数据
*/
@Slf4j
@RestController
@RequestMapping("/project_gps_data")
@RequiredArgsConstructor
public class ProjectGpsDataController {
private final ProjectGpsDataService projectGpsDataService;
/**
* 新增
*
* @param projectGpsDataEntity 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody ProjectGpsDataEntity projectGpsDataEntity) {
projectGpsDataService.add(projectGpsDataEntity);
return R.success();
}
/**
* 修改
*
* @param projectGpsDataEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody ProjectGpsDataEntity projectGpsDataEntity) {
projectGpsDataService.modify(projectGpsDataEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
projectGpsDataService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return ProjectGpsDataEntity 结果
*/
@GetMapping("/detail")
public R<ProjectGpsDataEntity> detail(@RequestParam Long id) {
return R.success(projectGpsDataService.detail(id));
}
/**
* 分页查询
*
* @param projectGpsDataEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;ProjectGpsDataEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<ProjectGpsDataEntity>> paging(PageParam pageParam, ProjectGpsDataEntity projectGpsDataEntity) {
return R.success(projectGpsDataService.paging(pageParam, projectGpsDataEntity));
}
@GetMapping("/all")
public R<List<ProjectGpsDataEntity>> all(@RequestParam(required = false) Long clearanceDetailId) {
return R.success(projectGpsDataService.list(Wrappers.<ProjectGpsDataEntity>lambdaQuery()
.eq(clearanceDetailId != null, ProjectGpsDataEntity::getClearanceId, clearanceDetailId)));
}
}

142
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/controller/ProjectInfoController.java
View File

@ -1,142 +0,0 @@
package com.njzscloud.supervisory.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.supervisory.project.pojo.entity.ProjectInfoEntity;
import com.njzscloud.supervisory.project.pojo.param.AddProjectInfoParam;
import com.njzscloud.supervisory.project.pojo.param.ProjectDispatchingParam;
import com.njzscloud.supervisory.project.pojo.result.*;
import com.njzscloud.supervisory.project.service.ProjectInfoService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 项目信息
*/
@Slf4j
@RestController
@RequestMapping("/project_info")
@RequiredArgsConstructor
public class ProjectInfoController {
private final ProjectInfoService projectInfoService;
/**
* 新增
*
* @param addProjectInfoParam 数据
*/
@PostMapping("/add")
public R<?> add(@RequestBody AddProjectInfoParam addProjectInfoParam) {
projectInfoService.add(addProjectInfoParam);
return R.success();
}
/**
* 修改
*
* @param projectInfoEntity 数据
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody ProjectInfoEntity projectInfoEntity) {
projectInfoService.modify(projectInfoEntity);
return R.success();
}
/**
* 删除
*
* @param ids Ids
*/
@PostMapping("/del")
public R<?> del(@RequestBody List<Long> ids) {
projectInfoService.del(ids);
return R.success();
}
/**
* 详情
*
* @param id Id
* @return ProjectInfoEntity 结果
*/
@GetMapping("/detail")
public R<SearchProjectInfoResult> detail(@RequestParam Long id) {
return R.success(projectInfoService.detail(id));
}
/**
* 分页查询
*
* @param projectInfoEntity 筛选条件
* @param pageParam 分页参数
* @return PageResult&lt;ProjectInfoEntity&gt; 分页结果
*/
@GetMapping("/paging")
public R<PageResult<SearchProjectInfoResult>> paging(PageParam pageParam, ProjectInfoEntity projectInfoEntity) {
return R.success(projectInfoService.paging(pageParam, projectInfoEntity));
}
/**
* 派车
*
* @param projectDispatchingParam 数据
*/
@PostMapping("/dispatching")
public R<?> dispatching(@RequestBody ProjectDispatchingParam projectDispatchingParam) {
projectInfoService.dispatching(projectDispatchingParam);
return R.success();
}
/**
* 派车
*/
@GetMapping("/req_dispatching")
public R<?> reqDispatching(@RequestParam Long id, @RequestParam Integer truckQuantity) {
projectInfoService.reqDispatching(id, truckQuantity);
return R.success();
}
/**
* A 联单
*/
@GetMapping("/a_bill")
public R<?> searchABillResult(PageParam pageParam) {
PageResult<SearchABillResult> aBillResults = projectInfoService.searchABillResult(pageParam);
return R.success(aBillResults);
}
/**
* A 联单
*/
@GetMapping("/b_bill")
public R<?> searchBBillResult(PageParam pageParam) {
PageResult<SearchBBillResult> aBillResults = projectInfoService.searchBBillResult(pageParam);
return R.success(aBillResults);
}
/**
* A 联单
*/
@GetMapping("/c_bill")
public R<?> searchCBillResult(PageParam pageParam) {
PageResult<SearchCBillResult> aBillResults = projectInfoService.searchCBillResult(pageParam);
return R.success(aBillResults);
}
@GetMapping("/bill")
public R<?> searchBill(Long clearanceDetailId) {
SearchBillResult billResult = projectInfoService.searchBill(clearanceDetailId);
return R.success(billResult);
}
@GetMapping("/statistics")
public R<StatisticsResult> statistics() {
return R.success(projectInfoService.statistics());
}
}

52
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectBookingMapper.java
View File

@ -1,52 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchBillResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectBookingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 预约订单
*/
@Mapper
public interface ProjectBookingMapper extends BaseMapper<ProjectBookingEntity> {
IPage<SearchProjectBookingResult> paging(Page<ProjectBookingEntity> page, @Param("companyId") Long companyId, @Param("bizObj") String bizObj, @Param("ew") QueryWrapper<SearchProjectBookingResult> ew);
BizCompanyEntity getCompanyInfoByUserId(@Param("userId") Long userId);
List<Map<String, Object>> statisticsCompanyCount();
List<Map<String, Object>> statisticsDaiShenHeCompanyCount();
List<Map<String, Object>> statisticsProjectCount();
List<Map<String, Object>> statisticsScopeCount();
List<Map<String, Object>> statisticsWeight();
Map<String, Object> statisticsWeightTruck();
SearchBillResult searchBill(@Param("bookingId") Long bookingId);
@SuppressWarnings("MybatisXMapperMethodInspection")
List<Map<String, Object>> statisticsGarbageCategory();
@SuppressWarnings("MybatisXMapperMethodInspection")
List<Map<String, Object>> statisticsGarbageCategoryNoProject();
@SuppressWarnings("MybatisXMapperMethodInspection")
List<Map<String, Object>> statisticsMonthClearanceQuantity(@Param("year") Integer year, @Param("month") Integer month);
@SuppressWarnings("MybatisXMapperMethodInspection")
List<Map<String, Object>> statisticsProjectClearanceQuantity();
}

37
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectClearanceDetailMapper.java
View File

@ -1,37 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.entity.ProjectBookingEntity;
import com.njzscloud.supervisory.project.pojo.entity.ProjectClearanceDetailEntity;
import com.njzscloud.supervisory.project.pojo.result.ClearanceTaskResult;
import com.njzscloud.supervisory.project.pojo.result.SearchPermitResult;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectClearanceDetailResult;
import com.njzscloud.supervisory.project.pojo.result.SearchWaybillResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 清运明细
*/
@Mapper
public interface ProjectClearanceDetailMapper extends BaseMapper<ProjectClearanceDetailEntity> {
Long selectConsumptionCompanyByUscc(@Param("consumptionUscc") String consumptionUscc);
ProjectClearanceDetailEntity selectAddInfo(@Param("projectSn") String projectSn, @Param("clearanceUscc") String clearanceUscc, @Param("consumptionUscc") String consumptionUscc, @Param("licensePlate") String licensePlate);
IPage<SearchProjectClearanceDetailResult> paging(Page<Object> page, @Param("userId") Long userId, @Param("bizObj") String bizObj, @Param("ew") QueryWrapper<SearchProjectClearanceDetailResult> ew);
SearchWaybillResult selectWaybill(@Param("licensePlate") String licensePlate);
SearchPermitResult selectPermit(@Param("licensePlate") String licensePlate);
Page<ClearanceTaskResult> clearanceTask(Page<ClearanceTaskResult> page, @Param("userId") Long userId, @Param("ew") QueryWrapper<ClearanceTaskResult> ew);
void updateOrderStatus(@Param("bookingId") Long bookingId, @Param("bookingStatus") String bookingStatus);
ProjectBookingEntity getBookingBill(String sn);
}

20
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectCompanyMapper.java
View File

@ -1,20 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.entity.ProjectCompanyEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectCompanyResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 项目清运公司/消纳场关系表
*/
@Mapper
public interface ProjectCompanyMapper extends BaseMapper<ProjectCompanyEntity> {
List<SearchProjectCompanyResult> selectCompanyByProjectSourceId(@Param("projectSourceId") Long projectSourceId);
List<SearchProjectCompanyResult> selectCompanyByProjectId(@Param("projectId") Long projectId);
}

19
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectFilingMapper.java
View File

@ -1,19 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.entity.ProjectFilingEntity;
import com.njzscloud.supervisory.project.pojo.result.SearchProjectFilingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 项目备案信息
*/
@Mapper
public interface ProjectFilingMapper extends BaseMapper<ProjectFilingEntity> {
IPage<SearchProjectFilingResult> paging(Page<Object> page, @Param("ew") QueryWrapper<ProjectFilingEntity> ew);
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectGpsDataMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.entity.ProjectGpsDataEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 车辆 GPS 数据
*/
@Mapper
public interface ProjectGpsDataMapper extends BaseMapper<ProjectGpsDataEntity> {
}

44
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectInfoMapper.java
View File

@ -1,44 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.project.pojo.entity.ProjectInfoEntity;
import com.njzscloud.supervisory.project.pojo.result.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 项目信息
*/
@Mapper
public interface ProjectInfoMapper extends BaseMapper<ProjectInfoEntity> {
IPage<SearchProjectInfoResult> paging(Page<SearchProjectInfoResult> page, @Param("bizObj") String bizObj, @Param("userId") Long userId);
IPage<SearchABillResult> searchABillResult(Page<SearchABillResult> page);
IPage<SearchBBillResult> searchBBillResult(Page<SearchBBillResult> page);
IPage<SearchCBillResult> searchCBillResult(Page<SearchCBillResult> page);
List<Map<String, Object>> statisticsCompanyCount();
List<Map<String, Object>> statisticsDaiShenHeCompanyCount();
List<Map<String, Object>> statisticsProjectCount();
List<Map<String, Object>> statisticsScopeCount();
List<Map<String, Object>> statisticsWeight();
@SuppressWarnings("MybatisXMapperMethodInspection")
Map<String, Object> statisticsWeightTruck();
SearchBillResult searchBill(@Param("clearanceDetailId") Long clearanceDetailId);
SearchProjectInfoResult detail(@Param("id") Long id);
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectTruckChangeMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckChangeEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 派车修改记录
*/
@Mapper
public interface ProjectTruckChangeMapper extends BaseMapper<ProjectTruckChangeEntity> {
}

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/mapper/ProjectTruckMapper.java
View File

@ -1,13 +0,0 @@
package com.njzscloud.supervisory.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njzscloud.supervisory.project.pojo.entity.ProjectTruckEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 项目派车
*/
@Mapper
public interface ProjectTruckMapper extends BaseMapper<ProjectTruckEntity> {
}

184
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectBookingEntity.java
View File

@ -1,184 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.BookingStatus;
import com.njzscloud.supervisory.project.contant.DispatchingStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/**
* 预约订单
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName(value = "project_booking", autoResultMap = true)
public class ProjectBookingEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 编号
*/
private String sn;
/**
* 备案 Id; project_filing.id
*/
private Long filingId;
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 产废单位 Id; 个人预约置空，biz_company.id
*/
private Long companyId;
/**
* 产废单位; 个人预约置空
*/
private String companyName;
/**
* 项目名称
*/
private String projectName;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 装修面积
*/
private Double square;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 现场照片; json
*/
@TableField(value = "site_photos", typeHandler = JsonTypeHandler.class)
private List<String> sitePhotos;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 预约时间
*/
private LocalDateTime bookingTime;
/**
* 预约状态; 字典编码：booking_status
*/
private BookingStatus bookingStatus;
/**
* 派车数量
*/
private Integer truckQuantity;
/**
* 剩余数量
*/
private Integer residueQuantity;
/**
* 派车状态; 字典编码：dispatching_status
*/
private DispatchingStatus dispatchingStatus;
/**
* 创建人 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;
}

130
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectClearanceDetailEntity.java
View File

@ -1,130 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/**
* 清运明细
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("project_clearance_detail")
public class ProjectClearanceDetailEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 编号
*/
private String sn;
/**
* 预约单 Id; project_booking.id
*/
private Long bookingId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 产废单位; biz_company.id/sys_user.id
*/
private Long producingId;
/**
* 清运公司 Id; biz_company.id
*/
private Long clearanceCompanyId;
/**
* 消纳场 Id; biz_company.id
*/
private Long consumptionCompanyId;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private String garbageCategory;
/**
* 车辆 Id; biz_truck.id
*/
private Long truckId;
/**
* 司机 Id; biz_driver
*/
private Long driverId;
/**
* 状态; 字典编码：clearance_status
*/
private ClearanceStatus clearanceStatus;
/**
* 派车时间
*/
private LocalDateTime dispatchingTime;
/**
* 清运时间; 开始
*/
private LocalDateTime startTime;
/**
* 清运时间; 结束
*/
private LocalDateTime endTime;
/**
* 业务系统单据编号
*/
private String billSn;
/**
* 进场时间
*/
private LocalDateTime inTime;
/**
* 出场时间
*/
private LocalDateTime outTime;
/**
* 进场磅重
*/
private String inWeight;
/**
* 出场磅重
*/
private String outWeight;
/**
* 净重
*/
private String suttleWeight;
/**
* 车辆照片; json
*/
@TableField(value = "photos", typeHandler = com.njzscloud.common.mp.support.handler.j.JsonTypeHandler.class)
private List<String> photos;
}

47
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectCompanyEntity.java
View File

@ -1,47 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
* 项目清运公司/消纳场关系表
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("project_company")
public class ProjectCompanyEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 项目来源; 字典编码：project_source
*/
private ProjectSource projectSource;
/**
* 源单 Id; project_booking.id/project_filing.id
*/
private Long projectSourceId;
/**
* 业务对象; 字典编码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
}

147
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectFilingEntity.java
View File

@ -1,147 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 项目备案信息
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("project_filing")
public class ProjectFilingEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 用户 Id; sys_user.id
*/
private Long userId;
/**
* 项目名称
*/
private String projectName;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 合同; 图片
*/
private String contract;
/**
* 审核状态; 字典编码：audit_status
*/
private AuditStatus auditStatus;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
/**
* 审核备注
*/
private String auditMemo;
/**
* 创建人 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;
}

46
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectGpsDataEntity.java
View File

@ -1,46 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/**
* 车辆 GPS 数据
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("project_gps_data")
public class ProjectGpsDataEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 清运明细 Id
*/
private Long clearanceId;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
}

163
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectInfoEntity.java
View File

@ -1,163 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.project.contant.DispatchingStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.contant.ProgressStage;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* 项目信息
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName(value = "project_info", autoResultMap = true)
public class ProjectInfoEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 编号
*/
private String sn;
/**
* 项目来源; 字典编码：project_source
*/
private ProjectSource projectSource;
/**
* 源单 Id; project_booking.id/project_filing.id
*/
private Long projectSourceId;
/**
* 项目名称
*/
private String projectName;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 合同; 图片
*/
private String contract;
/**
* 现场照片; json
*/
@TableField(value = "site_photos", typeHandler = JsonTypeHandler.class)
private List<String> sitePhotos;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
/**
* 施工阶段; 字典编码：progress_stage
*/
private ProgressStage progressStage;
/**
* 派车数量
*/
private Integer truckQuantity;
/**
* 派车状态; 字典编码：dispatching_status
*/
private DispatchingStatus dispatchingStatus;
/**
* 创建人 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;
}

54
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectTruckChangeEntity.java
View File

@ -1,54 +0,0 @@
package com.njzscloud.supervisory.project.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)
@TableName("project_truck_change")
public class ProjectTruckChangeEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 预约单 Id; project_booking.id
*/
private Long bookingId;
/**
* 旧车
*/
private Long oldTruckId;
/**
* 新车
*/
private Long newTruckId;
/**
* 创建人 Id; sys_user.id
*/
@TableField(fill = FieldFill.INSERT)
private Long creatorId;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
}

57
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/entity/ProjectTruckEntity.java
View File

@ -1,57 +0,0 @@
package com.njzscloud.supervisory.project.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 项目派车
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
@TableName("project_truck")
public class ProjectTruckEntity {
/**
* Id
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 项目 Id; project_info.id
*/
private Long projectId;
/**
* 项目编号
*/
private String projectSn;
/**
* 清运公司 Id; biz_company.id
*/
private Long companyId;
/**
* 清运公司统一社会信用代码; biz_company.uscc
*/
private String uscc;
/**
* 车辆 Id; biz_truck.id
*/
private Long truckId;
/**
* 车牌号
*/
private String licensePlate;
}

105
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectBookingParam.java
View File

@ -1,105 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/**
* 预约订单
*/
@Getter
@Setter
@Accessors(chain = true)
public class AddProjectBookingParam {
/**
* 备案 Id; project_filing.id
*/
private Long filingId;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 装修面积
*/
private Double square;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 产废单位; 个人预约置空
*/
private String companyName;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 现场照片; json
*/
private List<String> sitePhotos;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 预约时间
*/
private LocalDateTime bookingTime;
/**
* 派车数量
*/
private Integer truckQuantity;
private List<AddProjectCompanyParam> companyList;
}

58
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectClearanceDetailParam.java
View File

@ -1,58 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 清运明细
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddProjectClearanceDetailParam {
/**
* 预约单 Id; project_booking.id
*/
private Long bookingId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 产废单位; biz_company.id/sys_user.id
*/
private Long producingId;
/**
* 清运公司 Id; biz_company.id
*/
private Long clearanceCompanyId;
/**
* 消纳场 Id; biz_company.id
*/
private Long consumptionCompanyId;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 车辆 Id; biz_truck.id
*/
private Long truckId;
/**
* 司机 Id; biz_driver
*/
private Long driverId;
}

36
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectCompanyParam.java
View File

@ -1,36 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddProjectCompanyParam {
/**
* 项目来源; 字典编码：project_source
*/
private ProjectSource projectSource;
/**
* 源单 Id; project_booking.id/project_filing.id
*/
private Long projectSourceId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
}

86
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectFilingParam.java
View File

@ -1,86 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddProjectFilingParam {
/**
* 项目名称
*/
private String projectName;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 合同; 图片
*/
private String contract;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
/**
* 清运公司/消纳场 列表
*/
private List<AddProjectCompanyParam> companyList;
}

112
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectInfoParam.java
View File

@ -1,112 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import com.njzscloud.supervisory.project.contant.ProgressStage;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.util.List;
/**
* 项目信息
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddProjectInfoParam {
/**
* 项目来源; 字典编码：project_source
*/
private ProjectSource projectSource;
/**
* 源单 Id; project_booking.id/project_filing.id
*/
private Long projectSourceId;
/**
* 项目名称
*/
private String projectName;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 合同; 图片
*/
private String contract;
/**
* 现场照片; json
*/
private List<String> sitePhotos;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
/**
* 施工阶段; 字典编码：progress_stage
*/
private ProgressStage progressStage;
/**
* 派车数量
*/
private Integer truckQuantity;
}

27
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/AddProjectTruckParam.java
View File

@ -1,27 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
/**
* 项目派车
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class AddProjectTruckParam {
/**
* 车辆 Id; biz_truck.id
*/
private Long truckId;
/**
* 司机 Id; biz_driver
*/
private Long driverId;
}

107
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectBookingParam.java
View File

@ -1,107 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
/**
* 预约订单
*/
@Getter
@Setter
@Accessors(chain = true)
public class ModifyProjectBookingParam {
private Long id;
/**
* 备案 Id; project_filing.id
*/
private Long filingId;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 装修面积
*/
private Double square;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 产废单位; 个人预约置空
*/
private String companyName;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 现场照片; json
*/
private List<String> sitePhotos;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 预约时间
*/
private LocalDateTime bookingTime;
/**
* 派车数量
*/
private Integer truckQuantity;
private List<ModifyProjectCompanyParam> companyList;
}

36
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectCompanyParam.java
View File

@ -1,36 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.project.contant.ProjectSource;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ModifyProjectCompanyParam {
/**
* 项目来源; 字典编码：project_source
*/
private ProjectSource projectSource;
/**
* 源单 Id; project_booking.id/project_filing.id
*/
private Long projectSourceId;
/**
* 业务对象; 字典代码：biz_obj
*/
private BizObj bizObj;
/**
* 清运公司/消纳场 Id; biz_company.id
*/
private Long companyId;
}

92
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ModifyProjectFilingParam.java
View File

@ -1,92 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ModifyProjectFilingParam {
private Long id;
/**
* 项目名称
*/
private String projectName;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 预估垃圾量
*/
private String estimateQuantity;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 合同; 图片
*/
private String contract;
/**
* 审核状态; 字典编码：audit_status
*/
private AuditStatus auditStatus;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
/**
* 清运公司/消纳场 列表
*/
private List<ModifyProjectCompanyParam> companyList;
}

57
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ProjectClearanceDetailReportParam.java
View File

@ -1,57 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.util.List;
/**
* 清运明细
*/
@Getter
@Setter
@Accessors(chain = true)
public class ProjectClearanceDetailReportParam {
/**
* 编号
*/
private String sn;
/**
* 业务系统单据编号
*/
private String treatmentOrderNo;
/**
* 进场时间
*/
private String startTime;
/**
* 出场时间
*/
private String finishTime;
/**
* 进场磅重
*/
private String grossWeight;
/**
* 出场磅重
*/
private String tareWeight;
/**
* 净重
*/
private String netWeight;
/**
* 车辆照片; json
*/
private List<String> photo;
}

23
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/ProjectDispatchingParam.java
View File

@ -1,23 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ProjectDispatchingParam {
private Long bookingId;
/**
* 消纳场
*/
private Long companyId;
private List<AddProjectTruckParam> truckList;
}

23
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchClearanceTaskParam.java
View File

@ -1,23 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchClearanceTaskParam {
/**
* 产废单位
*/
private String producingName;
/**
* 消纳场
*/
private String consumptionCompanyName;
}

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchProjectClearanceDetailParam.java
View File

@ -1,22 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchProjectClearanceDetailParam {
private Long filingId;
private Long truckId;
private ClearanceStatus clearanceStatus;
private Integer alertValue;
private GarbageCategory garbageCategory;
private String projectName;
private String companyName;
}

38
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/param/SearchProjectFilingParam.java
View File

@ -1,38 +0,0 @@
package com.njzscloud.supervisory.project.pojo.param;
import com.njzscloud.supervisory.project.contant.AuditStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
/**
* 项目备案信息
*/
@Getter
@Setter
@Accessors(chain = true)
public class SearchProjectFilingParam {
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 审核状态; 字典编码：audit_status
*/
private AuditStatus auditStatus;
/**
* 项目名称
*/
private String projectName;
/**
* 发起方公司名称
*/
private String companyName;
}

109
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/ClearanceTaskResult.java
View File

@ -1,109 +0,0 @@
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ClearanceTaskResult {
private Long id;
/**
* 编号
*/
private String sn;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 状态; 字典编码：clearance_status
*/
private ClearanceStatus clearanceStatus;
/**
* 派车时间
*/
private LocalDateTime dispatchingTime;
/**
* 清运时间; 开始
*/
private LocalDateTime startTime;
/**
* 清运时间; 结束
*/
private LocalDateTime endTime;
/**
* 业务系统单据编号
*/
private String billSn;
/**
* 进场时间
*/
private LocalDateTime inTime;
/**
* 出场时间
*/
private LocalDateTime outTime;
/**
* 进场磅重
*/
private String inWeight;
/**
* 出场磅重
*/
private String outWeight;
/**
* 净重
*/
private String suttleWeight;
/**
* 车辆照片; json
*/
private List<String> photos;
/**
* 预约时间
*/
private LocalDateTime bookingTime;
/*
* 产废单位
*/
private Long producingId;
private String producingName;
private String producingContacts;
private String producingPhoneNum;
/*
* 清运公司
*/
private Long clearanceCompanyId;
private String clearanceCompanyName;
private String clearanceContacts;
private String clearancePhoneNum;
/*
* 消纳场
*/
private Long consumptionCompanyId;
private String consumptionCompanyName;
private String consumptionContacts;
private String consumptionPhoneNum;
}

83
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchABillResult.java
View File

@ -1,83 +0,0 @@
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDate;
/**
* 项目信息
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchABillResult {
/**
* Id
*/
private Long id;
/**
* 编号
*/
private String sn;
/**
* 项目名称
*/
private String projectName;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 开始时间
*/
private LocalDate startDate;
/**
* 结束时间
*/
private LocalDate endDate;
}

101
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchBBillResult.java
View File

@ -1,101 +0,0 @@
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
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 SearchBBillResult {
/**
* 编号
*/
private String sn;
/**
* 消纳场名称
*/
private String consumptionCompanyName;
/**
* 车牌
*/
private String licensePlate;
/**
* 司机名称
*/
private String driverName;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 司机手机号
*/
private String driverPhoneNum;
/**
* 净重
*/
private String suttleWeight;
/**
* 清运时间; 开始
*/
private LocalDateTime startTime;
/**
* 清运时间; 结束
*/
private LocalDateTime endTime;
/**
* 项目名称
*/
private String projectName;
/**
* 省; 名称，项目地
*/
private String province;
/**
* 市; 名称，项目地
*/
private String city;
/**
* 区; 名称，项目地
*/
private String county;
/**
* 街道; 名称，项目地
*/
private String street;
/**
* 详细地址; 项目地
*/
private String address;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phoneNum;
}

130
njzscloud-svr/src/main/java/com/njzscloud/supervisory/project/pojo/result/SearchBillResult.java
View File

@ -1,130 +0,0 @@
package com.njzscloud.supervisory.project.pojo.result;
import com.njzscloud.supervisory.project.contant.ClearanceStatus;
import com.njzscloud.supervisory.project.contant.GarbageCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchBillResult {
private Long id;
/**
* 编号
*/
private String sn;
/**
* 垃圾类型; 字典编码：garbage_category
*/
private GarbageCategory garbageCategory;
/**
* 状态; 字典编码：clearance_status
*/
private ClearanceStatus clearanceStatus;
/**
* 清运时间; 开始
*/
private LocalDateTime startTime;
/**
* 清运时间; 结束
*/
private LocalDateTime endTime;
/**
* 业务系统单据编号
*/
private String billSn;
/**
* 进场时间
*/
private LocalDateTime inTime;
/**
* 出场时间
*/
private LocalDateTime outTime;
/**
* 进场磅重
*/
private String inWeight;
/**
* 出场磅重
*/
private String outWeight;
/**
* 净重
*/
private String suttleWeight;
/**
* 车辆照片; json
*/
private List<String> photos;
/*
* 产废单位
*/
private Long producingId;
private String producingName;
private String producingContacts;
private String producingPhoneNum;
/*
* 清运公司
*/
private Long clearanceCompanyId;
private String clearanceCompanyName;
private String clearanceContacts;
private String clearancePhoneNum;
/*
* 消纳场
*/
private Long consumptionCompanyId;
private String consumptionCompanyName;
private String consumptionContacts;
private String consumptionPhoneNum;
/**
* 项目信息
*/
private String bookingSn;
private String projectName;
private LocalDateTime bookingTime;
private LocalDateTime dispatchingTime;
private String province;
private String city;
private String county;
private String street;
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
private List<String> sitePhotos;
private String licensePlate;
/**
* 最大载重; 单位：吨
*/
private String carryingCapacity;
private String driverName;
private String driverPhoneNum;
}

Some files were not shown because too many files have changed in this diff Show More