🔥 享受敲代码的美好时光,处理地图数据控制逻辑

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java

@@ -1,17 +1,14 @@
 package com.cloud.kicc.common.security.service.impl;
 
-import com.cloud.kicc.system.api.feign.RemoteUserService;
-import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.CacheConstants;
 import com.cloud.kicc.common.core.constant.SecurityConstants;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.service.KiccUserDetailsService;
+import com.cloud.kicc.system.api.entity.User;
+import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
 import org.springframework.security.core.userdetails.UserDetails;
 
 /**

kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java

@@ -1,17 +1,13 @@
 package com.cloud.kicc.common.security.service.impl;
 
-import com.cloud.kicc.system.api.feign.RemoteUserService;
-import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.common.core.api.R;
-import com.cloud.kicc.common.core.constant.CacheConstants;
 import com.cloud.kicc.common.core.constant.SecurityConstants;
-import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.service.KiccUserDetailsService;
+import com.cloud.kicc.system.api.entity.User;
+import com.cloud.kicc.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.userdetails.UserDetails;
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/HospitalController.java

@@ -41,6 +41,7 @@ public class HospitalController {
         return new LambdaQueryWrapper<Hospital>()
                 .like(StrUtil.isNotBlank(hospital.getName()), Hospital::getName, hospital.getName())
                 .eq(StrUtil.isNotBlank(hospital.getType()), Hospital::getType, hospital.getType())
+                .eq(StrUtil.isNotBlank(hospital.getMapNotify()), Hospital::getMapNotify, hospital.getMapLng())
                 .between(StrUtil.isNotBlank(hospital.getBeginTime()) && StrUtil.isNotBlank(hospital.getEndTime()), Hospital::getCreateTime, hospital.getBeginTime(), hospital.getEndTime())
                 .orderByAsc(Hospital::getCreateTime);
     }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@@ -22,6 +22,7 @@ import com.cloud.kicc.system.service.UserRoleService;
 import com.cloud.kicc.system.service.UserService;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 import com.pig4cloud.plugin.excel.annotation.Sheet;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -69,6 +70,13 @@ public class UserController {
         return R.ok(userIPage.getRecords(), userIPage.getTotal());
     }
 
+    @GetMapping("/getCourierUserList")
+    @ApiOperation(value = "获取全部快递员集合")
+    public R getCourierUserList() {
+        List<User> userList = userService.getCourierUserList();
+        return R.ok(userList);
+    }
+
     @GetMapping("/info")
     public R info() {
         return R.ok(userService.getCurrentUserInfo());

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cloud.kicc.system.api.entity.Dept;
 import com.cloud.kicc.system.api.entity.User;
 
+import java.util.List;
+
 /**
  *<p>
  * 用户信息表 Mapper 接口
@@ -21,4 +23,11 @@ public interface UserMapper extends BaseMapper<User> {
      * @return 结果
      */
     User selectUseByDept(Dept dept);
+
+    /**
+     * 获取全部快递员集合
+     * @return List<User>
+     */
+    List<User> getCourierUserList();
+
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java

@@ -49,4 +49,11 @@ public interface UserService extends IService<User> {
      * @return User
      */
     User getCurrentUserInfo();
+
+    /**
+     * 获取全部快递员集合
+     * @return List<User>
+     */
+    List<User> getCourierUserList();
+
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java

@@ -159,6 +159,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
     }
 
+    @Override
+    public List<User> getCourierUserList() {
+        return baseMapper.getCourierUserList();
+    }
 
     @Override
     public String importUser(List<User> userList, Boolean isUpdateSupport) {

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

@@ -42,4 +42,8 @@
         </where>
         limit 1
     </select>
+
+    <select id="getCourierUserList" resultType="User">
+        select * from sys_user u,common_map_logistic m where u.id != m.courier_user_id
+    </select>
 </mapper>

kicc-ui

@@ -1 +1 @@
-Subproject commit 067ded646d544e739ad36858af466995eba569e7
+Subproject commit 7673f885a168321ca3f052c29a44c801148b9867