From b45c2583b4764edb95efe9880c4abfddb8a1ec21 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 22 五月 2024 15:38:29 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 63 +++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 17 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 51db76c..f40fda8 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.management.domain.TPage; @@ -10,6 +11,7 @@ import com.ruoyi.management.domain.TUseGuide; import com.ruoyi.management.dto.AggrementDTO; import com.ruoyi.management.dto.UseGuidDTO; +import com.ruoyi.management.query.UseGuideQuery; import com.ruoyi.management.service.ITPageService; import com.ruoyi.management.service.ITProtocolService; import com.ruoyi.management.service.ITSysSetService; @@ -19,7 +21,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -35,7 +36,7 @@ * @author 无关风月 * @since 2024-04-26 */ -@Controller +@RestController @RequestMapping("/tSysSet") public class TSysSetController { @Autowired @@ -49,7 +50,6 @@ @ApiOperation(value = "获取系统设置", tags = {"后台-系统设置"}) @PostMapping(value = "/getSysSet") - @ResponseBody public AjaxResult getSysSet() { TSysSet byId = sysSetService.getById(1); SysSetVO sysSetVO = new SysSetVO(); @@ -58,7 +58,6 @@ } @ApiOperation(value = "保存系统设置", tags = {"后台-系统设置"}) @PostMapping(value = "/saveSysSet") - @ResponseBody public AjaxResult saveSysSet(SysSetVO vo) { TSysSet byId = sysSetService.getById(1); BeanUtils.copyProperties(vo,byId); @@ -68,14 +67,18 @@ } @ApiOperation(value = "获取启动页", tags = {"后台-启动页管理"}) @PostMapping(value = "/getPage") - @ResponseBody public AjaxResult getPage() { List<TPage> list = pageService.list(); return AjaxResult.success(list); } + @ApiOperation(value = "获取注意事项、启动页", tags = {"家长端-获取注意事项、启动页"}) + @PostMapping(value = "/getPage1") + public R<List<TPage>> getPage1() { + List<TPage> list = pageService.list(); + return R.ok(list); + } @ApiOperation(value = "保存启动页", tags = {"后台-启动页管理"}) @PostMapping(value = "/setPage") - @ResponseBody public AjaxResult setPage(PageVO vo) { for (TPage tPage : vo.getList()) { if (tPage.getId() == null){ @@ -86,7 +89,6 @@ } return AjaxResult.success("保存成功"); } - @ResponseBody @PostMapping("/agreement") @ApiOperation(value = "协议", tags = {"后台-协议管理"}) public AjaxResult agreement(@RequestBody AggrementDTO dto) { @@ -99,7 +101,15 @@ return AjaxResult.success(protocol.getContent()); } } - @ResponseBody + @PostMapping("/agreement1/{type}") + @ApiOperation(value = "协议", tags = {"家长端/学习端-获取协议"}) + 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") @ApiOperation(value = "使用指南-列表查询", tags = {"后台-使用指南"}) public AjaxResult<PageInfo<TUseGuide>> agreement(String title, Integer pageNumber, Integer pageSize) { @@ -117,7 +127,23 @@ res.setTotal(useGuides.size()); return AjaxResult.success(res); } - @ResponseBody + @PostMapping("/useGuide1") + @ApiOperation(value = "列表查询", tags = {"家长端-使用指南"}) + public R<PageInfo<TUseGuide>> useGuide1(@RequestBody UseGuideQuery query) { + QueryWrapper<TUseGuide> wrapper = new QueryWrapper<>(); + if (StringUtils.hasLength(query.getTitle())){ + wrapper.like("title",query.getTitle()); + } + 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); + res.setRecords(useGuides); + res.setTotal(useGuides.size()); + return R.ok(res); + } + @PostMapping("/updateUseGuide") @ApiOperation(value = "使用指南-添加/编辑/查看详情", tags = {"使用指南"}) public AjaxResult<TUseGuide> updateUseGuide(@RequestBody UseGuidDTO dto) { @@ -126,7 +152,6 @@ TUseGuide useGuide = new TUseGuide(); useGuide.setTitle(dto.getTitle()); useGuide.setSort(dto.getSort()); - useGuide.setIsDelete(0); useGuide.setAnswer(dto.getAnswer()); useGuide.setInsertTime(new Date()); useGuideService.save(useGuide); @@ -145,15 +170,19 @@ } return AjaxResult.success(new TUseGuide()); } - @ResponseBody - @DeleteMapping("/delete{id}") + @DeleteMapping("/delete") @ApiOperation(value = "使用指南-删除", tags = {"使用指南"}) - public AjaxResult updateUseGuide(@PathVariable Integer id) { - - TUseGuide useGuide2 = useGuideService.getById(id); - useGuide2.setIsDelete(1); - useGuideService.updateById(useGuide2); + public AjaxResult updateUseGuide( Integer id) { +// TUseGuide useGuide2 = useGuideService.getById(id); + useGuideService.removeById(id); return AjaxResult.success("删除成功"); } + + @GetMapping("/shareInfo") + @ApiOperation(value = "获取分享图片、标题及可获积分数", tags = {"获取分享图片、标题及可获积分数"}) + public R<TSysSet> shareInfo() { + return R.ok(sysSetService.lambdaQuery().one()); + } + } -- Gitblit v1.7.1