From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java | 94 +++++++++++++++++++++++++++++-----------------
1 files changed, 59 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index 1dc58ad..3dac5f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -21,6 +21,8 @@
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.FilePathEnum;
+import com.yeshi.fanli.util.StringUtil;
@Service
@@ -53,7 +55,7 @@
}
// 鏃堕棿浠诲姟鎺у埗
- conversionTime(record);
+ handleTime(record);
// 鍥剧墖涓婁紶
@@ -105,35 +107,31 @@
/**
* web娈垫椂闂磋浆鎹�
+ *
* @param record
*/
- public void conversionTime(SpecialCard record) throws SpecialCardException, 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 SpecialCardException(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));
- }
- }
+ private void handleTime(SpecialCard record) throws SpecialCardException, Exception {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ String startTime_str = record.getStartTime_str();
+ if (!StringUtil.isNullOrEmpty(startTime_str)) {
+ startTime_str = startTime_str.replaceAll("T", " ");
+ record.setStartTime(format.parse(startTime_str));
+ }
+
+ String endTime_str = record.getEndTime_str();
+ if (!StringUtil.isNullOrEmpty(endTime_str)) {
+ endTime_str = endTime_str.replaceAll("T", " ");
+ record.setEndTime(format.parse(endTime_str));
+ }
+
+ if (record.getEndTime() != null && record.getStartTime() != null
+ && record.getStartTime().getTime() > record.getEndTime().getTime()) {
+ throw new SpecialCardException(1, "璧峰鏃堕棿涓嶈兘灏忎簬缁撴潫鏃堕棿");
}
}
+
/**
* 涓婁紶鍥剧墖
@@ -149,7 +147,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath="/img/SpecialCard/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath=FilePathEnum.specialCard.getPath() +UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
@@ -176,9 +174,9 @@
}
@Override
- public List<SpecialCard> listQuery(long start, int count, String key, Integer sort) {
+ public List<SpecialCard> listQuery(long start, int count, String key, Integer sort, List<Long> listPid) {
- List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key);
+ List<SpecialCard> listObj = specialCardMapper.listQuery(start, count, key, listPid);
if (listObj == null || listObj.size() == 0) {
return null;
}
@@ -187,15 +185,20 @@
long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null, null);
specialCard.setTotalSpecial(totalSpecial);
+ // 灏嗙姸鎬佸彉鍖�
+ if (specialCard.getState() != null && specialCard.getState() == 0) {
+ specialCard.setState(1);
+ } else {
+ specialCard.setState(0);
+ }
+
+
Date startTime = specialCard.getStartTime();
Date endTime = specialCard.getEndTime();
if (startTime == null && endTime == null) {
- specialCard.setTimeTask(false);
specialCard.setStartTime_str("");
specialCard.setEndTime_str("");
} else {
- specialCard.setTimeTask(true);
-
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
if (startTime == null) {
specialCard.setStartTime_str("");
@@ -217,15 +220,13 @@
specialCard.setPlaceName(specialPlace.getName());
}
}
-
}
-
return listObj;
}
@Override
- public long countlistQuery(String key) {
- return specialCardMapper.countlistQuery(key);
+ public long countlistQuery(String key, List<Long> listPid) {
+ return specialCardMapper.countlistQuery(key, listPid);
}
@Override
@@ -234,6 +235,29 @@
}
+ @Override
+ public void switchState(Long id) throws SpecialCardException {
+ if (id == null) {
+ throw new SpecialCardException(1, "璇蜂紶閫掓纭弬鏁�");
+ }
+
+ SpecialCard resultObj = specialCardMapper.selectByPrimaryKey(id);
+ if (resultObj == null) {
+ throw new SpecialCardException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
+ }
+
+ Integer state = resultObj.getState();
+ if (state == null || state == 0) {
+ state = 1;
+ } else {
+ state = 0;
+ }
+
+ SpecialCard updateObj = new SpecialCard();
+ updateObj.setId(id);
+ updateObj.setState(state);
+ specialCardMapper.updateByPrimaryKeySelective(updateObj);
+ }
}
--
Gitblit v1.8.0