Merge remote-tracking branch 'origin/master'

jiangping

2024-05-22 a7fb50c91e4932aa175be266fbdd42b2a70eba66

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

@@ -1,5 +1,8 @@
package com.doumee.service.business.impl;

import cn.emay.sdk.util.StringUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -9,6 +12,12 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerMapper;
import com.doumee.dao.business.HiddenDangerParamMapper;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.HiddenDangerParamService;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
@@ -18,6 +27,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 com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -44,11 +54,53 @@
    @Autowired
    private MemberMapper memberMapper;

    @Override
    public Integer create(HiddenDanger model) {
    @Autowired
    private HiddenDangerParamMapper hiddenDangerParamMapper;

        hiddenDangerMapper.insert(model);
        return model.getId();
    @Autowired
    private MultifileMapper multifileMapper;

    @Override
    public Integer create(HiddenDanger hiddenDanger) {
        if(Objects.isNull(hiddenDanger)
            || Objects.isNull(hiddenDanger.getCreator())
            || Objects.isNull(hiddenDanger.getAreaId())
            || Objects.isNull(hiddenDanger.getCateId())
            || Objects.isNull(hiddenDanger.getApplyCheckUserId())
            || Objects.isNull(hiddenDanger.getSubmitTime())
            || StringUtils.isBlank(hiddenDanger.getContent())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        hiddenDanger.setIsdeleted(Constants.ZERO);
        hiddenDanger.setCreateDate(new Date());
        HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId());
        if(Objects.isNull(hiddenDangerParam)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到隐患区域");
        }
        hiddenDanger.setAreaName(hiddenDangerParam.getName());
        hiddenDanger.setStatus(Constants.ZERO);
        if(StringUtils.isBlank(hiddenDangerParam.getMemberIds())
        || hiddenDangerParam.getMemberIds().indexOf(hiddenDanger.getApplyCheckUserId().toString())<0){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"隐患区域与处理人不匹配");
        }
        hiddenDangerMapper.insert(hiddenDanger);
        List<Multifile> multifiles  = hiddenDanger.getMultifileList();
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)){
            for (int i = 0; i < multifiles.size(); i++) {
                    Multifile multifile = multifiles.get(i);
                multifile.setCreateDate(hiddenDanger.getCreateDate());
                multifile.setCreator(hiddenDanger.getCreator());
                multifile.setIsdeleted(Constants.ZERO);
                multifile.setObjId(hiddenDanger.getId());
                multifile.setObjType(Constants.multifileObjType.zero);
                multifile.setSortnum(i+1);
                multifileMapper.insert(multifile);
            }
        }


        return hiddenDanger.getId();
    }

    @Override