From 2e644445577d0773482753b7d08b3425afae7837 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 29 九月 2025 13:58:20 +0800
Subject: [PATCH] 新问题 25-9-28
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index c20dd0c..2c0193a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -170,6 +170,7 @@
*/
@Override
public Result removeById(String id) {
+ log.info("鎵ц鍒犻櫎鏂规硶-------------------");
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -265,7 +266,7 @@
if (!CollectionUtils.isEmpty(dynamics)) {
dynamicMap = dynamics.stream().filter(vo -> vo.getRefId() != null).collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
}
- //瀹氫箟琛ㄥご鍒楄〃
+ //瀹氫箟鍥哄畾琛ㄥご鍒楄〃
LinkedHashSet<String> headers = new LinkedHashSet<>();
headers.add(PointHeaderConstant.ID);
headers.add(PointHeaderConstant.Point_Name);
@@ -278,6 +279,8 @@
headers.add(PointHeaderConstant.Province_Tag_Face);
headers.add(PointHeaderConstant.Impotrant_Command_Image);
headers.add(PointHeaderConstant.Dept_Tag);
+ headers.add(PointHeaderConstant.Username);
+ headers.add(PointHeaderConstant.Password);
List<String> headersList = new LinkedList<>();
if (!CollectionUtils.isEmpty(dynamicsHeaders)) {
//浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
@@ -300,6 +303,8 @@
list.add(export.getProvinceTagFaceString());
list.add(export.getImportantCommandImageTagString());
list.add(export.getDeptTagString());
+ list.add(export.getUsername());
+ list.add(export.getPassword());
for (String header : headersList) {
//鍒涘缓涓�涓彉閲忚褰曟壘娌℃壘鍒拌繖涓猦eader
boolean flag = false;
@@ -336,6 +341,7 @@
needUpdateUnit) throws IOException, ExecutionException, InterruptedException {
List<Map<String, String>> list = EasyExcelImportUtils.makeData(file);
List<PointExport> dataList = new ArrayList<>();
+
// Consumer<List<PointExport>> consumer = (dataList) -> {
// try {
// this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
@@ -357,6 +363,8 @@
pointExport.setProvinceTagFace("鏄�".equals(map.get(PointHeaderConstant.Province_Tag_Face)));
pointExport.setImportantCommandImageTag("鏄�".equals(map.get(PointHeaderConstant.Impotrant_Command_Image)));
pointExport.setDeptTag("鏄�".equals(map.get(PointHeaderConstant.Dept_Tag)));
+ pointExport.setUsername(map.get(PointHeaderConstant.Username));
+ pointExport.setPassword(map.get(PointHeaderConstant.Password));
List<DynamicColumnVO> dynamics = new ArrayList<>();
// 澶勭悊鍔ㄦ�佸垪
for (Map.Entry<String, String> entry : map.entrySet()) {
@@ -403,6 +411,8 @@
point.setProvinceTagCar(item.getProvinceTagCar());
point.setProvinceTagFace(item.getProvinceTagFace());
point.setDeptTag(item.getDeptTag());
+ point.setUsername(item.getUsername());
+ point.setPassword(item.getPassword());
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
--
Gitblit v1.8.0