日志查询接口修改

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

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.gic.log.api.dto.LogSearchDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -194,30 +195,27 @@ public class MenuController {
      * @return  com.gic.commons.webapi.reponse.RestResponse

     
 */
     @RequestMapping("/list-log")
-    public RestResponse listOperationLog(String startTime, String endTime, Integer menuId, String search, PageQO pageQO) throws ParseException {
+    public RestResponse listOperationLog(String startTime, String endTime, Integer menuId, String search, PageQO pageQO)
+            throws ParseException {
 
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        Page<Map<String, Object>> pageParam = new Page<>();
-        Map<String, Object> param = new HashMap<>(16);
+
+        LogSearchDTO searchParam = new LogSearchDTO();
+        searchParam.setEnterpriseId(String.valueOf(enterpriseId));
+        searchParam.setInterfaceName(search);
+        searchParam.setRelationId(Long.valueOf(menuId));
         SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd HH:mm:ss");
         if (StringUtils.isNotBlank(startTime)) {
             startTime = startTime + " 00:00:00";
-            param.put("logTimeBegin", sdf.parse(startTime).getTime());
+            searchParam.setLogTimeBegin(sdf.parse(startTime));
         }
         if (StringUtils.isNotBlank(endTime)) {
             endTime = endTime + " 23:59:59";
-            param.put("logTimeBegin", sdf.parse(endTime).getTime());
+            searchParam.setLogTimeEnd(sdf.parse(endTime));
         }
-        param.put("relationId", menuId);
-        param.put("enterpriseId", enterpriseId);
-
-        param.put("logTimeEnd", endTime);
-        param.put("interfaceName", search);
-        pageParam.setCurrentPage(pageQO.getCurrentPage());
-        pageParam.setPageSize(pageQO.getPageSize());
-        pageParam.setParams(param);
 
-        ServiceResponse<Page<SystemSetLogDTO>> response = logApiService.listSystemSetLog(pageParam);
+        ServiceResponse<Page<SystemSetLogDTO>> response = logApiService.listSystemSetLog(pageQO.getCurrentPage(),
+                pageQO.getPageSize(), searchParam);
 
         Page<LogListVO> result = new Page<>();
         if (response.isSuccess()) {