lishuai
2023-12-18 427d8b6cabd30f154777a51ca5f35c6c3ed716c4
安全题目
已添加1个文件
已修改4个文件
64 ■■■■ 文件已修改
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/OptionsObject.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java
@@ -1,5 +1,6 @@
package com.doumee.api.business;
import com.alibaba.fastjson.JSON;
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
@@ -10,6 +11,7 @@
import com.doumee.service.business.ProblemsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,7 +35,7 @@
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:problems:create")
    //@RequiresPermissions("business:problems:create")
    public ApiResponse create(@RequestBody Problems problems) {
        return ApiResponse.success(problemsService.create(problems));
    }
@@ -61,7 +63,7 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:problems:update")
    //@RequiresPermissions("business:problems:update")
    public ApiResponse updateById(@RequestBody Problems problems) {
        problemsService.updateById(problems);
        return ApiResponse.success(null);
@@ -83,7 +85,7 @@
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:problems:query")
    //@RequiresPermissions("business:problems:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(problemsService.findById(id));
    }
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/OptionsObject.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.dao.admin.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author LS
 */
@Data
@ApiModel("选项对象集")
public class OptionsObject {
    @ApiModelProperty("选项编号")
    private String code;
    @ApiModelProperty("选项内容")
    private String value;
}
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.admin.request.OptionsObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,6 +12,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
/**
 * è¯•题信息表
@@ -86,4 +88,7 @@
    @ExcelColumn(name="使用场景 0劳务人员 1普通访客")
    private Integer useType;
    @ApiModelProperty(value = "选项集对象集合")
    @TableField(exist = false)
    private List<OptionsObject> objectList;
}
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -15,12 +15,14 @@
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.DeviceRoleVO;
import com.doumee.service.business.DeviceRoleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.MemberService;
import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -45,6 +47,8 @@
    @Autowired
    private DeviceRoleMapper deviceRoleMapper;
    @Autowired
    private MemberService memberService;
    @Override
@@ -235,9 +239,6 @@
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(DeviceRole::getStatus, pageWrap.getModel().getStatus());
        }
        queryWrapper.select("t_aa.*," +
                "(SELECT count(DISTINCT `KEY`) FROM `test` WHERE `test`.`key` = `t_aa`.id ) ");
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
@@ -245,7 +246,18 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(deviceRoleMapper.selectPage(page, queryWrapper));
        IPage<DeviceRole> newPage = deviceRoleMapper.selectPage(page, queryWrapper);
        if(null != newPage && newPage.getRecords().size() > 0) {
            List<DeviceRole> deviceRoleList = newPage.getRecords();
            for (DeviceRole dto:deviceRoleList) {
                Member member = new Member();
                member.setIsdeleted(Constants.ZERO);
                member.setRoleId(dto.getId());
                dto.setMemberNum((int) memberService.count(member));
            }
            newPage.setRecords(deviceRoleList);
        }
        return PageData.from(newPage);
    }
    @Override
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -1,12 +1,14 @@
package com.doumee.service.business.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.OptionsObject;
import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.ProblemsMapper;
import com.doumee.dao.business.model.Problems;
@@ -16,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
@@ -51,7 +54,9 @@
        insert.setIsdeleted(Constants.ZERO);
        insert.setRemark(problems.getRemark());
        insert.setTitle(problems.getTitle());
        insert.setOptions(problems.getOptions());
        if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
            insert.setOptions(JSON.toJSONString(problems.getObjectList()));
        }
        insert.setAnswer(problems.getAnswer());
        insert.setSortnu(problems.getSortnu());
        insert.setType(problems.getType());
@@ -109,7 +114,11 @@
    @Override
    public Problems findById(Integer id) {
        return problemsMapper.selectById(id);
        Problems problems = problemsMapper.selectById(id);
        if(null != problems && StringUtils.isNotBlank(problems.getOptions())) {
            problems.setObjectList(JSON.parseArray(problems.getOptions(), OptionsObject.class));
        }
        return problems;
    }
    @Override