elkers
2 天以前 7c947aac20e48860cd2d351d786e3ebac5da6044
src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java
@@ -72,28 +72,31 @@
            return ExecutedResult.failed("所属设备[id=" + request.getFacilityId() + "]不存在。");
        }
        List<WaterFacilityParameterPO> list = mapper.getListByFacilityId(request.getFacilityId());
        List<Long> ids = new ArrayList<Long>();
        if (ListUtil.isNotNullOrEmpty(list)) {
            list.forEach(x -> {
                ids.add(x.getId());
            });
        }
        if (ListUtil.isNotNullOrEmpty(ids)) {
            mapper.remove(ids);
        }
//        List<Long> ids = new ArrayList<Long>();
//        if (ListUtil.isNotNullOrEmpty(list)) {
//            list.forEach(x -> {
//                ids.add(x.getId());
//            });
//        }
//        if (ListUtil.isNotNullOrEmpty(ids)) {
//            mapper.remove(ids);
//        }
        if (ListUtil.isNotNullOrEmpty(request.getParameterList())) {
            for (ReqCreateWaterFacilityParameter x : request.getParameterList()) {
                WaterFacilityParameterPO item = new WaterFacilityParameterPO();
                item.setId(SnowFlakeUtil.getId());
                item.setFacilityId(facilityPO.getId());
                item.setFacilityCode(facilityPO.getFacilityCode());
                item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
                item.setColumnsUnits(x.getColumnsUnits());
                item.setColumnsCode(x.getColumnsCode());
                item.setColumnsShow(x.getColumnsShow());
                item.setColumnValue("");
                item.setLastTime("");
                this.mapper.insert(item);
                WaterFacilityParameterPO parameterPO = list.stream().filter(item -> item.getFacilityId().equals(request.getFacilityId()) && item.getColumnsCode().equals(x.getColumnsCode())).findFirst().orElse(null);
                if(Objects.isNull(parameterPO)){
                    WaterFacilityParameterPO item = new WaterFacilityParameterPO();
                    item.setId(SnowFlakeUtil.getId());
                    item.setFacilityId(facilityPO.getId());
                    item.setFacilityCode(facilityPO.getFacilityCode());
                    item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
                    item.setColumnsUnits(x.getColumnsUnits());
                    item.setColumnsCode(x.getColumnsCode());
                    item.setColumnsShow(x.getColumnsShow());
                    item.setColumnValue("");
                    item.setLastTime("");
                    this.mapper.insert(item);
                }
            }
        }
        return ExecutedResult.success("添加成功");