Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63cc815022 | ||
|
|
8f00d07377 |
+6
@@ -480,4 +480,10 @@ public class ConSessionApiController {
|
|||||||
return conSessionApiService.insertUserAndHelperSessionNew();
|
return conSessionApiService.insertUserAndHelperSessionNew();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "超时关闭视频咨询", description = "超时关闭视频咨询")
|
||||||
|
@GetMapping("/endVideoSession")
|
||||||
|
public Result<String> endVideoSession() {
|
||||||
|
return Result.ok(conSessionApiService.endVideoSession());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -115,4 +115,6 @@ public interface ConSessionApiService {
|
|||||||
|
|
||||||
UserSessionCount countForUser();
|
UserSessionCount countForUser();
|
||||||
|
|
||||||
|
String endVideoSession();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -2114,4 +2114,8 @@ public class ConSessionApiServiceImpl implements ConSessionApiService {
|
|||||||
return conSessionMapper.selectCount(wrapper).intValue();
|
return conSessionMapper.selectCount(wrapper).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String endVideoSession() {
|
||||||
|
return conSessionMapper.endVideoSession();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -294,4 +294,13 @@ public interface ConSessionMapper extends BaseMapper<ConSession> , MPJBaseMapper
|
|||||||
@Param("doctorjob")String doctorjob,
|
@Param("doctorjob")String doctorjob,
|
||||||
@Param("contentType")String contentType,
|
@Param("contentType")String contentType,
|
||||||
@Param("toAccount")String toAccount);
|
@Param("toAccount")String toAccount);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 音视频咨询过期处理:预约日期已过的视频咨询,有通话记录则改为待评价,无通话记录则改为取消
|
||||||
|
* content_status: 4=待评价,6=取消
|
||||||
|
*/
|
||||||
|
@Update("UPDATE con_session SET content_status = CASE WHEN session_time IS NOT NULL THEN 4 ELSE 6 END " +
|
||||||
|
"WHERE content_type = 2 AND CURDATE() > session_date " +
|
||||||
|
"AND content_status NOT IN (4, 5, 6, 7, 8) AND del_flag = 0 AND status = 1")
|
||||||
|
String endVideoSession();
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-2
@@ -7,6 +7,7 @@ import com.xxl.job.core.biz.model.ReturnT;
|
|||||||
import com.xxl.job.core.context.XxlJobHelper;
|
import com.xxl.job.core.context.XxlJobHelper;
|
||||||
import com.xxl.job.core.handler.annotation.XxlJob;
|
import com.xxl.job.core.handler.annotation.XxlJob;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.CommonConstant;
|
||||||
import org.jeecg.config.shiro.ClientSignThreadLocal;
|
import org.jeecg.config.shiro.ClientSignThreadLocal;
|
||||||
import org.parboiled.common.StringUtils;
|
import org.parboiled.common.StringUtils;
|
||||||
@@ -36,10 +37,10 @@ public class SyncScheduleJob {
|
|||||||
String expireHour = "168";
|
String expireHour = "168";
|
||||||
|
|
||||||
String param = XxlJobHelper.getJobParam();
|
String param = XxlJobHelper.getJobParam();
|
||||||
if(StringUtils.isNotEmpty(param)){
|
if (StringUtils.isNotEmpty(param)) {
|
||||||
JSONObject jsonObject = JSONObject.parseObject(param);
|
JSONObject jsonObject = JSONObject.parseObject(param);
|
||||||
String expireHourRequest = jsonObject.getString("expireHour");
|
String expireHourRequest = jsonObject.getString("expireHour");
|
||||||
if(StringUtils.isNotEmpty(expireHourRequest)){
|
if (StringUtils.isNotEmpty(expireHourRequest)) {
|
||||||
expireHour = jsonObject.getString("expireHour");
|
expireHour = jsonObject.getString("expireHour");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -53,4 +54,12 @@ public class SyncScheduleJob {
|
|||||||
return ReturnT.SUCCESS;
|
return ReturnT.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@XxlJob(value = "endVideoSession")
|
||||||
|
public Result<String> endVideoSession() {
|
||||||
|
// 20260327 新增 音视频咨询过期处理 规则为:超过预约时间,比如预约的是 12月9日和专家视频沟通,但超过时间一天,即为过期,需要关闭咨询
|
||||||
|
conSessionApiController.endVideoSession();
|
||||||
|
return Result.ok("success");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -192,6 +192,8 @@ public class HealthUserEmployeeExServiceImpl extends ServiceImpl<HealthUserEmplo
|
|||||||
}
|
}
|
||||||
List<String> orgCodes = GlobalUtils.getManagedCodes(filter.getOrgCode());
|
List<String> orgCodes = GlobalUtils.getManagedCodes(filter.getOrgCode());
|
||||||
filter.setOrgCodes(orgCodes);
|
filter.setOrgCodes(orgCodes);
|
||||||
|
// 20260330 · 名字中包含·需要转义回·
|
||||||
|
filter.setRealname(filter.getRealname().replaceAll("·", "·"));
|
||||||
IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.queryUserEmployeeList(page, filter);
|
IPage<UserEmployee> userEmployeeIPage = healthUserEmployeeExMapper.queryUserEmployeeList(page, filter);
|
||||||
if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {
|
if (CollectionUtils.isEmpty(userEmployeeIPage.getRecords())) {
|
||||||
return userEmployeeIPage;
|
return userEmployeeIPage;
|
||||||
|
|||||||
Reference in New Issue
Block a user