From 4581db487ca237dca8eb31415135e800b9982929 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 04 八月 2025 21:44:05 +0800
Subject: [PATCH] 增加了相关代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index 3dc66f6..22f5ae5 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -1,17 +1,20 @@
package com.ruoyi.service.impl;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ArchiveRecords;
+import com.ruoyi.domain.Archiverecordstouser;
import com.ruoyi.mapper.ArchiveRecordsMapper;
+import com.ruoyi.mapper.ArchiverecordstouserMapper;
import com.ruoyi.service.IArchiveRecordsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,7 +32,8 @@
// @Autowired
// private ArchiveRecordsMapper archiveRecordsMapper;
-
+ @Autowired
+ private ArchiverecordstouserMapper archiverecordstouserMapper;
@@ -49,10 +53,20 @@
// .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
// .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
// lqw.orderByDesc(ZfProperty::getCreateTime);
+ // lqw.orderByDesc(ArchiveRecords::isOwnData);
+ // lqw.orderByDesc(ArchiveRecords::getCreateTime);
+ lqw.orderByDesc(ArchiveRecords::getCreateTime);
System.out.println("ssssssssssssddd0000000000000000");
return lqw;
}
+
+ @Override
+ public Long getMaxId() {
+ //return this.
+ return baseMapper.findMaxId();
+ }
+
@Override
public AjaxResult selectDataList(ArchiveRecords archiveRecords, Integer pageNum, Integer pageSize) {
@@ -61,13 +75,37 @@
System.out.println("-------------");
System.out.println(pageNum);
- Page<ArchiveRecords> zfClanPage = new Page<>(pageNum, pageSize);
- Page<ArchiveRecords> pageResult = page(zfClanPage, lqw);
+
+
+
+ Page<ArchiveRecords> page = new Page<>(pageNum, pageSize);
+
+ // 浣跨敤鑷畾涔夌殑鍒嗛〉鏌ヨ鏂规硶锛屽厛杩炴帴鍐嶅垎椤�
+ Page<ArchiveRecords> pageResult = this.baseMapper.selectJoinUserPage(page, lqw);
+
+
+ //selectJoinUserPage(page, lqw);
+
+
List<ArchiveRecords> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
// List<ArchiveRecords> beanRecords = list(lqw);
// log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
// return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
+ //鎷垮埌褰撳墠鐢ㄦ埛鐨刬d
+ // 鑾峰彇褰撳墠鐢ㄦ埛ID
+ Long userid = SecurityUtils.getUserId();
+
+ beanRecords.forEach(record ->{
+ if(record.isArchiveRecordsId()!=null&&record.getUserId()==userid)
+ {
+ record.setOwnData(true);
+ }
+ else
+ record.setOwnData(false);
+ });
+
+ // Collections.sort(beanRecords, Comparator.comparing(ArchiveRecords::isOwnData));
HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
// System.out.println(data.get("data"));
// System.out.println(data.get("pageNum"));
@@ -120,6 +158,10 @@
@Override
public int insertArchiveRecords(ArchiveRecords archiveRecords)
{
+ LocalDateTime time = LocalDateTime.now();
+
+ Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
+ archiveRecords.setCreateTime(date);
boolean res = this.save(archiveRecords);
if(res)
return 1;
--
Gitblit v1.9.1