From 12c86527701af61593ab16aa322c3f7dd08aa019 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:34:33 +0800
Subject: [PATCH] 报备、添加运维人员增加账号
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 60cf212..40f9093 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,9 +1,14 @@
package com.ycl.platform.service.impl;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.ycl.platform.base.BaseSelect;
+import com.ycl.platform.domain.entity.Region;
+import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.domain.form.BatchEditPointForm;
+import com.ycl.platform.mapper.RegionMapper;
+import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
@@ -15,12 +20,13 @@
import com.ycl.platform.domain.query.YwPointQuery;
import java.util.List;
-import com.ycl.system.entity.SysDept;
+import com.ycl.system.entity.SysUser;
import com.ycl.system.service.ISysDeptService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.utils.SecurityUtils;
+import enumeration.general.RegionLevelEnum;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +34,6 @@
import java.util.ArrayList;
import java.util.Objects;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils;
@@ -44,11 +49,11 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
private final YwPointMapper ywPointMapper;
- @Autowired
- private ISysDeptService deptService;
- @Autowired
- private YwUnitService unitService;
+ private final ISysDeptService deptService;
+ private final YwUnitService unitService;
private final YwUnitMapper ywUnitMapper;
+ private final RegionMapper regionMapper;
+ private final YwPeopleMapper ywPeopleMapper;
/**
* 娣诲姞
@@ -194,4 +199,29 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result select(String keyword) {
+ Long userId = SecurityUtils.getUserId();
+ // 鑾峰彇褰撳墠杩愮淮浜哄憳鐨勮繍缁村崟浣�
+ YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper)
+ .eq(YwPeople::getUserId, userId)
+ .one();
+ Integer unitId = null;
+ if (Objects.nonNull(people)) {
+ unitId = people.getBelongUnit();
+ }
+
+ List<Region> list = new LambdaQueryChainWrapper<>(regionMapper)
+ .eq(Region::getRegionLevel, RegionLevelEnum.STREET)
+ .like(Region::getFullName, keyword)
+ .list();
+ List<BaseSelect> data = list.stream().map(item -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(item.getId());
+ baseSelect.setValue(item.getFullName());
+ return baseSelect;
+ }).collect(Collectors.toList());
+ return Result.ok().data(data);
+ }
}
--
Gitblit v1.8.0