From 5bb34860af3a025b136ebf023351bc4ce1e41a4f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 29 Nov 2023 17:56:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java | 19 ++++++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java | 31 +++++++--------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java | 15 ++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java | 16 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java | 14 ++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java | 14 ++++++-
6 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
index 25ffaaa..65e3315 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
@@ -1,9 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -39,14 +36,14 @@
* 名称
*/
@ApiModelProperty(value = "名称")
- @TableField("\"name\"")
+ @TableField(value = "\"name\"",fill = FieldFill.UPDATE)
private String name;
/**
* 数量
*/
@ApiModelProperty(value = "数量")
- @TableField("\"num\"")
+ @TableField(value = "\"num\"",fill = FieldFill.UPDATE)
private Integer num;
/**
@@ -60,77 +57,77 @@
* 洞（孔）身型式
*/
@ApiModelProperty(value = "洞（孔）身型式")
- @TableField("\"spillway_type\"")
+ @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
private String spillwayType;
/**
* 洞长
*/
@ApiModelProperty(value = "洞长")
- @TableField("\"cove_length\"")
+ @TableField(value = "\"cove_length\"",fill = FieldFill.UPDATE)
private Double coveLength;
/**
* 进口底槛高程
*/
@ApiModelProperty(value = "进口底槛高程")
- @TableField("\"threshold_elevation\"")
+ @TableField(value = "\"threshold_elevation\"",fill = FieldFill.UPDATE)
private Double thresholdElevation;
/**
* 出口底槛高程
*/
@ApiModelProperty(value = "出口底槛高程")
- @TableField("\"export_elevation\"")
+ @TableField(value = "\"export_elevation\"",fill = FieldFill.UPDATE)
private Double exportElevation;
/**
* 断面（孔洞）数量
*/
@ApiModelProperty(value = "断面（孔洞）数量")
- @TableField("\"section_num\"")
+ @TableField(value = "\"section_num\"",fill = FieldFill.UPDATE)
private Integer sectionNum;
/**
* 断面（孔洞）长度
*/
@ApiModelProperty(value = "断面（孔洞）长度")
- @TableField("\"section_length\"")
+ @TableField(value = "\"section_length\"",fill = FieldFill.UPDATE)
private Double sectionLength;
/**
* 断面（孔洞）宽度/直径
*/
@ApiModelProperty(value = "断面（孔洞）宽度/直径")
- @TableField("\"section_wide\"")
+ @TableField(value = "\"section_wide\"",fill = FieldFill.UPDATE)
private Double sectionWide;
/**
* 最大泄洪流量
*/
@ApiModelProperty(value = "最大泄洪流量 ")
- @TableField("\"check_fl_dis_charge\"")
+ @TableField(value = "\"check_fl_dis_charge\"",fill = FieldFill.UPDATE)
private Double checkFlDisCharge;
/**
* 工作闸门型式
*/
@ApiModelProperty(value = "工作闸门型式 ")
- @TableField("\"working_gate_type\"")
+ @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
private String workingGateType;
/**
* 启闭方式
*/
@ApiModelProperty(value = "启闭方式 ")
- @TableField("\"oc_type\"")
+ @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
private String ocType;
/**
* 启闭动力
*/
@ApiModelProperty(value = "启闭动力")
- @TableField("\"oc_power\"")
+ @TableField(value = "\"oc_power\"",fill = FieldFill.UPDATE)
private String ocPower;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
index caf9237..14f35e6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.intelligentCall.entity.Scene;
import cn.gistack.sm.sjztmd.entity.TbAttResPowerStation;
+import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResPowerStationMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResPowerStationService;
@@ -18,7 +19,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResPowerStationServiceImpl
@@ -138,8 +141,16 @@
setUpdateCheckLog(oldList,newList);
// 取旧数据和新提交数据交集--更新
- List<TbAttResPowerStation> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
- e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ List<TbAttResPowerStation> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResPowerStation::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
+
// 更新数据
boolean batch = updateBatchById(updateList);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
index 9f21919..0b9e52e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbNorspiServiceImpl.java
@@ -1,9 +1,7 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.*;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
-import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
-import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
-import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbNorspiMapper;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
@@ -27,7 +25,9 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResRsbNorspiServiceImpl
@@ -152,9 +152,16 @@
// 更新审核日志
setUpdateCheckLog(oldList,newList);
- // 取旧数据和新提交数据交集--更新
- List<TbAttResRsbNorspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
- e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ // 更新数据
+ List<TbAttResRsbNorspi> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResRsbNorspi::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
// 更新数据
boolean batch = updateBatchById(updateList);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
index 1f7021e..926accf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbSpillwayServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbSpillway;
+import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbSpillwayMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResRsbSpillwayService;
@@ -16,7 +17,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResRsbSpillwayServiceImpl
@@ -133,8 +136,19 @@
setUpdateLog(oldList,newList);
// 更新审核日志
setUpdateCheckLog(oldList,newList);
+
// 更新数据
- boolean batch = updateBatchById(newList);
+ List<TbAttResRsbSpillway> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResRsbSpillway::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
+
+ boolean batch = updateBatchById(updateList);
if (batch){
if (!edit) {
tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
index 7617bd6..28d5964 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResRsbVerspiServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
import cn.gistack.sm.sjztmd.mapper.TbAttResRsbVerspiMapper;
@@ -16,7 +17,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResRsbVerspiServiceImpl
@@ -135,8 +138,15 @@
setUpdateCheckLog(oldList,newList);
// 取旧数据和新提交数据交集--更新
- List<TbAttResRsbVerspi> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
- e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ List<TbAttResRsbVerspi> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResRsbVerspi::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
// 更新数据
boolean batch = updateBatchById(updateList);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
index 74004cb..0624462 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResWaterDeliveryServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.TbAttResRsbNorspi;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
@@ -16,7 +17,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @ClassName TbAttResWaterDeliveryServiceImpl
@@ -135,8 +138,15 @@
setUpdateCheckLog(oldList,newList);
// 取旧数据和新提交数据交集--更新
- List<TbAttResWaterDelivery> updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
- e.getGuid()).collect(Collectors.toList()).contains(vo.getGuid())).collect(Collectors.toList());
+ List<TbAttResWaterDelivery> updateList = Stream.concat(oldList.stream(),newList.stream())
+ .collect(Collectors.toMap(TbAttResWaterDelivery::getGuid, Function.identity(),(oldValue, newValue) -> {
+ oldValue.setCheckState(newValue.getCheckState());
+ return oldValue;
+ }
+ ))
+ .values()
+ .stream()
+ .collect(Collectors.toList());
// 更新数据
boolean batch = updateBatchById(updateList);
--
Gitblit v1.9.3