aijinhui
2023-10-08 2fad5b9483d3e6fec4b8bd1e6f8c578e270b4688
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,7 @@
     */
    @Override
    public int insertArdTubesDetails(ArdTubesDetails ardTubesDetails) {
        ardTubesDetails.setId(IdUtils.simpleUUID());
        ardTubesDetails.setUserId(SecurityUtils.getUserId());
        ardTubesDetails.setCreateBy(SecurityUtils.getUsername());
        ardTubesDetails.setCreateTime(DateUtils.getNowDate());
@@ -127,7 +129,7 @@
    @Override
    public String importArdTubesDetails(List<ArdTubesDetails> ardTubesDetailsList, Boolean isUpdateSupport, String operName, String tubeId) {
        if (StringUtils.isNull(ardTubesDetailsList) || ardTubesDetailsList.size() == 0) {
            throw new ServiceException("导入井数据不能为空!");
            throw new ServiceException("导入管线数据不能为空!");
        }
        ArdTubes tubes = ardTubesMapper.selectArdTubesById(tubeId);
        int successNum = 0;
@@ -140,7 +142,7 @@
                String userId = SecurityUtils.getUserId();
                tubesDetails.setUserId(userId);
                // 验证是否存在这个管线编号详情
                ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber());
                ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber(),tubesDetails.getInflectionPointNumber());
                if (StringUtils.isNull(atd)) {
                    BeanValidators.validateWithException(validator, tubesDetails);
                    tubesDetails.setCreateBy(operName);
@@ -148,7 +150,7 @@
                    tubesDetails.setDeptId(tubes.getDeptId());
                    this.insertArdTubesDetails(tubesDetails);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() + " 导入成功");
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 导入成功");
                } else if (isUpdateSupport) {
                    BeanValidators.validateWithException(validator, tubesDetails);
                    checkTubesDetailAllowed(tubesDetails);
@@ -158,14 +160,14 @@
                    tubesDetails.setDeptId(tubes.getDeptId());
                    this.updateArdTubesDetailsByReelNumber(tubesDetails);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() + " 更新成功");
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 更新成功");
                } else {
                    failureNum++;
                    failureMsg.append("<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() + " 已存在");
                    failureMsg.append("<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber()+"-"+tubesDetails.getInflectionPointNumber() + " 已存在");
                }
            } catch (Exception e) {
                failureNum++;
                String msg = "<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() + " 导入失败:";
                String msg = "<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 导入失败:";
                failureMsg.append(msg + e.getMessage());
                log.error(msg, e);
            }