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

客户管理

localizer
lzq 2025-09-18 15:21:43 +08:00
parent e6df5b63c4
commit 02b416d087
48 changed files with 506 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.contant;
package com.njzscloud.supervisory.biz.constant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/contant/BizObj.java → njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/BizObj.java
View File

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.contant;
package com.njzscloud.supervisory.biz.constant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;

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

@ -1,4 +1,4 @@
package com.njzscloud.supervisory.biz.contant;
package com.njzscloud.supervisory.biz.constant;
import com.njzscloud.common.core.ienum.DictStr;
import lombok.Getter;

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

@ -3,7 +3,7 @@ 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.constant.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;

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

@ -4,7 +4,7 @@ import com.njzscloud.common.core.utils.R;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.pojo.entity.BizProjectEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult;
import com.njzscloud.supervisory.biz.service.BizProjectService;

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

@ -3,7 +3,7 @@ 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.constant.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;

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

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizContractEntity.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.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

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

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizProjectEntity.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.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

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.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

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

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

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

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

4
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.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

4
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.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

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.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

4
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.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

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

@ -2,7 +2,7 @@ package com.njzscloud.supervisory.biz.pojo.result;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

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

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

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.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

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

@ -13,8 +13,8 @@ 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.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizCompanyMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam;

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java
View File

@ -13,8 +13,8 @@ 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.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizDriverMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizDriverEntity;
import com.njzscloud.supervisory.biz.pojo.param.AddDriverParam;

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

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.core.ex.Exceptions;
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.constant.AuditStatus;
import com.njzscloud.supervisory.biz.mapper.BizProjectMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizProjectEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult;

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

@ -13,8 +13,8 @@ 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.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizTruckMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity;
import com.njzscloud.supervisory.biz.pojo.param.SearchTruckParam;

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/constant/Constant.java 100644
View File

@ -0,0 +1,5 @@
package com.njzscloud.supervisory.constant;
public interface Constant {
String ROLE_SHORT_BARGE = "ROLE_SHORT_BARGE";
}

0
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/constant/.gitkeep 100644
View File

44
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/controller/CustomerController.java 100644
View File

@ -0,0 +1,44 @@
package com.njzscloud.supervisory.customer.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.customer.pojo.param.SearchCustomerParam;
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
import com.njzscloud.supervisory.customer.service.CustomerService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* 客户管理
*/
@RestController
@RequestMapping("/customer")
@RequiredArgsConstructor
public class CustomerController {
private final CustomerService customerService;
/**
* 客户分页查询
*/
@GetMapping("/paging")
public R<PageResult<SearchCustomerResult>> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
return R.success(customerService.paging(pageParam, searchCustomerParam));
}
/**
* 禁启用短驳权限
*/
@GetMapping("/short_barge")
public R<?> shortBarge(
@RequestParam("enable") Boolean enable,
@RequestParam("customerId") Long customerId
) {
customerService.shortBarge(enable, customerId);
return R.success();
}
}

18
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/mapper/CustomerMapper.java 100644
View File

@ -0,0 +1,18 @@
package com.njzscloud.supervisory.customer.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface CustomerMapper {
IPage<SearchCustomerResult> paging(@Param("page") Page<SearchCustomerResult> page, @Param("ew") QueryWrapper<Object> ew);
List<ShortBargeInfoResult> shortBargeInfo(@Param("ew") QueryWrapper<Object> ew);
}

0
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/entity/.gitkeep 100644
View File

22
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/param/SearchCustomerParam.java 100644
View File

@ -0,0 +1,22 @@
package com.njzscloud.supervisory.customer.pojo.param;
import com.njzscloud.supervisory.biz.constant.BizObj;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class SearchCustomerParam {
/**
* 业务对象
*/
private BizObj bizObj;
/**
* 客户名称
*/
private String customerName;
}

104
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCompanyResult.java 100644
View File

@ -0,0 +1,104 @@
package com.njzscloud.supervisory.customer.pojo.result;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
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 SearchCompanyResult {
/**
* 公司id
*/
private Long id;
/**
* 统一社会信用代码
*/
private String uscc;
/**
* 公司名称
*/
private String companyName;
/**
* 营业执照
*/
private String businessLicense;
/**
* 营业执照开始时间
*/
private LocalDateTime licenseStartTime;
/**
* 营业执照结束时间
*/
private LocalDateTime licenseEndTime;
/**
* 法人
*/
private String legalRepresentative;
/**
* 省份
*/
private String province;
/**
* 城市
*/
private String city;
/**
* 区县
*/
private String area;
/**
* 乡镇
*/
private String town;
/**
* 省份名称
*/
private String provinceName;
/**
* 城市名称
*/
private String cityName;
/**
* 区县名称
*/
private String areaName;
/**
* 乡镇名称
*/
private String townName;
/**
* 详细地址
*/
private String address;
/**
* 经度
*/
private Double lng;
/**
* 纬度
*/
private Double lat;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phone;
/**
* 审核状态
*/
private AuditStatus auditStatus;
/**
* 审核备注
*/
private String auditMemo;
}

