【学习助手】 修改响应异常信息，统一格式，使用 AjaxResult 在msg 提示

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

@@ -2,6 +2,8 @@ package com.ruoyi.zzb.study.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.controller.BaseController;
+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;
@@ -22,25 +24,26 @@ import javax.servlet.http.HttpServletResponse;
 @Slf4j
 @RestController
 @RequestMapping("/api/study")
-public class StudyController {
+public class StudyController extends BaseController {
 
 	@Autowired
 	private StudyService studyService;
 
 	@PostMapping("/findAllInfo")
-	public JSONObject findAllInfo(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody UserSearchParam userSearchParam) {
+	public AjaxResult findAllInfo(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody UserSearchParam userSearchParam) {
 		try {
 			Page<StudyDocInfo> result = studyService.findAllInfo(userSearchParam);
-			return RspResult.success(result);
+			return success(result);
+//			return RspResult.success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：findAllInfo======",e);
+			return error(e.getMessage());
 		}
 
 	}
 
 	@PostMapping("/findDocInfoById")
-	public JSONObject findDocInfoById(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody QueryInfoVO queryInfoVO) {
+	public AjaxResult findDocInfoById(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody QueryInfoVO queryInfoVO) {
 
 		try {
 			LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -53,15 +56,15 @@ public class StudyController {
 				studyService.saveViewLogInfo(queryInfoVO,sysUser);
 			}
 
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：findDocInfoById======",e);
+			return error(e.getMessage());
 		}
 	}
 
 	@PostMapping("/saveDoc")
-	public JSONObject saveDoc(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody StudyDocInfo studyDocInfo) {
+	public AjaxResult saveDoc(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody StudyDocInfo studyDocInfo) {
 
 		try {
 			LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -72,40 +75,40 @@ public class StudyController {
 			studyDocInfo.setCreateUserName(sysUser.getNickName());
 
 			boolean result = studyService.saveDocInfo(studyDocInfo);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：saveDocInfo======",e);
+			return error(e.getMessage());
 		}
 
 	}
 
 
 	@PostMapping("/deleteById")
-	public JSONObject deleteById(HttpServletResponse response, HttpServletRequest request,@RequestBody JSONObject params) {
+	public AjaxResult deleteById(HttpServletResponse response, HttpServletRequest request,@RequestBody JSONObject params) {
 		try {
 			String docId = params.getString("docId");
 			boolean result = studyService.deleteById(docId);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：deleteById======",e);
+			return error(e.getMessage());
 		}
 	}
 
 	@PostMapping("/updatePageViewNumById")
-	public JSONObject updatePageViewNumById(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody UpdatePageViewNumVO updatePageViewNumVO) {
+	public AjaxResult updatePageViewNumById(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody UpdatePageViewNumVO updatePageViewNumVO) {
 		try {
 			boolean result = studyService.updatePageViewNumById(updatePageViewNumVO);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：updatePageViewNumById======",e);
+			return error(e.getMessage());
 		}
 	}
 
 //	@PostMapping("/saveViewLog")		关闭保存访问日志对外接口
-	public JSONObject saveViewLog(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody QueryInfoVO queryInfoVO) {
+	public AjaxResult saveViewLog(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody QueryInfoVO queryInfoVO) {
 		try {
 
 			LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -113,10 +116,10 @@ public class StudyController {
 
 			queryInfoVO.setUserId(sysUser.getUserId()+"");
 			boolean result = studyService.saveViewLogInfo(queryInfoVO,sysUser);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：saveViewLog======",e);
+			return error(e.getMessage());
 		}
 
 	}
@@ -124,14 +127,14 @@ public class StudyController {
 
 
 	@PostMapping("/findInfoByTitle")
-	public JSONObject findInfoByTitle(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody UserSearchParam userSearchParam) {
+	public AjaxResult findInfoByTitle(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody UserSearchParam userSearchParam) {
 
 		try {
 			Page<StudyDocInfo> result = studyService.findInfoByTitle(userSearchParam);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：findInfoByTitle======",e);
+			return error(e.getMessage());
 		}
 
 	}
@@ -139,13 +142,13 @@ public class StudyController {
 
 
 	@PostMapping("/updateDocByDocId")
-	public JSONObject updateDocByDocId(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody StudyDocInfo studyDocInfo) {
+	public AjaxResult updateDocByDocId(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody StudyDocInfo studyDocInfo) {
 		try {
 			boolean result = studyService.updateById(studyDocInfo);
-			return RspResult.success(result);
+			return success(result);
 		}catch (Exception e){
-			e.printStackTrace();
-			return RspResult.error(e.getMessage());
+			log.error("============【学习助手】异常：updateDocByDocId======",e);
+			return error(e.getMessage());
 		}
 
 	}

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

@@ -51,7 +51,7 @@ public class StudyService {
         queryWrapper.orderByAsc(StudyDocInfo::getCreateTime);
         //分页查询
         rowPage = studyDocInfoMapper.selectPage(rowPage, queryWrapper);
-        log.info("============【学习板块】查询学习文章列表成功！============");
+        log.info("============【学习助手】查询学习文章列表成功！============");
         return rowPage;
 
     }
@@ -61,7 +61,11 @@ public class StudyService {
         queryWrapper.eq(StudyDocInfo::getDocId,id);
 
         StudyDocInfo studyDocInfo= studyDocInfoMapper.selectOne(queryWrapper);
-        log.info("============【学习板块】查询文章成功！{}============",id);
+
+        if(studyDocInfo == null){
+            throw new RuntimeException("文章详情查询失败，docId不存在:"+id);
+        }
+        log.info("============【学习助手】查询文章成功！{}============",id);
         return studyDocInfo;
     }
 
@@ -70,7 +74,7 @@ public class StudyService {
         if( i!=1 ){
             throw new RuntimeException("数据写入失败，成功0条,入参："+JSONObject.toJSONString(studyDocInfo));
         }
-        log.info("============【学习板块】添加文章成功！============");
+        log.info("============【学习助手】添加文章成功！============");
         return i == 1;
     }
 
@@ -80,7 +84,7 @@ public class StudyService {
         if( i!=1 ){
             throw new RuntimeException("数据删除失败，docId不存在:"+id);
         }
-        log.info("============【学习板块】删除文章成功！{}============",id);
+        log.info("============【学习助手】删除文章成功！{}============",id);
         return i == 1;
     }
 
@@ -93,7 +97,7 @@ public class StudyService {
         if( i!=1 ){
             throw new RuntimeException("修改文章浏览量失败，docId不存在:"+updatePageViewNumVO.getDocId());
         }
-        log.info("============【学习板块】修改文章浏览量成功！{}============",updatePageViewNumVO.getDocId());
+        log.info("============【学习助手】修改文章浏览量成功！{}============",updatePageViewNumVO.getDocId());
         return i == 1;
     }
 
@@ -128,7 +132,7 @@ public class StudyService {
             throw new RuntimeException("保存访问记录日志保存失败："+JSONObject.toJSONString(studyViewLogInfo));
         }
 
-        log.info("============【学习板块】保存访问记录成功！{}============", queryInfoVO.getDocId());
+        log.info("============【学习助手】保存访问记录成功！{}============", queryInfoVO.getDocId());
         return i == 1 && j ==1;
     }
 
@@ -165,7 +169,7 @@ public class StudyService {
         if(i != 1){
             throw new RuntimeException("docId不存在："+studyDocInfo.getDocId());
         }
-        log.info("============【学习板块】更新文章成功！{}============",studyDocInfo.getDocId());
+        log.info("============【学习助手】更新文章成功！{}============",studyDocInfo.getDocId());
 
         return i == 1;
     }