From 1da17d215d48e3e3aa9e8d7a3ef526904764f408 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 14:06:12 +0800
Subject: [PATCH] 1.5.3部分需求 提交
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index b52ee45..d2b37ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.homemodule;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -11,12 +12,17 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
+import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.homemodule.SpecialMapper;
import com.yeshi.fanli.entity.bus.homemodule.Special;
+import com.yeshi.fanli.entity.bus.homemodule.SpecialPlace;
+import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONObject;
@Service
@@ -24,6 +30,9 @@
@Resource
private SpecialMapper specialMapper;
+
+ @Resource
+ private SpecialPlaceService specialPlaceService;
@Override
@@ -120,6 +129,69 @@
@Override
+ @Cacheable(value = "configCache", key = "'getSpecialListCache-'+#card+'-'+#systemId")
+ public JSONObject getSpecialListCache(String card, Long systemId) throws Exception{
+
+ // 涓よ鍦嗗舰涓撻
+ List<Special> arcList = new ArrayList<Special>();
+ // 娲诲姩鍒楄〃
+ List<Special> activityList = new ArrayList<Special>();
+ // 鏂瑰潡閮ㄥ垎
+ List<Special> blockList = new ArrayList<Special>();
+
+
+ List<Special> list = specialMapper.listBySystemAndCard(card, systemId);
+ if (list != null && list.size() > 0) {
+ for (Special special : list) {
+ if (Special.SHOWTYPE_ARC.equals(special.getShowType())) {
+ // 涓よ鍦嗗舰涓撻
+ arcList.add(special);
+ } else if (Special.SHOWTYPE_BLOCK.equals(special.getShowType())) {
+ // 鏂瑰潡閮ㄥ垎
+ blockList.add(special);
+ } else if (Special.SHOWTYPE_ACTIVITY.equals(special.getShowType())) {
+ // 鍔ㄦ��
+ activityList.add(special);
+ }
+ }
+ }
+
+ JSONObject arcMap = new JSONObject();
+ arcMap.put("list", JsonUtil.getApiCommonGson().toJson(arcList));
+
+ JSONObject activityMap = new JSONObject();
+ activityMap.put("list", JsonUtil.getApiCommonGson().toJson(activityList));
+
+ JSONObject blockJsonMap = new JSONObject();
+ blockJsonMap.put("list", JsonUtil.getApiCommonGson().toJson(blockList));
+
+ // 鑳屾櫙鍥剧墖
+ List<SpecialPlace> listPlace = specialPlaceService.getList();
+ if (listPlace != null && listPlace.size() > 0) {
+ for (SpecialPlace specialPlace: listPlace) {
+ String bottomPicture = specialPlace.getBottomPicture();
+ if (bottomPicture != null && bottomPicture.trim().length() > 0) {
+ if (Special.SHOWTYPE_ARC.equals(specialPlace.getKey())) {
+ arcMap.put("bottomPicture", bottomPicture);
+ } else if (Special.SHOWTYPE_BLOCK.equals(specialPlace.getKey())) {
+ blockJsonMap.put("bottomPicture", bottomPicture);
+ } else if (Special.SHOWTYPE_ACTIVITY.equals(specialPlace.getKey())) {
+ activityMap.put("bottomPicture", bottomPicture);
+ }
+ }
+ }
+ }
+
+ JSONObject rootMap = new JSONObject();
+ rootMap.put("arcArea", arcMap);
+ rootMap.put("activityArea", activityMap);
+ rootMap.put("blockArea", blockJsonMap);
+
+ return rootMap;
+ }
+
+
+ @Override
public void uploadPicture(MultipartFile file, Special record, Long cardId) throws Exception {
InputStream inputStream = file.getInputStream();
--
Gitblit v1.8.0