perf: 完善用户查询。

fit: 新增模型线索实体、service、mapper

src/main/java/com/biutag/supervision/controller/sensitivePerception/ModelController.java

@@ -6,22 +6,29 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.common.UserContextHolder;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.entity.Model;
+import com.biutag.supervision.pojo.entity.ModelClass;
 import com.biutag.supervision.pojo.model.UserAuth;
 import com.biutag.supervision.pojo.param.ModelQueryParam;
+import com.biutag.supervision.pojo.vo.ModelTree;
+import com.biutag.supervision.service.ModelClassService;
 import com.biutag.supervision.service.ModelService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
-@RequestMapping("model")
+@RequestMapping("models")
 @RequiredArgsConstructor
 @RestController
 public class ModelController {
 
     private final ModelService modelService;
 
+    private final ModelClassService modelClassService;
+
     @GetMapping
     public Result<Page<Model>> list(ModelQueryParam queryParam) {
         LambdaQueryWrapper<Model> queryWrapper = new LambdaQueryWrapper<>();
@@ -33,6 +40,24 @@ public class ModelController {
         return Result.success(modelService.page(new Page<>(queryParam.getCurrent(), queryParam.getSize()), queryWrapper));
     }
 
+    @GetMapping("tree")
+    public Result<List<ModelTree>> tree() {
+        List<ModelClass> modelClasses = modelClassService.list();
+        List<Model> models = modelService.list();
+        List<ModelTree> list = new ArrayList<>();
+        list.addAll(modelClasses.stream().map(item -> {
+            ModelTree node = new ModelTree();
+            node.setValue(item.getId());
+            node.setLabel(item.getName());
+            node.setType("modelClass");
+            List<ModelTree> children = models.stream().filter(model -> item.getId().equals(model.getClassId())).map(ModelTree::of).toList();
+            node.setChildren(children);
+            return node;
+        }).toList());
+        list.addAll(models.stream().filter(model -> Objects.isNull(model.getClassId())).map(ModelTree::of).toList());
+        return Result.success(list);
+    }
+
     @PostMapping
     public Result<Void> add(@RequestBody Model model) {
         model.setCreateTime(LocalDateTime.now());

src/main/java/com/biutag/supervision/controller/system/PoliceController.java

@@ -51,6 +51,11 @@ public class PoliceController {
         return Result.success(policeService.updateById(police));
     }
 
+    @DeleteMapping("{id}")
+    public Result<Boolean> del(@PathVariable String id) {
+        return Result.success(policeService.removeById(id));
+    }
+
     @GetMapping("{departId}/all")
     public Result<List<SupPolice>> all(@PathVariable String departId) {
         return Result.success(policeService.listAllByDepartId(departId));

src/main/java/com/biutag/supervision/mapper/ModelClueMapper.java

@@ -0,0 +1,8 @@
+package com.biutag.supervision.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.supervision.pojo.entity.ModelClue;
+
+public interface ModelClueMapper extends BaseMapper<ModelClue> {
+
+}

src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java

@@ -0,0 +1,43 @@
+package com.biutag.supervision.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Setter
+@Getter
+public class ModelClue {
+
+    // 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    // 
+    @TableField("model_id")
+    private Integer modelId;
+
+    // 涉及单位
+    @TableField("involve_depart_name")
+    private String involveDepartName;
+
+    // 涉及人员
+    @TableField("involve_personnel_name")
+    private String involvePersonnelName;
+
+    // 预警内容
+    @TableField("thing_desc")
+    private String thingDesc;
+
+    // 分发状态
+    @TableField("distribution_staus")
+    private String distributionStaus;
+
+    // 
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+}

src/main/java/com/biutag/supervision/pojo/entity/SupPolice.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 @Setter
 @Getter
@@ -138,7 +138,7 @@ public class SupPolice {
 
     // 入职日期
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
-    private LocalDateTime employmentDate;
+    private LocalDate employmentDate;
 
     // 警员角色
     private String policeRole;

src/main/java/com/biutag/supervision/pojo/vo/ModelTree.java

@@ -0,0 +1,34 @@
+package com.biutag.supervision.pojo.vo;
+
+import com.biutag.supervision.pojo.entity.Model;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wxc
+ * @date 2024/10/15
+ */
+@Setter
+@Getter
+public class ModelTree {
+
+    private Integer value;
+
+    private String label;
+
+    private String type;
+
+    private List<ModelTree> children = new ArrayList<>();
+
+    public static ModelTree of(Model model) {
+        ModelTree child = new ModelTree();
+        child.setValue(model.getId());
+        child.setLabel(model.getModelName());
+        child.setType("model");
+        return child;
+    }
+
+}

src/main/java/com/biutag/supervision/service/BaseUserService.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -33,6 +34,14 @@ public class BaseUserService extends ServiceImpl<BaseUserMapper, BaseUser> {
         LambdaQueryWrapper<BaseUser> queryWrapper = new LambdaQueryWrapper<BaseUser>()
                 .like(StrUtil.isNotBlank(queryParam.getUserName()), BaseUser::getUserName, queryParam.getUserName())
                 .like(StrUtil.isNotBlank(queryParam.getNickName()), BaseUser::getNickName, queryParam.getNickName());
+        if (Objects.nonNull(queryParam.getRoleId()) && !queryParam.getRoleId().isEmpty()) {
+            List<String> userIds = roleUserService.list(new LambdaQueryWrapper<BaseRoleUser>()
+                    .in(BaseRoleUser::getRoleId, queryParam.getRoleId())).stream().map(BaseRoleUser::getUserId).toList();
+            if (userIds.isEmpty()) {
+                return new Page<UserModel>().setTotal(0).setRecords(new ArrayList<>());
+            }
+            queryWrapper.in(BaseUser::getUserId, userIds);
+        }
         Page<BaseUser> baseUserPage = page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         if (baseUserPage.getRecords().isEmpty()) {
             return new Page<UserModel>().setRecords(new ArrayList<>()).setTotal(0);

src/main/java/com/biutag/supervision/service/ModelClueService.java

@@ -0,0 +1,11 @@
+package com.biutag.supervision.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.pojo.entity.ModelClue;
+import com.biutag.supervision.mapper.ModelClueMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
+
+}

src/main/resources/mapper/SupPoliceMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryPage" resultType="com.biutag.supervision.pojo.model.PoliceModel">
         select p.id, p.name, p.emp_no, p.id_code, p.job, p.mobile, p.person_status, p.org_id, p.avatar_url, p.created_at, p.updated_at,
-               p.position, p.person_type, p.marital_status, p.have_children, p.education,
+               p.position, p.person_type, p.police_role, p.employment_date,
                d.name depart_name, d.short_name depart_short_name, d1.short_name parent_depart_short_name
             from sup_police p
                 left join sup_depart d on p.org_id = d.id