计算服务

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/controller/DataCalcController.java

@@ -3,6 +3,7 @@ package cn.com.victorysoft.business.calc.controller;
 import cn.com.victorysoft.business.calc.service.WaterTubularStructureService;
 import cn.com.victorysoft.business.calc.service.WaterWellBasicService;
 import cn.com.victorysoft.business.calc.service.WellSectionDailyService;
+import cn.com.victorysoft.business.util.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +43,15 @@ public class DataCalcController {
         waterWellBasicService.waterWellBasic();
     }
 
+    /**
+     * 同步工艺类型台账表
+     */
+    @GetMapping("/merge-well-process-type")
+    @ApiOperation("同步工艺类型台账表")
+    public void mergeWellProcessType(){
+        waterWellBasicService.mergeWellProcessType();
+    }
+
     /**
      * 初始化 WELL_SECTION_DAILY 表
      * @param startDate
@@ -50,7 +60,11 @@ public class DataCalcController {
     @GetMapping("/well-section-daily")
     @ApiOperation("初始化 WELL_SECTION_DAILY 表")
     public void wellSectionDaily(Date startDate, Date endDate){
-        wellSectionDailyService.wellSectionDaily(startDate, endDate);
+        Date current = startDate;
+        while (!current.after(endDate)) {
+            wellSectionDailyService.wellSectionDaily(current, current);
+            current = DateUtils.addDays(current, 1);
+        }
     }
 
     /**
@@ -58,7 +72,8 @@ public class DataCalcController {
      */
     @GetMapping("/water-tubular-structure")
     @ApiOperation("初始化 WATER_TUBULAR_STRUCTURE 表")
-    public void waterTubularStructure(){
-        waterTubularStructureService.waterTubularStructure();
+    public void waterTubularStructure(Date startDate, Date endDate){
+        waterTubularStructureService.waterTubularStructure(startDate, endDate);
     }
+
 }

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/WaterTubularStructureDao.java

