Merge remote-tracking branch 'origin/master'

src/main/groovy/com/jd/brume/controller/ServiceController.groovy

@@ -178,7 +178,7 @@ class ServiceController {
 			// 发送短信
 			ServiceEntity serviceEntity = service.getById(id)
 			Map<String, Object> config = configService.listMaps().get(0)
-			String templet = String.valueOf(config.get("partyTemplet"))
+			String templet = String.valueOf(config.get("party_templet"))
 			List<DictEntity> dictList = dictService.getDictByType(Constant.QXBM_ZD)
 			String qxbm = ''
 			for (dictEntity in dictList) {
@@ -188,7 +188,7 @@ class ServiceController {
 				}
 			}
 			String sms = templet.replace("{user}", serviceEntity.sqrxm).replace("{area}", String.valueOf(qxbm))
-			boolean flag = SmsUtil.sendSms(String.valueOf(config.get("smsUrl")), serviceEntity.sqrlxdh, sms)
+			boolean flag = SmsUtil.sendSms(String.valueOf(config.get("sms_url")), serviceEntity.sqrlxdh, sms)
 			SmsRecordEntity recordEntity = new SmsRecordEntity(type: 1, content: sms, phone: serviceEntity.sqrlxdh,
 				status: flag ? 0 : 1, serviceId: id, serviceType: corp.type)
 			smsRecordService.save(recordEntity)

src/main/groovy/com/jd/brume/filters/LoginFilter.java

@@ -50,7 +50,7 @@ public class LoginFilter implements Filter {
             response.sendRedirect(request.getContextPath() + "/web/view/login.html");
             return;
         }
-        // token楠岃瘉
+
         String access_token = request.getHeader("access-token");
         if (StrUtil.isBlank(access_token)) {
             response.setCharacterEncoding("utf-8");

src/main/groovy/com/jd/brume/task/ServiceTask.java

@@ -1,12 +1,11 @@
 package com.jd.brume.task;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import javax.annotation.Resource;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -64,7 +63,7 @@ class ServiceTask implements SchedulingConfigurer {
 				System.out.println("拉取数据完毕，拉取时间:".concat(DateUtil.now()));
 				// 判断是否发送短信
 				Map<String, Object> config = configService.listMaps().get(0);
-				if (Convert.toInt(config.get("smsType")) == 1) {
+				if (Convert.toInt(config.get("sms_type")) != 1) {
 					return;
 				}
 				System.err.println("发送短信");
@@ -79,15 +78,27 @@ class ServiceTask implements SchedulingConfigurer {
 				List<SmsRecordEntity> recordList = new ArrayList<>();
 				SmsRecordEntity recordEntity;
 				// 短信模板
-				String templet = String.valueOf(config.get("userTemplet"));
+				String templet = String.valueOf(config.get("user_templet"));
 				List<UserEntity> userList = userService.lambdaQuery().in(UserEntity::getUserId, userIds).list();
 				for (UserEntity userEntity : userList) {
 					CorpEntity corp = corpService.lambdaQuery().eq(CorpEntity::getDeptId, userEntity.getDeptId()).one();
-					
+					SimpleDateFormat sdfYMD = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					Calendar calendar = Calendar.getInstance();
+					calendar.set(Calendar.SECOND,0); //这是将当天的【秒】设置为0
+					calendar.set(Calendar.MINUTE,0); //这是将当天的【分】设置为0
+					calendar.set(Calendar.HOUR_OF_DAY,0); //这是将当天的【时】设置为0
+					String ymd = sdfYMD.format(calendar.getTime());
+					long count = recordService.lambdaQuery().eq(SmsRecordEntity::getUserId, userEntity.getUserId()).gt(SmsRecordEntity::getCreateTime, ymd).count();
+					// 已发送文件
+					if (count>0){
+						System.out.println(userEntity.getPhone()+"本日已发送短信");
+						continue;
+					}
+
 					Integer num = service.getServiceByType(corp.getDeptPrefix(), corp.getType());
 					String sms = templet.replace("{user}", userEntity.getUserName()).replace("{number}", String.valueOf(num));
 					// 发送短信
-					boolean status = SmsUtil.sendSms(String.valueOf(config.get("smsUrl")), userEntity.getPhone(), sms);
+					boolean status = SmsUtil.sendSms(String.valueOf(config.get("sms_url")), userEntity.getPhone(), sms);
 					recordEntity = new SmsRecordEntity();
 					recordEntity.setType(0);
 					recordEntity.setUserId(userEntity.getUserId());

src/main/groovy/com/jd/brume/task/SmsTask.java

@@ -21,6 +21,8 @@ import cn.hutool.core.date.DateUtil;
 @Component
 @EnableScheduling
 class SmsTask implements SchedulingConfigurer {
+
+	
 	
 	@Resource
 	ConfigService configService;
@@ -31,9 +33,9 @@ class SmsTask implements SchedulingConfigurer {
 
 			@Override
 			public void run() {
-				System.out.println("拉取数据，拉取时间:".concat(DateUtil.now()));
+				System.out.println("鎷夊彇鏁版嵁锛屾媺鍙栨椂闂�:".concat(DateUtil.now()));
 				ApiUtil.getService();
-				System.out.println("拉取数据完毕，拉取时间:".concat(DateUtil.now()));
+				System.out.println("鎷夊彇鏁版嵁瀹屾瘯锛屾媺鍙栨椂闂�:".concat(DateUtil.now()));
 			}
 		}, new Trigger() {