From 81d1b6068df83e28130dfe1f5dadac491c3325f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Fri, 24 Mar 2023 14:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/oper/web/OperLogController.java    | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/base-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java b/base-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java
index d3be74c7..7530ba70 100644
--- a/base-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java
@@ -1,29 +1,16 @@
-/**
-* 鏂囦欢锛歄perLogController.java
-* 鐗堟湰锛�1.0.0
-* 鏃ユ湡锛�
-* Copyright &reg; 
-* All right reserved.
-*/
 package com.mortals.xhx.base.system.oper.web;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.oper.model.OperLogEntity;
 import com.mortals.xhx.base.system.oper.service.OperLogService;
 import com.mortals.xhx.common.code.OperTypeEnum;
-
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,15 +25,44 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("oper/log")
-public class OperLogController extends BaseCRUDJsonMappingController<OperLogService,OperLogForm,OperLogEntity,Long> {
+public class OperLogController extends BaseCRUDJsonBodyMappingController<OperLogService,OperLogEntity,Long> {
 
 	public OperLogController(){
 		super.setFormClass(OperLogForm.class);
 		super.setModuleDesc("鎿嶄綔鏃ュ織");
 	}
 
+	/**
+	 * @param model
+	 * @param context
+	 */
+	@Override
+	protected void init(Map<String, Object> model, Context context) {
+		Map<String, Object> status = new HashMap<String, Object>(1);
+		// 杩斿洖鏃ュ織绫诲瀷
+		status.put("operType", OperTypeEnum.getEnumMap());
 
+		model.put(KEY_RESULT_DICT, status);
+		super.init(model, context);
+	}
+
+	/**
+	 * @param query
+	 * @param model
+	 * @param context
+	 * @throws AppException
+	 */
 	@Override
+	protected void doListBefore(OperLogEntity query, Map<String, Object> model, Context context) throws AppException {
+		super.doListBefore(query, model, context);
+		query.setOrderColList(new ArrayList<OrderCol>() {
+			{
+				add(new OrderCol("a.logDate", "desc"));
+			}
+		});
+	}
+
+/*	@Override
 	protected void init(HttpServletRequest request, HttpServletResponse response, OperLogForm form,
 						Map<String, Object> model, Context context) {
 		Map<String, Object> status = new HashMap<String, Object>(1);
@@ -64,6 +80,6 @@ public class OperLogController extends BaseCRUDJsonMappingController<OperLogServ
 				add(new OrderCol("a.logDate", "desc"));
 			}
 		});
-	}
+	}*/
 
 }
\ No newline at end of file
-- 
2.24.3