From d715a933d9f599c9586b07a34e076a6c614916b8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 31 十月 2024 02:04:09 +0800
Subject: [PATCH] 点位导出加个区县表头

---
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                       |    2 ++
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java   |    7 +++++--
 ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java |   17 ++---------------
 ycl-common/src/main/java/constant/PointHeaderConstant.java                        |    3 ++-
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java             |    3 +++
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java    |    2 ++
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ycl-common/src/main/java/constant/PointHeaderConstant.java b/ycl-common/src/main/java/constant/PointHeaderConstant.java
index 2fa0b5b..3545f83 100644
--- a/ycl-common/src/main/java/constant/PointHeaderConstant.java
+++ b/ycl-common/src/main/java/constant/PointHeaderConstant.java
@@ -11,6 +11,7 @@
     public final static String ID = "id";
     public final static String Point_Name = "鐐逛綅鍚嶇О(鍙慨鏀�)";
     public final static String Serial_Number = "鍥芥爣鐮�(涓嶅彲淇敼)";
+    public final static String Area = "鍖哄幙(涓嶅彲淇敼)";
     public final static String IP = "鐐逛綅IP(鍙慨鏀�)";
     public final static String Province_Tag = "鏄惁鐪佸巺鏍囩(鍙慨鏀�)";
     public final static String Impotrant_Command_Image = "鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)";
@@ -18,6 +19,6 @@
 
     // 鍙互灏嗚繖浜涘凡鐭ョ殑閿斁鍏ヤ竴涓泦鍚堜腑锛屾柟渚挎鏌�
     public static final Set<String> KNOWN_KEYS = new HashSet<>(Arrays.asList(
-            ID,Point_Name, IP, Serial_Number, Province_Tag, Impotrant_Command_Image, Dept_Tag
+            ID,Point_Name, IP, Serial_Number,Area, Province_Tag, Impotrant_Command_Image, Dept_Tag
     ));
 }
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 6105dfe..9189529 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
@@ -30,6 +30,9 @@
     @ColumnWidth(30)
     @ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
     private String pointIP;
+    @ColumnWidth(30)
+    @ExcelProperty("鍖哄幙(涓嶅彲淇敼)")
+    private String area;
 
     @ColumnWidth(40)
     @ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index d12887c..82c2ad2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -304,20 +304,6 @@
      */
     @Override
     public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
-//        String date = exportDTO.getDate();
-        //濡傛灉璇锋眰鍙傛暟鏃堕棿涓虹┖锛屾煡杩欐潯璁板綍鐨勬椂闂�
-//        if (StringUtils.isEmpty(exportDTO.getDate()) && CollectionUtils.isEmpty(exportDTO.getQuarter())) {
-//            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
-//            if (exportDTO.getId() != null) {
-//                CheckScore checkScore = getById(exportDTO.getId());
-//                Date createTime = checkScore.getCreateTime();
-//                date = formatter.format(createTime);
-//            } else {
-//                //闃叉鍗$墖椤甸潰瀵煎嚭涓嶄紶scoreId锛屽鑷存姤閿�
-//                date = formatter.format(new Date());
-//            }
-//        }
-        //TODO:鏍囩bug淇
         //娌℃湁鏍囩榛樿鍏ㄥ
         if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
             exportDTO.setExamineTags(Arrays.asList(0,1,2));
@@ -339,7 +325,6 @@
             if (examineTag == 0) {
                 checkIndexCar.setProvinceTag(Boolean.TRUE);
             }
-
             checkIndexCars.addAll(indexCarService.selectCheckIndexCarList(checkIndexCar));
         }
         //璁$畻骞冲潎鍊兼斁鍦╡xcel鏈�鍚�
@@ -374,6 +359,7 @@
             checkIndexCarVOS.add(excelVo);
         }
         ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
+
         //浜鸿劯
         List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
         for (Integer examineTag : exportDTO.getExamineTags()) {
@@ -423,6 +409,7 @@
             checkIndexFaceVOS.add(excelVo);
         }
         ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
+
         //瑙嗛
         List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
         for (Integer examineTag : exportDTO.getExamineTags()) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index da9952e..1df8869 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -19,11 +19,13 @@
 import com.ycl.system.domain.SysUserRole;
 import com.ycl.system.entity.SysRole;
 import com.ycl.system.entity.SysUser;
+import com.ycl.system.mapper.SysConfigMapper;
 import com.ycl.system.mapper.SysRoleMapper;
 import com.ycl.system.mapper.SysUserMapper;
 import com.ycl.system.mapper.SysUserRoleMapper;
 import com.ycl.system.page.PageUtil;
 import com.ycl.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.BeanUtils;
@@ -52,7 +54,7 @@
     private final SysUserMapper sysUserMapper;
     private final SysUserRoleMapper sysUserRoleMapper;
     private final SysRoleMapper sysRoleMapper;
-
+    private final SysConfigMapper sysConfigMapper;
     /**
      * 娣诲姞
      * @param form
@@ -93,7 +95,8 @@
      */
     public void fullUser(SysUser sysUser, YwPeopleForm form) {
         sysUser.setUserName(form.getYwPersonAccount());
-        sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
+        String password = sysConfigMapper.checkConfigKeyUnique("sys.user.initPassword").getConfigValue();
+        sysUser.setPassword(SecurityUtils.encryptPassword(password));
         sysUser.setStatus("0");
         sysUser.setFirstLogin((short) 0);
         sysUser.setNickName(form.getYwPersonName());
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 0ca6f0a..c4e154c 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
@@ -260,6 +260,7 @@
         headers.add(PointHeaderConstant.ID);
         headers.add(PointHeaderConstant.Point_Name);
         headers.add(PointHeaderConstant.Serial_Number);
+        headers.add(PointHeaderConstant.Area);
         headers.add(PointHeaderConstant.IP);
         headers.add(PointHeaderConstant.Province_Tag);
         headers.add(PointHeaderConstant.Impotrant_Command_Image);
@@ -278,6 +279,7 @@
             list.add(export.getId());
             list.add(export.getPointName());
             list.add(export.getSerialNumber());
+            list.add(export.getArea());
             list.add(export.getPointIP());
             list.add(export.getProvinceTagString());
             list.add(export.getImportantCommandImageTagString());
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 4e25244..cd9b458 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -226,6 +226,7 @@
         yu.unit_name,
         yp.start_time,
         yp.end_time,
+        d.area,
         CASE WHEN yp.province_tag = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagString,
         CASE WHEN yp.important_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantTagString,
         CASE WHEN yp.important_command_image_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantCommandImageTagString,
@@ -234,6 +235,7 @@
         t_yw_point yp
         INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
         LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
+        LEFT JOIN sys_dept d ON yp.dept_id = d.dept_id
         <where>
             yp.examine_status = 1
             <if test="query.pointName != null and query.pointName != ''">

--
Gitblit v1.8.0