Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/base/system/oper/web/OperLogController.java

-/**
-* 文件：OperLogController.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* 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