修改

src/main/java/com/ruoyi/project/zjsgfa/controller/SjDjjcController.java

@@ -744,7 +744,77 @@ public class SjDjjcController extends BaseController
                 sjJygjGdsjgdcsMapper.insertSjJygjGdsjgdcsBatch(sjJygjGdsjgdcsList);
                 sjJygjGdsjgdcsMapper.insertSjJygjGdsjgdcsBatch(sjJygjGdsjgdcsList);
             }
             }
             //井眼轨迹 轨道设计各点参数 end---------------------------------------------------
             //井眼轨迹 轨道设计各点参数 end---------------------------------------------------
+            List<SjJygjgdsj> sjJygjgdsjList=new ArrayList<>();
+            for(int i=3; i<=lastRowNum;i++){
+                row = sheet.getRow(i);
+                if(row==null){
+                    continue;
+                }
+                SjJygjgdsj gdfdcs =new SjJygjgdsj();
+                gdfdcs.setJh(jh);
+                int ks=24;
+                String jdcs=new DataFormatter().formatCellValue(row.getCell(ks));
+                if(StringUtils.isEmpty(jdcs)){
+                    continue;
+                }
+                gdfdcs.setJdcs(Double.parseDouble(jdcs));
+                String jdbhj=new DataFormatter().formatCellValue(row.getCell(ks+1));
+                if(StringUtils.isNotEmpty(jdbhj)){
+                    gdfdcs.setJdbhj(Double.parseDouble(jdbhj));
+                }
+
+                String jdbhfw=new DataFormatter().formatCellValue(row.getCell(ks+2));
+                if(StringUtils.isNotEmpty(jdbhfw)){
+                    gdfdcs.setJdbhfw(Double.parseDouble(jdbhfw));
+                }
+
+                String zxd=new DataFormatter().formatCellValue(row.getCell(ks+3));
+                gdfdcs.setZxd(Double.parseDouble(zxd));
+
+                String zdjxj=new DataFormatter().formatCellValue(row.getCell(ks+4));
+                if(StringUtils.isNotEmpty(zdjxj)){
+                    gdfdcs.setZdjxj(Double.parseDouble(zdjxj));
+                }
+
+
+                String cqj=new DataFormatter().formatCellValue(row.getCell(ks+5));
+                if(StringUtils.isNotEmpty(cqj)){
+                    gdfdcs.setCqj(Double.parseDouble(cqj));
+                }
 
 
+
+                String ccqd=new DataFormatter().formatCellValue(row.getCell(ks+6));
+                if(StringUtils.isNotEmpty(ccqd)){
+                    gdfdcs.setCcqd(Double.parseDouble(ccqd));
+                }
+
+
+                String cpj=new DataFormatter().formatCellValue(row.getCell(ks+7));
+                if(StringUtils.isNotEmpty(cpj)){
+                    gdfdcs.setCqj(Double.parseDouble(cpj));
+                }
+
+
+
+                String slj=new DataFormatter().formatCellValue(row.getCell(ks+8));
+                if(StringUtils.isNotEmpty(slj)){
+                    gdfdcs.setSlj(Double.parseDouble(slj));
+                }
+
+
+                String fwxzj=new DataFormatter().formatCellValue(row.getCell(ks+9));
+                if(StringUtils.isNotEmpty(fwxzj)){
+                    gdfdcs.setFwxzj(Double.parseDouble(fwxzj));
+                }
+
+
+
+                sjJygjgdsjList.add(gdfdcs);
+            }
+            if(sjJygjgdsjList.size()>0){
+                sjJygjgdsjMapper.deleteSjJygjgdsjByJh(jh);
+                sjJygjgdsjMapper.insertSjJygjgdsjBatch(sjJygjgdsjList);
+            }
             //钻井液  分段钻井液设计---------------------------------------------------
             //钻井液  分段钻井液设计---------------------------------------------------
             sheet = workbook.getSheetAt(4);
             sheet = workbook.getSheetAt(4);
             lastRowNum = sheet.getLastRowNum();
             lastRowNum = sheet.getLastRowNum();

src/main/java/com/ruoyi/project/zjsgfa/domain/SjJygjgdsj.java

 package com.ruoyi.project.zjsgfa.domain;
 package com.ruoyi.project.zjsgfa.domain;
 
 
-import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -25,43 +25,43 @@ public class SjJygjgdsj extends BaseEntity
 
 
     /** 井底垂深 */
     /** 井底垂深 */
     @Excel(name = "井底垂深")
     @Excel(name = "井底垂深")
