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

大屏

localizer
lzq 2025-10-25 15:42:47 +08:00
parent 356aff0f5b
commit 0d1b9f679c
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
njzscloud-localizer-svr/src/main/resources/application-dev.yml
View File

@ -9,4 +9,4 @@ localizer:
enabled: true enabled: true
boss-threads: 1 boss-threads: 1
worker-threads: 1 worker-threads: 1
port: 30100 port: 10088

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

@ -22,7 +22,6 @@ import com.njzscloud.supervisory.customer.mapper.CustomerMapper;
import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam; import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam;
import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult; import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult; import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
import com.njzscloud.supervisory.order.contant.OrderStatus;
import com.njzscloud.supervisory.sys.user.service.UserRoleService; import com.njzscloud.supervisory.sys.user.service.UserRoleService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -42,6 +41,12 @@ public class CustomerService {
private final UserRoleService userRoleService; private final UserRoleService userRoleService;
private final BizAuditConfigService bizAuditConfigService; private final BizAuditConfigService bizAuditConfigService;
public static List<String> mergeLists(List<String> list1, List<String> list2) {
Set<String> set = new HashSet<>(list1);
set.addAll(list2);
return new ArrayList<>(set);
}
public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) { public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
Page<SearchCustomerResult> page = pageParam.toPage(); Page<SearchCustomerResult> page = pageParam.toPage();
page.addOrder(OrderItem.desc("b.regdate"), OrderItem.desc("a.id")); page.addOrder(OrderItem.desc("b.regdate"), OrderItem.desc("a.id"));
@ -90,7 +95,7 @@ public class CustomerService {
UserDetail userDetail = SecurityUtil.loginUser(); UserDetail userDetail = SecurityUtil.loginUser();
Set<String> roles = userDetail.getRoles(); Set<String> roles = userDetail.getRoles();
if (CollUtil.isNotEmpty(roles) && roles.contains(ROLE_JG)) { if (CollUtil.isNotEmpty(roles) && !SecurityUtil.isAdmin() && roles.contains(ROLE_JG)) {
List<String> areaList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles)) List<String> areaList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles))
.stream().map(BizAuditConfigEntity::getArea).distinct().collect(Collectors.toList()); .stream().map(BizAuditConfigEntity::getArea).distinct().collect(Collectors.toList());
List<String> cityList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles)) List<String> cityList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles))
@ -112,12 +117,6 @@ public class CustomerService {
return PageResult.of(paging); return PageResult.of(paging);
} }
public static List<String> mergeLists(List<String> list1, List<String> list2) {
Set<String> set = new HashSet<>(list1);
set.addAll(list2);
return new ArrayList<>(set);
}
public void shortBarge(Boolean enable, Long customerId) { public void shortBarge(Boolean enable, Long customerId) {
userRoleService.shortBarge(enable, customerId); userRoleService.shortBarge(enable, customerId);
} }

3
njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml
View File

@ -277,8 +277,7 @@
INNER JOIN goods_category e ON e.id = d.goods_category_id AND e.deleted = 0 INNER JOIN goods_category e ON e.id = d.goods_category_id AND e.deleted = 0
INNER JOIN biz_company f ON f.id = a.station_id AND f.deleted = 0 INNER JOIN biz_company f ON f.id = a.station_id AND f.deleted = 0
INNER JOIN biz_company g ON g.id = a.trans_company_id AND g.deleted = 0 INNER JOIN biz_company g ON g.id = a.trans_company_id AND g.deleted = 0
WHERE a.order_status = 'YiWanCheng' WHERE a.deleted = 0
AND a.deleted = 0
ORDER BY a.create_time DESC ORDER BY a.create_time DESC
LIMIT 50 LIMIT 50
</select> </select>