增加开放查询字典接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -49,6 +49,19 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * wanghao  增加开放字典查询
+     * @param dictData
+     * @return
+     */
+    @GetMapping("/listByDictType")
+    public AjaxResult listByDictType(SysDictData dictData)
+    {
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        return success(list);
+    }
+
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -91,7 +91,10 @@ public class SysUser extends BaseEntity
 
 
     //wanghao 20241121 增加人员信息
+    @Excel(name = "身份证号", cellType = ColumnType.TEXT)
     private String idCard;
+
+    @Excel(name = "警号", cellType = ColumnType.TEXT)
     private String policeNo;
 
     public SysUser()

ruoyi-zzb/src/main/java/com/ruoyi/zzb/base/controller/BaseInfoController.java

@@ -1,11 +1,89 @@
 package com.ruoyi.zzb.base.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.zzb.base.domain.req.QueryPersonInfoVO;
+import com.ruoyi.zzb.base.service.BaseInfoService;
+import com.ruoyi.zzb.common.RspResult;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
+
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 @Slf4j
 @RestController
-@RequestMapping("/zhzg/api/baseInfo")
+@RequestMapping("/api/baseInfo")
 public class BaseInfoController {
+
+    @Autowired
+    private BaseInfoService baseInfoService;
+
+
+    @PostMapping("/findUserByUserInfo")
+    public JSONObject findUserByUserInfo(HttpServletResponse response, HttpServletRequest request, @RequestBody QueryPersonInfoVO queryPersonInfoVO) {
+        try {
+//
+//            userService.checkUserDataScope(userId);
+//            AjaxResult ajax = AjaxResult.success();
+//            List<SysRole> roles = roleService.selectRoleAll();
+//            ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+//            ajax.put("posts", postService.selectPostAll());
+//            if (StringUtils.isNotNull(userId))
+//            {
+//                SysUser sysUser = userService.selectUserById(userId);
+//                ajax.put(AjaxResult.DATA_TAG, sysUser);
+//                ajax.put("postIds", postService.selectPostListByUserId(userId));
+//                ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+//            }
+//            return ajax;
+
+
+            JSONObject result = baseInfoService.findUserByUserInfo(queryPersonInfoVO);
+            return RspResult.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return RspResult.error(e.getMessage());
+        }
+
+    }
+
+
+    @PostMapping("/findUserModels")
+    public JSONObject findUserModels(HttpServletResponse response, HttpServletRequest request, @RequestBody QueryPersonInfoVO queryPersonInfoVO) {
+        try {
+            JSONObject result = baseInfoService.findUserModels(queryPersonInfoVO);
+            return RspResult.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return RspResult.error(e.getMessage());
+        }
+    }
+//
+//
+//    @PostMapping("/findUserCurrentModelDetail")
+//    public JSONObject findUserCurrentModelDetail(HttpServletResponse response, HttpServletRequest request, @RequestBody QueryPersonInfoVO queryPersonInfoVO) {
+//        try {
+//            JSONObject result = baseInfoService.findUserCurrentModelDetail(queryPersonInfoVO);
+//            return RspResult.success(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return RspResult.error(e.getMessage());
+//        }
+//    }
+
+
+
+
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/base/domain/BasePersonInfo.java

@@ -1,20 +1,27 @@
 package com.ruoyi.zzb.base.domain;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
 @TableName("ZZB_BASE_PERSON_INFO")
 public class BasePersonInfo {
 
+    @TableId(type = IdType.ASSIGN_ID)
     private String userId;
     private String name;
     private String idcard;
@@ -27,13 +34,15 @@ public class BasePersonInfo {
 
     @TableLogic
     private String status;
+
+    @JsonIgnore
     private String password;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String createTime;
+    private Date createTime;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String updateTime;
+    private Date updateTime;
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/base/service/BaseInfoService.java

@@ -6,11 +6,16 @@ import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.zzb.base.domain.BasePersonInfo;
+import com.ruoyi.zzb.base.domain.BasePersonModule;
+import com.ruoyi.zzb.base.domain.req.QueryPersonInfoVO;
 import com.ruoyi.zzb.base.mapper.BasePersonInfoMapper;
+import com.ruoyi.zzb.base.mapper.BasePersonModuleMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @Slf4j
 @DataSource(value = DataSourceType.SLAVE)
@@ -20,21 +25,64 @@ public class BaseInfoService {
     @Autowired
     private BasePersonInfoMapper basePersonInfoMapper;
 
+    @Autowired
+    private BasePersonModuleMapper basePersonModuleMapper;
 
-
-    public JSONObject findUserInfoInfoByUserId(String idno){
-
+    public JSONObject findUserByUserInfo(QueryPersonInfoVO queryPersonInfoVO){
         JSONObject resultData = new JSONObject();
-        //查询条件
         LambdaQueryWrapper<BasePersonInfo> queryWrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotEmpty(idno))
-        {
-            queryWrapper.like(BasePersonInfo::getIdcard,idno);
+
+        if(!StringUtils.isEmpty(queryPersonInfoVO.getUserId())){
+            queryWrapper.eq(BasePersonInfo::getUserId,queryPersonInfoVO.getUserId());
+        }else if(!StringUtils.isEmpty(queryPersonInfoVO.getIdCard())){
+            queryWrapper.eq(BasePersonInfo::getIdcard,queryPersonInfoVO.getIdCard());
+        }else if(!StringUtils.isEmpty(queryPersonInfoVO.getPoliceNo())){
+            queryWrapper.eq(BasePersonInfo::getPoliceNo,queryPersonInfoVO.getPoliceNo());
+        }else{
+            throw new RuntimeException("查询条件不能均为空,当前入参:"+JSONObject.toJSONString(queryPersonInfoVO));
         }
+
         BasePersonInfo personInfo =basePersonInfoMapper.selectOne(queryWrapper);
-        resultData.put("data",personInfo);
+        resultData.put("records",personInfo);
+
+        return resultData;
+    }
+
+
+
+    public JSONObject findUserModels(QueryPersonInfoVO queryPersonInfoVO){
+        JSONObject resultData = new JSONObject();
+        LambdaQueryWrapper<BasePersonModule> queryWrapper = new LambdaQueryWrapper<>();
+
+        if(!StringUtils.isEmpty(queryPersonInfoVO.getUserId())){
+            queryWrapper.eq(BasePersonModule::getUserId,queryPersonInfoVO.getUserId());
+        }else if(!StringUtils.isEmpty(queryPersonInfoVO.getPoliceNo())){
+            queryWrapper.eq(BasePersonModule::getPoliceNo,queryPersonInfoVO.getPoliceNo());
+        }else{
+            throw new RuntimeException("查询条件不能为空,当前入参:"+JSONObject.toJSONString(queryPersonInfoVO));
+        }
+
+        List<BasePersonModule> personModules =basePersonModuleMapper.selectList(queryWrapper);
+        resultData.put("records",personModules);
 
         return resultData;
     }
 
+
+    public JSONObject findUserCurrentModelDetail(QueryPersonInfoVO queryPersonInfoVO){
+        JSONObject resultData = new JSONObject();
+        LambdaQueryWrapper<BasePersonModule> queryWrapper = new LambdaQueryWrapper<>();
+
+        if(StringUtils.isNotEmpty(queryPersonInfoVO.getPoliceNo()) && StringUtils.isNotEmpty(queryPersonInfoVO.getModuleCode()) ){
+            queryWrapper.eq(BasePersonModule::getPoliceNo,queryPersonInfoVO.getPoliceNo());
+            queryWrapper.eq(BasePersonModule::getModuleCode,queryPersonInfoVO.getModuleCode());
+        }else{
+            throw new RuntimeException("查询条件不能为空,当前入参:"+JSONObject.toJSONString(queryPersonInfoVO));
+        }
+
+        BasePersonModule personModule =basePersonModuleMapper.selectOne(queryWrapper);
+        resultData.put("records",personModule);
+
+        return resultData;
+    }
 }

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/controller/StudyController.java

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 
 @Slf4j
 @RestController
-@RequestMapping("/zhzg/api/study")
+@RequestMapping("/api/study")
 public class StudyController {
 
 	@Autowired

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/domain/StudyDocInfo.java

@@ -29,7 +29,7 @@ public class StudyDocInfo {
     @NotBlank
     private String  content;
     private String  url;
-    private Integer  urlType;
+    private String  urlType;
 
     @NotNull
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/service/StudyService.java

@@ -63,7 +63,7 @@ public class StudyService {
         StudyDocInfo studyDocInfo= studyDocInfoMapper.selectOne(queryWrapper);
         System.out.println(JSONObject.toJSONString(studyDocInfo));
 
-        resultData.put("data",studyDocInfo);
+        resultData.put("records",studyDocInfo);
 
         return resultData;
     }