From afb2bc8e77e086ebeb358915e12fad41dac78a6a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 14:41:34 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
index e9c7944..9461bda 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -18,6 +18,7 @@
import com.ruoyi.management.service.ITUseGuideService;
import com.ruoyi.management.vo.PageVO;
import com.ruoyi.management.vo.SysSetVO;
+import com.ruoyi.study.api.feignClient.StudyClient;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,8 @@
private ITProtocolService protocolService;
@Autowired
private ITUseGuideService useGuideService;
+ @Autowired
+ private StudyClient studyClient;
@ApiOperation(value = "获取系统设置", tags = {"后台-系统设置"})
@PostMapping(value = "/getSysSet")
@@ -62,6 +65,10 @@
public AjaxResult saveSysSet(SysSetVO vo) {
TSysSet byId = sysSetService.getById(1);
BeanUtils.copyProperties(vo, byId);
+ // 音效更改及更改音效设置时间
+ if (!byId.getCorrect().equals(vo.getCorrect()) || !byId.getError().equals(vo.getError())) {
+ byId.setAcousticsTime(new Date());
+ }
byId.setId(1);
sysSetService.updateById(byId);
return AjaxResult.success("保存成功");
@@ -88,6 +95,7 @@
String page2 = vo.getPage2();
String page3 = vo.getPage3();
String page4 = vo.getPage4();
+ String page5 = vo.getPage5();
if (StringUtils.hasLength(page1)) {
TPage type = pageService.getOne(new QueryWrapper<TPage>()
.eq("type", 1));
@@ -142,18 +150,34 @@
pageService.updateById(type);
}
}
+ if (StringUtils.hasLength(page5)) {
+ TPage type = pageService.getOne(new QueryWrapper<TPage>()
+ .eq("type", 5));
+ if (type == null) {
+ TPage tPage = new TPage();
+ tPage.setImg(page5);
+ tPage.setType(5);
+ pageService.save(tPage);
+ } else {
+ if(!page5.equals(type.getImg())){
+ studyClient.resetLookVideo();
+ }
+ type.setImg(page5);
+ pageService.updateById(type);
+ }
+ }
return AjaxResult.success("保存成功");
}
@PostMapping("/agreement")
@ApiOperation(value = "协议", tags = {"后台-协议管理"})
- public AjaxResult agreement( AggrementDTO dto) {
+ public AjaxResult agreement(@RequestBody AggrementDTO dto) {
TProtocol protocol = protocolService.getById(dto.getType());
- if (StringUtils.hasLength(dto.getContent())) {
+ if (StringUtils.hasLength(dto.getContent())){
protocol.setContent(dto.getContent());
protocolService.updateById(protocol);
return AjaxResult.success("修改成功");
- } else {
+ }else {
return AjaxResult.success(protocol.getContent());
}
}
@@ -163,9 +187,7 @@
public R<String> agreement1(@PathVariable("type") Integer type) {
TProtocol protocol = protocolService.getOne(new QueryWrapper<TProtocol>()
.eq("type", type));
-
return R.ok(protocol.getContent());
-
}
@PostMapping("/useGuide")
@@ -178,11 +200,9 @@
List<String> strings = new ArrayList<>();
strings.add("insertTime");
wrapper.orderByDesc(strings);
-
- List<TUseGuide> useGuides = useGuideService.list(wrapper);
PageInfo<TUseGuide> res = new PageInfo<>(pageNumber, pageSize);
+ List<TUseGuide> useGuides = useGuideService.pageList(title,res,pageNumber,pageSize);
res.setRecords(useGuides);
- res.setTotal(useGuides.size());
return AjaxResult.success(res);
}
@@ -197,14 +217,9 @@
List<String> strings = new ArrayList<>();
strings.add("insertTime");
wrapper.orderByDesc(strings);
- PageInfo<TUseGuide> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- List<TUseGuide> useGuides = useGuideService.list(wrapper);
- List<TUseGuide> useGuides2 = useGuideService.listAll(query);
- PageInfo<TUseGuide> page = useGuideService.page(new PageInfo<>(query.getPageNumber(), query.getPageSize()), wrapper);
-
- res.setRecords(useGuides2);
- res.setTotal(useGuides.size());
-
+ PageInfo<TUseGuide> res = new PageInfo<>(query.getPageNumber(),query.getPageSize());
+ List<TUseGuide> useGuides = useGuideService.pageList(query.getTitle(),res,query.getPageNumber(),query.getPageSize());
+ res.setRecords(useGuides);
return R.ok(res);
}
@@ -254,6 +269,18 @@
public R<TSysSet> promptVoice() {
return R.ok(sysSetService.lambdaQuery().eq(TSysSet::getDisabled, 0).one());
}
+ @ApiOperation(value = "2.0新增，是否展示文字配置", tags = {"2.0新增，是否展示文字配置"})
+ @GetMapping(value = "/getIsOpen")
+ public R<Boolean> getIsOpen() {
+ TSysSet one = sysSetService.lambdaQuery().eq(TSysSet::getDisabled, 0).one();
+ switch (one.getIsOpen()){
+ case 1:
+ return R.ok(true);
+ case 0:
+ return R.ok(false);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1