58
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java 100644
View File

@ -0,0 +1,58 @@
package com.njzscloud.supervisory.customer.pojo.result;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.sys.user.contant.Gender;
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 SearchCustomerResult {
/**
* Id
*/
private Long id;
/**
* 客户名称
*/
private String customerName;
/**
* 头像
*/
private String avatar;
/**
* 性别
*/
private Gender gender;
/**
* 邮箱
*/
private String email;
/**
* 客户手机号
*/
private String customerPhone;
/**
* 业务对象
*/
private BizObj bizObj;
/**
* 注册时间
*/
private LocalDateTime regdate;
/**
* 是否允许短驳
*/
private Boolean shortBarge;
/**
* 公司信息
*/
private SearchCompanyResult company;
}

15
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/ShortBargeInfoResult.java 100644
View File

@ -0,0 +1,15 @@
package com.njzscloud.supervisory.customer.pojo.result;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ShortBargeInfoResult {
private Long userId;
private Boolean shortBarge;
}

95
njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java 100644
View File

@ -0,0 +1,95 @@
package com.njzscloud.supervisory.customer.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.core.utils.GroupUtil;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.customer.mapper.CustomerMapper;
import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam;
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
import com.njzscloud.supervisory.sys.user.service.UserRoleService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Slf4j
@Service
@RequiredArgsConstructor
public class CustomerService {
private final CustomerMapper customerMapper;
private final UserRoleService userRoleService;
public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
Page<SearchCustomerResult> page = pageParam.toPage();
page.addOrder(OrderItem.desc("b.regdate"), OrderItem.desc("a.id"));
String customerName = searchCustomerParam.getCustomerName();
QueryWrapper<Object> ew = Wrappers.query()
.and(StrUtil.isNotBlank(customerName), it ->
it.like("a.nickname", customerName)
.or().like("c.contacts", customerName)
.or().like("d.driver_name", customerName)
.or().like("c.company_name", customerName)
);
BizObj bizObj = searchCustomerParam.getBizObj();
if (bizObj != null) {
Assert.isTrue(bizObj == BizObj.GeRen
|| bizObj == BizObj.ChanFeiDanWei
|| bizObj == BizObj.QingYunGongSi
, () -> Exceptions.clierr("客户类型错误"));
if (bizObj == BizObj.GeRen) {
ew.eq("a.biz_obj", bizObj);
} else if (bizObj == BizObj.ChanFeiDanWei) {
ew.in("a.biz_obj", Stream.of(
BizObj.WuYe,
BizObj.ShiGongDanWei,
BizObj.ChaiQian,
BizObj.SheQu).map(BizObj::getVal).collect(Collectors.toList()));
} else if (bizObj == BizObj.QingYunGongSi) {
ew.in("a.biz_obj", Stream.of(
BizObj.QiYe,
BizObj.GeTi).map(BizObj::getVal).collect(Collectors.toList()));
}
} else {
ew.in("a.biz_obj", Stream.of(
BizObj.GeRen,
BizObj.WuYe,
BizObj.ShiGongDanWei,
BizObj.ChaiQian,
BizObj.SheQu,
BizObj.QiYe,
BizObj.GeTi).map(BizObj::getVal).collect(Collectors.toList()));
}
IPage<SearchCustomerResult> paging = customerMapper.paging(page, ew);
List<SearchCustomerResult> records = paging.getRecords();
if (CollUtil.isEmpty(records)) return PageResult.of(paging);
List<Long> collect = records.stream().map(SearchCustomerResult::getId).collect(Collectors.toList());
List<ShortBargeInfoResult> shortBargeInfoResults = customerMapper.shortBargeInfo(Wrappers.query()
.in("a.user_id", collect).groupBy("a.user_id"));
Map<Long, Boolean> map = GroupUtil.k_o(shortBargeInfoResults, ShortBargeInfoResult::getUserId, ShortBargeInfoResult::getShortBarge);
for (SearchCustomerResult record : records) {
record.setShortBarge(map.getOrDefault(record.getId(), false));
}
return PageResult.of(paging);
}
public void shortBarge(Boolean enable, Long customerId) {
userRoleService.shortBarge(enable, customerId);
}
}

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/geo/pojo/entity/GeoFenceConfigEntity.java
View File