@@ -18,18 +18,32 @@ import java.util.List;
 public interface WaterTubularStructureDao {
 
     /**
-     *
+     * 同步管柱结构数据
      */
-    void waterTubularStructure();
+    void waterTubularStructure(Date startDate, Date endDate);
 
     /**
-     *
-     * @return
+     * 更新下次作业日期
+     */
+    void updateNextZyrq();
+
+    /**
+     * 更新在井时间
+     */
+    void updateZjsj();
+
+    /**
+     * 更新管柱有效期
      */
-    List<WaterTubularStructure> selectList();
+    void updateGzYxq();
 
     /**
-     *
+     * 查询管柱结构
+     */
+    List<WaterTubularStructure> selectList(Date startDate, Date endDate);
+
+    /**
+     * 查询工具代码
      * @param jh
      * @param wjrq
      * @return
@@ -37,14 +51,19 @@ public interface WaterTubularStructureDao {
     List<String> selectTooLCode(@Param("jh") String jh,@Param("wjrq") Date wjrq);
 
     /**
-     *
+     * 查询工具附录
+     */
+    List<Fla55> selectTooLList();
+
+    /**
+     * 查询工具附录
      * @param tooLCode
      * @return
      */
     Fla55 selectTooL(String tooLCode);
 
     /**
-     *
+     * 更新管柱结构工具数据
      * @param waterTubularStructure
      */
     void updateData(WaterTubularStructure waterTubularStructure);

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/WaterWellBasicDao.java

@@ -18,4 +18,9 @@ public interface WaterWellBasicDao {
      */
     void waterWellBasic();
 
+    /**
+     * 同步工艺类型台账表
+     */
+    void mergeWellProcessType();
+
 }

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/WaterTubularStructureService.java

@@ -9,7 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author TY
@@ -23,26 +26,36 @@ public class WaterTubularStructureService {
     private WaterTubularStructureDao waterTubularStructureDao;
 
     @Transactional
-    public void waterTubularStructure() {
+    public void waterTubularStructure(Date startDate, Date endDate) {
         // 主数据同步
-        waterTubularStructureDao.waterTubularStructure();
+        waterTubularStructureDao.waterTubularStructure(startDate, endDate);
+        // 同步下次作业日期
+        waterTubularStructureDao.updateNextZyrq();
+        // 更新在井时间
+        waterTubularStructureDao.updateZjsj();
+        // 更新管柱有效期
+        waterTubularStructureDao.updateGzYxq();
 
         // 查询同步完的数据
-        List<WaterTubularStructure> waterTubularStructureList = waterTubularStructureDao.selectList();
+        List<WaterTubularStructure> waterTubularStructureList = waterTubularStructureDao.selectList(startDate, endDate);
 
-        //
+        // 查询类别
+        List<Fla55> fla55List = waterTubularStructureDao.selectTooLList();
+        Map<String, Fla55> fla55Map = fla55List.stream().collect(Collectors.toMap(Fla55::getDm, v -> v));
+        // 同步工具
         for (WaterTubularStructure waterTubularStructure : waterTubularStructureList) {
             List<String> tooLCodeList = waterTubularStructureDao.selectTooLCode(waterTubularStructure.getJh(), waterTubularStructure.getWjrq());
             for (String tooLCode : tooLCodeList) {
-                // 查询类别
-                Fla55 fla55 = waterTubularStructureDao.selectTooL(tooLCode);
-                // 封隔器
-                if ("封隔器".equals(fla55.getDmmc())) {
-                    waterTubularStructure.setFgq(fla55.getDmmc());
-                }
-                // 锚定工具
-                if ("锚定工具".equals(fla55.getDmmc())) {
-                    waterTubularStructure.setMdgj(fla55.getDmmc());
+                Fla55 fla55 = fla55Map.get(tooLCode);
+                if (fla55 != null) {
+                    // 封隔器
+                    if ("封隔器".equals(fla55.getDmmc())) {
+                        waterTubularStructure.setFgq(fla55.getDmmc());
+                    }
+                    // 锚定工具
+                    if ("锚定工具".equals(fla55.getDmmc())) {
+                        waterTubularStructure.setMdgj(fla55.getDmmc());
+                    }
                 }
             }
             waterTubularStructureDao.updateData(waterTubularStructure);

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/WaterWellBasicService.java

@@ -5,8 +5,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 /**
  * @Author TY
  * @Date: 2023/1/30 9:56
@@ -24,4 +22,11 @@ public class WaterWellBasicService {
     public void waterWellBasic() {
         waterWellBasicDao.waterWellBasic();
     }
+
+    /**
+     * 同步工艺类型台账表
+     */
+    public void mergeWellProcessType() {
+        waterWellBasicDao.mergeWellProcessType();
+    }
 }

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/task/DataSyncTask.java

@@ -0,0 +1,69 @@
+package cn.com.victorysoft.business.calc.task;
+
+import cn.com.victorysoft.business.calc.service.WaterTubularStructureService;
+import cn.com.victorysoft.business.calc.service.WaterWellBasicService;
+import cn.com.victorysoft.business.calc.service.WellSectionDailyService;
+import cn.com.victorysoft.business.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 数据同步任务调度
+ */
+@Slf4j
+@Component
+public class DataSyncTask {
+
+    @Value("${data.calc.enabled}")
+    private boolean calcEnabled;
+
+    @Resource
+    private WaterWellBasicService wellBasicService;
+    @Resource
+    private WellSectionDailyService wellSectionDailyService;
+    @Resource
+    private WaterTubularStructureService waterTubularStructureService;
+
+    @Scheduled(cron = "0 0 23 * * ?")
+    public void syncStatic() {
+        if (calcEnabled) {
+            log.info("静态数据同步任务开始");
+            wellBasicService.waterWellBasic();
+            wellBasicService.mergeWellProcessType();
+            log.info("静态数据同步任务结束");
+        }
+    }
+
+    /**
+     * 每天同步日度数据-----
+     */
+    @Scheduled(cron = "0 0 14,22 * * ?")
+    public void syncDailyData() {
+        if (calcEnabled) {
+            Date date = DateUtils.truncate(new Date(), Calendar.DATE);
+            log.info("水井日度层段数据同步任务开始");
+            try {
+                wellSectionDailyService.wellSectionDaily(date, date);
+            }catch (Exception e) {
+                log.error("水井日度层段数据同步任务异常", e);
+            }
+            log.info("水井日度层段数据同步任务结束");
+
+//            log.info("管柱结构数据同步任务开始");
+//            // 同步30天内的完工数据
+//            try {
+//                waterTubularStructureService.waterTubularStructure(DateUtils.addDays(date, -30), date);
+//            }catch (Exception e) {
+//                log.error("管柱结构数据同步任务异常", e);
+//            }
+//            log.info("管柱结构数据同步任务结束");
+        }
+    }
+
+}

vseaf4.4-calc/src/main/resources/mapper/WaterTubularStructureDao.xml

@@ -6,12 +6,19 @@
         MERGE INTO WATER_TUBULAR_STRUCTURE T1 USING (
             SELECT
                 B.DWMC, B.DYDM, B.EJDWDM, B.DWDM,
-                A.JH, A.KGRQ, A.WGRQ, A.CSLB, A.KGRQ - A.LAST_WGRQ ZJSJ, A.LAST_WGRQ
+                A.JH, A.KGRQ, A.WGRQ, A.CSLB, A.GYLX
             FROM (
+                SELECT * FROM
+                (
                 SELECT
-                    A.*, LEAD(KGRQ, 1, NULL) OVER(PARTITION BY JH ORDER BY KGRQ) LAST_WGRQ
+                    A.*,
+                    B.GYLX, row_number() over(partition by B.JH order by B.FWSJ desc) rn
                 FROM
-                    YS_DDH01 A
+                    YS_DDH01 A, WELL_PROCESS_TYPE B
+                WHERE A.JH = B.JH AND A.WGRQ >= B.FWSJ
+                AND A.WGRQ >= #{startDate}
+                AND A.WGRQ <= #{endDate}
+                ) where rn = 1
             ) A
             LEFT JOIN YS_DAA01 B ON A.JH = B.JH
         ) T2 ON (T1.JH = T2.JH AND T1.WJRQ = T2.WGRQ)
@@ -19,13 +26,28 @@
             UPDATE SET
                 DWDM = T2.EJDWDM,
                 DYDM = T2.DYDM,
-                NEXT_ZYRQ = NULL,
-                CSLB = T2.CSLB,
-                ZJSJ = T2.ZJSJ,
-                GZ_YXQ = T2.ZJSJ
+                CSLB = T2.CSLB
         WHEN NOT MATCHED THEN
-            INSERT(DWDM, DYDM, JH, WJRQ, NEXT_ZYRQ, CSLB, ZJSJ, GZ_YXQ, GYLX)
-            VALUES(T2.EJDWDM, T2.DYDM, T2.JH, T2.WGRQ, NULL, T2.CSLB, T2.ZJSJ, T2.ZJSJ, 'GYLX1')
+            INSERT(DWDM, DYDM, JH, WJRQ, CSLB, GYLX)
+            VALUES(T2.EJDWDM, T2.DYDM, T2.JH, T2.WGRQ, T2.CSLB, T2.GYLX)
+    </update>
+
+    <update id="updateNextZyrq">
+        update water_tubular_structure t
+        set NEXT_ZYRQ = (select min(kgrq) from ys_ddh01 where jh = t.jh and kgrq > t.wjrq + 90)
+        where NEXT_ZYRQ is null
+    </update>
+
+    <update id="updateZjsj">
+        update water_tubular_structure t
+        set ZJSJ = NEXT_ZYRQ - WJRQ
+        where ZJSJ is null and WJRQ is not null and NEXT_ZYRQ is not null
+    </update>
+
+    <update id="updateGzYxq">
+        update water_tubular_structure t
+        set gz_yxq = ZJSJ
+        where ZJSJ is not null and gz_yxq is null
     </update>
 
     <update id="updateData">
@@ -41,6 +63,8 @@
 
     <select id="selectList" resultType="cn.com.victorysoft.business.calc.entity.WaterTubularStructure">
         SELECT * FROM WATER_TUBULAR_STRUCTURE
+        WHERE WJRQ >= #{startDate}
+        AND WJRQ &lt;= #{endDate}
     </select>
 
     <select id="selectTooLCode" resultType="java.lang.String">
@@ -61,6 +85,10 @@
             )
     </select>
 
+    <select id="selectTooLList" resultType="cn.com.victorysoft.business.calc.entity.Fla55">
+        SELECT * FROM FLA55
+    </select>
+
     <select id="selectTooL" resultType="cn.com.victorysoft.business.calc.entity.Fla55">
         SELECT
             *
@@ -69,4 +97,4 @@
         WHERE
             DM = #{tooLCode}
     </select>
-</mapper>
+</mapper>

vseaf4.4-calc/src/main/resources/mapper/WaterWellBasicDao.xml

@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.victorysoft.business.calc.dao.WaterWellBasicDao">
 
-
     <update id="waterWellBasic">
         MERGE INTO WATER_WELL_BASIC T1 USING (
             SELECT
-                A.*, B.ZDJXJ, C.TGMC, C.TGGJ, C.WJ
+                A.*, B.ZDJXJ, C.TGMC, C.TGGJ, C.WJ,
+                (select p_unitcode from SYS_UNITINFO where unitcode = A.dwdm) unitcode_area,
+                '30200000' unitcode_group
             FROM
             (
             SELECT
@@ -49,10 +50,28 @@
                     YCZS = (T2.SKYCDS2 + T2.SKYCDS1)/2,
                     TGGG = T2.TGGJ || '/' || T2.WJ,
                     JX = T2.ZDJXJ,
-                    STHD = T2.YXHD
+                    STHD = T2.YXHD,
+                    UNITCODE_COMPANY = T2.EJDWDM,
+                    UNITCODE_AREA = T2.UNITCODE_AREA,
+                    UNITCODE_GROUP = T2.UNITCODE_GROUP
         WHEN NOT MATCHED THEN
-            INSERT(JH, QKDM, DWDM, DWMC, YTDM, BGRQ, YCLX, SCCW, CS, YSDCYL, YSDCWD, YSBHYL, ZSJDDS, ZSJDDIS, YCZS, TGGG, JX, STHD)
-            VALUES(T2.JH, T2.DYDM, T2.EJDWDM, T2.DWMC, T2.YQTDM, SYSDATE, '', T2.CW, T2.CS, T2.YSDCYL, T2.YSDCWD, T2.YSBHYL, T2.SKYCDS1, T2.SKYCDS2, (T2.SKYCDS2 + T2.SKYCDS1)/2, T2.TGGJ || '/' || T2.WJ, T2.ZDJXJ, T2.YXHD)
+            INSERT(JH, QKDM, DWDM, DWMC, YTDM, BGRQ, YCLX, SCCW, CS, YSDCYL,
+            YSDCWD, YSBHYL, ZSJDDS, ZSJDDIS, YCZS, TGGG, JX, STHD,
+            UNITCODE_COMPANY, UNITCODE_AREA, UNITCODE_GROUP)
+            VALUES(T2.JH, T2.DYDM, T2.EJDWDM, T2.DWMC, T2.YQTDM, SYSDATE, '', T2.CW, T2.CS, T2.YSDCYL,
+            T2.YSDCWD, T2.YSBHYL, T2.SKYCDS1, T2.SKYCDS2, (T2.SKYCDS2 + T2.SKYCDS1)/2, T2.TGGJ || '/' || T2.WJ, T2.ZDJXJ, T2.YXHD,
+            T2.EJDWDM, T2.UNITCODE_AREA, T2.UNITCODE_GROUP)
     </update>
 
-</mapper>
+  <update id="mergeWellProcessType">
+    MERGE INTO well_process_type T1
+    USING (SELECT 井号 JH, 注水工艺 GYLX, nvl(注水日期, date '1900-01-01') FWSJ
+             FROM zss_zsgy) T2
+    ON (T1.JH = T2.JH and T1.FWSJ = T2.FWSJ)
+    WHEN MATCHED THEN
+      UPDATE SET GYLX = T2.GYLX
+    WHEN NOT MATCHED THEN
+      INSERT (JH, GYLX, FWSJ) VALUES (T2.JH, T2.GYLX, T2.FWSJ)
+  </update>
+
+</mapper>