From 452d29df782fb1a91ce16d565fcb6e5cccadb82e Mon Sep 17 00:00:00 2001
From: whycrzh <ruanzhigang@whycst.com>
Date: 星期六, 23 一月 2021 09:29:24 +0800
Subject: [PATCH] update battRtState.battStateRate
---
src/main/java/com/fgkj/services/Batt_rtstateService.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fgkj/services/Batt_rtstateService.java b/src/main/java/com/fgkj/services/Batt_rtstateService.java
index d85b9c5..9cafe6b 100644
--- a/src/main/java/com/fgkj/services/Batt_rtstateService.java
+++ b/src/main/java/com/fgkj/services/Batt_rtstateService.java
@@ -1,10 +1,12 @@
package com.fgkj.services;
import com.fgkj.dto.*;
+import com.fgkj.mapper.BattTestData;
import com.fgkj.mapper.impl.Batt_rtdataMapper;
import com.fgkj.mapper.impl.Batt_rtstateMapper;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
@@ -113,8 +115,49 @@
//棣栭〉涓婇ゼ鐘跺浘鐢垫睜鐘舵�佹瘮渚�
public ServiceModel serchBattStateRate(User_inf obj){
ServiceModel model = new ServiceModel();
- List list=mapper.serchBattStateRate(obj);
+ List<Batt_rtstate> list=mapper.serchBattStateRate(obj);
+ int test_plan0=0;//鐘舵�佷负鏃�
+ int test_plan1=0;//鐘舵�佷负娴厖
+ int test_plan2=0;//鐘舵�佷负鍏呯數
+ int test_plan3=0;//鐘舵�佷负鏀剧數
+ int test_plan4=0;//鐘舵�佷负鍧囧厖
if(list!=null&&list.size()>0){
+ for (Batt_rtstate batt_rtstate : list) {
+ if(batt_rtstate.getBatt_state()==BattTestData.test_plan0){
+ test_plan0+=batt_rtstate.getBatt_count(); // COUNT(tb_batt_rtstate.BattGroupId) batt_count
+ }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan1){
+ test_plan1+=batt_rtstate.getBatt_count();
+ }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan2){
+ test_plan2+=batt_rtstate.getBatt_count();
+ }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan3){
+ test_plan3+=batt_rtstate.getBatt_count();
+ }else if(batt_rtstate.getBatt_state()==BattTestData.test_plan4){
+ test_plan4+=batt_rtstate.getBatt_count();
+ }
+ }
+ list= new ArrayList<>();
+ {
+ Batt_rtstate bstate = new Batt_rtstate();
+ bstate.setBatt_state(BattTestData.test_plan0);
+ bstate.setNum(test_plan0);
+ list.add(bstate);
+ Batt_rtstate bstate1 = new Batt_rtstate();
+ bstate1.setBatt_state(BattTestData.test_plan1);
+ bstate1.setNum(test_plan1);
+ list.add(bstate1);
+ Batt_rtstate bstate2 = new Batt_rtstate();
+ bstate2.setBatt_state(BattTestData.test_plan2);
+ bstate2.setNum(test_plan2);
+ list.add(bstate2);
+ Batt_rtstate bstate3 = new Batt_rtstate();
+ bstate3.setBatt_state(BattTestData.test_plan3);
+ bstate3.setNum(test_plan3);
+ list.add(bstate3);
+ Batt_rtstate bstate4 = new Batt_rtstate();
+ bstate4.setBatt_state(BattTestData.test_plan4);
+ bstate4.setNum(test_plan4);
+ list.add(bstate4);
+ }
model.setCode(1);
model.setData(list);
model.setMsg("鏌ヨ鎴愬姛!");
@@ -128,8 +171,19 @@
//娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鏃�)
public ServiceModel serchDisOrChargr(){
ServiceModel model = new ServiceModel();
- List list=mapper.serchDisOrChargr();
+ List<Batt_rtstate> list=mapper.serchDisOrChargr();
if(list!=null&&list.size()>0){
+ int charge=0;
+ int dischar=0;
+ for (Batt_rtstate brt: list) {
+ if(brt.getBatt_test_type()==3){
+ dischar++;
+ }else if(brt.getBatt_test_type()==2){
+ charge++;
+ }
+ }
+ list.get(list.size()-1).setNum(charge);
+ list.get(list.size()-1).setBatt_count(dischar);
model.setCode(1);
model.setData(list);
model.setMsg("鏌ヨ鎴愬姛!");
@@ -146,8 +200,19 @@
//娴嬭瘯鏁版嵁鈥斺�斿疄鏃舵煡璇腑宸︿笅瑙掔殑鍏呮斁鐢电粺璁�(鐢ㄦ埛绠＄悊鐨勬満鎴�)
public ServiceModel serchDisOrChargrNew(User_inf obj){
ServiceModel model = new ServiceModel();
- List list=mapper.serchDisOrChargrNew(obj);
+ List<Batt_rtstate> list=mapper.serchDisOrChargrNew(obj);
if(list!=null&&list.size()>0){
+ int charge=0;
+ int dischar=0;
+ for (Batt_rtstate brt: list) {
+ if(brt.getBatt_test_type()==3){
+ dischar++;
+ }else if(brt.getBatt_test_type()==2){
+ charge++;
+ }
+ }
+ list.get(list.size()-1).setNum(charge);
+ list.get(list.size()-1).setBatt_count(dischar);
model.setCode(1);
model.setData(list);
model.setMsg("鏌ヨ鎴愬姛!");
--
Gitblit v1.9.1