三一车辆查询bug修改及电磁锁状态修改提交

zhangnaisong

2024-07-30 4c133c297ff25eddd1a30a4bce032affb334969a

三一车辆查询bug修改及电磁锁状态修改提交

 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java

@@ -94,4 +94,6 @@
    public List<ArdSyCar> getCarListByDeptIdList(@Param("deptIdList") List<Long> deptIdList);

    public List<ArdSyCar> selectArdSyCarAndTankLockByUserId(String userId);

    public List<ArdSyCar> selectByBrandAndType(@Param("carBrand")String carBrand,@Param("carType")String carType);
}

 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java

@@ -2,6 +2,7 @@

import java.util.List;
import com.ruoyi.sy.domain.ArdTankLockState;
import org.apache.ibatis.annotations.Param;

/**
 * 罐车锁状态Mapper接口
@@ -62,4 +63,6 @@
    public int insertOrUpdateArdTankLockState(ArdTankLockState ardTankLockState);

    public ArdTankLockState selectArdTankLockStateByLockIdLimitOne(String lockId);

    public int updateArdTankLockStateByUniqueMark(@Param("uniqueMark") String uniqueMark,@Param("uploadTime") String uploadTime);
}

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -134,10 +134,11 @@

    @Override
    public AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result) {
        QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
        queryWrapper.like(ardSyCarParam.getCarBrand()!=null,"car_brand",ardSyCarParam.getCarBrand())
                .like(ardSyCarParam.getCarType()!=null,"car_type",ardSyCarParam.getCarType());
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);*/
        List<ArdSyCar> ardSyCars = ardSyCarMapper.selectByBrandAndType(ardSyCarParam.getCarBrand(),ardSyCarParam.getCarType());
        List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
        if(((String)result.get("code")).equals("200")){
            List<Map<String,Object>> list = (List<Map<String, Object>>) result.get("data");

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java

@@ -227,12 +227,30 @@
                    ardTankLockProcessLog.setProcessTime(this.sdf.format(new Date()));
                    ardTankLockProcessLogMapper.insertArdTankLockProcessLog(ardTankLockProcessLog);
                    return AjaxResult.success("发送成功");
                }else{
                }else if(((String)result.get("rspCode")).equals("-6")){
                    return AjaxResult.error("找不到车辆");
                }else if(((String)result.get("rspCode")).equals("-5")){
                    return AjaxResult.error("找不到用户");
                }else if(((String)result.get("rspCode")).equals("-4")){
                    return AjaxResult.error("找不到指令");
                }else if(((String)result.get("rspCode")).equals("-3")){
                    return AjaxResult.error("指令发送超时");
                }else if(((String)result.get("rspCode")).equals("-2")){
                    return AjaxResult.error("离线待发");
                }else if(((String)result.get("rspCode")).equals("-1")){
                    return AjaxResult.error("车辆离线");
                }else if(((String)result.get("rspCode")).equals("1")){
                    return AjaxResult.error("发送失败");
                }else if(((String)result.get("rspCode")).equals("2")){
                    return AjaxResult.error("消息有误");
                }else if(((String)result.get("rspCode")).equals("3")){
                    return AjaxResult.error("不支持");
                }else{
                    return AjaxResult.error("其他原因发送失败");
                }
            }catch(Exception e){
                e.printStackTrace();
                return AjaxResult.error("发送失败");
                return AjaxResult.error("发送失败" + e.toString());
            }
        }
    }

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java

@@ -99,7 +99,7 @@

    @Override
    public int insertOrUpdateArdTankLockState(ArdTankLockState ardTankLockState) {
        int result = ardTankLockStateMapper.insertOrUpdateArdTankLockState(ardTankLockState);
        /*int result = ardTankLockStateMapper.insertOrUpdateArdTankLockState(ardTankLockState);
        try{
            return result;
        }finally {
@@ -107,6 +107,18 @@
            ardTankLock.setId(ardTankLockState.getLockId());
            ardTankLock.setOnlineTime(ardTankLockState.getUploadTime());
            ardTankLockMapper.updateArdTankLock(ardTankLock);//更改状态
        }*/
        try{
            int result = ardTankLockStateMapper.insertArdTankLockState(ardTankLockState);
            return result;
        }catch(Exception e){
            int result = ardTankLockStateMapper.updateArdTankLockStateByUniqueMark(ardTankLockState.getUniqueMark(),ardTankLockState.getUploadTime());
            return result;
        }finally {
            ArdTankLock ardTankLock = new ArdTankLock();
            ardTankLock.setId(ardTankLockState.getLockId());
            ardTankLock.setOnlineTime(ardTankLockState.getUploadTime());
            ardTankLockMapper.updateArdTankLock(ardTankLock);//更改状态
        }
    }
}

 ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml

@@ -180,4 +180,11 @@
        )
        select dept_id from rsd) order by "asc".car_id desc,atl.lock_num
    </select>
    <select id="selectByBrandAndType" resultMap="ArdSyCarResult" parameterType="java.lang.String">
        select * from ard_sy_car
        <where>
            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
            <if test="carBrand != null  and carBrand != ''"> and car_brand = #{carBrand}</if>
        </where>
    </select>
</mapper>

 ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml

@@ -125,4 +125,9 @@
        where atls.lock_id = #{lockId} order by atls.upload_time desc
        limit 1
    </select>

    <update id="updateArdTankLockStateByUniqueMark" parameterType="java.lang.String">
        update ard_tank_lock_state set upload_time = #{uploadTime}
        where unique_mark = #{uniqueMark}
    </update>
</mapper>

 ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml

@@ -98,11 +98,4 @@
        inner join ard_tank_wall atw on atwl.wall_id = atw.id
        where atwl.lock_id = #{lockId} and atwl.process_type != '0'
    </select>

    <select id="getDistinctArdTankWallByCarId" resultMap="ArdTankWallResult" parameterType="java.lang.String">
        select distinct atw.* from ard_tank_lock atl
        inner join ard_tank_wall_lock atwl on atl.id = atwl.lock_id
        inner join ard_tank_wall atw on atwl.wall_id = atw.id
        where atl.car_id = #{carId}
    </select>
</mapper>