aijinhui
2023-11-14 92dba8e44a911c92832ecc22e4c98968409d5c68
远程封印
已添加1个文件
已修改3个文件
30 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -12,6 +12,7 @@
import com.ruoyi.sy.param.AddCarParam;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
@@ -193,8 +194,8 @@
    @GetMapping("/seal")
    @ApiOperation("远程封印")
    public AjaxResult seal(@RequestBody LockTypeParam lockTypeParam)  {
        return AjaxResult.success(ardSyCarLockService.seal(lockTypeParam));
    public AjaxResult seal(@RequestBody RtuTypeParam rtuTypeParam)  {
        return AjaxResult.success(ardSyCarLockService.seal(rtuTypeParam));
    }
    @GetMapping("/lockIng")
ard-work/src/main/java/com/ruoyi/sy/param/RtuTypeParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.sy.param;
import lombok.Data;
@Data
public class RtuTypeParam {
    private String carId;
    private Integer type;
}
ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java
@@ -5,6 +5,7 @@
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
import org.eclipse.paho.client.mqttv3.MqttException;
@@ -46,7 +47,7 @@
    ArdSyCarLock getCurrentInfo(String Rtu,String currents);
    AjaxResult seal(LockTypeParam lockTypeParam);
    AjaxResult seal(RtuTypeParam rtuTypeParam);
    AjaxResult onOff(LockTypeParam lockTypeParam);
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.sy.mapper.ArdSyCarRtuMapper;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.vo.CarVo;
import com.ruoyi.sy.vo.RtuVo;
@@ -228,25 +229,25 @@
    }
    @Override
    public AjaxResult seal(LockTypeParam lockTypeParam) {
    public AjaxResult seal(RtuTypeParam rtuTypeParam) {
        QueryWrapper<ArdSyCarRtu> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("carId",lockTypeParam.getCarId());
        queryWrapper.eq("carId",rtuTypeParam.getCarId());
        ArdSyCarRtu ardSyCarRtu = rtuMapper.selectOne(queryWrapper);
        MqttOnce mqttOnce = new MqttOnce();
        //1解封
        if(lockTypeParam.getType()==1){
        if(rtuTypeParam.getType()==1){
            Map<String,Object> map = new HashMap<>();
            map.put("A01", 110000);//导通第一路继电器
            map.put("A02", 110000);//导通第二路继电器
            map.put("res", String.valueOf(System.currentTimeMillis()));
            try {
                return AjaxResult.success(mqttOnce.publishCar(lockTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"解封"));
                return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"解封"));
            } catch (MqttException e) {
                log.debug("解封指令发生失败"+e);
            }
        }
        //0施封
        if(lockTypeParam.getType()==0){
        if(rtuTypeParam.getType()==0){
            //锁开关状态
            int lockCloseNum = 0;
            //查询锁信息
@@ -289,7 +290,7 @@
                map.put("A02", 100000);//断开第二路继电器
                map.put("res", String.valueOf(System.currentTimeMillis()));
                try {
                    return AjaxResult.success(mqttOnce.publishCar(lockTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"施封"));
                    return AjaxResult.success(mqttOnce.publishCar(rtuTypeParam.getCarId(),ardSyCarRtu.getTopicPublish(),String.valueOf(new com.alibaba.fastjson2.JSONObject(map)),"施封"));
                } catch (MqttException e) {
                    log.debug("施封指令发生失败"+e);
                }