0827-稳定版-完善(发送消息时可以不用wellList)

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

@@ -49,44 +49,47 @@ public class GtController {
         List<String> wellList = gtBody.getWellList().stream().map(x->x.toString()).collect(Collectors.toList());
         JSONObject jsonObject = new JSONObject();
         jdbcTemplate = new JdbcTemplate(dataSource);
-        int curPage = 0;
-        int pageSize = 5000;
         int sumData = 0;
         try {
-                for (int i = 0; i < wellList.size(); i++) {
+                if (wellList.isEmpty() || wellList.size()==0 ){
                     String sql = String.format("select so.well_id,so.well_common_name,so.org_id,ti.prod_date,ti.stroke_frequency,ti.stroke_length,ti.sgt from centralbase.cb_temp_well_mech_runtime ti, centralbase.cb_cd_well_source so " +
-                            " where ti.well_id = so.well_id and ti.well_id = '%s' and ti.prod_date between '%s' and '%s' ",wellList.get(i) ,startDate,endDate);
-                    String countSql = String.format("select count(1) from (%s)",sql);
-                    //Integer count = jdbcTemplate.queryForObject(countSql, Integer.class);
-                    List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
-                    for (Map<String, Object> map : list) {
-                        String wellName =map.get("well_common_name").toString();
-                        String wellId =map.get("well_id").toString();
-                        String orgId = map.get("org_id").toString();
-                        String prodDate = map.get("prod_date").toString().substring(0,19);
-                        Double strokeLength = Double.valueOf(map.get("stroke_length").toString());
-                        Double strokeFrequency = Double.valueOf(map.get("stroke_frequency").toString());
-                        String sgt = map.get("sgt").toString();
-                        if (sgt == null || sgt.length() ==0){
-                            sgt = "0,0,0,0,0,0,0,0,0,0";
-                        }
-                        DiagnoseMsg diagnoseMsg = new DiagnoseMsg(wellId, wellName, orgId, prodDate, sgt, LocalDateTime.now().toString(), strokeLength, strokeFrequency);
-                        producer.send((MessageBody) diagnoseMsg);
+                            " where ti.well_id = so.well_id  and ti.prod_date between '%s' and '%s' " ,startDate,endDate);
+                    sumData = sendDataToMQ(sql);
+                }else {
+                    for (int i = 0; i < wellList.size(); i++) {
+                        String sql = String.format("select so.well_id,so.well_common_name,so.org_id,ti.prod_date,ti.stroke_frequency,ti.stroke_length,ti.sgt from centralbase.cb_temp_well_mech_runtime ti, centralbase.cb_cd_well_source so " +
+                                " where ti.well_id = so.well_id and ti.well_id = '%s' and ti.prod_date between '%s' and '%s' ", wellList.get(i), startDate, endDate);
+                        sumData = sendDataToMQ(sql);
                     }
-                   /* sumData += list.size();
-                    if (list.size()< pageSize){
-                        break;
-                    }
-                    curPage ++ ;*/
                 }
-
         }catch (Exception e){
             e.printStackTrace();
             jsonObject.put("error",e.getMessage());
         }finally {
-            jsonObject.put("sumData",sumData);
+            jsonObject.put("发送数据为sumData",sumData);
         }
-        return    jsonObject;
+        return  jsonObject;
+    }
+
+    public int sendDataToMQ(String sql){
+        int sumData = 0;
+        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
+        for (Map<String, Object> map : list) {
+            String wellName = map.get("well_common_name").toString();
+            String wellId = map.get("well_id").toString();
+            String orgId = map.get("org_id").toString();
+            String prodDate = map.get("prod_date").toString().substring(0, 19);
+            Double strokeLength = Double.valueOf(map.get("stroke_length").toString());
+            Double strokeFrequency = Double.valueOf(map.get("stroke_frequency").toString());
+            String sgt = map.get("sgt").toString();
+            if (sgt == null || sgt.length() == 0) {
+                sgt = "0,0,0,0,0,0,0,0,0,0";
+            }
+            DiagnoseMsg diagnoseMsg = new DiagnoseMsg(wellId, wellName, orgId, prodDate, sgt, LocalDateTime.now().toString(), strokeLength, strokeFrequency);
+            //producer.send((MessageBody) diagnoseMsg);
+            sumData++;
+        }
+        return sumData;
     }
 
    /* @GetMapping("/getGTSJ")

src/main/resources/application.yml

@@ -116,7 +116,7 @@ server:
 
 rocketmq:
   #rocketmq的路由调度器的地址
-  name-server: 101.200.219.190:9876
+  name-server: 10.72.143.2:9876
   producer:
     # 消息分组
     group: aoid
@@ -134,7 +134,7 @@ gct:
         group: diagnose
         access-key: diagnose-msg-v1
         secret-key: diagnose-msg-v1
-      name-server: 101.200.219.190:9876
+      name-server: 10.72.143.2:9876
       consumer:
         group: diagnose
         access-key: diagnose-msg-v1
@@ -147,7 +147,7 @@ gct:
         group: warn
         access-key: warn-msg-v1
         secret-key: warn-msg-v1
-      name-server: 101.200.219.190:9876
+      name-server: 10.72.143.2:9876
       consumer:
         group: warn
         access-key: warn-msg-v1