养护计划优化提交

王富生
1 parent dcbf3fe9
Showing 5 changed files with 108 additions and 15 deletions
urbanops-framework/urbanops-spring-boot-starter-mybatis/src/main/java/com/zteits/urbanops/framework/mybatis/core/type/StringArrayToListTypeHandler.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanCommitDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
+package com.zteits.urbanops.framework.mybatis.core.type;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class StringArrayToListTypeHandler extends BaseTypeHandler<List<String>> {
+
+    // 匹配引号（单或双）
+    private static final Pattern SPLIT_PATTERN = Pattern.compile(",\\s*");
+    private static final Pattern TRIM_QUOTES = Pattern.compile("^(['\"])(.*)\\1$");
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+        if (parameter == null || parameter.isEmpty()) {
+            ps.setString(i, "[]");
+            return;
+        }
+        // 统一用双引号序列化为 JSON 格式写入
+        StringBuilder sb = new StringBuilder();
+        sb.append("[");
+        for (int idx = 0; idx < parameter.size(); idx++) {
+            if (idx > 0) sb.append(",");
+            sb.append("\"").append(parameter.get(idx)).append("\"");
+        }
+        sb.append("]");
+        ps.setString(i, sb.toString());
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        return parse(rs.getString(columnName));
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        return parse(rs.getString(columnIndex));
+    }
+
+    @Override
+    public List<String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        return parse(cs.getString(columnIndex));
+    }
+
+    /**
+     * 解析 ['a','b'] 或 ["x","y"] 等格式
+     */
+    private List<String> parse(String value) {
+        if (value == null || (value = value.trim()).length() == 0 || "null".equalsIgnoreCase(value)) {
+            return Collections.emptyList();
+        }
+
+        // 去掉首尾的 [ 和 ]
+        if (!value.startsWith("[") || !value.endsWith("]")) {
+            return Collections.emptyList(); // 非法格式
+        }
+        value = value.substring(1, value.length() - 1).trim();
+
+        // 空数组
+        if (value.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<String> result = new ArrayList<>();
+        String[] items = SPLIT_PATTERN.split(value);
+
+        for (String item : items) {
+            item = item.trim();
+            if (item.length() == 0) continue;
+
+            // 移除首尾的单引号或双引号
+            if ((item.startsWith("'") && item.endsWith("'")) ||
+                    (item.startsWith("\"") && item.endsWith("\""))) {
+                item = item.substring(1, item.length() - 1);
+            }
+
+            result.add(item);
+        }
+
+        return result;
+    }
+}
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zteits.urbanops.framework.mybatis.core.type.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -57,11 +59,8 @@ public class InspectionPlanCommitRespVO {
     @Schema(description = "巡检照片")
     @ExcelProperty("巡检照片")
-    private String img;
-
-    @Schema(description = "巡检照片")
-    @ExcelProperty("巡检照片")
-    private List<String> imgList;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> img;
     @Schema(description = "巡检结果: 1:正常;2:异常")
     @ExcelProperty("巡检结果: 1:正常;2:异常")
 package com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan;
+import com.zteits.urbanops.framework.mybatis.core.type.StringListTypeHandler;
 import lombok.*;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
@@ -61,7 +64,8 @@ public class InspectionPlanCommitDO extends BaseDO {
     /**
      * 巡检照片
      */
-    private String img;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> img;
     /**
      * 巡检结果: 1:正常;2:异常
      */
@@ -132,7 +132,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
                 .batchNo(inspectionPlanDO.getBatchNo())
                 .planNo(createReqVO.getPlanNo()).busiLine(inspectionPlanDO.getBusiLine())
                 .companyId(inspectionPlanDO.getCompanyId()).deptId(inspectionPlanDO.getDeptId())
-                .roadId(inspectionPlanDO.getRoadId()).img(JSONObject.toJSONString(createReqVO.getImgList()))
+                .roadId(inspectionPlanDO.getRoadId()).img(createReqVO.getImgList())
                 .inspectionState(createReqVO.getInspectionState()).transState(createReqVO.getTransState())
                 .transWorkNo(createReqVO.getTransWorkNo())
                 .userId(userId).userName(userName)
@@ -195,7 +195,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         IPage<InspectionPlanCommitRespVO> page = inspectionPlanCommitMapper.selectForPage(mpPage, pageReqVO);
         addDataInspectionPlan(page.getRecords());
         // 转换返回
-        return new PageResult<>(imgProcess(page.getRecords()), page.getTotal());
+        return new PageResult<>(page.getRecords(), page.getTotal());
     }
     @Override
@@ -242,11 +242,11 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         });
     }
-    private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
-        list.forEach(e -> {
-            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
-        });
-        return list;
-    }
+//    private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
+//        list.forEach(e -> {
+//            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
+//        });
+//        return list;
+//    }
 }
 \ No newline at end of file
@@ -2,6 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanCommitMapper">
+
+    <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO">
+            <result property="img" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
+    </resultMap>
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
         无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
@@ -9,7 +13,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
     <!-- 复杂联表分页查询 -->
-    <select id="selectForPage"  resultType="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO">
+    <select id="selectForPage"  resultMap="BaseResultMap">
         SELECT
             a.plan_no,
             b.plan_name,