|
@@ -10,7 +10,9 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.toolkit.StringUtils;
|
|
import com.baomidou.mybatisplus.toolkit.StringUtils;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Sets;
|
|
import com.google.common.collect.Sets;
|
|
|
|
+import com.winsea.svc.base.base.entity.CommonStaff;
|
|
import com.winsea.svc.base.base.entity.CommonStaffRole;
|
|
import com.winsea.svc.base.base.entity.CommonStaffRole;
|
|
|
|
+import com.winsea.svc.base.base.mapper.CommonStaffMapper;
|
|
import com.winsea.svc.base.base.service.ICommonStaffRoleService;
|
|
import com.winsea.svc.base.base.service.ICommonStaffRoleService;
|
|
import com.winsea.svc.base.base.service.ICommonStaffVesselService;
|
|
import com.winsea.svc.base.base.service.ICommonStaffVesselService;
|
|
import com.winsea.svc.base.base.util.MessagePusherUtils;
|
|
import com.winsea.svc.base.base.util.MessagePusherUtils;
|
|
@@ -43,14 +45,18 @@ import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.NewNoticeTaskMapper;
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.NewNoticeTaskMapper;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeTaskService;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeTaskService;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeUtilService;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.INewNoticeUtilService;
|
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
+import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@SofaService
|
|
@SofaService
|
|
public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, NoticeTaskInfo> implements INewNoticeTaskService {
|
|
public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, NoticeTaskInfo> implements INewNoticeTaskService {
|
|
@@ -69,6 +75,10 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
|
|
private NewNoticeTaskMapper newNoticeTaskMapper;
|
|
private NewNoticeTaskMapper newNoticeTaskMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private INewNoticeUtilService noticeUtilService;
|
|
private INewNoticeUtilService noticeUtilService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private GeTuiUtils geTuiUtils;
|
|
|
|
+ @Autowired
|
|
|
|
+ private CommonStaffMapper commonStaffMapper;
|
|
private Set<String> businessCodes;
|
|
private Set<String> businessCodes;
|
|
@Value("${taskmsg.isPushed:true}")
|
|
@Value("${taskmsg.isPushed:true}")
|
|
private boolean isTaskmsgPushed;
|
|
private boolean isTaskmsgPushed;
|
|
@@ -232,6 +242,31 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
|
|
return this.selectList(noticeTaskWrapper);
|
|
return this.selectList(noticeTaskWrapper);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 添加
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ /**
|
|
|
|
+ * 每天16.30点更新
|
|
|
|
+ */
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Scheduled(cron = "0 */5 * * * ?")
|
|
|
|
+ public void call() throws Exception {
|
|
|
|
+ Wrapper<NoticeTaskInfo> noticeTaskWrapper = new EntityWrapper();
|
|
|
|
+ noticeTaskWrapper.eq("delete_flag", 0);
|
|
|
|
+ noticeTaskWrapper.eq("accept_type","STAFF");
|
|
|
|
+ noticeTaskWrapper.notIn("accept_type","RETURN");
|
|
|
|
+ noticeTaskWrapper.groupBy("accept_id");
|
|
|
|
+ List<NoticeTaskInfo> noticeTaskInfos = this.selectList(noticeTaskWrapper);
|
|
|
|
+// geTuiUtils.callPhone("111");
|
|
|
|
+ if(CollectionUtils.isNotEmpty(noticeTaskInfos)){
|
|
|
|
+ for(int i=0;i<noticeTaskInfos.size();i++){
|
|
|
|
+ geTuiUtils.callPhone(noticeTaskInfos.get(i).getAcceptId());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public List<NoticeBusinessTypeNumber> findBusinessTypeCount() {
|
|
public List<NoticeBusinessTypeNumber> findBusinessTypeCount() {
|
|
NoticeTaskInfo noticeTaskInfo = new NoticeTaskInfo();
|
|
NoticeTaskInfo noticeTaskInfo = new NoticeTaskInfo();
|