日志查询接口修改

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java

@@ -201,7 +201,7 @@ public class MenuController {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
 
         LogSearchDTO searchParam = new LogSearchDTO();
-        searchParam.setEnterpriseId(String.valueOf(enterpriseId));
+        searchParam.setEnterpriseId(Long.valueOf(enterpriseId));
         searchParam.setInterfaceName(search);
         if (menuId != null) {
             searchParam.setRelationId(Long.valueOf(menuId));
@@ -219,26 +219,7 @@ public class MenuController {
         ServiceResponse<Page<SystemSetLogDTO>> response = logApiService.listSystemSetLog(pageQO.getCurrentPage(),
                 pageQO.getPageSize(), searchParam);
 
-        Page<LogListVO> result = new Page<>();
-        if (response.isSuccess()) {
-            Page<SystemSetLogDTO> pageResult = response.getResult();
-            List<SystemSetLogDTO> list = pageResult.getResult();
-            if (CollectionUtils.isNotEmpty(list)) {
-                List<LogListVO> voList = new ArrayList<>(list.size());
-                result = EntityUtil.changeEntityNew(Page.class, pageResult);
-                for (SystemSetLogDTO logDTO : list) {
-                    LogListVO vo = EntityUtil.changeEntityNew(LogListVO.class, logDTO);
-                    vo.setNationCode(logDTO.getRemark1());
-                    vo.setPhone(logDTO.getRemark2());
-                    voList.add(vo);
-                    vo.setOperationObject(logDTO.getBusinessName());
-                }
-                result.setResult(voList);
-
-            }
-
-        }
-        return RestResponse.success(result);
+        return ResultControllerUtils.commonPageResult(response, LogListVO.class);
     }
 
     public static List<Map<String, Object>> changePageListToTree(int storeGroupId, List<MenuDTO> list) {

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/LogListVO.java

@@ -39,10 +39,9 @@ public class LogListVO implements Serializable{
      */
     private Long relationId;
 
-    /**
-     *
-     */
-    private String operationObject;
+    private String businessName;
+    private String remark1;
+    private String remark2;
 
     public Long getLogId() {
         return logId;
@@ -72,21 +71,11 @@ public class LogListVO implements Serializable{
     }
 
     public String getNationCode() {
-        return nationCode;
-    }
-
-    public LogListVO setNationCode(String nationCode) {
-        this.nationCode = nationCode;
-        return this;
+        return remark1;
     }
 
     public String getPhone() {
-        return phone;
-    }
-
-    public LogListVO setPhone(String phone) {
-        this.phone = phone;
-        return this;
+        return remark2;
     }
 
     public String getProject() {
@@ -134,12 +123,30 @@ public class LogListVO implements Serializable{
         return this;
     }
 
-    public String getOperationObject() {
-        return operationObject;
+    public String getBusinessName() {
+        return businessName;
+    }
+
+    public LogListVO setBusinessName(String businessName) {
+        this.businessName = businessName;
+        return this;
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public LogListVO setRemark1(String remark1) {
+        this.remark1 = remark1;
+        return this;
+    }
+
+    public String getRemark2() {
+        return remark2;
     }
 
-    public LogListVO setOperationObject(String operationObject) {
-        this.operationObject = operationObject;
+    public LogListVO setRemark2(String remark2) {
+        this.remark2 = remark2;
         return this;
     }
 }