数据入库（优化，根据时间和矿id删除原本已有的，防止重复导入）-优化

ruoyi-admin/src/main/resources/application-dev.yml

@@ -11,9 +11,18 @@ spring:
 #                username: root
 #                password: 123456
             master:
-                url: jdbc:mysql://192.168.111.222:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.111.227:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: Klwlzhpzd@2024
+#            master:
+#              url: jdbc:mysql://192.168.111.226:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#              username: root
+#              password: root
+#            master:
+#                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: 210718
+
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application-druid.yml

@@ -5,12 +5,20 @@ spring:
     driverClassName: com.mysql.cj.jdbc.Driver
     druid:
       # 主库数据源
-      master:
-        username: root
-        url: jdbc:mysql://192.168.111.227:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        password: Klwlzhpzd@2024
+#      master:
+#        username: root
+#        url: jdbc:mysql://192.168.111.227:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        password: Klwlzhpzd@2024
 #        url: jdbc:mysql://192.168.111.228:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        password: wlzhpzd
+      master:
+        username: root
+        url: jdbc:mysql://192.168.111.226:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        password: root
+#      master:
+#        url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: root
+#        password: 210718
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesMaterialDetails.java

 package com.ruoyi.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,14 +19,19 @@ public class ActSuppliesMaterialDetails {
     //主键id
     private String id;
     //物料名称
+    @JsonProperty(value = "NameColumn")
     private String nameColumn;
     //材料编码
+    @JsonProperty(value = "CodeColumn")
     private String codeColumn;
     //部门
+    @JsonProperty(value = "DepartmentColumn")
     private String departmentColumn;
     //数量
+    @JsonProperty(value = "NumberColumn")
     private Long numberColumn;
     //单价
+    @JsonProperty(value = "MoneyColumn")
     private BigDecimal moneyColumn;
     //总额
     private BigDecimal money;
@@ -38,12 +44,13 @@ public class ActSuppliesMaterialDetails {
     //矿id
     private String mineId;
     //费用来源
-    private String sourceColumn;
+    private String sourceColoumn;
     //一级材料类别
     private String oneLevel;
     //二级材料类别
     private String twoLevel;
     //日期
+    @JsonProperty(value = "DateColumn")
     private String dateColumn;
 
 

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMaterialMapper.java

@@ -11,6 +11,7 @@ import java.util.List;
  * @date 2024/7/8
  */
 public interface ActSuppliesMaterialMapper {
+
     Boolean save(@Param("accList") List<ActSuppliesMaterialDetails> materials);
 
     void delete(@Param("mineId") String mineId, @Param("dateColumn") String dateColumn);

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMaterialMapper.xml

@@ -19,18 +19,22 @@
         <result property="oneLevel" column="one_level"/>
         <result property="twoLevel" column="two_level"/>
         <result property="dateColumn" column="date_column"/>
+        <result property="sourceColoumn" column="source_coloumn"/>
     </resultMap>
 
-    <insert id="save">
+    <insert id="save" parameterType="java.util.List">
         INSERT INTO act_supplies_material_info
-        (name_column, code_column, department_column, number_column, money_column, money, unit, model, mine_name,
-        mine_id, one_level, two_level, date_column,source_column)
+        (name_column, code_column, department_column, number_column,
+        money_column, money, unit, model, mine_name,
+        mine_id, one_level, two_level, date_column, source_coloumn)
         VALUES
-        <foreach collection="accList" item="list" separator=",">
-            (#{list.nameColumn}, #{list.codeColumn}, #{list.departmentColumn}, #{list.numberColumn}, #{list.moneyColumn}, #{list.money}, #{list.unit},
-            #{list.model}, #{list.mineName}, #{list.mineId}, #{list.oneLevel}, #{list.twoLevel}, #{list.dateColumn},#{list.sourceColumn})
+        <foreach collection="accList" item="item" separator=",">
+            (#{item.nameColumn}, #{item.codeColumn}, #{item.departmentColumn}, #{item.numberColumn}, #{item.moneyColumn}, #{item.money}, #{item.unit},
+            #{item.model}, #{item.mineName}, #{item.mineId}, #{item.oneLevel}, #{item.twoLevel}, #{item.dateColumn}, #{item.sourceColoumn})
         </foreach>
     </insert>
+
+
     <delete id="delete">
         delete from act_supplies_material_info
         where mine_id = #{mineId} and date_column = #{dateColumn}