2023年11月9日 修改接口,新增接口

This commit is contained in:
bai 2023-11-09 01:22:27 +08:00
parent 9373247221
commit 396cbf5bdb
2 changed files with 50 additions and 7 deletions

View File

@ -12,6 +12,7 @@ import com.beust.jcommander.internal.Sets;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
import org.jeecg.modules.kc.jiaoshi.controller.KcZhihuijiaoshiController;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
@ -51,6 +52,10 @@ public class RefreshLiveServer extends BaseSync {
@Autowired
private IKcZhihuijiaoshiStateLogService kcZhihuijiaoshiStateLogService;//直播状态日志
@Autowired
private RedisUtil redisUtil;
/**
* 若参数变量名修改 QuartzJobController中也需对应修改
*/
@ -144,6 +149,8 @@ public class RefreshLiveServer extends BaseSync {
if(!onList.isEmpty()){
UpdateWrapper<KcZhihuijiaoshi> onUw = new UpdateWrapper<>();
onUw.set("sfyx",0);
onUw.set("update_by","system");
onUw.set("update_time",new Date());
onUw.in("jsbh",onList);
kcZhihuijiaoshiService.update(onUw);
}
@ -151,6 +158,8 @@ public class RefreshLiveServer extends BaseSync {
if(!outList.isEmpty()) {
UpdateWrapper<KcZhihuijiaoshi> outUw = new UpdateWrapper<>();
outUw.set("sfyx", 1);
outUw.set("update_by","system");
outUw.set("update_time",new Date());
outUw.in("jsbh", outList);
kcZhihuijiaoshiService.update(outUw);
}
@ -161,6 +170,11 @@ public class RefreshLiveServer extends BaseSync {
* 刷新日志
*/
public void refreshState(String jxlName){
if(StringUtils.isNotBlank(jxlName)){
redisUtil.set("zhihuijiaos:" + jxlName + ":btnStatus",true,60);
}else{
redisUtil.set("zhihuijiaos:all:btnStatus",true,60);
}
QueryWrapper<KcZhihuijiaoshi> qw = new QueryWrapper<>();
//qw.eq("xm","教师近景");
qw.eq(StringUtils.isNotBlank(jxlName),"jxl_name",jxlName);
@ -219,10 +233,15 @@ public class RefreshLiveServer extends BaseSync {
}
});
kcZhihuijiaoshiStateLogService.saveBatch(stateLogMap.values());
//更新全部的修改时间
UpdateWrapper<KcZhihuijiaoshiStateLog> uqw = new UpdateWrapper<>();
uqw.set("create_time",new Date());
kcZhihuijiaoshiStateLogService.update(uqw);
//更新全部的修改时间(新规则分批展示时间)
// UpdateWrapper<KcZhihuijiaoshiStateLog> uqw = new UpdateWrapper<>();
// uqw.set("create_time",new Date());
// kcZhihuijiaoshiStateLogService.update(uqw);
if(StringUtils.isNotBlank(jxlName)){
redisUtil.del("zhihuijiaos:" + jxlName + ":btnStatus");
}else{
redisUtil.del("zhihuijiaos:all:btnStatus");
}
}
/**

View File

@ -19,6 +19,7 @@ import lombok.Data;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.kc.grab.SynchronizationService.RefreshLiveServer;
import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo;
import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi;
@ -84,6 +85,10 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
@Autowired
private DictUtils dictUtils;
@Autowired
private RedisUtil redisUtil;
@Data
public class JieciIntTime {
private Integer ksTime;
@ -95,7 +100,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
QueryWrapper<KcZhihuijiaoshi> queryWrapper) {
TimeInterval timer = DateUtil.timer();
Page<KcZhihuijiaoshi> page = new Page<KcZhihuijiaoshi>(pageNo, pageSize);
Page<KcZhihuijiaoshi> page = new Page<>(pageNo, pageSize);
IPage<KcZhihuijiaoshi> pageList = kcZhihuijiaoshiService.page(page, queryWrapper);
log.info("01: {}",timer.intervalRestart());
@ -169,13 +174,13 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
log.info("06: {}",timer.intervalRestart());
starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天
// String nowStr2 = starTime.toString("yyyy-MM-dd");
String nowStr2 = starTime.toString("yyyy-MM-dd");
QueryWrapper<KcKetangbiao> nextDayKtqw = new QueryWrapper<>();
nextDayKtqw.eq("hh","01、02");//明天的只查0102这个节次的
// nextDayKtqw.apply("skrq >= STR_TO_DATE('"+nowStr2+"', '%Y-%m-%d')");
// nextDayKtqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr2+"','%Y-%m-%d'),INTERVAL 1 DAY)");
nextDayKtqw.eq("skrq",nowStr);
nextDayKtqw.eq("skrq",nowStr2);
nextDayKtqw.isNotNull("jsbh");
List<KcKetangbiao> nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw);
@ -421,4 +426,23 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
return Result.OK(kcZhihuijiaoshiStateLogService.list());
}
/**
* 查询redis中某key的状态
* @return
*/
@GetMapping(value = "/getRedisKey")
public Result<?> getRedisKey(String key){
return Result.OK(redisUtil.get(key));
}
/**
* 查询redis中某key的状态
* @return
*/
@GetMapping(value = "/resettingRedisKeys")
public Result<?> resettingRedisKey(String key){
redisUtil.del(StringUtils.split(key,","));
return Result.OK();
}
}