【制度查询】新增token机制后相关业务逻辑代码改造

ruoyi-admin/src/main/resources/application.yml

@@ -135,7 +135,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /zhzg/dev-api
 
 # 防止XSS攻击
 xss:

ruoyi-ui/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/zhzg/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/controller/ZdcxController.java

@@ -1,16 +1,15 @@
 package com.ruoyi.zzb.zdcx.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.zzb.base.domain.BasePersonInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.zzb.common.RspResult;
+import com.ruoyi.zzb.zdcx.domain.Zdcx;
 import com.ruoyi.zzb.zdcx.service.ZdcxService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.sql.SQLIntegrityConstraintViolationException;
-
 @Slf4j
 @RestController
 @RequestMapping("/zhzg/api/zdcx")
@@ -44,25 +43,20 @@ public class ZdcxController {
 
     /**
      * 保存一条制度信息
-     * @param reqBody
+     * @param
      * @return
      */
     @PostMapping("/save")
-    public JSONObject save(@RequestBody JSONObject reqBody){
-        String policeNo = reqBody.getString("policeNo");
-        if(StringUtils.isBlank(policeNo)){
-            log.error("【用户警号】参数为空");
-            return RspResult.error("【用户警号】参数为空");
-        }
-        // 根据警号查询当前登录用户信息，警号为前端传入
+    public JSONObject save(@RequestBody Zdcx zdcx){
+        // 获取若依当前登录用户信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
         try {
-            BasePersonInfo basePersonInfo = zdcxService.getDataByParams(policeNo);
-            if(basePersonInfo != null){
-                if(zdcxService.insertStandardInfo(reqBody, basePersonInfo)){
+            if(user != null){
+                if(zdcxService.insertStandardInfo(zdcx, user)){
                     return RspResult.success();
                 }
             }
-            return RspResult.error("不存在用户信息，制度规范信息保存失败");
+            return RspResult.error("用户信息为空，制度规范信息保存失败");
         } catch (Exception e){
             log.error("制度规范信息保存失败", e);
             return RspResult.error("制度规范信息保存失败 - " + e.getMessage());

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zdcx/service/ZdcxService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.zzb.base.domain.BasePersonInfo;
 import com.ruoyi.zzb.base.mapper.BasePersonInfoMapper;
@@ -84,7 +86,7 @@ public class ZdcxService {
      * @param policeNo
      * @return
      */
-    public BasePersonInfo getDataByParams(String policeNo){
+    public BasePersonInfo getDataByPoliceNo(String policeNo){
         QueryWrapper<BasePersonInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("POLICE_NO", policeNo);
         return basePersonInfoMapper.selectOne(queryWrapper);
@@ -92,17 +94,16 @@ public class ZdcxService {
 
     /**
      * 根据参数保存一条制度规范信息
-     * @param reqBody
+     * @param
      * @param basePersonInfo
      * @return
-     */
-    public boolean insertStandardInfo(JSONObject reqBody, BasePersonInfo basePersonInfo){
-        Zdcx zdcx = new Zdcx();
+     *//*
+    public boolean insertStandardInfo(Zdcx zdcx, BasePersonInfo basePersonInfo){
         // 制度信息
-        zdcx.setDocId(reqBody.getString("docId"));
+        *//*zdcx.setDocId(reqBody.getString("docId"));
         zdcx.setTitle(reqBody.getString("title"));
         zdcx.setPublishDept(reqBody.getString("publishDept"));
-        zdcx.setContent(reqBody.getString("content"));
+        zdcx.setContent(reqBody.getString("content"));*//*
         // 录入人信息
         zdcx.setCreateUserId(basePersonInfo.getUserId());
         zdcx.setCreateUserName(basePersonInfo.getName());
@@ -117,6 +118,31 @@ public class ZdcxService {
         }
         log.error("制度规范信息保存失败");
         return false;
+    }*/
+
+
+    /**
+     * 根据参数保存一条制度规范信息
+     * @param
+     * @param
+     * @return
+     */
+    public boolean insertStandardInfo(Zdcx zdcx, SysUser user){
+        // 录入人信息
+        zdcx.setCreateUserId(String.valueOf(user.getUserId()));
+        zdcx.setCreateUserName(user.getNickName());
+        zdcx.setCreateUserPoliceNo(user.getUserName());   // userName属性实际存储用户警号
+        SysDept dept = user.getDept();
+        zdcx.setCreateDeptName(dept.getDeptName());
+        zdcx.setCreateDeptCode(String.valueOf(user.getDeptId()));
+        zdcx.setCreateParentDeptName(dept.getParentName());
+        zdcx.setCreateParentDeptCode(String.valueOf(dept.getParentId()));
+        if (zdcxMapper.insert(zdcx) > 0) {
+            log.info("制度规范信息保存成功");
+            return true;
+        }
+        log.error("制度规范信息保存失败");
+        return false;
     }
 
 }