日志

liuhaonan

2022-05-18 7f74c2a4101e25e7889c046e8d3bcc1c30f360d3

日志

 dao/src/main/java/com/sandu/ximon/dao/domain/ForHelp.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/mapper/ForHelpMapper.java

ÎļþÒÑɾ³ý

 dao/src/main/resources/mapper/ForHelpMapper.xml

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ForHelpController.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentNongGengService.java

@@ -8,15 +8,14 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirEquipmentNongGengBo;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.AirEquipmentNongGeng;
import com.sandu.ximon.dao.mapper.AirEquipmentMapper;
import com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
@@ -38,6 +37,18 @@
        AirEquipmentNongGeng one = getOne(Wrappers.lambdaQuery(AirEquipmentNongGeng.class).eq(AirEquipmentNongGeng::getMac, airEquipmentNongGeng.getMac()));
        if (one == null) {
            save(airEquipmentNongGeng);
            /**
             * æ·»åŠ å†œè€•å¤§æ°”设备 æ—¥å¿—记录开始
             */
            List<String> listCode = new ArrayList<>(1);
            listCode.add(airEquipmentNongGeng.getMac());
            String content = "{ è®¾å¤‡id:" + airEquipmentNongGeng.getId() + "设备code：" + airEquipmentNongGeng.getMac() +
                    "}";

            StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加农耕大气设备", content);
            /**
             * æ·»åŠ å†œè€•å¤§æ°”设备 æ—¥å¿—记录结束
             */
        }
    }

@@ -69,6 +80,19 @@
        if (airEquipmentNongGeng == null) {
            throw new BusinessException("找不到大气设备数据");
        }

        /**
         * åˆ é™¤å†œè€•å¤§æ°”设备 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(airEquipmentNongGeng.getMac());
        String content = "{ è®¾å¤‡id:" + airEquipmentNongGeng.getId() + "设备code：" + airEquipmentNongGeng.getMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除农耕大气设备", content);
        /**
         * åˆ é™¤å†œè€•å¤§æ°”设备 æ—¥å¿—记录结束
         */
        return removeById(Id);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirEquipmentService.java

@@ -5,10 +5,10 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5AtmosphereReportEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.domain.AirEquipment;
@@ -16,6 +16,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -54,6 +55,18 @@
//                , 1, 300L);
        if (one == null) {
            save(airEquipment);
            /**
             * æ·»åŠ å¤§æ°”设备 æ—¥å¿—记录开始
             */
            List<String> listCode = new ArrayList<>(1);
            listCode.add(airEquipment.getMac());
            String content = "{ è®¾å¤‡id:" + airEquipment.getId() + "设备code：" + airEquipment.getMac() +
                    "}";

            StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加大气设备", content);
            /**
             * æ·»åŠ å¤§æ°”设备 æ—¥å¿—记录结束
             */
        }
    }