-    private BigDecimal jdcs;
+    private Double jdcs;
 
 
     /** 井底闭合距 */
     /** 井底闭合距 */
     @Excel(name = "井底闭合距")
     @Excel(name = "井底闭合距")
-    private BigDecimal jdbhj;
+    private Double jdbhj;
 
 
     /** 井底闭合方位 */
     /** 井底闭合方位 */
     @Excel(name = "井底闭合方位")
     @Excel(name = "井底闭合方位")
-    private BigDecimal jdbhfw;
+    private Double jdbhfw;
 
 
     /** 造斜点 */
     /** 造斜点 */
     @Excel(name = "造斜点")
     @Excel(name = "造斜点")
-    private BigDecimal zxd;
+    private Double zxd;
 
 
     /** 最大井斜角 */
     /** 最大井斜角 */
     @Excel(name = "最大井斜角")
     @Excel(name = "最大井斜角")
-    private BigDecimal zdjxj;
+    private Double zdjxj;
 
 
     /** 磁倾角 */
     /** 磁倾角 */
     @Excel(name = "磁倾角")
     @Excel(name = "磁倾角")
-    private BigDecimal cqj;
+    private Double cqj;
 
 
     /** 磁场强度 */
     /** 磁场强度 */
     @Excel(name = "磁场强度")
     @Excel(name = "磁场强度")
-    private BigDecimal ccqd;
+    private Double ccqd;
 
 
     /** 磁偏角 */
     /** 磁偏角 */
     @Excel(name = "磁偏角")
     @Excel(name = "磁偏角")
-    private BigDecimal cpj;
+    private Double cpj;
 
 
     /** 收敛角 */
     /** 收敛角 */
     @Excel(name = "收敛角")
     @Excel(name = "收敛角")
-    private BigDecimal slj;
+    private Double slj;
 
 
     /** 方位修正角 */
     /** 方位修正角 */
     @Excel(name = "方位修正角")
     @Excel(name = "方位修正角")
-    private BigDecimal fwxzj;
+    private Double fwxzj;
 
 
     public void setId(Long id) 
     public void setId(Long id) 
     {
     {
@@ -83,102 +83,102 @@ public class SjJygjgdsj extends BaseEntity
         return jh;
         return jh;
     }
     }
 
 
-    public void setJdcs(BigDecimal jdcs) 
+    public void setJdcs(Double jdcs) 
     {
     {
         this.jdcs = jdcs;
         this.jdcs = jdcs;
     }
     }
 
 
-    public BigDecimal getJdcs() 
+    public Double getJdcs() 
     {
     {
         return jdcs;
         return jdcs;
     }
     }
 
 
-    public void setJdbhj(BigDecimal jdbhj) 
+    public void setJdbhj(Double jdbhj) 
     {
     {
         this.jdbhj = jdbhj;
         this.jdbhj = jdbhj;
     }
     }
 
 
-    public BigDecimal getJdbhj() 
+    public Double getJdbhj() 
     {
     {
         return jdbhj;
         return jdbhj;
     }
     }
 
 
-    public void setJdbhfw(BigDecimal jdbhfw) 
+    public void setJdbhfw(Double jdbhfw) 
     {
     {
         this.jdbhfw = jdbhfw;
         this.jdbhfw = jdbhfw;
     }
     }
 
 
-    public BigDecimal getJdbhfw() 
+    public Double getJdbhfw() 
     {
     {
         return jdbhfw;
         return jdbhfw;
     }
     }
 
 
-    public void setZxd(BigDecimal zxd) 
+    public void setZxd(Double zxd) 
     {
     {
         this.zxd = zxd;
         this.zxd = zxd;
     }
     }
 
 
-    public BigDecimal getZxd() 
+    public Double getZxd() 
     {
     {
         return zxd;
         return zxd;
     }
     }
 
 
-    public void setZdjxj(BigDecimal zdjxj) 
+    public void setZdjxj(Double zdjxj) 
     {
     {
         this.zdjxj = zdjxj;
         this.zdjxj = zdjxj;
     }
     }
 
 
-    public BigDecimal getZdjxj() 
+    public Double getZdjxj() 
     {
     {
         return zdjxj;
         return zdjxj;
     }
     }
 
 
-    public void setCqj(BigDecimal cqj) 
+    public void setCqj(Double cqj) 
     {
     {
         this.cqj = cqj;
         this.cqj = cqj;
     }
     }
 
 
-    public BigDecimal getCqj() 
+    public Double getCqj() 
     {
     {
         return cqj;
         return cqj;
     }
     }
 
 
