From c8934d00792358c042de75f659f96372dd6bca37 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 16:01:59 +0800
Subject: [PATCH] 点位导入增加标签

---
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                    |    5 ++++-
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java          |   18 ++++++++++++++++++
 ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java    |    4 ++--
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java |    9 ++++++---
 ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java          |    2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index 7055348..d9b1ac5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.domain.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -42,4 +43,21 @@
     @ExcelProperty("杩愮淮缁撴潫鏃堕棿")
     private Date endTime;
 
+    @ExcelIgnore
+    private Boolean provinceTag;
+
+    @ExcelProperty("鏄惁鐪佸巺鏍囩")
+    private String provinceTagString;
+
+    @ExcelIgnore
+    private Boolean importantTag;
+
+    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+    private String importantTagString;
+
+    @ExcelIgnore
+    private Boolean importantCommandImageTag;
+
+    @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
+    private String importantCommandImageTagString;
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 6a663cb..506e616 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -116,8 +116,8 @@
 
     @PostMapping("/import/{unitId}")
     @ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
-    public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime) throws IOException {
-        return ywPointService.importData(file, unitId, startTime, endTime);
+    public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
+        return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
     }
 
 }
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index 79d6f48..0af0f0a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -121,5 +121,5 @@
      * @param unitId 杩愮淮鍗曚綅id
      * @return
      */
-    Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException;
+    Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException;
 }
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 354b073..6a877dc 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
@@ -234,9 +234,9 @@
     }
 
     @Override
-    public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
+    public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException {
         Consumer<List<PointExport>> consumer = (dataList) -> {
-            this.updatePoint(dataList, unitId, startTime, endTime);
+            this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag);
         };
         EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
         return Result.ok();
@@ -248,7 +248,7 @@
      * @param dataList
      * @param unitId
      */
-    private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) {
+    private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) {
         if (CollectionUtils.isEmpty(dataList)) {
             throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
         }
@@ -258,6 +258,9 @@
                 .set(YwPoint::getUnitId, unitId)
                 .set(YwPoint::getStartTime, startTime)
                 .set(YwPoint::getEndTime, endTime)
+                .set(YwPoint::getProvinceTag, provinceTag)
+                .set(YwPoint::getImportantTag, importantTag)
+                .set(YwPoint::getImportantCommandImageTag, importantCommandImageTag)
                 .update();
     }
 
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index c500d7d..28f53bf 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -83,7 +83,10 @@
                m.ip,
                yu.unit_name,
                yp.start_time,
-               yp.end_time
+               yp.end_time,
+               yp.province_tag,
+               yp.important_tag,
+               yp.important_command_image_tag
         FROM
              t_yw_point yp
                  INNER JOIN t_monitor m ON yp.serial_number = m.serial_number

--
Gitblit v1.8.0