1、协议细化，处理小数； 2、水肥机、气象站、墒情站实体增加属性fboxId(FBox序列号)；

liurunyu

2025-06-20 e9d04864135236c8b39b06f62d001631524197e6

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StConsumeByIcSv.java

@@ -46,7 +46,12 @@
        List<VoIcConsumeStatistics> list = rmOpenCloseValveHistoryMapper.statisticsByIc(statisticsStartDt, statisticsEndDt) ;
        if(list != null && list.size() > 0){
            for(VoIcConsumeStatistics vo : list){
                StConsumeIcDay po = this.stConsumeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
                List<StConsumeIcDay> listOfDay = this.stConsumeIcDayMapper.selectByClientAndCardAndYearAndMonth(vo.clientId, vo.cardId, statisticsYear, statisticsMonth) ;
                StConsumeIcDay po = null ;
                if(listOfDay != null && listOfDay.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfDay.get(0) ;
                }
                if(po == null){
                    po = new StConsumeIcDay() ;
                    po.clientId = vo.clientId ;
@@ -73,7 +78,12 @@
        List<VoIcConsumeStatistics> list = stConsumeIcDayMapper.statisticsByIc(statisticsYear, statisticsMonth) ;
        if(list != null && list.size() > 0){
            for(VoIcConsumeStatistics vo : list){
                StConsumeIcMonth po = this.stConsumeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                List<StConsumeIcMonth> listOfMonth = this.stConsumeIcMonthMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                StConsumeIcMonth po = null ;
                if(listOfMonth != null && listOfMonth.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfMonth.get(0) ;
                }
                if(po == null){
                    po = new StConsumeIcMonth() ;
                    po.clientId = vo.clientId ;
@@ -99,7 +109,12 @@
        List<VoIcConsumeStatistics> list = stConsumeIcMonthMapper.statisticsByIc(statisticsYear) ;
        if(list != null && list.size() > 0){
            for(VoIcConsumeStatistics vo : list){
                StConsumeIcYear po = this.stConsumeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                List<StConsumeIcYear> listOfYear = this.stConsumeIcYearMapper.selectByClientAndCardAndYear(vo.clientId, vo.cardId, statisticsYear) ;
                StConsumeIcYear po = null ;
                if(listOfYear != null && listOfYear.size() > 0){
                    //程序逻辑控制上，集合中只有一个对象
                    po = listOfYear.get(0) ;
                }
                if(po == null){
                    po = new StConsumeIcYear() ;
                    po.clientId = vo.clientId ;