From d04c117fdebce55aaa97bc0c44181948d1e2150c Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 02 Jun 2022 10:43:47 +0800 Subject: [PATCH] 20220527 --- src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java | 25 ++++++ src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeWebSetInfoVo.java | 25 ++++++ src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSetEntity.java | 22 +++++ src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSetService.java | 12 +++ src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java | 4 + src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java | 34 ++++++++ src/main/java/com/xcong/farmer/cms/modules/system/mapper/WebSetMapper.java | 7 + src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java | 66 ++++++++++++++++ 8 files changed, 195 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java new file mode 100644 index 0000000..f2b2b70 --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminWebSetController.java @@ -0,0 +1,34 @@ +package com.xcong.farmer.cms.modules.system.Controller; + +import com.xcong.farmer.cms.common.response.Result; +import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto; +import com.xcong.farmer.cms.modules.system.service.IWebSetService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; + +@RestController +@RequestMapping(value = "/api/webset") +@Slf4j +@Api(value = "网页设置", tags = "网页设置") +public class AdminWebSetController { + + @Resource + private IWebSetService iWebSetService; + + @ApiOperation(value = "查看网页设置", notes = "查看网页设置") + @GetMapping(value = "/seeWebSetInfo") + public Result seeWebSetInfo() { + return iWebSetService.seeWebSetInfo(); + } + + @ApiOperation(value = "更新网页设置", notes = "更新网页设置") + @PostMapping(value = "/updateWebSet") + public Result updateWebSet(@RequestBody @Valid AdminUpdateWebSetDto adminUpdateWebSetDto) { + return iWebSetService.updateWebSet(adminUpdateWebSetDto); + } +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java new file mode 100644 index 0000000..9eb825d --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java @@ -0,0 +1,25 @@ +package com.xcong.farmer.cms.modules.system.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "AdminUpdateWebSetDto", description = "参数接收类") +public class AdminUpdateWebSetDto { + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "网页标题") + private String webTitle; + + @ApiModelProperty(value = "网页关键字") + private String webKeyword; + + @ApiModelProperty(value = "网页描述") + private String webRemark; + + @ApiModelProperty(value = "网页LOGO") + private String webPic; +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSetEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSetEntity.java new file mode 100644 index 0000000..0212604 --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSetEntity.java @@ -0,0 +1,22 @@ +package com.xcong.farmer.cms.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 网页配置表 + */ +@Data +@TableName("t_web_set") +public class WebSetEntity { + //ID + private Long id; + //网页标题 + private String webTitle; + //网页关键字 + private String webKeyword; + //网页描述 + private String webRemark; + //网页LOGO + private String webPic; +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/WebSetMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/WebSetMapper.java new file mode 100644 index 0000000..a927324 --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/WebSetMapper.java @@ -0,0 +1,7 @@ +package com.xcong.farmer.cms.modules.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xcong.farmer.cms.modules.system.entity.WebSetEntity; + +public interface WebSetMapper extends BaseMapper<WebSetEntity> { +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSetService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSetService.java new file mode 100644 index 0000000..cc4e59f --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSetService.java @@ -0,0 +1,12 @@ +package com.xcong.farmer.cms.modules.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.xcong.farmer.cms.common.response.Result; +import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto; +import com.xcong.farmer.cms.modules.system.entity.WebSetEntity; + +public interface IWebSetService extends IService<WebSetEntity> { + Result seeWebSetInfo(); + + Result updateWebSet(AdminUpdateWebSetDto adminUpdateWebSetDto); +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java index b966f3c..dffba4e 100644 --- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java +++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java @@ -49,6 +49,10 @@ if(ObjectUtil.isEmpty(userEntity)){ return Result.fail("请输入正确的账号和密码"); } + Integer status = userEntity.getStatus(); + if(UserEntity.STATUS_DISABLED.equals(status)){ + return Result.fail("账号禁止登陆,请联系管理员"); + } //生成UUID作为token String token = IdUtil.simpleUUID(); String redisToken = AppContants.APP_LOGIN_PREFIX + token; diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java new file mode 100644 index 0000000..f48276f --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java @@ -0,0 +1,66 @@ +package com.xcong.farmer.cms.modules.system.service.Impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xcong.farmer.cms.common.response.Result; +import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto; +import com.xcong.farmer.cms.modules.system.entity.WebSetEntity; +import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper; +import com.xcong.farmer.cms.modules.system.service.IWebSetService; +import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.collection.CollUtil; + +@Service +@Slf4j +public class WebSetServiceImpl extends ServiceImpl<WebSetMapper, WebSetEntity> implements IWebSetService { + @Override + public Result seeWebSetInfo() { + AdminSeeWebSetInfoVo adminSeeWebSetInfoVo = new AdminSeeWebSetInfoVo(); + List<WebSetEntity> webSetEntities = this.baseMapper.selectList(new QueryWrapper<>()); + if(CollUtil.isNotEmpty(webSetEntities)){ + WebSetEntity webSetEntity = webSetEntities.get(0); + adminSeeWebSetInfoVo.setId(webSetEntity.getId()); + adminSeeWebSetInfoVo.setWebTitle(webSetEntity.getWebTitle()); + adminSeeWebSetInfoVo.setWebKeyword(webSetEntity.getWebKeyword()); + adminSeeWebSetInfoVo.setWebRemark(webSetEntity.getWebRemark()); + adminSeeWebSetInfoVo.setWebPic(webSetEntity.getWebPic()); + } + return Result.ok(adminSeeWebSetInfoVo); + } + + @Override + public Result updateWebSet(AdminUpdateWebSetDto adminUpdateWebSetDto) { + Long id = adminUpdateWebSetDto.getId() == null ? 0L : adminUpdateWebSetDto.getId(); + WebSetEntity webSetEntity = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(webSetEntity)){ + return Result.fail("网页设置不存在"); + } + String webTitle = adminUpdateWebSetDto.getWebTitle(); + if(StrUtil.isEmpty(webTitle)){ + return Result.fail("请输入网页标题"); + } + webSetEntity.setWebTitle(webTitle); + String webKeyword = adminUpdateWebSetDto.getWebKeyword(); + if(StrUtil.isEmpty(webKeyword)){ + return Result.fail("请输入网页关键字"); + } + webSetEntity.setWebKeyword(webKeyword); + String webRemark = adminUpdateWebSetDto.getWebRemark(); + if(StrUtil.isNotEmpty(webRemark)){ + webSetEntity.setWebRemark(webRemark); + } + String webPic = adminUpdateWebSetDto.getWebPic(); + if(StrUtil.isNotEmpty(webPic)){ + webSetEntity.setWebPic(webPic); + } + this.baseMapper.updateById(webSetEntity); + return Result.ok("保存成功"); + } +} diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeWebSetInfoVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeWebSetInfoVo.java new file mode 100644 index 0000000..3073ff3 --- /dev/null +++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeWebSetInfoVo.java @@ -0,0 +1,25 @@ +package com.xcong.farmer.cms.modules.system.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "AdminSeeWebSetInfoVo", description = "网页设置详情返回") +public class AdminSeeWebSetInfoVo { + + @ApiModelProperty(value = "ID") + private Long id; + + @ApiModelProperty(value = "网页标题") + private String webTitle; + + @ApiModelProperty(value = "网页关键字") + private String webKeyword; + + @ApiModelProperty(value = "网页描述") + private String webRemark; + + @ApiModelProperty(value = "网页LOGO") + private String webPic; +} -- Gitblit v1.9.1