@@ -68,6 +81,17 @@
        if (airEquipment == null) {
            throw new BusinessException("找不到大气设备数据");
        }
        /**
         * åˆ é™¤å¤§æ°”设备 æ—¥å¿—记录开始
         */
        List<String> listCode=new ArrayList<>(1);
        listCode.add(airEquipment.getMac());
        String content = "{设备code：" + airEquipment.getMac() + "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除大气设备", content);
        /**
         * åˆ é™¤å¤§æ°”设备 æ—¥å¿—记录结束
         */
        return removeById(Id);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -33,6 +33,7 @@
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -862,7 +863,23 @@
            c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());
        }
        c3mCharging.setC3Mac(c3ChargingAddParam.getC3Mac());
        return save(c3mCharging);
        /**
         * æ·»åŠ å……电桩 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(c3mCharging.getMcuUdid());
        String content = "{设备code：" + c3mCharging.getMcuUdid() + "设备名:" + c3mCharging.getC3Name() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加充电桩", content);
        /**
         * æ·»åŠ å……电桩 æ—¥å¿—记录结束
         */

        return

                save(c3mCharging);

    }

    public boolean updateC3ChargingName(C3ChargingAddParam c3ChargingAddParam) {
@@ -877,6 +894,21 @@
        C3mCharging c3mCharging = new C3mCharging();
        c3mCharging.setC3Id(c3ChargingAddParam.getC3Id());
        c3mCharging.setC3Name(c3ChargingAddParam.getC3Name());

        /**
         * ä¿®æ”¹å……电桩 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(c3mCharging.getMcuUdid());
        String content = "{设备code：" + c3mCharging.getMcuUdid() + "设备原名:" + one.getC3Name() + "更改后的设备名:" + c3mCharging.getC3Name() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "编辑充电桩", content);
        /**
         * ä¿®æ”¹å……电桩 æ—¥å¿—记录结束
         */


        return updateById(c3mCharging);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ForHelpService.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java

@@ -8,6 +8,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneHostParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.domain.InterphoneHost;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
@@ -17,6 +18,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -34,7 +36,21 @@
    public boolean addHost(InterphoneHostParam interphoneHostParam) {
        InterphoneHost interphoneHost = new InterphoneHost();
        BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
        return save(interphoneHost);
        boolean save = save(interphoneHost);
        /**
         * æ·»åŠ ä¸€é”®æ±‚助主机 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(interphoneHost.getHostMac());
        String content = "{ è®¾å¤‡id:" + interphoneHost.getHostId() + "设备code：" + interphoneHost.getHostMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加一键求助主机", content);
        /**
         * æ·»åŠ ä¸€é”®æ±‚助主机 æ—¥å¿—记录结束
         */

        return save;
    }

    /**
@@ -53,6 +69,19 @@
        InterphoneHost interphoneHost = new InterphoneHost();
        interphoneHost.setHostId(id);
        BeanUtils.copyProperties(interphoneHostParam, interphoneHost);

        /**
         * ç¼–辑一键求助主机 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(interphoneHost.getHostMac());
        String content = "{ è®¾å¤‡id:" + interphoneHost.getHostId() + "设备code：" + interphoneHost.getHostMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "编辑一键求助主机", content);
        /**
         * ç¼–辑一键求助主机 æ—¥å¿—记录结束
         */
        return updateById(interphoneHost);
    }

@@ -72,6 +101,20 @@
        if (byId == null) {
            return false;
        }

        /**
         * åˆ é™¤ä¸€é”®æ±‚助主机 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(byId.getHostMac());
        String content = "{ è®¾å¤‡id:" + byId.getHostId() + "设备code：" + byId.getHostMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除一键求助主机", content);
        /**
         * åˆ é™¤ä¸€é”®æ±‚助主机 æ—¥å¿—记录结束
         */

        return removeById(id);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java

@@ -8,6 +8,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneSubParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.InterphoneSubBo;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
import com.sandu.ximon.dao.domain.InterphoneSub;
@@ -17,6 +18,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -32,7 +34,20 @@
    public boolean addSub(InterphoneSubParam interphoneSubParam) {
        InterphoneSub interphoneSub = new InterphoneSub();
        BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
        return save(interphoneSub);
        boolean save = save(interphoneSub);
        /**
         * æ·»åŠ ä¸€é”®æ±‚助子设备 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(interphoneSub.getSubMac());
        String content = "{ è®¾å¤‡id:" + interphoneSub.getSubId() + "设备code：" + interphoneSub.getSubMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加一键求助子设备", content);
        /**
         * æ·»åŠ ä¸€é”®æ±‚助子设备 æ—¥å¿—记录结束
         */
        return save;
    }

    /**
@@ -50,6 +65,20 @@
        InterphoneSub interphoneSub = new InterphoneSub();
        BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
        interphoneSub.setSubId(id);

        /**
         * ç¼–辑一键求助子设备 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(interphoneSub.getSubMac());
        String content = "{ è®¾å¤‡id:" + interphoneSub.getSubId() + "设备code：" + interphoneSub.getSubMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "编辑一键求助子设备", content);
        /**
         * ç¼–辑一键求助子设备 æ—¥å¿—记录结束
         */

        return updateById(interphoneSub);
    }

@@ -65,6 +94,21 @@
        if (byId == null) {
            return false;
        }


        /**
         * åˆ é™¤ä¸€é”®æ±‚助子设备 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(byId.getSubMac());
        String content = "{ è®¾å¤‡id:" + byId.getSubId() + "设备code：" + byId.getSubMac() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除一键求助子设备", content);
        /**
         * åˆ é™¤ä¸€é”®æ±‚助子设备 æ—¥å¿—记录结束
         */

        return removeById(id);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedPlayerEntityService.java

