|
@@ -1,24 +1,14 @@
|
|
|
package com.goafanti.weChat.service.impl;
|
|
package com.goafanti.weChat.service.impl;
|
|
|
|
|
|
|
|
-import java.text.ParseException;
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
-import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
-
|
|
|
|
|
-import com.goafanti.admin.service.DepartmentService;
|
|
|
|
|
-import com.goafanti.common.dao.*;
|
|
|
|
|
-import com.goafanti.common.model.*;
|
|
|
|
|
-import com.goafanti.weChat.bo.*;
|
|
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
-import org.springframework.web.socket.TextMessage;
|
|
|
|
|
-
|
|
|
|
|
|
|
+import cn.jiguang.common.utils.StringUtils;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
|
|
+import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.AsyncUtils;
|
|
import com.goafanti.common.utils.AsyncUtils;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.SendEmailUtil;
|
|
import com.goafanti.common.utils.SendEmailUtil;
|
|
@@ -26,12 +16,20 @@ import com.goafanti.common.utils.WeChatUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
|
|
+import com.goafanti.core.websocket.SystemWebSocketHandler;
|
|
|
import com.goafanti.customer.bo.FollowBusinessBo;
|
|
import com.goafanti.customer.bo.FollowBusinessBo;
|
|
|
import com.goafanti.customer.service.CustomerService;
|
|
import com.goafanti.customer.service.CustomerService;
|
|
|
|
|
+import com.goafanti.weChat.bo.*;
|
|
|
import com.goafanti.weChat.service.PublicReleaseService;
|
|
import com.goafanti.weChat.service.PublicReleaseService;
|
|
|
-import com.goafanti.core.websocket.SystemWebSocketHandler;
|
|
|
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
+import org.springframework.web.socket.TextMessage;
|
|
|
|
|
|
|
|
-import cn.jiguang.common.utils.StringUtils;
|
|
|
|
|
|
|
+import java.text.ParseException;
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
+import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
|
|
public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
|
|
@@ -1129,7 +1127,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
throw new BusinessException("转换异常");
|
|
throw new BusinessException("转换异常");
|
|
|
}
|
|
}
|
|
|
List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
|
|
List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
|
|
|
- if (is.size()>1) {
|
|
|
|
|
|
|
+ if (is.size()>=1) {
|
|
|
return true;
|
|
return true;
|
|
|
}else if(is.size()==1){
|
|
}else if(is.size()==1){
|
|
|
//如果id为新增那么直接不允许时间重复
|
|
//如果id为新增那么直接不允许时间重复
|