upd：

1、修复定位接口并合并

app/src/main/java/com/yiring/app/domain/location/LocationTag.java

@@ -113,8 +113,7 @@ public class LocationTag implements Serializable {
     @SuppressWarnings({ "unused" })
     public enum Type {
         BTT01("蓝牙人员定位卡"),
-        BTT02("蓝牙车辆定位器"),
-        BTT11("蓝牙人员定位卡（超薄）");
+        BTT02("蓝牙车辆定位器");
 
         final String text;
 

app/src/main/java/com/yiring/app/excel/location/LocationTagImportExcel.java

@@ -30,12 +30,8 @@ public class LocationTagImportExcel implements Serializable {
     @ExcelColumn(index = 1)
     String type;
 
-    // 实体类型
-    @ExcelColumn(index = 2)
-    String entityType;
-
     // 设备编码
-    @ExcelColumn(index = 3)
+    @ExcelColumn(index = 2)
     String imei;
 
     public LocationTag transform() {

app/src/main/java/com/yiring/app/param/location/LocationTagAddParam.java

@@ -40,7 +40,11 @@ public class LocationTagAddParam implements Serializable {
             .code(this.code)
             .type(this.type)
             .imei(this.imei)
+            .used(false)
+            .silent(false)
+            .volt(0)
             .createTime(LocalDateTime.now())
+            .updateTime(LocalDateTime.now())
             .build();
     }
 }

app/src/main/java/com/yiring/app/param/location/zy/ZyLocationTagAddParam.java

@@ -42,9 +42,6 @@ public class ZyLocationTagAddParam implements Serializable {
 
     public static ZyLocationTagAddParam transform(LocationTag locationTag, Integer orgId) {
         String entityType = StrUtil.equals(locationTag.getType().name(), "BTT02") ? "car" : "staff";
-        if (StrUtil.equals(locationTag.getType().name(), "BTT11")) {
-            locationTag.setType(LocationTag.Type.BTT01);
-        }
         return ZyLocationTagAddParam
             .builder()
             .orgId(orgId)
@@ -62,9 +59,6 @@ public class ZyLocationTagAddParam implements Serializable {
             .stream()
             .map(locationTagImportExcel -> {
                 String entityType = StrUtil.equals(locationTagImportExcel.getType(), "BTT02") ? "car" : "staff";
-                if (StrUtil.equals(locationTagImportExcel.getType(), "BTT11")) {
-                    locationTagImportExcel.setType(LocationTag.Type.BTT01.name());
-                }
                 return ZyLocationTagAddParam
                     .builder()
                     .entityType(entityType)

app/src/main/java/com/yiring/app/service/location/impl/LocationTagServiceImpl.java

@@ -181,15 +181,15 @@ public class LocationTagServiceImpl implements LocationTagService {
             List<Predicate> predicates = ListUtil.toList();
 
             if (StrUtil.isNotEmpty(param.getCode())) {
-                cb.like(root.get(LocationTag.Fields.code), "%" + param.getCode() + "%");
+                predicates.add(cb.like(root.get(LocationTag.Fields.code), "%" + param.getCode() + "%"));
             }
 
             if (ObjectUtil.isNotEmpty(param.getType())) {
-                cb.equal(root.get(LocationTag.Fields.type), param.getType());
+                predicates.add(cb.equal(root.get(LocationTag.Fields.type), param.getType()));
             }
 
             if (ObjectUtil.isNotEmpty(param.getSilent())) {
-                cb.equal(root.get(LocationTag.Fields.silent), param.getSilent());
+                predicates.add(cb.equal(root.get(LocationTag.Fields.silent), param.getSilent()));
             }
 
             Order order = cb.desc(root.get(LocationTag.Fields.createTime));

app/src/main/java/com/yiring/app/vo/location/LocationTagVo.java

@@ -62,6 +62,7 @@ public class LocationTagVo implements Serializable {
                     .type(locationTag.getType())
                     .silent(locationTag.getSilent())
                     .volt(locationTag.getVolt())
+                    .updateTime(locationTag.getUpdateTime())
                     .build()
             )
             .collect(Collectors.toList());

basic-auth/src/main/java/com/yiring/auth/domain/dept/Department.java

@@ -5,6 +5,7 @@ import com.yiring.auth.domain.post.Post;
 import com.yiring.auth.domain.user.User;
 import com.yiring.common.annotation.FieldMapping;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
@@ -82,6 +83,12 @@ public class Department implements Serializable {
     @Comment("树节点标识")
     String tree;
 
+    @Comment("更新时间")
+    LocalDateTime updateTime;
+
+    @Comment("创建时间")
+    LocalDateTime createTime;
+
     @Comment("岗位集合")
     @Builder.Default
     @ToString.Exclude

basic-auth/src/main/java/com/yiring/auth/param/dept/DepartmentAddParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.param.dept;
+
+import com.yiring.auth.domain.dept.Department;
+import com.yiring.auth.domain.user.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 部门新增入参
+ * @author LJ-2204
+ * @date 2022/4/19
+ */
+
+@ApiModel("DepartmentAddParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DepartmentAddParam implements Serializable {
+
+    private static final long serialVersionUID = -9143398676976586072L;
+
+    @ApiModelProperty(value = "上级部门", example = "1")
+    @NotNull
+    Long pid;
+
+    @ApiModelProperty(value = "名称", example = "Java")
+    @NotNull
+    String name;
+
+    @ApiModelProperty(value = "负责人", example = "1")
+    Long leaderId;
+
+    @ApiModelProperty(value = "部门状态", example = "1")
+    Boolean enable;
+
+    public Department transform() {
+        return Department
+            .builder()
+            .pid(this.pid)
+            .name(this.name)
+            .leader(User.builder().id(this.leaderId).build())
+            .enable(this.enable)
+            .createTime(LocalDateTime.now())
+            .updateTime(LocalDateTime.now())
+            .build();
+    }
+}

basic-auth/src/main/java/com/yiring/auth/param/user/UserByNameParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.param.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 用户名称联想
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@ApiModel("UserByNameParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class UserByNameParam implements Serializable {
+
+    private static final long serialVersionUID = -8021455509303095719L;
+
+    @ApiModelProperty(value = "真实姓名", example = "刘浪")
+    String name;
+}

basic-auth/src/main/java/com/yiring/auth/service/dept/DepartmentService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.dept;
+
+import com.yiring.auth.param.dept.DepartmentAddParam;
+import com.yiring.common.core.Result;
+
+/**
+ * 部门管理
+ * @author LJ-2204
+ * @date 2022/4/19
+ */
+public interface DepartmentService {
+    /**
+     * 新增部门
+     * @param param DepartmentAddParam
+     * @return Result<String>
+     */
+    Result<String> addDepartment(DepartmentAddParam param);
+}

basic-auth/src/main/java/com/yiring/auth/service/dept/impl/DepartmentServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.dept.impl;
+
+import com.yiring.auth.domain.dept.Department;
+import com.yiring.auth.domain.dept.DepartmentRepository;
+import com.yiring.auth.param.dept.DepartmentAddParam;
+import com.yiring.auth.service.dept.DepartmentService;
+import com.yiring.auth.service.zy.ZyHttpService;
+import com.yiring.common.core.Result;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 部门管理
+ * @author LJ-2204
+ * @date 2022/4/19
+ */
+
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class DepartmentServiceImpl implements DepartmentService {
+
+    @Resource
+    DepartmentRepository departmentRepository;
+
+    @Resource
+    ZyHttpService zyHttpService;
+
+    @Override
+    public Result<String> addDepartment(DepartmentAddParam param) {
+        Department department = param.transform();
+        departmentRepository.save(department);
+        return Result.ok();
+    }
+}

basic-auth/src/main/java/com/yiring/auth/service/user/UserService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.user;
+
+import com.yiring.auth.param.user.UserByNameParam;
+import com.yiring.auth.vo.user.UserAutoVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.vo.PageVo;
+
+/**
+ * 用户
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+public interface UserService {
+    /**
+     * 通过用户名查询
+     * @param param UserByNameParam
+     * @return Result<PageVo<UserAutoVo>>
+     */
+    Result<PageVo<UserAutoVo>> findUserByName(UserByNameParam param);
+}

basic-auth/src/main/java/com/yiring/auth/service/user/impl/UserServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.user.impl;
+
+import com.yiring.auth.domain.user.UserRepository;
+import com.yiring.auth.param.user.UserByNameParam;
+import com.yiring.auth.service.user.UserService;
+import com.yiring.auth.vo.user.UserAutoVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.vo.PageVo;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 用户
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class UserServiceImpl implements UserService {
+
+    @Resource
+    UserRepository userRepository;
+
+    @Override
+    public Result<PageVo<UserAutoVo>> findUserByName(UserByNameParam param) {
+        return null;
+    }
+}

basic-auth/src/main/java/com/yiring/auth/vo/user/UserAutoVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.vo.user;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 用户联想模型
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@ApiModel("UserAutoVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class UserAutoVo implements Serializable {
+
+    private static final long serialVersionUID = -8767805224176648753L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键", example = "1")
+    Long id;
+
+    @ApiModelProperty(value = "真实姓名", example = "超级用户")
+    String realName;
+}

basic-auth/src/main/java/com/yiring/auth/web/dept/DepartmentController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.web.dept;
+
+import com.yiring.auth.param.dept.DepartmentAddParam;
+import com.yiring.auth.service.dept.DepartmentService;
+import com.yiring.common.core.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 部门信息控制器
+ * @author LJ-2204
+ * @date 2022/4/19
+ */
+
+@Slf4j
+@Validated
+@Api(tags = "部门信息")
+@RestController
+@RequestMapping("/dept/")
+public class DepartmentController {
+
+    @Resource
+    DepartmentService departmentService;
+
+    @ApiOperation("新增部门")
+    @PostMapping("addDepartment")
+    public Result<String> addDepartment(@Valid DepartmentAddParam param) {
+        return departmentService.addDepartment(param);
+    }
+}

basic-auth/src/main/java/com/yiring/auth/web/user/UserController.java

@@ -8,8 +8,11 @@ import com.yiring.auth.domain.role.RoleRepository;
 import com.yiring.auth.domain.user.User;
 import com.yiring.auth.domain.user.UserRepository;
 import com.yiring.auth.param.IdsParam;
+import com.yiring.auth.param.user.UserByNameParam;
+import com.yiring.auth.service.user.UserService;
 import com.yiring.auth.util.Permissions;
 import com.yiring.auth.vo.permission.MenuVo;
+import com.yiring.auth.vo.user.UserAutoVo;
 import com.yiring.auth.vo.user.UserInfoVo;
 import com.yiring.auth.vo.user.UserVo;
 import com.yiring.common.core.Result;
@@ -57,6 +60,9 @@ public class UserController {
     @Resource
     RoleRepository roleRepository;
 
+    @Resource
+    UserService userService;
+
     @ApiOperation(value = "获取登录用户信息")
     @GetMapping("getUserInfo")
     public Result<UserInfoVo> getUserInfo() {
@@ -147,4 +153,10 @@ public class UserController {
         StpUtil.logout(id);
         throw new FailStatusException(Status.UNAUTHORIZED);
     }
+
+    @ApiOperation("联想查询(名称)")
+    @GetMapping
+    public Result<PageVo<UserAutoVo>> findUserByName(@Valid UserByNameParam param) {
+        return userService.findUserByName(param);
+    }
 }