@ -1,8 +1,10 @@
package com.njzscloud.supervisory.geo.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.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -15,7 +17,7 @@ import lombok.experimental.Accessors;
@Setter
@ToString
@Accessors(chain = true)
@TableName("geo_fence_config")
@TableName(value = "geo_fence_config", autoResultMap = true)
public class GeoFenceConfigEntity {
/**
@ -27,6 +29,7 @@ public class GeoFenceConfigEntity {
/**
* 地图配置
*/
private String config;
@TableField(typeHandler = JacksonTypeHandler.class)
private Object config;
}

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java
View File

@ -2,7 +2,7 @@ package com.njzscloud.supervisory.order.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.constant.AuditStatus;
import com.njzscloud.supervisory.order.contant.*;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/AuditOrderParam.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.order.pojo.param;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.order.pojo.param;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.order.contant.CheckStatus;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.order.pojo.result;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.goods.contant.MoneyStrategy;
import com.njzscloud.supervisory.order.contant.*;
import lombok.Getter;

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -20,8 +20,8 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.common.sn.support.SnUtil;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.pojo.entity.BizAuditConfigEntity;
import com.njzscloud.supervisory.biz.service.BizAuditConfigService;
import com.njzscloud.supervisory.order.contant.CheckStatus;
@ -327,6 +327,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
OrderInfoEntity orderInfo = this.getById(startTransportOrderParam.getOrderId());
Assert.notNull(orderInfo, () -> Exceptions.clierr("订单不存在"));
Assert.isTrue(orderInfo.getOrderStatus() == OrderStatus.YiJieDan, () -> Exceptions.clierr("当前订单状态，无法开始运输"));
Assert.isTrue(orderInfo.getAuditStatus() == AuditStatus.TongGuo, () -> Exceptions.clierr("当前订单未审核完成，无法开始运输"));
this.updateById(new OrderInfoEntity()
.setId(orderInfo.getId())
.setCargoPhoto(startTransportOrderParam.getCargoPhoto())

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/auth/pojo/result/MyResult.java
View File

@ -2,7 +2,7 @@ package com.njzscloud.supervisory.sys.auth.pojo.result;
import com.njzscloud.common.security.support.EndpointResource;
import com.njzscloud.common.security.support.MenuResource;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
import com.njzscloud.supervisory.sys.user.contant.Gender;
import lombok.Getter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/entity/UserEntity.java
View File

@ -1,7 +1,7 @@
package com.njzscloud.supervisory.sys.user.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.sys.user.contant.Gender;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/AddUserParam.java
View File

@ -3,7 +3,7 @@ package com.njzscloud.supervisory.sys.user.pojo.param;
import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.mvc.validator.Constrained;
import com.njzscloud.common.mvc.validator.ValidRule;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.sys.user.contant.Gender;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/param/UserRegisterParam.java
View File

@ -3,7 +3,7 @@ package com.njzscloud.supervisory.sys.user.pojo.param;
import cn.hutool.core.util.StrUtil;
import com.njzscloud.common.mvc.validator.Constrained;
import com.njzscloud.common.mvc.validator.ValidRule;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.sys.user.contant.Gender;
import lombok.Getter;
import lombok.Setter;

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/pojo/result/UserDetailResult.java
View File

@ -1,6 +1,6 @@
package com.njzscloud.supervisory.sys.user.pojo.result;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
import com.njzscloud.supervisory.sys.user.contant.Gender;
import lombok.Getter;

21
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserRoleService.java
View File

@ -6,6 +6,7 @@ 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.core.ex.Exceptions;
import com.njzscloud.supervisory.constant.Constant;
import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
import com.njzscloud.supervisory.sys.role.pojo.result.RoleDetailResult;
import com.njzscloud.supervisory.sys.role.service.RoleService;
@ -58,4 +59,24 @@ public class UserRoleService extends ServiceImpl<SysUserRoleMapper, SysUserRoleE
this.saveBatch(roleIds.stream().map(roleId -> new SysUserRoleEntity().setRoleId(roleId).setUserId(userId)).collect(Collectors.toList()));
}
@Transactional(rollbackFor = Exception.class)
public void shortBarge(Boolean enable, Long customerId) {
RoleEntity roleEntity = roleService.getOne(Wrappers.<RoleEntity>lambdaQuery().eq(RoleEntity::getRoleCode, Constant.ROLE_SHORT_BARGE));
if (roleEntity == null) {
roleEntity = new RoleEntity()
.setRoleCode(Constant.ROLE_SHORT_BARGE)
.setMemo("短驳角色")
.setRoleName("短驳角色");
roleService.save(roleEntity);
}
if (enable) {
SysUserRoleEntity sysUserRoleEntity = this.getOne(Wrappers.<SysUserRoleEntity>lambdaQuery().eq(SysUserRoleEntity::getUserId, customerId).eq(SysUserRoleEntity::getRoleId, roleEntity.getId()));
if (sysUserRoleEntity == null) {
this.save(new SysUserRoleEntity().setRoleId(roleEntity.getId()).setUserId(customerId));
}
} else {
this.remove(Wrappers.<SysUserRoleEntity>lambdaQuery().eq(SysUserRoleEntity::getUserId, customerId).eq(SysUserRoleEntity::getRoleId, roleEntity.getId()));
}
}
}

