fix 日志

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -87,8 +87,8 @@ public class MajorCategoryController extends BaseController {
     @PreAuthorize("@ss.hasPermi('course:category:add')")
     @Log(title = "【专业分类】", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@Validated  @RequestBody MajorCategoryAddBo bo) {
-        return toAjax(iMajorCategoryService.insertByAddBo(bo) ? 1 : 0);
+    public AjaxResult<Long> add(@Validated  @RequestBody MajorCategoryAddBo bo) {
+        return AjaxResult.success(iMajorCategoryService.insertByAddBo(bo));
     }
 
     /**

zhongzheng-common/src/main/java/com/zhongzheng/common/core/controller/BaseController.java

@@ -11,6 +11,7 @@ import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.page.TableSupport;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.sql.SqlUtil;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
@@ -22,7 +23,7 @@ import java.util.List;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author zhongzheng
  */
 public class BaseController
@@ -77,7 +78,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
@@ -86,6 +87,8 @@ public class BaseController
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
+
+
     /**
      * 响应返回结果
      *

zhongzheng-framework/src/main/java/com/zhongzheng/framework/aspectj/LogAspect.java

@@ -167,7 +167,7 @@ public class LogAspect
         {
             String params = argsArrayToString(joinPoint.getArgs());
             operLog.setOperParam(StrUtil.sub(params, 0, 2000));
-            operLog.addPrimaryKeyId(params);
+            operLog.addPrimaryIdAndContent();
         }
         else
         {

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorCategoryService.java

@@ -30,7 +30,7 @@ public interface IMajorCategoryService extends IService<MajorCategory> {
 	 */
 	List<MajorCategoryVo> queryList(MajorCategoryQueryBo bo);
 
-	Boolean insertByAddBo(MajorCategoryAddBo bo);
+	Long insertByAddBo(MajorCategoryAddBo bo);
 
 	Boolean updateByEditBo(MajorCategoryEditBo bo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorCategoryServiceImpl.java

@@ -71,12 +71,12 @@ public class MajorCategoryServiceImpl extends ServiceImpl<MajorCategoryMapper, M
     }
 
     @Override
-    public Boolean insertByAddBo(MajorCategoryAddBo bo) {
+    public Long insertByAddBo(MajorCategoryAddBo bo) {
         MajorCategory add = BeanUtil.toBean(bo, MajorCategory.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        return this.save(add)?add.getCategoryId():0;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysOperLog.java

@@ -141,7 +141,7 @@ public class SysOperLog implements Serializable {
 
 
     /**
-     * 返回参数
+     * 主键ID
      */
     @Excel(name = "主键ID")
     private Integer primaryKeyId;
@@ -149,15 +149,31 @@ public class SysOperLog implements Serializable {
     @Excel(name = "操作文案")
     private String operContent;
 
-    //PUT POST方法会触发
-    public void addPrimaryKeyId(String params){
-        if(getOperUrl().equals("/system/notice")){
-            JSONObject jsonObject = JSONObject.parseObject(params);
-            if (jsonObject.containsKey("noticeId")){
-                setPrimaryKeyId((Integer) jsonObject.get("noticeId"));
-                setOperContent("操作文案");
+    //日志PUT POST方法会触发
+    public void addPrimaryIdAndContent(){
+        String params = getOperParam();
+        //专业分类模块
+        if(getOperUrl().startsWith("/course/category")&&getStatus()==0){
+            //新增
+            if(getOperUrl().equals("/course/category")){
+                JSONObject jsonObject = JSONObject.parseObject(params);
+                JSONObject resultObject = JSONObject.parseObject(getJsonResult());
+                if (jsonObject.containsKey("categoryName")){
+                    setPrimaryKeyId((Integer)resultObject.get("data"));
+                    setOperContent("新增分类："+ jsonObject.get("categoryName"));
+                }
+            }
+            //修改
+            if(getOperUrl().equals("/course/category/edit")){
+                JSONObject jsonObject = JSONObject.parseObject(params);
+                if (jsonObject.containsKey("categoryId")){
+                    setPrimaryKeyId((Integer)jsonObject.get("categoryId"));
+                    String content = "修改分类："+ jsonObject.get("categoryName");
+                    setOperContent(content);
+                }
             }
-
         }
+
+
     }
 }