fix web_setting

Helius

2022-07-11 c09e9401bb56f652347312617ae45e4ae31ee045

fix web_setting

 src/main/java/com/xcong/farmer/cms/conversion/WebSettingConversion.java

New file
@@ -0,0 +1,20 @@
package com.xcong.farmer.cms.conversion;

import com.xcong.farmer.cms.modules.system.dto.SetWebSettingDto;
import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

/**
 * @author wzy
 * @date 2022-07-11
 **/
@Mapper
public abstract class WebSettingConversion {
    public static WebSettingConversion INSTANCE = Mappers.getMapper(WebSettingConversion.class);

    public abstract WebSettingEntity dtoToEntity(SetWebSettingDto setWebSettingDto);

    public abstract AdminSeeWebSetInfoVo entityToVo(WebSettingEntity webSettingEntity);
}

 src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminWebSetController.java

@@ -1,12 +1,15 @@
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.dto.SetWebSettingDto;
import com.xcong.farmer.cms.modules.system.service.IReleaseService;
import com.xcong.farmer.cms.modules.system.service.IWebSetService;
import com.xcong.farmer.cms.modules.system.service.IWebSettingService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -20,21 +23,24 @@
public class AdminWebSetController {

    @Resource
    private IWebSetService iWebSetService;
    private IWebSettingService iWebSetService;

    @Resource
    private IReleaseService releaseService;

    @ApiOperation(value = "查看网页设置", notes = "查看网页设置")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = AdminSeeWebSetInfoVo.class)
    })
    @GetMapping(value = "/seeWebSetInfo")
    public Result seeWebSetInfo() {
        return iWebSetService.seeWebSetInfo();
        return iWebSetService.getWebSetting();
    }

    @ApiOperation(value = "更新网页设置", notes = "更新网页设置")
    @PostMapping(value = "/updateWebSet")
    public Result updateWebSet(@RequestBody @Valid AdminUpdateWebSetDto adminUpdateWebSetDto) {
        return iWebSetService.updateWebSet(adminUpdateWebSetDto);
    public Result updateWebSet(@RequestBody @Valid SetWebSettingDto setWebSettingDto) {
        return iWebSetService.setWebSetting(setWebSettingDto);
    }

    @ApiOperation(value = "发布全站", notes = "发布全站")

 src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateWebSetDto.java

File was deleted

 src/main/java/com/xcong/farmer/cms/modules/system/dto/SetWebSettingDto.java

New file
@@ -0,0 +1,40 @@
package com.xcong.farmer.cms.modules.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

@Data
@ApiModel(value = "AdminUpdateWebSetDto", description = "参数接收类")
public class SetWebSettingDto {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "网页标题")
    @NotBlank(message = "请输入网页标题")
    private String title;

    @ApiModelProperty(value = "网页关键字")
    private String seoTitle;

    @ApiModelProperty(value = "网页描述")
    private String seoDescription;

    @ApiModelProperty(value = "网页描述")
    private String seoKeyword;

    @ApiModelProperty(value = "网页LOGO")
    private String logoUrl;

    @ApiModelProperty(value = "首页模板")
    private String indexTemplate;

    @ApiModelProperty(value = "搜索模板")
    private String searchTemplate;

    @ApiModelProperty(value = "在线留言模板")
    private String msgTemplate;
}

 src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSetEntity.java

File was deleted

 src/main/java/com/xcong/farmer/cms/modules/system/entity/WebSettingEntity.java

New file
@@ -0,0 +1,60 @@
package com.xcong.farmer.cms.modules.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

/**
 * 网页配置表
 */
@Data
@TableName("t_web_setting")
public class WebSettingEntity {
    //ID

    @TableId(value = "id",type = IdType.AUTO)
    private Long id;

    /**
     * 网站标题
     */
    private String title;

    /**
     * seo标题
     */
    private String seoTitle;

    /**
     * seo关键词
     */
    private String seoKeyword;

