whyclxw
2024-11-07 4f9cb11aaa56a63e84c619203a9d34e68b2c47cf
src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -73,23 +73,16 @@
                List<Float> monVols=null;
                List<Integer> monNums=null;
                BatttestdataId tdata=null;
                Float maxTmp=0f;
                Float minTmp=0f;
                int num=0;
                try {
                    while (rs.next()){
                        int monNum=rs.getInt("mon_num");
                        float monvol=rs.getFloat("mon_vol");
                        int recordNum=rs.getInt("record_num");
                        Float monTmp=rs.getFloat("mon_tmp");
                        if(num!=recordNum){
                            if(num!=0){
                                tdata.setMonVols(monVols);
                                tdata.setMonNums(monNums);
                                tdata.setMaxTmp(maxTmp);
                                tdata.setMinTmp(minTmp);
                                maxTmp=0f;
                                minTmp=0f;
                                list.add(tdata);
                            }
                            tdata=new BatttestdataId();
@@ -107,19 +100,13 @@
                            tdata.setTestCurr(rs.getDouble("test_curr"));
                            tdata.setTestCap(rs.getDouble("test_cap"));
                            tdata.setNeedTest(rs.getInt("need_test"));
                            tdata.setMaxTemp(rs.getFloat("max_temp"));
                            tdata.setMinTemp(rs.getFloat("min_temp"));
                            num=recordNum;
                        }
                        if(monTmp>maxTmp){
                            maxTmp =monTmp;
                        }
                        if(monTmp<minTmp){
                            minTmp=monTmp;
                        }
                        monVols.add(monvol);
                        monNums.add(monNum);
                    }
                    tdata.setMaxTmp(maxTmp);
                    tdata.setMinTmp(minTmp);
                    tdata.setMonVols(monVols);
                    tdata.setMonNums(monNums);
                    list.add(tdata);