fix

Helius

2022-08-19 fce8e677dd4f4b7b34c01f481c17d19fcf4465cb

fix

 src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java

@@ -31,5 +31,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime = new Date();

    private Integer version;
    private Integer version = 1;
}

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

@@ -69,7 +69,6 @@
    public Result modify(@RequestBody @Valid AdModifyDto adModifyDto) {
        UserEntity user = LoginUserUtil.getLoginUser();
        CmsAdInfoEntity adInfo = CmsAdInfoConversion.INSTANCE.modifyDtoToEntity(adModifyDto);
        adInfo.setCreateBy(user.getNickname());
        adInfo.setUpdateBy(user.getNickname());
        cmsAdInfoService.updateById(adInfo);
        return Result.ok("修改成功");

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

@@ -71,7 +71,6 @@
        UserEntity user = LoginUserUtil.getLoginUser();

        CmsFriendlyLinkEntity friendlyLink = CmsFriendlyLinkConversion.INSTANCE.modifyDtoToEntity(modifyFriendlyLinkDto);
        friendlyLink.setCreateBy(user.getNickname());
        friendlyLink.setUpdateBy(user.getNickname());
        cmsFriendlyLinkService.updateById(friendlyLink);
        return Result.ok("修改成功");

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

@@ -1,5 +1,6 @@
package com.xcong.farmer.cms.modules.system.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.farmer.cms.common.response.Result;
@@ -55,28 +56,21 @@
    @ApiOperation(value = "添加分组", notes = "添加分组")
    @PostMapping(value = "/add")
    public Result add(@RequestBody @Valid AddGroupInfoDto addGroupInfoDto) {
        UserEntity user = LoginUserUtil.getLoginUser();
        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.addDtoToEntity(addGroupInfoDto);
        groupInfo.setCreateBy(user.getNickname());
        groupInfo.setUpdateBy(user.getNickname());
        cmsGroupInfoService.save(groupInfo);
        cmsGroupInfoService.add(addGroupInfoDto);
        return Result.ok("添加成功");
    }

    @ApiOperation(value = "修改分组", notes = "修改分组")
    @PostMapping(value = "/modify")
    public Result modify(@RequestBody @Valid ModifyGroupInfoDto modifyGroupInfoDto) {
        UserEntity user = LoginUserUtil.getLoginUser();
        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.modifyDtoToEntity(modifyGroupInfoDto);
        groupInfo.setCreateBy(user.getNickname());
        groupInfo.setUpdateBy(user.getNickname());
        cmsGroupInfoService.updateById(groupInfo);
        cmsGroupInfoService.modify(modifyGroupInfoDto);
        return Result.ok("修改成功");
    }

    @ApiOperation(value = "删除")
    @PostMapping(value = "/delete")
    public Result delete(@RequestBody @Valid GroupDeleteDto groupDeleteDto) {
        return null;
        cmsGroupInfoService.removeByIds(StrUtil.split(groupDeleteDto.getIds(), ','));
        return Result.ok("删除成功");
    }
}

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

@@ -21,4 +21,6 @@
    private Long groupId;

    private String remark;

    private Long companyId;
}

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

@@ -20,12 +20,9 @@

    private String logo;

    /**
     * 1-文字 2-图片
     */
    private Integer type;

    private Long groupId;

    private String remark;

    private Long companyId;
}

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

@@ -26,4 +26,6 @@
     * 分组类型 1-友情链接 2-广告
     */
    private Integer type;

    private Long companyId;
}

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

@@ -2,6 +2,9 @@

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

public interface CmsGroupInfoMapper extends BaseMapper<CmsGroupInfoEntity> {

    CmsGroupInfoEntity selectByCode(@Param("code") String code, @Param("companyId") Long companyId);
}

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

@@ -1,7 +1,13 @@
package com.xcong.farmer.cms.modules.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.farmer.cms.modules.system.dto.AddGroupInfoDto;
import com.xcong.farmer.cms.modules.system.dto.ModifyGroupInfoDto;
import com.xcong.farmer.cms.modules.system.entity.CmsGroupInfoEntity;

public interface ICmsGroupInfoService extends IService<CmsGroupInfoEntity> {

    void add(AddGroupInfoDto addGroupInfoDto);

    void modify(ModifyGroupInfoDto modifyGroupInfoDto);
}

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

@@ -1,11 +1,20 @@
package com.xcong.farmer.cms.modules.system.service.Impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.exception.GlobalException;
import com.xcong.farmer.cms.modules.system.conversion.CmsGroupInfoConversion;
import com.xcong.farmer.cms.modules.system.dto.AddGroupInfoDto;
import com.xcong.farmer.cms.modules.system.dto.ModifyGroupInfoDto;
import com.xcong.farmer.cms.modules.system.entity.CmsGroupInfoEntity;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsGroupInfoMapper;
import com.xcong.farmer.cms.modules.system.service.ICmsGroupInfoService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.Objects;

/**
 * @author wzy
@@ -13,5 +22,37 @@
 **/
@Slf4j
@Service
@RequiredArgsConstructor
public class CmsGroupInfoServiceImpl  extends ServiceImpl<CmsGroupInfoMapper, CmsGroupInfoEntity> implements ICmsGroupInfoService {


    @Override
    public void add(AddGroupInfoDto addGroupInfoDto) {
        UserEntity user = LoginUserUtil.getLoginUser();

        CmsGroupInfoEntity hasExist = this.baseMapper.selectByCode(addGroupInfoDto.getCode(), user.getCompanyId());
        if (hasExist != null) {
            throw new GlobalException("分组编码已存在");
        }

        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.addDtoToEntity(addGroupInfoDto);
        groupInfo.setCreateBy(user.getNickname());
        groupInfo.setUpdateBy(user.getNickname());
        groupInfo.setCompanyId(user.getCompanyId());
        this.baseMapper.insert(groupInfo);
    }

    @Override
    public void modify(ModifyGroupInfoDto modifyGroupInfoDto) {
        UserEntity user = LoginUserUtil.getLoginUser();

        CmsGroupInfoEntity hasExist = this.baseMapper.selectByCode(modifyGroupInfoDto.getCode(), user.getCompanyId());
        if (hasExist != null && !Objects.equals(hasExist.getId(), modifyGroupInfoDto.getId())) {
            throw new GlobalException("分组编码已存在");
        }

        CmsGroupInfoEntity groupInfo = CmsGroupInfoConversion.INSTANCE.modifyDtoToEntity(modifyGroupInfoDto);
        groupInfo.setUpdateBy(user.getNickname());
        this.baseMapper.updateById(groupInfo);
    }
}

 src/main/resources/mapper/CmsGroupInfoMapper.xml

New file
@@ -0,0 +1,10 @@
<?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.CmsGroupInfoMapper">

    <select id="selectByCode" resultType="com.xcong.farmer.cms.modules.system.entity.CmsGroupInfoEntity">
        select * from cms_group_info
        where code=#{code} and company_id=#{companyId}
    </select>

</mapper>