From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 5 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 8bd65cc..5aa8326 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.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -21,6 +22,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.AppVersionService;
@@ -28,6 +30,7 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
@@ -84,6 +87,11 @@
} else if (!StringUtil.isJson(params)) {
throw new SpecialException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
}
+
+ String startTime_str = record.getStartTime_str();
+ if (record.isTimeTask() && (startTime_str == null || startTime_str.length() == 0)) {
+ throw new SpecialException(1, "鎺у埗鏃堕棿涓嶈兘涓虹┖");
+ }
if (!StringUtil.isNullOrEmpty(jumpType)) {
List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
@@ -91,6 +99,9 @@
record.setJumpDetail(listByType.get(0));
}
}
+
+ // 鏃堕棿杞崲
+ conversionTime(record);
Long state = record.getState();
if (state == null) {
@@ -197,6 +208,37 @@
}
}
+ /**
+ * web娈垫椂闂磋浆鎹�
+ * @param record
+ */
+ public void conversionTime(Special record) throws SpecialException, Exception {
+ // 鏄惁鏃堕棿鎺у埗
+ if(!record.isTimeTask()) {
+ record.setStartTime(null);
+ record.setEndTime(null);
+ } else {
+ String startTime_str = record.getStartTime_str();
+ String endTime_str = record.getEndTime_str();
+
+ if ((startTime_str == null|| startTime_str.trim().length() == 0)
+ && (endTime_str == null || endTime_str.trim().length() == 0)) {
+ throw new HomeNavbarException(1, "璇疯緭鍏ユ帶鍒舵椂闂�");
+ } else {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ if (startTime_str != null && startTime_str.trim().length() > 0) {
+ startTime_str = startTime_str.replaceAll("T", " ");
+ record.setStartTime(format.parse(startTime_str));
+ }
+
+ if (endTime_str != null && endTime_str.trim().length() > 0) {
+ endTime_str = endTime_str.replaceAll("T", " ");
+ record.setEndTime(format.parse(endTime_str));
+ }
+ }
+ }
+ }
+
/**
* 涓婁紶鍥剧墖
*
@@ -329,6 +371,32 @@
// 璺宠浆閾炬帴
for (Special special : list) {
+
+ Date startTime = special.getStartTime();
+ Date endTime = special.getEndTime();
+
+ if (startTime == null && endTime == null) {
+ special.setTimeTask(false);
+ special.setStartTime_str("");
+ special.setEndTime_str("");
+ } else {
+ special.setTimeTask(true);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (startTime == null) {
+ special.setStartTime_str("");
+ } else {
+ special.setStartTime_str(sdf.format(startTime));
+ }
+
+ if (endTime == null) {
+ special.setEndTime_str("");
+ } else {
+ special.setEndTime_str(sdf.format(endTime));
+ }
+ }
+
+
String params = special.getParams();
if (StringUtil.isNullOrEmpty(params)) {
special.setParams("");
@@ -391,7 +459,10 @@
else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
indexArc = "index_arc_1.5.6";
- List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ int version = Integer.parseInt(acceptData.getVersion());
+
+ List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex, platformCode, version);
if (listArc == null) {
listArc = new ArrayList<Special>();
} else if (listArc.size() > 0) {
@@ -439,7 +510,7 @@
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
- listActivity = specialMapper.listByPlaceKey("index_activity", null);
+ listActivity = specialMapper.listByPlaceKey("index_activity", null, platformCode, version);
}
if (listActivity == null) {
@@ -462,7 +533,7 @@
indexBlock = "index_block_1.5.6";
JSONObject blockJsonMap = new JSONObject();
- List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);
+ List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex, platformCode, version);
if (listBlock == null) {
listBlock = new ArrayList<Special>();
} else if (listBlock.size() > 0) {
@@ -496,8 +567,8 @@
}
@Override
- public List<Special> listByPlaceKey(String placeKey) {
- return specialMapper.listByPlaceKey(placeKey, null);
+ public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode) {
+ return specialMapper.listByPlaceKey(placeKey, null, platform, versionCode);
}
/**
--
Gitblit v1.8.0