changes

liuhaonan

2022-10-25 d495f9b8cdc83663e4189bc3cc72ac9543ff5555

 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,11 @@

        try {
            String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
            System.out.println(s);

            System.out.println(waterQualityEquipmentCode + "-------------------------------" + s);
            if (!s.startsWith("{")) {
                equipmentInfo.setEquipmentState("未知");
                return equipmentInfo;
            }
            WaterQualityDataDto waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
            //设置水质设备状态
            if (waterQualityDataDto != null) {