sunyj 9 лет назад
Родитель
Сommit
fb374ae585

+ 1 - 1
search-console-b2b/src/main/resources/bootstrap.yml

@@ -39,5 +39,5 @@ zk:
 service:
  message:
   sms:
-   templateId: a38cd5c8-8772-48b6-b59d-e8da613ca3b3
+   templateId: 186c7219-fe33-4b64-b50e-d351c6846583
    receivers: 18782417445

+ 0 - 22
search-console/src/main/java/com/uas/search/console/controller/ScheduleController.java

@@ -1,16 +1,12 @@
 package com.uas.search.console.controller;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.message.sms.domain.SmsLog;
-import com.uas.message.sms.service.SmsService;
 import com.uas.search.console.schedule.model.TaskInformation;
 import com.uas.search.console.schedule.service.TaskService;
 
@@ -53,22 +49,4 @@ public class ScheduleController {
 	public boolean isStopped() {
 		return taskService.isStopped();
 	}
-
-	@Autowired
-	private SmsService smsService;
-
-	@RequestMapping("/test")
-	@ResponseBody
-	// TODO 测完后删除
-	public void test() {
-		Set<String> receivers = new HashSet<>();
-		receivers.add("18782417445");
-		List<SmsLog> logs = smsService.sendAll("a38cd5c8-8772-48b6-b59d-e8da613ca3b3", receivers,
-				new Object[] { "B2C实时更新服务出现问题,正在自动重启实时更新服务" });
-		for (SmsLog log : logs) {
-			System.out.println(log.getJsonResult());
-			System.out.println(log.getErrMsg());
-		}
-	}
-
 }

+ 5 - 1
search-console/src/main/java/com/uas/search/console/service/impl/IndexServiceImpl.java

@@ -398,7 +398,7 @@ public class IndexServiceImpl implements IndexService {
 		int fileIndex = 1;
 		if (startFileIndex != null) {
 			if (startFileIndex < 1) {
-				throw new SearchException("startFileIndex需大于1");
+				throw new SearchException("startFileIndex不小于1");
 			} else {
 				fileIndex = startFileIndex;
 			}
@@ -415,6 +415,10 @@ public class IndexServiceImpl implements IndexService {
 		Page<ComponentSimpleInfo> pageResult = componentDao.findAll(pageInfo);
 
 		// 数据库中数据的总数目
+		if (pageResult.getTotalElements() < (fileIndex - 1) * SINGLE_FILE_MAX_SIZE) {
+			throw new SearchException("startFileIndex不超过"
+					+ ((int) Math.ceil(pageResult.getTotalElements() / (1.0 * SINGLE_FILE_MAX_SIZE))));
+		}
 		long totalElements = pageResult.getTotalElements() - (fileIndex - 1) * SINGLE_FILE_MAX_SIZE;
 		logger.info("发现数据:" + totalElements + "条");
 		// 已翻页的数据数目

+ 1 - 1
search-console/src/main/resources/bootstrap.yml

@@ -34,5 +34,5 @@ zk:
 service:
  message:
   sms:
-   templateId: a38cd5c8-8772-48b6-b59d-e8da613ca3b3
+   templateId: 186c7219-fe33-4b64-b50e-d351c6846583
    receivers: 18782417445