瀏覽代碼

fix:“优化数据统计“

soobin 1 年之前
父節點
當前提交
75944161df

+ 23 - 0
src/main/java/com/szwl/controller/EsController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TCoinOrder;
 import com.szwl.model.entity.TOrder;
 import com.szwl.model.query.TCoinOrderParam;
@@ -162,4 +164,25 @@ public class EsController {
                         .setCode(true)
                         .setMessage("同步es设备数据成功"));
     }
+
+    @ApiOperation("删除订单号")
+    @GetMapping("/deleteData")
+    public ResponseModel<?> deleteData(String sn){
+        LambdaQueryWrapper<TCoinOrder> snQuery = Wrappers.lambdaQuery();
+        snQuery.eq(TCoinOrder::getSn,sn);
+        List<TCoinOrder> coinOrderList = tCoinOrderService.list(snQuery);
+        try{
+            if(coinOrderList.size() > 1) {
+                for(int i = 1; i < coinOrderList.size(); i++) {
+                    TCoinOrder coinOrder = coinOrderList.get(i);
+                    Long id = coinOrder.getId();
+                    tCoinOrderService.removeById(id);
+                    esTCoinOrderService.deleteTableById(String.valueOf(id));
+                }
+            }
+        } catch (Exception e) {
+            log.error("ElasticsearchRunner deleteData 发生错误:{}" , e);
+        }
+        return R.ok();
+    }
 }

+ 1 - 1
src/main/java/com/szwl/service/es/EsTEquipmentService.java

@@ -233,7 +233,7 @@ public class EsTEquipmentService extends EsBaseService<TEquipment, TEquipmentPar
                         )
                 );
             } else {
-                boolQueryBuilder.must(QueryBuilders.termQuery("machineType","1"));
+                boolQueryBuilder.must(QueryBuilders.termQuery("machineType",machineType));
             }
         }
         if("1".equals(param.getChangeType())){

+ 1 - 1
src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -342,7 +342,7 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
                             )
                     );
                 } else {
-                    queryBuilder.must(QueryBuilders.termQuery("machineType","1"));
+                    queryBuilder.must(QueryBuilders.termQuery("machineType",machineType));
                 }
             }