From 4e170beb5569ee2a8c12d472cd39f21333e94735 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 01 十二月 2024 21:38:21 +0800
Subject: [PATCH] 修改了日志相关内容
---
zhang-content/src/main/java/com/ruoyi/mapper/ZfLogMapper.java | 13 ++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfLogServiceImpl.java | 40 ++++++++++++++++++++
zhang-content/src/main/java/com/ruoyi/service/ZfLogService.java | 5 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java | 38 +++++++++++++++++--
4 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
index 9b7ade9..7d00a7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
@@ -1,18 +1,27 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfLog;
import com.ruoyi.service.ZfLogService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -33,14 +42,35 @@
private ZfLogService zfLogService;
@GetMapping("/list")
- public AjaxResult list(){
+ public AjaxResult list(ZfLog zfLog) throws ParseException {
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- Page<ZfLog> zfLogPage = new Page<>(pageNum,pageSize);
- Page<ZfLog> page = zfLogService.page(zfLogPage);
- return AjaxResult.success(MapUtils.getResult(page));
+ String st = ServletUtils.getParameter("module");
+ if(st!=null&&!st.equals("")) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime dateTime = LocalDate.parse(st, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
+
+
+
+
+
+
+
+
+ return zfLogService.selectDataList(dateTime, pageNum, pageSize);
+ }
+ else
+ {
+ return AjaxResult.success();
+ }
+
+// List<ZfLog> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+// Page<ZfLog> zfLogPage = new Page<>(pageNum,pageSize);
+// Page<ZfLog> page = zfLogService.page(zfLogPage);
+
+ // return AjaxResult.success(MapUtils.getResult(pageResult));
}
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfLogMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfLogMapper.java
index b0c8f40..2a31d06 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfLogMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfLogMapper.java
@@ -1,8 +1,18 @@
package com.ruoyi.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.domain.ZfLog;
+import com.ruoyi.domain.dto.AncestorClan;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -12,6 +22,9 @@
* @author ojq
* @since 2023-09-06
*/
+@Mapper
public interface ZfLogMapper extends BaseMapper<ZfLog> {
+ @Select("select * from zf_log where DATE(update_time)=#{st}")
+ Page<ZfLog> selectAllInfo(Page page, @Param("st") LocalDateTime st);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfLogService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfLogService.java
index 16153ee..2b426ff 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfLogService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfLogService.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZfAncestor;
import com.ruoyi.domain.ZfLog;
+
+import java.time.LocalDateTime;
/**
* <p>
@@ -14,4 +18,5 @@
*/
public interface ZfLogService extends IService<ZfLog> {
+ public AjaxResult selectDataList(LocalDateTime ldt, Integer pageNo, Integer pageSize) ;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfLogServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfLogServiceImpl.java
index f896e57..4ee3a9e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfLogServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfLogServiceImpl.java
@@ -1,11 +1,23 @@
package com.ruoyi.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfLog;
+import com.ruoyi.domain.dto.AncestorClan;
import com.ruoyi.mapper.ZfLogMapper;
import com.ruoyi.service.ZfLogService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
/**
* <p>
@@ -18,4 +30,32 @@
@Service
public class ZfLogServiceImpl extends ServiceImpl<ZfLogMapper, ZfLog> implements ZfLogService {
+ @Autowired
+ private ZfLogMapper zfLogMapper;
+ @Override
+ public AjaxResult selectDataList(LocalDateTime ldt, Integer pageNo, Integer pageSize) {
+
+
+
+// QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
+//
+//
+// LambdaQueryWrapper<ZfLog> lqw = new LambdaQueryWrapper<>();
+//
+// lqw.eq(ldt != null, ZfLog::getUpdateTime, ldt);
+ Page<ZfLog> zfCleanPage = new Page<>(pageNo, pageSize);
+// Page<ZfLog> pageResult = zfLogService.page(zfCleanPage, lqw);
+//
+// queryWrapper.eq(zfAncestor.getClanId() !=null , " zf_ancestor.clan_id", zfAncestor.getClanId());
+// queryWrapper.eq(zfAncestor.getSysId() !=null , " zf_ancestor.sys_id ", zfAncestor.getSysId());
+// queryWrapper.like(StringUtils.isNotEmpty(zfAncestor.getName()),"zf_ancestor.name",zfAncestor.getName());
+
+ Page<ZfLog> info = zfLogMapper.selectAllInfo(new Page<>(pageNo, pageSize),ldt);
+ //page(pa, wrapper);
+ // List<AncestorClan> orders = page(pa, wrapper);
+ List<ZfLog> list =info.getRecords();
+ HashMap<String, Object> data = MapUtils.getResult(info, list);
+ return AjaxResult.success(data);
+// return null;
+ }
}
--
Gitblit v1.9.1