    /**
     * seo描述
     */
    private String seoDescription;

    /**
     * logo地址
     */
    private String logoUrl;

    /**
     * 首页模板
     */
    private String indexTemplate;

    /**
     * 搜索模板
     */
    private String searchTemplate;

    /**
     * 在线留言模板
     */
    private String msgTemplate;

    private Long companyId;
}

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/WebSetMapper.java

@@ -1,7 +1,10 @@
package com.xcong.farmer.cms.modules.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xcong.farmer.cms.modules.system.entity.WebSetEntity;
import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;
import org.apache.ibatis.annotations.Param;

public interface WebSetMapper extends BaseMapper<WebSetEntity> {
public interface WebSetMapper extends BaseMapper<WebSettingEntity> {

    WebSettingEntity selectByCompanyId(@Param("companyId") Long companyId);
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSetService.java

File was deleted

 src/main/java/com/xcong/farmer/cms/modules/system/service/IWebSettingService.java

New file
@@ -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.SetWebSettingDto;
import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;

public interface IWebSettingService extends IService<WebSettingEntity> {
    Result getWebSetting();

    Result setWebSetting(SetWebSettingDto adminUpdateWebSetDto);
}

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java

File was deleted

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSettingServiceImpl.java

New file
@@ -0,0 +1,44 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.conversion.WebSettingConversion;
import com.xcong.farmer.cms.modules.system.dto.SetWebSettingDto;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;
import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
import com.xcong.farmer.cms.modules.system.service.IWebSettingService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@Service
@Slf4j
public class WebSettingServiceImpl extends ServiceImpl<WebSetMapper, WebSettingEntity> implements IWebSettingService {
    @Override
    public Result getWebSetting() {
        Long companyId = LoginUserUtil.getCompanyId();
        WebSettingEntity webSetting = this.baseMapper.selectByCompanyId(companyId);
        if (webSetting == null) {
            webSetting = new WebSettingEntity();
        }

        AdminSeeWebSetInfoVo adminSeeWebSetInfoVo = WebSettingConversion.INSTANCE.entityToVo(webSetting);
        return Result.ok(adminSeeWebSetInfoVo);
    }

    @Override
    public Result setWebSetting(SetWebSettingDto setWebSettingDto) {
        Long companyId = LoginUserUtil.getCompanyId();

        WebSettingEntity webSetting = WebSettingConversion.INSTANCE.dtoToEntity(setWebSettingDto);
        webSetting.setCompanyId(companyId);
        if (setWebSettingDto.getId() == null) {
            this.baseMapper.insert(webSetting);
        } else {
            this.baseMapper.updateById(webSetting);
        }
        return Result.ok("保存成功");
    }
}

 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeWebSetInfoVo.java

@@ -12,14 +12,26 @@
    private Long id;

    @ApiModelProperty(value = "网页标题")
    private String webTitle;
    private String title;

    @ApiModelProperty(value = "网页关键字")
    private String webKeyword;
    @ApiModelProperty(value = "seo关键字")
    private String seoKeyword;

    @ApiModelProperty(value = "网页描述")
    private String webRemark;
    @ApiModelProperty(value = "seo描述")
    private String seoRemark;

    @ApiModelProperty(value = "seo描述")
    private String seoDescription;

    @ApiModelProperty(value = "网页LOGO")
    private String webPic;
    private String logoUrl;

    @ApiModelProperty(value = "首页模板")
    private String indexTemplate;

    @ApiModelProperty(value = "搜索模板")
    private String searchTemplate;

    @ApiModelProperty(value = "在线留言模板")
    private String msgTemplate;
}

 src/main/resources/mapper/WebSetMapper.xml

New file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xcong.farmer.cms.modules.system.mapper.WebSetMapper">

    <select id="selectByCompanyId" resultType="com.xcong.farmer.cms.modules.system.entity.WebSettingEntity">
        select * from t_web_setting where company_id=#{companyId}
    </select>

</mapper>