@@ -7,6 +7,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
@@ -38,8 +39,29 @@
        return getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getPlayerId, playerId));
    }

    /**
     * è¯ºç“¦è®¾å¤‡æ–°å¢ž
     *
     * @param ledPlayerEntity
     * @return
     */
    public boolean saveLed(LedPlayerEntity ledPlayerEntity) {
        return ledPlayerEntityMapper.saveLed(ledPlayerEntity);
        boolean b = ledPlayerEntityMapper.saveLed(ledPlayerEntity);
        /**
         * è¯ºç“¦è®¾å¤‡æ–°å¢ž æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(ledPlayerEntity.getSn());
        String content = "{ è®¾å¤‡id:" + ledPlayerEntity.getId() + "设备code：" + ledPlayerEntity.getSn()
                + "诺瓦playId:" + ledPlayerEntity.getPlayerId()
                + "诺瓦设备名称:" + ledPlayerEntity.getName() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦设备新增", content);
        /**
         * è¯ºç“¦è®¾å¤‡æ–°å¢ž æ—¥å¿—记录结束
         */
        return b;
    }


@@ -109,14 +131,4 @@
        return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
    }

//    public List<LedPlayerEntity> ledPlayerEntityList() {
//        List<LedPlayerEntity> list;
//        //超管
//        if (SecurityUtils.getClientId() == null) {
//            list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
//        } else {
//            list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
//        }
//        return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
//    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java

@@ -231,7 +231,7 @@
         */
        List<String> listCode = new ArrayList<>();
        listCode.add(poleLightemit.getLightemitControlCode());
        String content = "{屏幕id：" + poleLightemit.getLightemitId() + "， å±å¹•åç§°ï¼š" + poleLightemit.getLightemitName() + "， å±å¹•ç¼–码：" + poleLightemit.getLightemitControlCode() + " }";
        String content = "{屏幕id：" + poleLightemit.getLightemitId() + "， å±å¹•åŽŸåï¼š" + byId.getLightemitName() + "， å±å¹•åç§°ï¼š" + poleLightemit.getLightemitName() + "， å±å¹•ç¼–码：" + poleLightemit.getLightemitControlCode() + " }";
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "熙汛LED编辑", content);
        /**
         * ç†™æ±›led编辑日志记录结束

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java

@@ -9,6 +9,7 @@
import com.sandu.ximon.admin.dto.nova.PlayerWidget;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
import com.sandu.ximon.admin.utils.request.VnnoxScreenStatusType;
@@ -36,13 +37,13 @@
@AllArgsConstructor
public class VnnoxService {

    // @Autowired

    private VnnoxAPIUtil vnnoxAPIUtil;
    // @Autowired

    private RedisUtils redisUtils;
    // @Autowired

    private LedPlayerEntityService ledPlayerEntityService;
    // @Autowired

    private VnnoxProgramAPIUtil vnnoxProgramAPIUtil;

    /**
@@ -113,10 +114,7 @@
            type = VnnoxScreenStatusType.OPEN;
        }

        VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(
                playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
                type
        );
        VnnoxResult vnnoxResult = vnnoxAPIUtil.screenStatus(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), type);
        //  æ ¹æ®å±å¹•çŠ¶æ€è°ƒæ•´REDIS标识位
        for (String playerId : vnnoxResult.getSuccess()) {
            redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + playerId, screenStatus, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -125,10 +123,7 @@
    }

    public VnnoxResult volChange(List<LedPlayerEntity> playerList, Integer vol) {
        VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(
                playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
                vol
        );
        VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), vol);
        //  æ ¹æ®éŸ³é‡è°ƒæ•´REDIS标识位
        for (String playerId : vnnoxResult.getSuccess()) {
            redisUtils.set(VnnoxConstant.REDIS_VOL + playerId, vol, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -137,10 +132,7 @@
    }

    public VnnoxResult brightnessChange(List<LedPlayerEntity> playerList, Integer brightness) {
        VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(
                playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()),
                brightness
        );
        VnnoxResult vnnoxResult = vnnoxAPIUtil.brightnessChange(playerList.stream().map(item -> item.getPlayerId()).collect(Collectors.toList()), brightness);
        //  æ ¹æ®äº®åº¦è°ƒæ•´REDIS标识位
        for (String playerId : vnnoxResult.getSuccess()) {
            redisUtils.set(VnnoxConstant.REDIS_BRIGHTNESS + playerId, brightness, VnnoxConstant.REDIS_MAX_SAVE_TIME);
@@ -238,6 +230,17 @@
        LedPlayerEntity led = new LedPlayerEntity();
        led.setId(id);
        led.setName(name);
        /**
         * è¯ºç“¦è®¾å¤‡ç¼–辑 æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(led.getSn());
        String content = "{ è®¾å¤‡id:" + led.getId() + "设备code：" + led.getSn() + "诺瓦playId:" + led.getPlayerId() + "诺瓦设备原名:" + byId.getName() + "诺瓦设备更改后的名称:" + led.getName() + "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "诺瓦设备编辑", content);
        /**
         * è¯ºç“¦è®¾å¤‡ç¼–辑 æ—¥å¿—记录结束
         */
        return ledPlayerEntityService.updateById(led);
    }

