增加 from A2 Data to insert statusDaily and volDaily 接口

src/main/java/com/gct/tools/etlcamelhuge/controller/BaseDataController.java

@@ -26,7 +26,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/BaseData")
-@Api(value = "BaseDataController",description = "基础数据操作controller")
+@Api(value = "BaseDataController", description = "基础数据操作controller")
 public class BaseDataController {
 
     private JdbcTemplate jdbcTemplate;
@@ -36,15 +36,18 @@ public class BaseDataController {
     @Resource(name = "centralbase")
     DataSource baseDataSource;
 
-    @PostMapping("/StatusDaily")
-    @ApiOperation("从 A2 获取 数据插入到 centrlBase 中")
-    public JSONObject saveDataToStatusDaily(@RequestBody BaseDataBody baseDataBody){
+    @PostMapping("/saveDataToStatusDaily")
+    @ApiOperation("从 A2 获取 数据插入到 centrlBase-StatusDaily 中")
+    public JSONObject saveDataToStatusDaily(@RequestBody BaseDataBody baseDataBody) {
         JSONObject jsonObject = new JSONObject();
-        long insertCount = 0;
+        int insertCount = 0;
+        int updateDYMCount = 0;
+        int updateCMDCount = 0;
+        int updateOLiNozzleCount = 0;
         try {
             jdbcTemplate = new JdbcTemplate(oracleDataSource);
             String date = baseDataBody.getDate();
-            String sql = "select  distinct jh,rq,cyfs,yz,hysx , yysx ,tysx,bs,dym from DBA01 where rq  = to_date('"+date+"','yyyy-MM-dd') and qyrq is not null ";
+            String sql = "select  distinct jh,rq,cyfs,yz,hysx , yysx ,tysx,bs,dym from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null ";
             List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
             for (Map<String, Object> map : list) {
                 if (map.get("YZ") == null) map.put("YZ", "0.0");
@@ -53,66 +56,147 @@ public class BaseDataController {
                 if (map.get("TYSX") == null) map.put("TYSX", "0.0");
                 if (map.get("BS") == null) map.put("BS", "0.0");
                 sql = "insert into centralbase.cb_pc_pro_wellbore_status_daily(well_id,prod_date,oil_prod_method,oil_nozzle,back_pres,tubing_pres,casing_pres,pump_depth) " +
-                        "value (?,?,?,?,?,?,?,?)";
-                int count = insertBaseDataSourceOfStatusDaily(sql, map);
+                        "values (?,?,?,?,?,?,?,?)";
+                insertCount = insertBaseDataSourceOfStatusDaily(sql, map);
                 List<Map<String, Object>> dymIsNotNUllList = selectA2DataOfNotIsNullDYM();
                 for (Map<String, Object> stringObjectMap : dymIsNotNUllList) {
-                    sql = "update centralbase.cb_pc_pro_wellbore_status_daily set start_pump_liq_level = '"+stringObjectMap.get("DYM")+"' where well_id = '"+stringObjectMap.get("JH")+"' and prod_date::date  = '"+stringObjectMap.get("RQ")+"' ";
-                    int dymIsNotNullCount = updateBaseDataSourceOfStatusDaily(sql);
-                    insertCount = insertCount + dymIsNotNullCount;
+                    sql = "update centralbase.cb_pc_pro_wellbore_status_daily set start_pump_liq_level = '" + stringObjectMap.get("DYM") + "' where well_id = '" + stringObjectMap.get("JH") + "' and prod_date::date  = '" + stringObjectMap.get("RQ") + "' ";
+                    updateDYMCount = updateBaseDataSourceOfStatusDaily(sql) + updateDYMCount;
                 }
-                sql = "select well_id,prod_date,start_pump_liq_level,pump_depth from centralbase.cb_pc_pro_wellbore_status_daily where prod_date = '"+map.get("RQ")+"' ";
+                sql = "select well_id,prod_date,start_pump_liq_level,pump_depth from centralbase.cb_pc_pro_wellbore_status_daily where prod_date = '" + map.get("RQ") + "' ";
                 List<Map<String, Object>> CMDDataList = selectBaseDataSourceStatusDaily(sql);
                 for (Map<String, Object> stringObjectMap : CMDDataList) {
-                    stringObjectMap.put("submergence_depth",null);
-                    if (stringObjectMap.get("start_pump_liq_level")!=null && stringObjectMap.get("pump_depth")!=null){
-                        double cmd= Double.valueOf(stringObjectMap.get("pump_depth").toString())-Double.valueOf(stringObjectMap.get("start_pump_liq_level").toString())/10;
-                        BigDecimal bd=new BigDecimal(cmd);
-                        double cmd1=bd.setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
-                        stringObjectMap.put("submergence_depth",cmd1);
+                    stringObjectMap.put("submergence_depth", null);
+                    if (stringObjectMap.get("start_pump_liq_level") != null && stringObjectMap.get("pump_depth") != null) {
+                        double cmd = Double.valueOf(stringObjectMap.get("pump_depth").toString()) - Double.valueOf(stringObjectMap.get("start_pump_liq_level").toString()) / 10;
+                        BigDecimal bd = new BigDecimal(cmd);
+                        double cmd1 = bd.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                        stringObjectMap.put("submergence_depth", cmd1);
                     }
-                    sql = " update centralbase.cb_pc_pro_wellbore_status_daily set submergence_depth = '"+stringObjectMap.get("submergence_depth")+"' where well_id = '"+stringObjectMap.get("well_id")+"' and prod_date  = '"+stringObjectMap.get("prod_date")+"' ";
-                    int CMDUpdateCount = updateBaseDataSourceOfStatusDaily(sql);
-                    insertCount = insertCount + CMDUpdateCount;
+                    //修改为batch 执行,用一个list 接受,在执行那个batchUpdate
+                    sql = " update centralbase.cb_pc_pro_wellbore_status_daily set submergence_depth = '" + stringObjectMap.get("submergence_depth") + "' where well_id = '" + stringObjectMap.get("well_id") + "' and prod_date  = '" + stringObjectMap.get("prod_date") + "' ";
+                    updateCMDCount = updateBaseDataSourceOfStatusDaily(sql) + updateCMDCount;
                 }
                 sql = " select distinct rn.well_id,cb.prod_date,rn.pump_diameter  from centralbase.cb_temp_well_mech_runtime rn ,centralbase.cb_pc_pro_wellbore_status_daily cb where cb.well_id = rn.well_id " +
-                        " and cb.prod_date = '"+date+"'  ";
+                        " and cb.prod_date = '" + date + "'  ";
                 List<Map<String, Object>> oilNozzleList = selectBaseDataSourceStatusDaily(sql);
                 for (Map<String, Object> stringObjectMap : oilNozzleList) {
-                    sql = " update centralbase.cb_pc_pro_wellbore_status_daily set oil_nozzle = '"+stringObjectMap.get("pump_diameter")+"' where well_id ='"+stringObjectMap.get("well_id")+"' and prod_date='"+stringObjectMap.get("prod_date")+"' ";
-                    int oliNozzle = updateBaseDataSourceOfStatusDaily(sql);
-                    insertCount = insertCount + oliNozzle;
+                    sql = " update centralbase.cb_pc_pro_wellbore_status_daily set oil_nozzle = '" + stringObjectMap.get("pump_diameter") + "' where well_id ='" + stringObjectMap.get("well_id") + "' and prod_date='" + stringObjectMap.get("prod_date") + "' ";
+                    updateOLiNozzleCount = updateBaseDataSourceOfStatusDaily(sql) + updateOLiNozzleCount;
                 }
+                insertCount++;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            jsonObject.put("error",e.getMessage());
-        }finally {
-            jsonObject.put("插入条数",insertCount);
+            jsonObject.put("error", e.getMessage());
+        } finally {
+            jsonObject.put("插入条数", insertCount);
+            jsonObject.put("修改DYM条数", updateDYMCount);
+            jsonObject.put("修改CMD条数", updateCMDCount);
+            jsonObject.put("修改OliNozzle条数", updateOLiNozzleCount);
         }
         return jsonObject;
     }
 
 
-    public int insertBaseDataSourceOfStatusDaily(String sql,Map<String,Object> map){
+    public int insertBaseDataSourceOfStatusDaily(String sql, Map<String, Object> map) {
         jdbcTemplate = new JdbcTemplate(baseDataSource);
         if (map.isEmpty()) return 0;
-        return  jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("CYFS"), map.get("YZ"), map.get("HYSX"), map.get("YYSX"), map.get("BS"), map.get("DYM"));
+        return jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("CYFS"), map.get("YZ"), map.get("HYSX"), map.get("YYSX"), map.get("BS"), map.get("DYM"));
     }
 
-    public List<Map<String, Object>> selectA2DataOfNotIsNullDYM(){
+    public List<Map<String, Object>> selectA2DataOfNotIsNullDYM() {
         jdbcTemplate = new JdbcTemplate(oracleDataSource);
         String sql = "SELECT  distinct jh,max(rq),dym FROM DBA01 WHERE dym is not null group by jh,dym";
-        return  jdbcTemplate.queryForList(sql);
+        return jdbcTemplate.queryForList(sql);
     }
 
-    public List<Map<String, Object>> selectBaseDataSourceStatusDaily(String sql){
+    public List<Map<String, Object>> selectBaseDataSourceStatusDaily(String sql) {
         jdbcTemplate = new JdbcTemplate(baseDataSource);
-         return  jdbcTemplate.queryForList(sql);
+        return jdbcTemplate.queryForList(sql);
     }
-    public int updateBaseDataSourceOfStatusDaily(String sql){
+
+    public int updateBaseDataSourceOfStatusDaily(String sql) {
+        jdbcTemplate = new JdbcTemplate(baseDataSource);
+        return jdbcTemplate.update(sql);
+    }
+
+
+    @PostMapping("/saveDataToVolDaily")
+    @ApiOperation("从 A2 获取 数据插入到 centrlBase-VolDaily 中")
+    public JSONObject saveVolDaily(@RequestBody BaseDataBody baseDataBody) {
+        JSONObject jsonObject = new JSONObject();
+        int insertCount = 0;
+        int updateLiqOliDailyCount = 0;
+        try {
+            jdbcTemplate = new JdbcTemplate(oracleDataSource);
+            String date = baseDataBody.getDate();
+            String sql = " select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null ";
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+            for (Map<String, Object> map : list) {
+                if (map.get("SCSJ") == null) map.put("SCSJ", "0.0");
+                if (map.get("RCYL1") == null) map.put("RCYL1", "0.0");
+                if (map.get("RCYL") == null) map.put("RCYL", "0.0");
+                if (map.get("RCQL") == null) map.put("RCQL", "0.0");
+                if (map.get("HS") == null) map.put("HS", "0.0");
+                if (map.get("BZ") == null) map.put("BZ", "");
+                map.put("RCSL", -1);
+                map.put("QYB", -1);
+                map.put("SQB", -1);
+                if (map.get("RCQL") != null && map.get("RCYL") != null && !map.get("RCYL").equals("0.0") && map.get("RCYL") != "0.0") {
+                    double qyb = Double.valueOf(map.get("RCQL").toString()) / Double.valueOf(map.get("RCYL").toString());
+                    if (!Double.isNaN(qyb) && !Double.isInfinite(qyb)) {
+                        BigDecimal bd = new BigDecimal(qyb);
+                        double d1 = bd.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                        map.put("QYB", d1);
+                    }
+                }
+                if (map.get("RCYL1") != null && map.get("HS") != null && !map.get("HS").equals("0.0") && map.get("HS") != "0.0") {
+                    double rcsl = (Double.valueOf(map.get("RCYL1").toString()) * Double.valueOf(map.get("HS").toString())) / 100;
+                    if (!Double.isNaN(rcsl) && !Double.isInfinite(rcsl)) {
+                        BigDecimal bd = new BigDecimal(rcsl);
+                        double d1 = bd.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                        map.put("RCSL", d1);
+                    }
+                }
+                if (map.get("RCQL") != null && map.get("RCSL") != null && !map.get("RCQL").equals("0.0") && map.get("RCQL") != "0.0") {
+                    double sqb = Double.valueOf(map.get("RCSL").toString()) / Double.valueOf(map.get("RCQL").toString());
+                    if (!Double.isNaN(sqb) && !Double.isInfinite(sqb)) {
+                        BigDecimal bd = new BigDecimal(sqb);
+                        double d1 = bd.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                        map.put("SQB", d1);
+                    }
+                }
+                if (!map.containsKey("SMD")) {
+                    map.put("SMD", 1);
+                }
+                if (!map.containsKey("YMD")) {
+                    map.put("YMD", 0.85);
+                }
+                sql = "insert into centralbase.cb_pc_pro_wellbore_vol_daily(well_id,prod_date,prod_time,liq_prod_daily,oil_prod_daily,gas_prod_daily,water_cut,remarks,gas_oil_ratio,water_prod_daily,water_gas_ratio,surface_crude_water_density,surface_crude_oil_density) " +
+                        "values(?,?,?,?,?,?,?,?,?,?,?,?,?) ";
+                insertCount = insertBaseDataVolDaily(sql, map) + insertCount;
+                sql = "select distinct  jh,rq,scsj, rcyl1,rcyl,rcql,hs, bz from DBA01 where rq  = to_date('" + date + "','yyyy-MM-dd') and qyrq is not null ";
+                updateLiqOliDailyCount = updateBaseDataVolDaily(sql) + updateLiqOliDailyCount;
+            }
+
+        } catch (Exception e) {
+            jsonObject.put("error", e.getMessage());
+        } finally {
+            jsonObject.put("插入条数", insertCount);
+            jsonObject.put("修改liqOliDaily条数", updateLiqOliDailyCount);
+        }
+        return jsonObject;
+    }
+
+    public int insertBaseDataVolDaily(String sql, Map<String, Object> map) {
         jdbcTemplate = new JdbcTemplate(baseDataSource);
-        return  jdbcTemplate.update(sql);
+        if (map.isEmpty()) return 0;
+        return jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("SCSJ"), map.get("RCYL1"), map.get("RCYL"), map.get("RCQL"), map.get("HS"), map.get("BZ"), map.get("QYB"), map.get("RCSL"), map.get("SQB"), map.get("SMD"), map.get("YMD"));
     }
 
+    public int updateBaseDataVolDaily(String sql) {
+        jdbcTemplate = new JdbcTemplate(baseDataSource);
+        return jdbcTemplate.update(sql);
+    }
 }

src/main/java/com/gct/tools/etlcamelhuge/controller/GtController.java

@@ -149,7 +149,7 @@ public class GtController {
                         map.put("stroke",stroke);
                     }
                     jdbcTemplate.update("insert into centralbase.cb_temp_well_mech_runtime(well_id,prod_date,stroke_length,stroke_frequency,susp_max_load,susp_min_load,sgt) " +
-                            "value (?,?,?,?,?,?,?)",map.get("well_name").toString(),map.get("dyna_create_time"),map.get("stroke"),map.get("frequency"),map.get("susp_max_load"),map.get("susp_min_load"),map.get("sgt"));
+                            "values (?,?,?,?,?,?,?)",map.get("well_name").toString(),map.get("dyna_create_time"),map.get("stroke"),map.get("frequency"),map.get("susp_max_load"),map.get("susp_min_load"),map.get("sgt"));
                 }
                 sumData += list.size();
                 if (list.size()< pageSize){