电磁锁概要操作修改提交

zhangnaisong

2024-07-02 7a7048db22ace25df5fd39a78c32ea6685c97862

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

@@ -1,7 +1,6 @@
package com.ruoyi.sy.service.impl;

import java.util.HashMap;
import java.util.List;
import java.util.*;

import com.dtflys.forest.annotation.Var;
import com.ruoyi.common.core.domain.entity.SysConfig;
@@ -16,8 +15,8 @@
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Map;

import java.util.stream.Collectors;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -82,10 +81,28 @@
     * @return 结果
     */
    @Override
    public int insertArdTankLock(Map<String,Object> para) {
        String carId = (String) para.get("carId");
        List<Map<String,String>> lockList = (List<Map<String,String>>)para.get("lockList");
        List<ArdTankLock> ardTankLocks = new ArrayList();
        for(Map<String,String> map : lockList){
            ArdTankLock ardTankLock = new ArdTankLock();
            ardTankLock.setId(IdUtils.simpleUUID());
            ardTankLock.setLockNum(map.get("lockNum"));
            ardTankLock.setLockName(map.get("lockName"));
            ardTankLock.setImgPositionTop(map.get("imgPositionTop"));
            ardTankLock.setImgPositionLeft(map.get("imgPositionLeft"));
            ardTankLock.setCarId(carId);
            ardTankLock.setEnable(map.get("enable"));
            ardTankLocks.add(ardTankLock);
        }
        return ardTankLockMapper.insertArdTankLocks(ardTankLocks);
    }
    /*@Override
    public int insertArdTankLock(ArdTankLock ardTankLock) {
                ardTankLock.setId(IdUtils.simpleUUID());
            return ardTankLockMapper.insertArdTankLock(ardTankLock);
    }
    }*/

    /**
     * 修改电磁锁
@@ -152,7 +169,11 @@
            map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
            map.put("carId",ardTankLock.getCarId());
            map.put("enable",ardTankLock.getEnable());
            map.put("restartState",ardTankLock.getRestartState());
            if(ardTankLock.getRestartState() == null){
                map.put("restartState","");
            }else{
                map.put("restartState",ardTankLock.getRestartState());
            }
            if(ardTankLock.getOnlineTime() == null){
                map.put("onlineTime","");
            }else{
@@ -165,6 +186,25 @@
            }
            result.add(map);
        }
        return Results.succeed(result);
        List<Map<String,Object>> result0 = new ArrayList();//拼接carId和carPlate
        Set<String> carIdSet = new HashSet();
        for(Map<String,Object> map : result){
            if(!carIdSet.contains((String) map.get("carId"))){
                Map<String,Object> mapr = new HashMap();
                mapr.put("carId",map.get("carId"));
                mapr.put("carPlate",map.get("carPlate"));
                mapr.put("lockList",new ArrayList());
                result0.add(mapr);
            }
            carIdSet.add((String) map.get("carId"));
        }
        for(Map<String,Object> map : result0){
            for(Map<String,Object> map0 : result){
                if(((String)map.get("carId")).equals((String)map0.get("carId"))){
                    ((List)map.get("lockList")).add(map0);
                }
            }
        }
        return Results.succeed(result0);
    }
}