15
njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java
View File

@ -13,7 +13,7 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.contant.AuthWay;
import com.njzscloud.common.security.util.EncryptUtil;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.contant.BizObj;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.pojo.param.AddBizCompanyParam;
import com.njzscloud.supervisory.biz.service.BizCompanyService;
import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity;
@ -148,14 +148,21 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
String codeId = userRegisterParam.getAccount().getCodeId();
String code = userRegisterParam.getAccount().getCode();
Assert.isTrue(EncryptUtil.checkCode(codeId, code), () -> Exceptions.clierr("验证码错误"));
String phone = userRegisterParam.getAccount().getPhone();
UserAccountEntity one = userAccountService.getOne(Wrappers.<UserAccountEntity>lambdaQuery().eq(UserAccountEntity::getPhone, phone));
if (one != null) {
return SecurityUtil.registrationToken(phone, AuthWay.PHONE);
} else {
AddUserParam addUserParam = BeanUtil.copyProperties(userRegisterParam, AddUserParam.class);
addUserParam.setAccount(BeanUtil.copyProperties(userRegisterParam.getAccount(), AddUserAccountParam.class));
this.add(addUserParam);
return SecurityUtil.registrationToken(phone, AuthWay.PHONE);
}
}
AddUserParam addUserParam = BeanUtil.copyProperties(userRegisterParam, AddUserParam.class);
addUserParam.setAccount(BeanUtil.copyProperties(userRegisterParam.getAccount(), AddUserAccountParam.class));
Long userId = this.add(addUserParam);
if (bizObj == BizObj.GeRen) {
return SecurityUtil.registrationToken(userRegisterParam.getAccount().getPhone(), AuthWay.PHONE);
}
UserRegisterParam.Company company = userRegisterParam.getCompany();
Assert.notNull(company, "公司信息不能为空");

66
njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml 100644
View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njzscloud.supervisory.customer.mapper.CustomerMapper">
<resultMap id="SearchCompanyResultMap" autoMapping="true" type="com.njzscloud.supervisory.customer.pojo.result.SearchCompanyResult">
<result column="contacts_phone" property="phone"/>
<result column="company_id" property="id"/>
<result column="audit_status" property="auditStatus" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
</resultMap>
<resultMap id="SearchCustomerResultMap" autoMapping="true" type="com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult">
<result column="biz_obj" property="bizObj" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
<result column="gender" property="gender" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
<association property="company" resultMap="SearchCompanyResultMap"/>
</resultMap>
<select id="paging" resultMap="SearchCustomerResultMap">
SELECT a.id,
IF(c.contacts IS NOT NULL, c.contacts, IF(d.driver_name IS NOT NULL, d.driver_name, a.nickname)) customer_name,
IF(c.phone IS NOT NULL, c.phone, IF(d.phone IS NOT NULL, d.phone, a.phone)) customer_phone,
a.avatar,
a.gender,
a.email,
a.biz_obj,
b.regdate,
c.id company_id,
c.uscc,
c.company_name,
c.business_license,
c.license_start_time,
c.license_end_time,
c.legal_representative,
c.province,
c.city,
c.area,
c.town,
c.province_name,
c.city_name,
c.area_name,
c.town_name,
c.address,
c.lng,
c.lat,
c.contacts,
c.phone contacts_phone,
c.audit_status,
c.audit_memo
FROM sys_user a
INNER JOIN sys_user_account b ON b.user_id = a.id AND b.deleted = 0
LEFT JOIN biz_company c ON c.user_id = a.id AND c.station = 0 AND c.deleted = 0
LEFT JOIN biz_driver d ON d.user_id = a.id AND d.deleted = 0
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
<select id="shortBargeInfo"
resultType="com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult">
SELECT a.user_id,
IF(COUNT(1) > 0, 1, 0) short_barge
FROM sys_user_role a
INNER JOIN sys_role b ON b.id = a.role_id AND b.role_code = 'ROLE_SHORT_BARGE' AND b.deleted = 0
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
</mapper>