前后端对接，接口调整

lishuai

2023-12-22 8b5464b9d4938d9c4fac9739eacfc0eb2f830a72

前后端对接，接口调整

 server/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java

@@ -76,7 +76,7 @@

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:problemlog:exportExcel")
//    @RequiresPermissions("business:problemlog:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ProblemLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ProblemLog.class).export(problemLogService.findPage(pageWrap).getRecords(), "访客答题记录表", response);
    }

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigDTO.java

@@ -11,17 +11,9 @@
@ApiModel("劳务访客配置")
public class LaborConfigDTO {

    @ApiModelProperty(value = "来访预约方式")
    private String reservationWay = "";

    @ApiModelProperty(value = "被访人校验方式")
    private String checkVisit = "";

    @ApiModelProperty(value = "健康证是否必填")
    private String healthCard = "";

    @ApiModelProperty(value = "劳务是否答题")
    private String isAnswer = "";
    @ApiModelProperty(value = "劳务对象")
    private LaborConfigParam laborConfigParam;

    @ApiModelProperty(value = "劳务答题主题")
    private String theme = "";

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborConfigParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.doumee.dao.admin.request;

import io.swagger.annotations.ApiModelProperty;

public class LaborConfigParam {

    @ApiModelProperty(value = "来访预约方式")
    private String reservationWay = "";

    @ApiModelProperty(value = "被访人校验方式")
    private String checkVisit = "";

    @ApiModelProperty(value = "健康证是否必填")
    private String healthCard = "";

    @ApiModelProperty(value = "劳务是否答题")
    private String isAnswer = "";

}

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigDTO.java

@@ -18,17 +18,9 @@
@ApiModel("劳务来访配置")
public class VisitConfigDTO {

    @ApiModelProperty(value = "来访预约方式")
    private String reservationWay = "";

    @ApiModelProperty(value = "被访人校验方式")
    private String checkVisit = "";

    @ApiModelProperty(value = "健康证是否必填")
    private String healthCard = "";

    @ApiModelProperty(value = "劳务是否答题")
    private String isAnswer = "";
    @ApiModelProperty(value = "参数对象")
    private VisitConfigParam visitConfigParam;

    @ApiModelProperty(value = "劳务答题主题")
    private String theme = "";

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitConfigParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.doumee.dao.admin.request;

import io.swagger.annotations.ApiModelProperty;

/**
 * æŒ‡å®šå‚æ•°
 */
public class VisitConfigParam {

    @ApiModelProperty(value = "来访预约方式")
    private String reservationWay = "";

    @ApiModelProperty(value = "被访人校验方式")
    private String checkVisit = "";

    @ApiModelProperty(value = "健康证是否必填")
    private String healthCard = "";

    @ApiModelProperty(value = "劳务是否答题")
    private String isAnswer = "";

}

 server/dmvisit_service/src/main/java/com/doumee/dao/business/join/ProblemLogJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.ProblemLog;
import com.github.yulichang.base.mapper.MPJJoinMapper;
/**
 * @author T14
 */
public interface ProblemLogJoinMapper extends MPJJoinMapper<ProblemLog> {

}

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java

@@ -282,7 +282,7 @@
        //是否包含英文
        boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());

        IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());


 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java

