修改同步事项

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

@@ -62,24 +62,5 @@ public class OperLogController extends BaseCRUDJsonBodyMappingController<OperLog
 		});
 	}
 
-/*	@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);
-		// 返回日志类型
-		status.put("operType", OperTypeEnum.getEnumMap());
-
-		model.put(KEY_RESULT_DICT, status);
-		super.init(request, response, form, model, context);
-	}
-
-	@Override
-	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, OperLogForm form, Map<String, Object> model, Context context) throws AppException {
-		form.getQuery().setOrderColList(new ArrayList<OrderCol>() {
-			{
-				add(new OrderCol("a.logDate", "desc"));
-			}
-		});
-	}*/
 
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/oper/service/impl/OperLogServiceImpl.java

@@ -113,6 +113,9 @@ public class OperLogServiceImpl extends AbstractCRUDServiceImpl<OperLogDao,OperL
         operLogEntity.setContent(content);
 
         save(operLogEntity, null);
+
+
+
     }
     private void formatterLogContent(OperLogEntity operLogEntity, String content, String id, OperTypeEnum operType) {
         if (operType == OperTypeEnum.SAVE) {

portal-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.annotation.UnAuth;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
-import com.mortals.framework.model.Result;
-import com.mortals.framework.web.BaseCRUDJsonMappingController;
+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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,65 +25,42 @@ 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(HttpServletRequest request, HttpServletResponse response, OperLogForm form,
-						Map<String, Object> model, Context context) {
+	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(request, response, form, model, context);
-	}
-
-	@Override
-	@PostMapping({"list"})
-	@UnAuth
-	public String list(@RequestBody OperLogForm form) {
-		Map<String, Object> model = new HashMap();
-		JSONObject ret = new JSONObject();
-		Context context = this.getContext();
-		String busiDesc = "查询" + this.getModuleDesc();
-
-		int code;
-		try {
-			this.doListBefore(this.request, this.response, form, model, context);
-			Result result = this.getService().find(form.getQuery(), form.getPageInfo(), context);
-			model.put("result", result.getList());
-			model.put("pageInfo", result.getPageInfo());
-			model.put("total", result.getPageInfo().getTotalResult());
-			model.putAll(form.getModel());
-			code = this.doListAfter(this.request, this.response, form, model, context);
-			this.recordSysLog(this.request, busiDesc + " 【成功】");
-		} catch (Exception var8) {
-			code = -1;
-			this.doException(this.request, busiDesc, model, var8);
-		}
-
-		form.getModel().clear();
-		this.init(this.request, this.response, form, model, context);
-		ret.put("code", code);
-		ret.put("msg", model.remove("message_info"));
-		ret.put("query", form.getQuery());
-		ret.put("data", model);
-		return ret.toJSONString();
+		super.init(model, context);
 	}
 
+	/**
+	 * @param query
+	 * @param model
+	 * @param context
+	 * @throws AppException
+	 */
 	@Override
-	protected void doListBefore(HttpServletRequest request, HttpServletResponse response, OperLogForm form, Map<String, Object> model, Context context) throws AppException {
-		form.getQuery().setOrderColList(new ArrayList<OrderCol>() {
+	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"));
 			}
 		});
 	}
 
+
 }
\ No newline at end of file