From 128447d263b3f5cac53cf10d0decc2b2172c5f0d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:56:21 +0800
Subject: [PATCH] 代码同步

---
 src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
index 72ef3c1..fb10eff 100644
--- a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
+++ b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
@@ -51,7 +51,8 @@
 				for (DirectiveFile directiveFile : directiveFiles) {
 					builderFile.append(directiveFile.getUrl()).append(",");
 				}
-				record.setUrl(builder.toString().substring(0, builderFile.toString().length() - 1));
+				String urls = builderFile.toString();
+				record.setUrl(urls.substring(0, urls.length() - 1));
 			}
 			record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
 		}
@@ -66,4 +67,60 @@
 	public DirectiveVo selectDirectiveInfo(Directive directive) {
 		return baseMapper.selectDirectiveInfo(directive);
 	}
+
+
+	/**
+	 * 插入图片
+	 * @param directiveFile
+	 * @return
+	 */
+	@Override
+	public boolean saveDirectiveFile(DirectiveFile directiveFile) {
+		int i = baseMapper.saveDirectiveFile(directiveFile);
+		if (i>0){
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * 删除图片
+	 * @param id 指令id
+	 * @return
+	 */
+	@Override
+	public int deleleByDirectiveId(Long id) {
+		return baseMapper.deleteByDirectiveId(id);
+	}
+
+	/**
+	 * 自定义分页--接收到的指令
+	 * @param page,size
+	 * @param directive 指令对象
+	 */
+	@Override
+	public IPage<DirectiveVo> selectDirectiveReplyPage(IPage<DirectiveVo> page, DirectiveVo directive) {
+		IPage<DirectiveVo> directiveVoIPage = page.setRecords(baseMapper.selectDirectiveReplyPage(page, directive));
+		List<DirectiveVo> records = directiveVoIPage.getRecords();
+		for (DirectiveVo record : records) {
+//			String[] receiveDirectiveIds = record.getReceiveDirectiveIds().toString().split(",");
+//			StringBuilder builder = new StringBuilder();
+//			for (String receiveDirectiveId : receiveDirectiveIds) {
+//				User user = userService.getById(receiveDirectiveId);
+//				builder.append(user.getRealName()).append(",");
+//			}
+			//查询图片
+			List<DirectiveFile> directiveFiles = baseMapper.getDirectiveFileList(record.getId());
+			if (directiveFiles.size()>0){
+				StringBuilder builderFile = new StringBuilder();
+				for (DirectiveFile directiveFile : directiveFiles) {
+					builderFile.append(directiveFile.getUrl()).append(",");
+				}
+				String urls = builderFile.toString();
+				record.setUrl(urls.substring(0, urls.length() - 1));
+			}
+//			record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
+		}
+		return directiveVoIPage;
+	}
 }

--
Gitblit v1.9.3