@@ -10,15 +10,19 @@
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.ProblemLog;
import com.doumee.dao.business.model.Retention;
import com.doumee.dao.web.reqeust.FinishAnswerDTO;
import com.doumee.service.business.ProblemLogService;
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.github.yulichang.wrapper.MPJLambdaWrapper;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +49,9 @@

    @Autowired
    private CompanyMapper companyMapper;

    @Autowired
    private ProblemLogJoinMapper problemLogJoinMapper;

    @Override
    public Integer create(ProblemLog problemLog) {
@@ -106,64 +113,15 @@
    @Override
    public PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap) {
        IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<ProblemLog> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(ProblemLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(ProblemLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(ProblemLog::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(ProblemLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(ProblemLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(ProblemLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(ProblemLog::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getUserId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getUserId, pageWrap.getModel().getUserId());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(ProblemLog::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getLogId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getLogId, pageWrap.getModel().getLogId());
        }
        if (pageWrap.getModel().getScore() != null) {
            queryWrapper.lambda().eq(ProblemLog::getScore, pageWrap.getModel().getScore());
        }
        if (pageWrap.getModel().getContent() != null) {
            queryWrapper.lambda().eq(ProblemLog::getContent, pageWrap.getModel().getContent());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(ProblemLog::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(ProblemLog::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getCompanyName() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName());
        }
        if (pageWrap.getModel().getOpenid() != null) {
            queryWrapper.lambda().eq(ProblemLog::getOpenid, pageWrap.getModel().getOpenid());
        }
        queryWrapper.select("problem_log.*,(select type from member where member.openid = problem_log.openid) as type");
        queryWrapper.orderByAsc("problem_log.createDate");
        return PageData.from(problemLogMapper.selectPage(page, queryWrapper));
        queryWrapper.leftJoin(Member.class,Member::getOpenid,ProblemLog::getOpenid);
        queryWrapper.selectAll(ProblemLog.class)
                .selectAs(Member::getType,ProblemLog::getType);
        queryWrapper.orderByDesc(ProblemLog::getCreateDate);
        IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
        System.out.println(problemLogIPage);
        return PageData.from(problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper));
    }

    @Override

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java

@@ -93,7 +93,9 @@
        update.setEditor(loginUserInfo.getId());
        update.setEditDate(new Date());
        update.setTitle(problems.getTitle());
        update.setOptions(problems.getOptions());
        if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
            update.setOptions(JSON.toJSONString(problems.getObjectList()));
        }
        update.setAnswer(problems.getAnswer());
        update.setSortnu(problems.getSortnu());
        update.setType(problems.getType());
@@ -174,7 +176,7 @@
            queryWrapper.lambda().eq(Problems::getSortnu, pageWrap.getModel().getSortnu());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(Problems::getType, pageWrap.getModel().getType());
            queryWrapper.lambda().in(Problems::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getScore() != null) {
            queryWrapper.lambda().eq(Problems::getScore, pageWrap.getModel().getScore());

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java

@@ -193,10 +193,6 @@

    @Override
    public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) {
        Random random = new Random();
        int randomNumber = random.nextInt(999999);
        String formattedNumber = String.format("%06d", randomNumber);
        System.out.println(formattedNumber);
        //是否是数字
        boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
        //是否包含中文

 server/dmvisit_service/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborConfigDTO;
import com.doumee.dao.admin.request.VisitConfigDTO;
@@ -21,14 +22,19 @@
import com.doumee.service.system.SystemDictDataService;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import static net.sf.jsqlparser.parser.feature.Feature.set;
import static net.sf.jsqlparser.parser.feature.Feature.update;

/**
 * å­—典数据Service实现
@@ -160,7 +166,6 @@

    @Override
    public void updateVisitConfig(VisitConfigDTO miniProgrammeDTO) {
        try {

            QueryWrapper<SystemDict> systemDictQuery = new QueryWrapper<>();
            systemDictQuery.lambda()
@@ -171,19 +176,29 @@
            if (Objects.isNull(systemDict)){
                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"字典不存在");
            }
            String jasonStr = Constants.toUnderlineJSONString(miniProgrammeDTO);
            JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
            parse.entrySet().forEach(s->{
                UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
                wrapper.lambda()
                        .eq(SystemDictData::getDictId,systemDict.getId())
                        .eq(SystemDictData::getLabel,s.getKey().toUpperCase())
                        .set(SystemDictData::getCode,s.getValue());
                systemDictDataMapper.update(null,wrapper);
            });
        } catch (JsonProcessingException e) {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"字典值解析有误");
        }
            QuerySystemDictDataDTO dictData = new QuerySystemDictDataDTO();
            dictData.setDictId((systemDict.getId()));
            List<SystemDictDataListVO> systemDictDataListVOS = systemDictDataMapper.selectManageList(dictData);
            if(null != systemDictDataListVOS && systemDictDataListVOS.size() > 0) {
                LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
                SystemDictData systemDictData = new SystemDictData();
                systemDictData.setDictId(systemDict.getId());
                systemDictData.setCode(JSONObject.toJSONString(miniProgrammeDTO.getVisitConfigParam()));
                systemDictData.setDisabled(true);
                systemDictData.setSort(Constants.ZERO);
                systemDictData.setLabel(miniProgrammeDTO.getTheme());
                systemDictData.setRemark(miniProgrammeDTO.getDescription());
                systemDictData.setCreateTime(new Date());
                systemDictData.setUpdateTime(new Date());
                systemDictData.setCreateUser(loginUserInfo.getId());
                systemDictData.setUpdateUser(loginUserInfo.getId());
                if(null == systemDictDataListVOS.get(0).getId()) {
                    systemDictDataMapper.insert(systemDictData);
                }else {
                    systemDictData.setId(systemDictDataListVOS.get(0).getId());
                    systemDictDataMapper.updateById(systemDictData);
                }
            }
    }

    @Override