fix:活码

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/logrecord/LogRecordController.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/logrecord/HbLogRecordController.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.controller.logrecord;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.dsmongo.api.dto.DocumentResultDTO;
 import com.gic.dsmongo.api.dto.QueryDocDTO;
 import com.gic.dsmongo.api.service.MongoOperationService;
@@ -13,8 +14,6 @@ import com.gic.log.record.bean.GicLogRecordBean;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
 import com.gic.log.record.util.LogCommenUtil;
-import com.gic.web.common.controller.DefaultController;
-import com.gic.web.common.utils.Response;
 import com.mongodb.BasicDBObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -31,9 +30,9 @@ import java.util.*;
 
 @Controller
 @RequestMapping("/log-record")
-public class LogRecordController extends DefaultController {
+public class HbLogRecordController {
     
-    private static final Logger LOGGER = LogManager.getLogger(LogRecordController.class);
+    private static final Logger LOGGER = LogManager.getLogger(HbLogRecordController.class);
     @Autowired
     MongoOperationService mongoOperationService;
 
@@ -44,7 +43,7 @@ public class LogRecordController extends DefaultController {
 
     @RequestMapping("/list")
     @ResponseBody
-    public Response pageLog(LogRecordQo qo, @RequestParam(defaultValue="1")int pageNum  , @RequestParam(defaultValue="20")int pageSize){
+    public RestResponse pageLog(LogRecordQo qo, @RequestParam(defaultValue="1")int pageNum  , @RequestParam(defaultValue="20")int pageSize){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String eid = qo.getEnterpriseId() ;
         if(null != loginUser && StringUtils.isEmpty(eid)) {
@@ -103,7 +102,7 @@ public class LogRecordController extends DefaultController {
         retPage.setTotalCount(Long.valueOf(documentResultDTO.getTotalCount()).intValue());
         retPage.setPageSize(pageSize);
         retPage.setCurrentPage(pageNum);
-        return this.success(retPage);
+        return RestResponse.successResult(retPage);
     }
 
     /**
@@ -112,7 +111,7 @@ public class LogRecordController extends DefaultController {
      */
     @RequestMapping("business-types")
     @ResponseBody
-    public Response businessTypes(){
+    public RestResponse businessTypes(){
         List<LogRecordTypeVO> ret=new ArrayList<>();
         GicLogRecordCategoryEnum[] values = GicLogRecordCategoryEnum.values();
         for (GicLogRecordCategoryEnum value : values) {
@@ -123,7 +122,7 @@ public class LogRecordController extends DefaultController {
                 ret.add(mid);
             }
         }
-        return this.success(ret);
+        return RestResponse.successResult(ret);
     }
 
     /**
@@ -132,7 +131,7 @@ public class LogRecordController extends DefaultController {
      */
     @RequestMapping("opt-types")
     @ResponseBody
-    public Response optTypes(){
+    public RestResponse optTypes(){
         List<LogRecordTypeVO> ret=new ArrayList<>();
         GicLogRecordOptTypeEnum[] values = GicLogRecordOptTypeEnum.values();
         for (GicLogRecordOptTypeEnum value : values) {
@@ -143,7 +142,7 @@ public class LogRecordController extends DefaultController {
                 ret.add(mid);
             }
         }
-        return this.success(ret);
+        return RestResponse.successResult(ret);
     }