pmd

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

@@ -298,7 +298,26 @@ public class MenuController {
 
         ServiceResponse<Page<SystemSetLogDTO>> response = logApiService.listSystemSetLog(pageQO.getPageSize(),
                 pageQO.getCurrentPage(), searchParam);
-        return ResultControllerUtils.commonPageResult(response, LogListVO.class);
+        if (response.isSuccess()) {
+            Page page = (Page) response.getResult();
+            if (page == null) {
+                return RestResponse.success();
+            }
+            List<SystemSetLogDTO> responseList = page.getResult();
+            if (CollectionUtils.isNotEmpty(responseList)) {
+                List<LogListVO> resultList = responseList.stream().map(e -> {
+                    LogListVO temp = EntityUtil.changeEntityNew(LogListVO.class, e);
+                    temp.setNationCodeFrom(e.getRemark1());
+                    temp.setPhoneFrom(e.getRemark2());
+                    return temp;
+                }).collect(Collectors.toList());
+                page.setResult(resultList);
+                return RestResponse.success(page);
+            }
+            return RestResponse.success();
+        } else {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
     }
 
     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

 package com.gic.auth.web.vo;
 
-import com.gic.commons.annotation.SkipNamingCheck;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +10,6 @@ import java.util.Date;
  * @author guojuxing

  * @date 2019/11/8 2:15 PM

  */
-@SkipNamingCheck
 public class LogListVO implements Serializable{
 
 
@@ -43,8 +40,8 @@ public class LogListVO implements Serializable{
     private Long relationId;
 
     private String businessName;
-    private String remark1;
-    private String remark2;
+    private String nationCodeFrom;
+    private String phoneFrom;
 
     public Long getLogId() {
         return logId;
@@ -74,11 +71,11 @@ public class LogListVO implements Serializable{
     }
 
     public String getNationCode() {
-        return remark1;
+        return nationCodeFrom;
     }
 
     public String getPhone() {
-        return remark2;
+        return phoneFrom;
     }
 
     public String getProject() {
@@ -135,21 +132,21 @@ public class LogListVO implements Serializable{
         return this;
     }
 
-    public String getRemark1() {
-        return remark1;
+    public String getNationCodeFrom() {
+        return nationCodeFrom;
     }
 
-    public LogListVO setRemark1(String remark1) {
-        this.remark1 = remark1;
+    public LogListVO setNationCodeFrom(String nationCodeFrom) {
+        this.nationCodeFrom = nationCodeFrom;
         return this;
     }
 
-    public String getRemark2() {
-        return remark2;
+    public String getPhoneFrom() {
+        return phoneFrom;
     }
 
-    public LogListVO setRemark2(String remark2) {
-        this.remark2 = remark2;
+    public LogListVO setPhoneFrom(String phoneFrom) {
+        this.phoneFrom = phoneFrom;
         return this;
     }
 
@@ -167,8 +164,8 @@ public class LogListVO implements Serializable{
                 ", createTime=" + createTime +
                 ", relationId=" + relationId +
                 ", businessName='" + businessName + '\'' +
-                ", remark1='" + remark1 + '\'' +
-                ", remark2='" + remark2 + '\'' +
+                ", nationCodeFrom='" + nationCodeFrom + '\'' +
+                ", phoneFrom='" + phoneFrom + '\'' +
                 '}';
     }
 }