冲突提交

src/main/java/com/yihu/wlyy/job/consult/ConsultCleaner.java

@@ -41,7 +41,7 @@ public class ConsultCleaner {
            // 先关闭超过24小时未回应的咨询
            consultTeamDao.updateUnresponsedConsultOver24Hours();
            // 计算下一次执行此任务的时间，若无下次计算时间为半个小时后
            // 计算下一次执行此任务的时间，若无下次计算时间为50分钟后
            Date nextTriggerTime;
            Page<ConsultTeam> consultTeams = consultTeamDao.getUnresponsedConsultIn24Hours(new PageRequest(0, 1));
@@ -54,17 +54,16 @@ public class ConsultCleaner {
                nextTriggerTime = calendar.getTime();
            } else {
                Calendar calendar = GregorianCalendar.getInstance();
                calendar.set(Calendar.MINUTE, calendar.get(Calendar.MINUTE) + 30);
                calendar.set(Calendar.MINUTE, calendar.get(Calendar.MINUTE) + 50);
                nextTriggerTime = calendar.getTime();
            }
            if (quartzHelper.isExistJob(ConsultTerminatorJobKey)) {
                quartzHelper.removeJob(ConsultTerminatorJobKey);
            }
            System.out.println("计算下次任务执行时间，下次执行在" + nextTriggerTime.toString());
            //quartzHelper.startAt(nextTriggerTime, ConsultCleanerJob.class, ConsultTerminatorJobKey, null);
            quartzHelper.startAt(nextTriggerTime,
                    ConsultCleanerJob.class,
                    ConsultTerminatorJobKey + new Date().toString(),
                    null);
        } catch (Exception e) {
            e.printStackTrace();
        }

src/main/java/com/yihu/wlyy/repository/consult/ConsultTeamDao.java

@@ -226,15 +226,12 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
	@Query("select a from ConsultTeam a, ConsultTeamDoctor b where a.consult = b.consult and a.type=6 and b.to = ?1 and a.status = 0 and b.reply = 1 and a.del = '1' and b.del = '1'")
	Page<ConsultTeam> findFamousDoctorIngNoTitleList(String uid, Pageable pageRequest);
    // 最近24小时内未回复的项目
    @Query("FROM ConsultTeam a where CURRENT_TIME - a.czrq < 86400 and a.status = 0 order by a.czrq desc")
    Page<ConsultTeam> getUnresponsedConsultIn24Hours(Pageable pageable);
    // 更新超过24小时未回复的项目，多加一分钟，防止过于频繁更新
    @Modifying
    @Query("UPDATE ConsultTeam a set a.status = -2 where CURRENT_TIME - a.czrq > 87840")
    @Query("UPDATE ConsultTeam a set a.status = -2 where TIMESTAMPDIFF(SECOND, a.czrq, CURRENT_TIME) > 87840 and status = 0")
    void updateUnresponsedConsultOver24Hours();
	@Query("FROM ConsultTeam a where a.type=?1 and a.adminTeamId is null")
	List<ConsultTeam> findByTypeAndAdminTeamIdIsNull(Integer s);
    // 最近24小时内未回复的项目
    @Query("FROM ConsultTeam a where TIMESTAMPDIFF(SECOND, a.czrq, CURRENT_TIME) < 86400 and a.status = 0 order by a.czrq desc")
    Page<ConsultTeam> getUnresponsedConsultIn24Hours(Pageable pageable);
}

src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -81,17 +81,18 @@ public class AdminTeamService extends BaseService {
        return team;
    }
    public Map<String, Object> getPatientSigningTeam(String patientCode){
    public Map<String, Object> getPatientSigningTeam(String patientCode, String currentDoctor){
        Object result[] = (Object[]) teamDao.getPatientSigningTeam(patientCode);
        if (result == null) return null;
        Map<String, Object> team = new HashMap<>();
        team.put("teamId", result[0]);
        team.put("teamName", result[1]);
        team.put("doctorCode", result[2]);
        team.put("doctorName", result[3]);
        team.put("healthDoctorCode", result[4]);
        team.put("healthDoctorName", result[5]);
        team.put("isLeader", currentDoctor != null && result[2].equals(currentDoctor));
        team.put("doctorCode", result[3]);
        team.put("doctorName", result[4]);
        team.put("healthDoctorCode", result[5]);
        team.put("healthDoctorName", result[6]);
        return team;
    }