@@ -305,7 +308,7 @@

        /**
         * è¯ºç“¦æŽ¨é€å¤§æ°”数据 æ—¥å¿—记录开始
////         */
         ////         */
//        String content = "{诺瓦playerId：" + playerId + ",节目内容：" + JSON.toJSONString(playerProgram) + " }";
//        StoreOperationRecordsUtils.storeOperationData(null, null, "大气数据推送到诺瓦", content);
        /**
@@ -336,15 +339,7 @@
            list.add("CO2：" + poleSensorEntity.getCo2() + "ppm");
        }

        widgetList.add(new PlayerWidget().generateScrollUpTextWidget(
                "weather",
                1,
                100000L,
                list,
                "#FFFFFF",
                15,
                new PlayerLayout("0%", "5%", "100%", "100%")
        ));
        widgetList.add(new PlayerWidget().generateScrollUpTextWidget("weather", 1, 100000L, list, "#FFFFFF", 15, new PlayerLayout("0%", "5%", "100%", "100%")));

        return widgetList;
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java

@@ -9,6 +9,7 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
@@ -16,6 +17,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -65,6 +67,18 @@
        //删除摄水质设备前需要先解绑
        poleBindingService.unBindPole(null, waterQualityEquipment.getWaterQualityEquipmentCode());

        /**
         * åˆ é™¤æ°´è´¨è®¾å¤‡ æ—¥å¿—记录开始
         */
        List<String> listCode = new ArrayList<>(1);
        listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
        String content = "{ è®¾å¤‡id:" + waterQualityEquipment.getId() + "设备code：" + waterQualityEquipment.getWaterQualityEquipmentCode() +
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除水质设备", content);
        /**
         * åˆ é™¤æ°´è´¨è®¾å¤‡ æ—¥å¿—记录结束
         */
        return removeById(Id);
    }

@@ -84,7 +98,20 @@
        if (one == null) {
            WaterQualityEquipment result = new WaterQualityEquipment();
            result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
            return save(result);
            boolean save = save(result);
            /**
             * æ·»åŠ æ°´è´¨è®¾å¤‡ æ—¥å¿—记录开始
             */
            List<String> listCode = new ArrayList<>(1);
            listCode.add(waterQualityEquipment.getWaterQualityEquipmentCode());
            String content = "{ è®¾å¤‡id:" + waterQualityEquipment.getId() + "设备code：" + waterQualityEquipment.getWaterQualityEquipmentCode() +
                    "}";

            StoreOperationRecordsUtils.storeOperationData(listCode, null, "添加水质设备", content);
            /**
             * æ·»åŠ æ°´è´¨è®¾å¤‡ æ—¥å¿—记录结束
             */
            return save;
        } else {
            throw new BusinessException("该水质设备已存在！");
        }
@@ -109,8 +136,8 @@

        try {
            String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
            System.out.println(waterQualityEquipmentCode+"-------------------------------"+s);
            if(!s.startsWith("{")){
            System.out.println(waterQualityEquipmentCode + "-------------------------------" + s);
            if (!s.startsWith("{")) {
                equipmentInfo.setEquipmentState("未知");
                return equipmentInfo;
            }