jiangping
2025-02-17 66ca3c7a1abce80143a3bd5c1e197aa020c396b6
jtt808初始化
已修改5个文件
73 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/core/constants/Constants.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/Sites.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -44,6 +44,7 @@
    //车辆类型数据
    public static final String  BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
    public static final String MINI_PROGRAMME_REALEASE ="MINI_PROGRAMME_REALEASE" ;
    public static final int FOUR =4 ;
    public static String REDIS_DEBUG_STR="test_";
    public static final String AD = "AD";
    public static String REPAIR = "REPAIR";
server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
@@ -60,8 +60,8 @@
    @ExcelColumn(name="排序码(升序)")
    private Integer sortnum;
    @ApiModelProperty(value = "类型 0车辆保修原因 1强制还车原因 2时长减免原因 3单车类型", example = "1")
    @ExcelColumn(name="类型 0车辆保修原因 1强制还车原因 2时长减免原因 3单车类型")
    @ApiModelProperty(value = "类型 0车辆保修原因 1强制还车原因 2时长减免原因 3单车类型 4电车类型", example = "1")
    @ExcelColumn(name="类型 0车辆保修原因 1强制还车原因 2时长减免原因 3单车类型  4电车类型")
    @NotEmpty(message = "类型参数为空")
    private Integer type;
server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -50,6 +50,10 @@
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
//    @TableLogic
    private Integer isdeleted;
    @ApiModelProperty(value = "站点类型 0自行车 1电车", example = "1")
    @ExcelColumn(name="站点类型 0自行车 1电车")
//    @TableLogic
    private Integer type;
    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -2,10 +2,14 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.StringTools;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BaseParamMapper;
import com.doumee.dao.business.BikesMapper;
import com.doumee.dao.business.join.BikesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -23,13 +27,12 @@
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -43,6 +46,8 @@
    @Autowired
    private BikesMapper bikesMapper;
    @Autowired
    private BaseParamMapper baseParamMapper;
    @Autowired
    private BikesJoinMapper bikesJoinMapper;
@@ -51,6 +56,33 @@
    @Override
    public String create(Bikes bikes) {
        if(StringUtils.isBlank(bikes.getParamId() )
                ||StringUtils.isBlank(bikes.getCode())
                ||StringUtils.isBlank(bikes.getDeviceSn())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,Constants.FOUR)) ==0){
            throw   new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,请选择正确的电车类型!");
        }
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Bikes::getCode,bikes.getCode())
                .eq(Bikes::getIsdeleted,Constants.ZERO)
                .eq(Bikes::getType,Constants.ONE);
        Integer count = bikesMapper.selectCount(wrapper);
        if (count > 0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"车牌号号已存在");
        }
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        bikes.setId(UUID.randomUUID().toString());
        bikes.setCreateDate(new Date());
        bikes.setCreator(user.getId());
        bikes.setEditDate(bikes.getCreateDate());
        bikes.setEditor(user.getId());
        bikes.setStatus(Constants.ZERO);
        bikes.setIsdeleted(Constants.ZERO);
        bikes.setType(Constants.ONE);//只能新增电车数据
        bikesMapper.insert(bikes);
        return bikes.getId();
    }
@@ -76,6 +108,27 @@
    @Override
    public void updateById(Bikes bikes) {
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Bikes::getCode,bikes.getCode())
                .eq(Bikes::getIsdeleted,Constants.ZERO)
                .ne(Bikes::getId,bikes.getId())
                .eq(Bikes::getType,Constants.ONE);
        Integer count = bikesMapper.selectCount(wrapper);
        if (count > 0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"车牌号号已存在");
        }
        if(StringUtils.isNotBlank(bikes.getParamId()) &&
                baseParamMapper.selectCount(new QueryWrapper<BaseParam>().lambda().eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,Constants.FOUR)) ==0){
            throw   new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,请选择正确的电车类型!");
        }
        LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        bikes.setEditDate(new Date());
        bikes.setEditor(user.getId());
        bikes.setStatus(Constants.ZERO);
        bikes.setIsdeleted(Constants.ZERO);
        bikes.setType(null);//只能新增电车数据
        bikesMapper.updateById(bikes);
    }
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -66,7 +66,8 @@
        QueryWrapper<Sites> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Sites::getCode,sites.getCode());
                .eq(Sites::getCode,sites.getCode())
                .eq(Sites::getIsdeleted,Constants.ZERO);
        Integer count = sitesMapper.selectCount(wrapper);
        if (count > 0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"站点编号已存在");
@@ -81,6 +82,7 @@
        insert.setInfo(sites.getInfo());
        insert.setName(sites.getName());
        insert.setCode(sites.getCode());
        insert.setElectronicFence(sites.getElectronicFence());
        insert.setStatus(Constants.ZERO);
        insert.setLockNum(sites.getLockNum());
        insert.setIp(sites.getIp());
@@ -123,6 +125,7 @@
        update.setEditor(principal.getId());
        update.setName(sites.getName());
        update.setLockNum(sites.getLockNum());
        update.setElectronicFence(sites.getElectronicFence());
        update.setIp(sites.getIp());
        update.setNeedNotice(sites.getNeedNotice());
        sitesMapper.updateById(update);