Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java

@@ -14,7 +14,9 @@
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.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -38,10 +40,16 @@
    public String create(BaseParam baseParam) {

        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        if (Objects.isNull(baseParam.getType()) || StringUtils.isEmpty(baseParam.getName())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"参数错误");
        }

        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getType,baseParam.getName());
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getName,baseParam.getName());

        Integer count = baseParamMapper.selectCount(wrapper);
        if (count > 0){
@@ -65,13 +73,18 @@

    @Override
    public void deleteById(String id) {
        baseParamMapper.deleteById(id);
        BaseParam baseParam = new BaseParam();
        baseParam.setId(id);
        baseParam.setEditDate(new Date());
        baseParam.setIsdeleted(Constants.ONE);
        baseParamMapper.updateById(baseParam);
    }

    @Override
    public void delete(BaseParam baseParam) {
        UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
        baseParamMapper.delete(deleteWrapper);
//      UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ONE);
        baseParamMapper.updateById(baseParam);
    }

    @Override
@@ -80,7 +93,9 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        baseParamMapper.deleteBatchIds(ids);
       for(String id :ids){
           deleteById(id);
       }
    }

    @Override
@@ -89,9 +104,10 @@
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getType,baseParam.getName());
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getName,baseParam.getName());

        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper);
        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
        if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆问题已存在");
        }
@@ -99,6 +115,7 @@
        updateWrapper
                .lambda()
                .eq(BaseParam::getId,baseParam.getId())
                .set(BaseParam::getRequired,baseParam.getRequired())
                .set(BaseParam::getName,baseParam.getName())
                .set(BaseParam::getSortnum,baseParam.getSortnum())
                .set(BaseParam::getEditDate,new Date())
@@ -124,12 +141,14 @@
    @Override
    public BaseParam findOne(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        return baseParamMapper.selectOne(wrapper);
        return baseParamMapper.selectOne(wrapper.last(" limit 1"));
    }

    @Override
    public List<BaseParam> findList(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ZERO);
        wrapper.orderByAsc("sortnum");
        return baseParamMapper.selectList(wrapper);
    }

@@ -138,6 +157,7 @@
        IPage<BaseParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<BaseParam> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(BaseParam::getId, pageWrap.getModel().getId());
        }
@@ -159,7 +179,7 @@
            queryWrapper.lambda().eq(BaseParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(BaseParam::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(BaseParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(BaseParam::getSortnum, pageWrap.getModel().getSortnum());
@@ -171,24 +191,19 @@
            queryWrapper.lambda().eq(BaseParam::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getInfo() != null) {
            queryWrapper.lambda().eq(BaseParam::getInfo, pageWrap.getModel().getInfo());
            queryWrapper.lambda().like(BaseParam::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getRequired() != null) {
            queryWrapper.lambda().eq(BaseParam::getRequired, pageWrap.getModel().getRequired());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByAsc(BaseParam::getSortnum);
        return PageData.from(baseParamMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(BaseParam baseParam) {
        QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
        baseParam.setIsdeleted(Constants.ZERO);
        return baseParamMapper.selectCount(wrapper);
    }
}