From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java |   62 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
index ce3917b..a2f984a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
@@ -5,6 +5,9 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.bus.homemodule.Special;
+import com.yeshi.fanli.exception.homemodule.SpecialException;
+
+import net.sf.json.JSONObject;
 
 /**
  *  涓撻
@@ -14,36 +17,14 @@
  */
 public interface SpecialService {
 
-	public int deleteByPrimaryKey(Long id);
-
-	public int insert(Special record);
-
-	public int insertSelective(Special record);
 
 	public Special selectByPrimaryKey(Long id);
 
-	public int updateByPrimaryKeySelective(Special record);
-
-	public int updateByPrimaryKey(Special record);
 
 	public List<Special> listQueryByCard(long start, int count, Long card, String key);
 
 	public long countlistQueryByCard(Long card, String key);
 
-	/**
-	 * 鏌ヨ鎺掑簭鍊�
-	 * @param card
-	 * @return
-	 */
-	public int getMaxOrderByCard(Long card);
-
-	/**
-	 * 涓撻鍥剧墖涓婁紶
-	 * @param file
-	 * @param record
-	 * @throws Exception
-	 */
-	public void uploadPicture(MultipartFile file, Special record, Long cardId) throws Exception;
 
 	/**
 	 * 鏍规嵁id鎵归噺鍒犻櫎
@@ -62,16 +43,6 @@
 	public int deleteBatchByCardID(List<Long> list) throws Exception;
 
 	/**
-	 * 鎺掑簭浜ゆ崲瀵硅薄鏌ヨ
-	 * @param cardId
-	 * @param type
-	 * @param order
-	 * @return
-	 */
-	public List<Special> getOrderByCardID(Long cardId, Integer type, Integer order);
-
-	
-	/**
 	 * 鏍规嵁鏍囪瘑銆佺郴缁熸煡璇㈠惎鐢ㄤ笓棰�
 	 * @param card
 	 * @param systemId
@@ -89,4 +60,31 @@
 	 */
 	public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId);
 
+
+	/**
+	 * 淇濆瓨
+	 * @param file
+	 * @param record
+	 * @param jumpType
+	 * @throws SpecialException
+	 * @throws Exception
+	 */
+	public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record, String jumpType) throws SpecialException, Exception;
+
+	/**
+	 * 鏇存崲椤哄簭
+	 * @param id
+	 * @param moveType
+	 * @throws SpecialException
+	 */
+	public void updateOrder(Long id, Integer moveType) throws SpecialException;
+
+
+	/**
+	 * 棣栭〉-涓撻鏁版嵁
+	 * @return
+	 * @throws Exception
+	 */
+	public JSONObject listCacheSpecialToIndex() throws Exception;
+
 }

--
Gitblit v1.8.0