20220606

xiaoyong931011

2022-06-17 1bf379d02afceac7fb1a64f7ddc6547025ab54af

20220606

 src/main/java/com/xcong/farmer/cms/modules/system/config/KaptchaConfig.java

@@ -19,13 +19,13 @@
        // 字体颜色
        properties.setProperty("kaptcha.textproducer.font.color", "black");
        // 图片宽
        properties.setProperty("kaptcha.image.width", "160");
        properties.setProperty("kaptcha.image.width", "150");
        // 图片高
        properties.setProperty("kaptcha.image.height", "58");
        properties.setProperty("kaptcha.image.height", "42");
        // 文字间隔
        properties.setProperty("kaptcha.textproducer.font.space", "5");
        properties.setProperty("kaptcha.textproducer.font.space", "10");
        // 字体大小
        properties.setProperty("kaptcha.textproducer.font.size", "38");
        properties.setProperty("kaptcha.textproducer.font.size", "30");
        // session key
        properties.setProperty("kaptcha.session.key", "code");
        // 验证码长度

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

@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -34,6 +35,7 @@
    private Long columnId;

    @ApiModelProperty(value = "访问量")
    @Min(value = 0, message = "访问量不能小于0")
    private Integer visits;

    @ApiModelProperty(value = "主图")

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

@@ -80,6 +80,9 @@
        String columnCode = adminAddColumnDto.getColumnCode();
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        if(UserEntity.USER_BELONG_TOP != companyId){
            objectQueryWrapper.eq("company_id",companyId);
        }
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities)){
            return Result.fail("栏目编码不能重复");
@@ -140,6 +143,8 @@
    @Override
    @Transactional
    public Result updateColumn(AdminUpdateColumnDto adminUpdateColumnDto) {
        UserEntity userlogin = LoginUserUtil.getLoginUser();
        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
        Long id = adminUpdateColumnDto.getId();
        if(ObjectUtil.isEmpty(id)){
            return Result.fail("栏目不存在");
@@ -153,6 +158,9 @@
        String columnCode = adminUpdateColumnDto.getColumnCode();
        QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("column_code",columnCode);
        if(UserEntity.USER_BELONG_TOP != companyId){
            objectQueryWrapper.eq("company_id",companyId);
        }
        List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper);
        if(CollUtil.isNotEmpty(columnEntities) && columnEntities.size() > 1){
            return Result.fail("栏目编码不能重复");

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

@@ -12,8 +12,10 @@
import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateCompanyDto;
import com.xcong.farmer.cms.modules.system.entity.CompanyEntity;
import com.xcong.farmer.cms.modules.system.entity.MenuEntity;
import com.xcong.farmer.cms.modules.system.entity.RoleEntity;
import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
import com.xcong.farmer.cms.modules.system.mapper.*;
import com.xcong.farmer.cms.modules.system.service.ICompanyService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminCompanyVo;
@@ -28,9 +30,23 @@
import cn.hutool.core.util.ObjectUtil;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

@Service
@Slf4j
public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, CompanyEntity> implements ICompanyService {

    @Resource
    private RoleMapper roleMapper;
    @Resource
    private UserRoleMapper userRoleMapper;
    @Resource
    private RoleMenuMapper roleMenuMapper;
    @Resource
    private MenuMapper menuMapper;
    @Resource
    private UserMapper userMapper;

    @Override
    public Result getBelongInPage(AdminBelongDto adminBelongDto) {
        UserEntity userlogin = LoginUserUtil.getLoginUser();
@@ -138,6 +154,7 @@
    }

    @Override
    @Transactional
    public Result delObjs(AdminDeleteDto adminDeleteDto) {
        String ids = adminDeleteDto.getIds();
        UserEntity userlogin = LoginUserUtil.getLoginUser();
@@ -148,6 +165,18 @@
            String[] companyIds = ids.split(StringPool.COMMA);
            for(String companyIdStr : companyIds){
                Long companyId = Long.valueOf(companyIdStr);
                QueryWrapper<UserEntity> userQueryWrapper = new QueryWrapper<>();
                userQueryWrapper.eq("company_id",companyId);
                List<UserEntity> userEntities = userMapper.selectList(userQueryWrapper);
                if(CollUtil.isNotEmpty(userEntities)){
                    return Result.fail("请先清空属于该公司的用户");
                }
                QueryWrapper<RoleEntity> roleQueryWrapper = new QueryWrapper<>();
                roleQueryWrapper.eq("company_id",companyId);
                List<RoleEntity> roleEntities = roleMapper.selectList(roleQueryWrapper);
                if(CollUtil.isNotEmpty(roleEntities)){
                    return Result.fail("请先清空属于该公司的角色");
                }
                this.baseMapper.deleteById(companyId);
            }
        }

 src/main/java/com/xcong/farmer/cms/modules/system/util/CaptchaUtil.java

@@ -55,7 +55,7 @@
    }

    public BufferedImage creatImage(String code) {
        int width = 160, height = 50;
        int width = 150, height = 42;
        //生成随机类
        Random random = new Random();
        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);

 src/main/resources/application.properties

@@ -2,3 +2,8 @@
upload.file.location=file:D:/Tools/
upload.file.path =/image/**
static.resource.url =http://192.168.0.11:8878/image/
# µ¥¸öÎļþ´óСΪ5MB
spring.servlet.multipart.max-file-size = 5MB

# ×ÜÉÏ´«µÄÊý¾Ý´óС5MB
spring.servlet.multipart.max-request-size = 5MB