-    public void setCcqd(BigDecimal ccqd) 
+    public void setCcqd(Double ccqd) 
     {
     {
         this.ccqd = ccqd;
         this.ccqd = ccqd;
     }
     }
 
 
-    public BigDecimal getCcqd() 
+    public Double getCcqd() 
     {
     {
         return ccqd;
         return ccqd;
     }
     }
 
 
-    public void setCpj(BigDecimal cpj) 
+    public void setCpj(Double cpj) 
     {
     {
         this.cpj = cpj;
         this.cpj = cpj;
     }
     }
 
 
-    public BigDecimal getCpj() 
+    public Double getCpj() 
     {
     {
         return cpj;
         return cpj;
     }
     }
 
 
-    public void setSlj(BigDecimal slj) 
+    public void setSlj(Double slj) 
     {
     {
         this.slj = slj;
         this.slj = slj;
     }
     }
 
 
-    public BigDecimal getSlj() 
+    public Double getSlj() 
     {
     {
         return slj;
         return slj;
     }
     }
 
 
-    public void setFwxzj(BigDecimal fwxzj) 
+    public void setFwxzj(Double fwxzj) 
     {
     {
         this.fwxzj = fwxzj;
         this.fwxzj = fwxzj;
     }
     }
 
 
-    public BigDecimal getFwxzj() 
+    public Double getFwxzj() 
     {
     {
         return fwxzj;
         return fwxzj;
     }
     }

src/main/java/com/ruoyi/project/zjsgfa/mapper/SjJygjgdsjMapper.java

@@ -58,4 +58,8 @@ public interface SjJygjgdsjMapper
      * @return 结果
      * @return 结果
      */
      */
     public int deleteSjJygjgdsjByIds(Long[] ids);
     public int deleteSjJygjgdsjByIds(Long[] ids);
+
+    int deleteSjJygjgdsjByJh(String jh);
+
+    int insertSjJygjgdsjBatch(List<SjJygjgdsj> sjJygjgdsjList);
 }
 }

src/main/resources/application-druid.yml

@@ -20,15 +20,17 @@ spring:
                 url: jdbc:oracle:thin:@192.168.31.167:1521/qianhe
                 url: jdbc:oracle:thin:@192.168.31.167:1521/qianhe
                 username: HHZJJS
                 username: HHZJJS
                 password: HHZJJS
                 password: HHZJJS
+#                username: DISUSER1
+#                password: dis#2022
 #            slave:
 #            slave:
 #                # 从数据源开关/默认关闭
 #                # 从数据源开关/默认关闭
 #                enabled: true
 #                enabled: true
 #                driverClassName: oracle.jdbc.driver.OracleDriver
 #                driverClassName: oracle.jdbc.driver.OracleDriver
 #                url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
 #                url: jdbc:oracle:thin:@127.0.0.1:1521/orcl
-#                username: HHZJJS
-#                password: HHZJJS
-##                username: DISUSER1
-##                password: dis#2022
+##                username: HHZJJS
+##                password: HHZJJS
+#                username: DISUSER1
+#                password: dis#2022
 #            slave2:
 #            slave2:
 #                # 从数据源开关/默认关闭
 #                # 从数据源开关/默认关闭
 #                enabled: true
 #                enabled: true

src/main/resources/mybatis/zjsgfa/SjJygjgdsjMapper.xml

@@ -74,6 +74,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fwxzj != null">#{fwxzj},</if>
             <if test="fwxzj != null">#{fwxzj},</if>
          </trim>
          </trim>
     </insert>
     </insert>
+    <insert id="insertSjJygjgdsjBatch">
+        INSERT INTO sj_jygjgdsj
+        (jh, jdcs, jdbhj, jdbhfw, zxd, zdjxj, cqj, ccqd, cpj, slj, fwxzj)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.jh},
+            #{item.jdcs},
+            #{item.jdbhj},
+            #{item.jdbhfw},
+            #{item.zxd},
+            #{item.zdjxj},
+            #{item.cqj},
+            #{item.ccqd},
+            #{item.cpj},
+            #{item.slj},
+            #{item.fwxzj}
+            )
+        </foreach>
+
+    </insert>
 
 
     <update id="updateSjJygjgdsj" parameterType="SjJygjgdsj">
     <update id="updateSjJygjgdsj" parameterType="SjJygjgdsj">
         update sj_jygjgdsj
         update sj_jygjgdsj
@@ -103,4 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
             #{id}
         </foreach>
         </foreach>
     </delete>
     </delete>
+    <delete id="deleteSjJygjgdsjByJh">
+        delete from sj_jygjgdsj where jh = #{jh}
+    </delete>
 </mapper>
 </mapper>
\ No newline at end of file