From ff33cdfa1bd3a89ad9f5a72067b1c9b47376ef22 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 21 五月 2019 14:05:15 +0800
Subject: [PATCH] 动态邀请素材优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index af35526..fbb61aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -12,6 +13,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
+import org.yeshi.utils.DateLunarUtil;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.taobao.TbImgUtil;
@@ -343,13 +345,13 @@
}
@Override
- @Cacheable(value = "dynamicCache", key = "'count-'+#cid+'-'+#subId")
+// @Cacheable(value = "dynamicCache", key = "'count-'+#cid+'-'+#subId")
public long count(Long cid, Long subId) {
return dynamicInfoDao.count(cid, subId);
}
@Override
- @Cacheable(value = "dynamicCache", key = "'query-'+#start+'-'+#count+'-'+#cid+'-'+#subId")
+// @Cacheable(value = "dynamicCache", key = "'query-'+#start+'-'+#count+'-'+#cid+'-'+#subId")
public List<DynamicInfo> query(int start, int count, Long cid, Long subId) {
List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);
@@ -409,28 +411,43 @@
}
- // 浠嬬粛鍐呭
- ClientTextStyleVO row1 = new ClientTextStyleVO();
- row1.setColor("#333333");
- row1.setContent(title);
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
- listtitle.add(row1);
- dynamicVO.setTitle(listtitle);
+
List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
- if(!StringUtil.isNullOrEmpty(picUrl)) {
- GoodsPicture p2 = new GoodsPicture();
- p2.setW(100);
- p2.setH(100);
- p2.setUrl(picUrl);
- listImg.add(p2);
- dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ONE);
- } else {
+ if(StringUtil.isNullOrEmpty(picUrl)) {
+ dynamicVO.setImgs(listImg);
dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
+
+ // 浠嬬粛鍐呭
+ ClientTextStyleVO row1 = new ClientTextStyleVO();
+ row1.setColor("#333333");
+ row1.setContent(title);
+ listtitle.add(row1);
+ dynamicVO.setTitle(listtitle);
+ dynamicInfoDao.insert(dynamicVO);
+ } else {
+ try {
+ dynamicVO.setTitle(listtitle);
+ dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ONE);
+
+ // 鍥剧墖
+ String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl , null, null, null);
+ GoodsPicture p2 = new GoodsPicture();
+ p2.setW(100);
+ p2.setH(100);
+ p2.setUrl(imgLink);
+ p2.setUrlOriginal(picUrl);
+ listImg.add(p2);
+ dynamicVO.setImgs(listImg);
+
+
+ dynamicInfoDao.insert(dynamicVO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- dynamicVO.setImgs(listImg);
- dynamicInfoDao.insert(dynamicVO);
}
@@ -770,9 +787,11 @@
if (inviteMaterial == null) {
return;
}
- String materialId = inviteMaterial.getId();
+ Date date = new Date();
+ String materialId = inviteMaterial.getId();
String content = inviteMaterial.getText();
+
if (!StringUtil.isNullOrEmpty(content)) {
DynamicInfo dynamicTxt= new DynamicInfo();
dynamicTxt.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -783,12 +802,26 @@
dynamicTxt.setShareType(DynamicInfo.SHARE_TYPE_INVITE);
dynamicTxt.setUser(activityUserService.listRand(1).get(0));
dynamicTxt.setShareCount(1000 + (int) (Math.random() * 8000));
- dynamicTxt.setCreateTime(new Date());
- dynamicTxt.setUpdateTime(new Date());
+ dynamicTxt.setCreateTime(date);
+ dynamicTxt.setUpdateTime(date);
+ SimpleDateFormat format = new SimpleDateFormat("MM鏈坉d鏃�");
+
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("------------------------------------------\n");
+ buffer.append("浠婂ぉ : " + format.format(date));
+ buffer.append(" ");
+ buffer.append(DateLunarUtil.getWeekd(date) + "\n");
+ buffer.append("鍚勪綅浜茬埍鐨勪綘");
+ buffer.append(" ");
+ buffer.append("鏃╁畨锝瀄n");
+ buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
+ buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
+
+
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
- row1.setContent(content);
+ row1.setContent(content + "\n" + buffer.toString());
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
listtitle.add(row1);
dynamicTxt.setTitle(listtitle);
@@ -811,8 +844,8 @@
dynamicPic.setShareType(DynamicInfo.SHARE_TYPE_INVITE);
dynamicPic.setUser(activityUserService.listRand(1).get(0));
dynamicPic.setShareCount(1000 + (int) (Math.random() * 8000));
- dynamicPic.setCreateTime(new Date());
- dynamicPic.setUpdateTime(new Date());
+ dynamicPic.setCreateTime(date);
+ dynamicPic.setUpdateTime(date);
try {
// 鐢诲浘
@@ -825,6 +858,8 @@
p2.setW(100);
p2.setH(100);
p2.setUrl(url);
+ p2.setUrlOriginal(picture);
+ p2.setTitleOriginal(content);
List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
listImg.add(p2);
dynamicPic.setImgs(listImg);
--
Gitblit v1.8.0