From 49aaecfb0617b0e6043147c86f3d303e9f24867e Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期三, 09 七月 2025 20:27:56 +0800
Subject: [PATCH] 修改yml配置
---
src/main/java/com/fengdu/gas/service/WaterFacilityParameterService.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fengdu/gas/service/WaterFacilityParameterService.java b/src/main/java/com/fengdu/gas/service/WaterFacilityParameterService.java
index 302ef34..35bda99 100644
--- a/src/main/java/com/fengdu/gas/service/WaterFacilityParameterService.java
+++ b/src/main/java/com/fengdu/gas/service/WaterFacilityParameterService.java
@@ -26,6 +26,9 @@
import com.fengdu.gas.common.enums.*;
import com.fengdu.gas.common.model.Tuple;
import com.fengdu.gas.common.util.*;
+import com.fengdu.gas.entity.request.waterfacilityparameter.ReqAddParameter;
+import com.fengdu.gas.repository.impl.WaterFacilityMapperImpl;
+import com.fengdu.gas.repository.po.WaterFacilityPO;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,22 +50,34 @@
public class WaterFacilityParameterService extends BaseService {
@Autowired
private WaterFacilityParameterMapperImpl mapper;
+ @Autowired
+ private WaterFacilityMapperImpl waterFacilityMapper;
- public ExecutedResult<Long> create(ReqCreateWaterFacilityParameter request) {
- // 转换po
- WaterFacilityParameterPO item = WaterFacilityParameterConvert.INSTANCE.toCreate(request);
- // 设置状态
- //item.setStatus(EState.NORMAL.getValue());
- // 设置记录创建时间
- item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
- // 是否删除(逻辑删除)初始值
- item.setIsDelete(EYesOrNo.NO.getValue());
-
- int rowCount = mapper.insert(item);
- if (rowCount != 1) {
- return ExecutedResult.failed("创建[设备设定参数]失败。");
+ public ExecutedResult<String> create(ReqAddParameter request) {
+ WaterFacilityPO facilityPO = waterFacilityMapper.get(request.getFacilityId());
+ if (Objects.isNull(facilityPO)) {
+ return ExecutedResult.failed("所属设备[id=" + request.getFacilityId() + "]不存在。");
}
- return ExecutedResult.success(item.getId());
+ List<WaterFacilityParameterPO> list = mapper.getListByFacilityId(request.getFacilityId());
+ if (ListUtil.isNotNullOrEmpty(request.getParameterList())) {
+ for (ReqCreateWaterFacilityParameter x : request.getParameterList()) {
+ 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("添加成功");
}
public ExecutedResult<String> modify(ReqModifyWaterFacilityParameter request) {
--
Gitblit v1.9.3