生成大表数据 因工业库挂掉或者日报填写太晚导致的数据确实 做兜底方案处理

slibra-quartz/src/main/java/com/slibra/quartz/business/JsCsFormatData.java

@@ -3,6 +3,7 @@ package com.slibra.quartz.business;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.slibra.business.domain.TXinyiBigTableHour;
 import com.slibra.business.domain.TXinyiIndustry;
 import com.slibra.business.domain.TXinyiNormConfig;
 import com.slibra.business.domain.TXinyiRobot;
@@ -128,4 +129,35 @@ public class JsCsFormatData {
         return csData;
     }
 
+
+    public void addRobot2Hour(TXinyiBigTableHour tXinyiBigTableHour, TXinyiRobot tXinyiRobot) {
+        tXinyiBigTableHour.setHyCodYb(tXinyiRobot.getCodYb());
+        tXinyiBigTableHour.setHyCodJqr(tXinyiRobot.getCodJqr());
+        tXinyiBigTableHour.setHyCodYz(tXinyiRobot.getCodYz());
+        tXinyiBigTableHour.setHyTpHl1Jqr(tXinyiRobot.getTpHl1Jqr());
+        tXinyiBigTableHour.setHyTpHl2Jqr(tXinyiRobot.getTpHl2Jqr());
+        tXinyiBigTableHour.setHyTpRccJqr(tXinyiRobot.getTpRccJqr());
+        tXinyiBigTableHour.setHyTp1Yz(tXinyiRobot.getTp1Yz());
+        tXinyiBigTableHour.setHyTp2Yz(tXinyiRobot.getTp2Yz());
+        tXinyiBigTableHour.setHyTpRccYz(tXinyiRobot.getTpRccYz());
+        tXinyiBigTableHour.setHyNh31Jqr(tXinyiRobot.getNh31Jqr());
+        tXinyiBigTableHour.setHyNh32Jqr(tXinyiRobot.getNh32Jqr());
+        tXinyiBigTableHour.setHyNh31Yz(tXinyiRobot.getNh31Yz());
+        tXinyiBigTableHour.setHyNo3Hlc1Yz(tXinyiRobot.getNo3Hlc1Yz());
+        tXinyiBigTableHour.setHyNh32Yz(tXinyiRobot.getNh32Yz());
+        tXinyiBigTableHour.setHyNo3Hlc2Yz(tXinyiRobot.getNo3Hlc2Yz());
+        tXinyiBigTableHour.setHyNo3Hlj1Jqr(tXinyiRobot.getNo3Hlj1Jqr());
+        tXinyiBigTableHour.setHyNo3Hlj2Jqr(tXinyiRobot.getNo3Hlj2Jqr());
+        tXinyiBigTableHour.setHyTyll(tXinyiRobot.getTYLL());
+        tXinyiBigTableHour.setHyNo3Qyc1Jqr(tXinyiRobot.getNo3Qyc1Jqr());
+        tXinyiBigTableHour.setHyNo3Qyc2Jqr(tXinyiRobot.getNo3Qyc2Jqr());
+        tXinyiBigTableHour.setHyNo3Qyc1Yz(tXinyiRobot.getNo3Qyc1Yz());
+        tXinyiBigTableHour.setHyNo3Qyc2Yz(tXinyiRobot.getNo3Qyc2Yz());
+        tXinyiBigTableHour.setHyJsll(tXinyiRobot.getJSLL());
+        tXinyiBigTableHour.setHyHycxsyAll(tXinyiRobot.getHycxsyAll());
+        tXinyiBigTableHour.setHyQyanAll(tXinyiRobot.getQyanAll());
+        tXinyiBigTableHour.setHyQyckxsyAll(tXinyiRobot.getQyckxsyAll());
+        tXinyiBigTableHour.setHyHyzlsyAll(tXinyiRobot.getHyzlsyAll());
+    }
+
 }

slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -10,6 +10,7 @@ import com.slibra.business.req.*;
 import com.slibra.business.res.ShowValueCSBasic;
 import com.slibra.business.res.ShowValueJSBasic;
 import com.slibra.business.res.ShowValueSHBasic;
+import com.slibra.business.service.ITXinyiDailyService;
 import com.slibra.common.DecimalUtils;
 import com.slibra.common.config.BigModelConfig;
 import com.slibra.common.constant.MyConstants;
@@ -28,6 +29,7 @@ import inference.PredictionsRequest;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
@@ -85,6 +87,8 @@ public class AsyncTask {
     @Value("${spring.profiles.active}")
     private String environment;
 
+    @Autowired
+    private ITXinyiDailyService xinyiDailyService;
 
     /**
      *
@@ -132,6 +136,23 @@ public class AsyncTask {
         //处理计算的数据
         this.addCalculate2BigTable(xinyiBigTableHour, xinyiCalculate);
 
+        //2024年08月13日13:35:15 修复bug:如果工业库挂了某段时间，那么这段时间内的日报和化验数据可能就一直无法获取到了
+        //先去查询日报是否，查看是否已经有了
+        List<TXinyiDaily> tXinyiDailies = this.xinyiDailyMapper.selectTXinyiDailyList(TXinyiDaily.builder().testDate(tXinyiIndustry.getTestDate()).build());
+        if(CollectionUtils.isEmpty(tXinyiDailies)){
+            log.info("~~~~进入了兜底处理因为工业库挂掉或者其他原因，导致日报数据早于工业库数据的问题@@@%%%");
+            TXinyiDaily tXinyiDaily = tXinyiDailies.get(0);
+            //处理天级的数据
+            xinyiDailyService.addDailyData(tXinyiDaily, xinyiBigTableHour);
+        }
+        //再去查询化验库，查看是否已经存在化验库的数据了
+        List<TXinyiRobot> tXinyiRobots = this.xinyiRobotMapper.selectTXinyiRobotList(TXinyiRobot.builder().testHour(tXinyiIndustry.getTestHour()).build());
+        if(CollectionUtils.isEmpty(tXinyiRobots)){
+            log.info("~~~~进入了兜底处理因为工业库挂掉或者其他原因，导致化验室数据早于工业库数据的问题@@@***");
+            TXinyiRobot tXinyiRobot = tXinyiRobots.get(0);
+            jsCsFormatData.addRobot2Hour(xinyiBigTableHour, tXinyiRobot);
+        }
+
         //插入
         this.xinyiBigTableHourMapper.insertTXinyiBigTableHour(xinyiBigTableHour);
     }
@@ -2350,33 +2371,7 @@ public class AsyncTask {
     }
 
     private void updateBigTableByRobot(TXinyiBigTableHour tXinyiBigTableHour, TXinyiRobot tXinyiRobot) {
-        tXinyiBigTableHour.setHyCodYb(tXinyiRobot.getCodYb());
-        tXinyiBigTableHour.setHyCodJqr(tXinyiRobot.getCodJqr());
-        tXinyiBigTableHour.setHyCodYz(tXinyiRobot.getCodYz());
-        tXinyiBigTableHour.setHyTpHl1Jqr(tXinyiRobot.getTpHl1Jqr());
-        tXinyiBigTableHour.setHyTpHl2Jqr(tXinyiRobot.getTpHl2Jqr());
-        tXinyiBigTableHour.setHyTpRccJqr(tXinyiRobot.getTpRccJqr());
-        tXinyiBigTableHour.setHyTp1Yz(tXinyiRobot.getTp1Yz());
-        tXinyiBigTableHour.setHyTp2Yz(tXinyiRobot.getTp2Yz());
-        tXinyiBigTableHour.setHyTpRccYz(tXinyiRobot.getTpRccYz());
-        tXinyiBigTableHour.setHyNh31Jqr(tXinyiRobot.getNh31Jqr());
-        tXinyiBigTableHour.setHyNh32Jqr(tXinyiRobot.getNh32Jqr());
-        tXinyiBigTableHour.setHyNh31Yz(tXinyiRobot.getNh31Yz());
-        tXinyiBigTableHour.setHyNo3Hlc1Yz(tXinyiRobot.getNo3Hlc1Yz());
-        tXinyiBigTableHour.setHyNh32Yz(tXinyiRobot.getNh32Yz());
-        tXinyiBigTableHour.setHyNo3Hlc2Yz(tXinyiRobot.getNo3Hlc2Yz());
-        tXinyiBigTableHour.setHyNo3Hlj1Jqr(tXinyiRobot.getNo3Hlj1Jqr());
-        tXinyiBigTableHour.setHyNo3Hlj2Jqr(tXinyiRobot.getNo3Hlj2Jqr());
-        tXinyiBigTableHour.setHyTyll(tXinyiRobot.getTYLL());
-        tXinyiBigTableHour.setHyNo3Qyc1Jqr(tXinyiRobot.getNo3Qyc1Jqr());
-        tXinyiBigTableHour.setHyNo3Qyc2Jqr(tXinyiRobot.getNo3Qyc2Jqr());
-        tXinyiBigTableHour.setHyNo3Qyc1Yz(tXinyiRobot.getNo3Qyc1Yz());
-        tXinyiBigTableHour.setHyNo3Qyc2Yz(tXinyiRobot.getNo3Qyc2Yz());
-        tXinyiBigTableHour.setHyJsll(tXinyiRobot.getJSLL());
-        tXinyiBigTableHour.setHyHycxsyAll(tXinyiRobot.getHycxsyAll());
-        tXinyiBigTableHour.setHyQyanAll(tXinyiRobot.getQyanAll());
-        tXinyiBigTableHour.setHyQyckxsyAll(tXinyiRobot.getQyckxsyAll());
-        tXinyiBigTableHour.setHyHyzlsyAll(tXinyiRobot.getHyzlsyAll());
+        jsCsFormatData.addRobot2Hour(tXinyiBigTableHour, tXinyiRobot);
         //更新数据库
         this.xinyiBigTableHourMapper.updateTXinyiBigTableHour(tXinyiBigTableHour);
     }

slibra-system/src/main/java/com/slibra/business/service/ITXinyiDailyService.java

@@ -1,5 +1,6 @@
 package com.slibra.business.service;
 
+import com.slibra.business.domain.TXinyiBigTableHour;
 import com.slibra.common.core.domain.TXinyiDaily;
 import com.slibra.business.res.XinyiDailySimple;
 
@@ -62,4 +63,6 @@ public interface ITXinyiDailyService
     public int deleteTXinyiDailyByID(Long ID);
 
     List<XinyiDailySimple> getRecently30CountInfo();
+
+    void addDailyData(TXinyiDaily tXinyiDaily, TXinyiBigTableHour tXinyiBigTableHour);
 }

slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiDailyServiceImpl.java

@@ -8,7 +8,9 @@ import java.util.List;
 import java.util.Objects;
 
 import com.alibaba.fastjson2.JSON;
+import com.slibra.business.domain.TXinyiBigTableDay;
 import com.slibra.business.domain.TXinyiBigTableHour;
+import com.slibra.business.mapper.TXinyiBigTableDayMapper;
 import com.slibra.common.core.domain.TXinyiDaily;
 import com.slibra.business.mapper.TXinyiBigTableHourMapper;
 import com.slibra.business.mapper.TXinyiDailyMapper;
@@ -17,6 +19,8 @@ import com.slibra.business.service.ITXinyiDailyService;
 import com.slibra.common.exception.ServiceException;
 import com.slibra.common.utils.DateUtils;
 import com.slibra.common.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -33,12 +37,16 @@ import static com.slibra.common.utils.DateUtils.getAllDatesBetween;
 @Service
 public class TXinyiDailyServiceImpl implements ITXinyiDailyService
 {
+    private static final Logger log = LoggerFactory.getLogger(TXinyiDailyServiceImpl.class);
     @Autowired
     private TXinyiDailyMapper tXinyiDailyMapper;
 
     @Autowired
     private TXinyiBigTableHourMapper xinyiBigTableHourMapper;
 
+    @Autowired
+    private TXinyiBigTableDayMapper xinyiBigTableDayMapper;
+
     /**
      * 查询信义日报数据
      * 
@@ -87,80 +95,165 @@ public class TXinyiDailyServiceImpl implements ITXinyiDailyService
         List<TXinyiBigTableHour> tXinyiBigTableHours = this.xinyiBigTableHourMapper.selectTXinyiBigTableHourList(TXinyiBigTableHour.builder().testDate(tXinyiDaily.getTestDate()).build());
         if(!CollectionUtils.isEmpty(tXinyiBigTableHours)){
             for (TXinyiBigTableHour tXinyiBigTableHour : tXinyiBigTableHours) {
-                //更新数据
-                tXinyiBigTableHour.setRbJsCod(tXinyiDaily.getJsCod());
-                tXinyiBigTableHour.setRbJsPh(tXinyiDaily.getJsPh());
-                tXinyiBigTableHour.setRbJsBod5(tXinyiDaily.getJsBod5());
-                tXinyiBigTableHour.setRbJsSs(tXinyiDaily.getJsSs());
-                tXinyiBigTableHour.setRbJsNh3(tXinyiDaily.getJsNh3());
-                tXinyiBigTableHour.setRbJsTn(tXinyiDaily.getJsTn());
-                tXinyiBigTableHour.setRbJsTp(tXinyiDaily.getJsTp());
-                tXinyiBigTableHour.setRbJsDcgj(tXinyiDaily.getJsDcgj());
-                tXinyiBigTableHour.setRbCsCod(tXinyiDaily.getCsCod());
-                tXinyiBigTableHour.setRbCsPh(tXinyiDaily.getCsPh());
-                tXinyiBigTableHour.setRbCsBod5(tXinyiDaily.getCsBod5());
-                tXinyiBigTableHour.setRbCsSs(tXinyiDaily.getCsSs());
-                tXinyiBigTableHour.setRbCsNh3(tXinyiDaily.getCsNh3());
-                tXinyiBigTableHour.setRbCsTn(tXinyiDaily.getCsTn());
-                tXinyiBigTableHour.setRbCsTp(tXinyiDaily.getCsTp());
-                tXinyiBigTableHour.setRbCsDcgj(tXinyiDaily.getCsDcgj());
-                tXinyiBigTableHour.setRbJsSw(tXinyiDaily.getJsSw());
-                tXinyiBigTableHour.setRbCsSw(tXinyiDaily.getCsSw());
-                tXinyiBigTableHour.setRbShcOnePh(tXinyiDaily.getShcOnePh());
-                tXinyiBigTableHour.setRbShcTwoPh(tXinyiDaily.getShcTwoPh());
-                tXinyiBigTableHour.setRbShcHyOneSv(tXinyiDaily.getShcHyOneSv());
-                tXinyiBigTableHour.setRbShcHyTwoSv(tXinyiDaily.getShcHyTwoSv());
-                tXinyiBigTableHour.setRbShcHyOneSvi(tXinyiDaily.getShcHyOneSvi());
-                tXinyiBigTableHour.setRbShcHyTwoSvi(tXinyiDaily.getShcHyTwoSvi());
-                tXinyiBigTableHour.setRbShcHyOneMlss(tXinyiDaily.getShcHyOneMlss());
-                tXinyiBigTableHour.setRbShcHyTwoMlss(tXinyiDaily.getShcHyTwoMlss());
-                tXinyiBigTableHour.setRbShcHyOneMlvss(tXinyiDaily.getShcHyOneMlvss());
-                tXinyiBigTableHour.setRbShcHyTwoMlvss(tXinyiDaily.getShcHyTwoMlvss());
-                tXinyiBigTableHour.setRbShcYyOneDo(tXinyiDaily.getShcYyOneDo());
-                tXinyiBigTableHour.setRbShcYyTwoDo(tXinyiDaily.getShcYyTwoDo());
-                tXinyiBigTableHour.setRbShcQyOneDo(tXinyiDaily.getShcQyOneDo());
-                tXinyiBigTableHour.setRbShcQyTwoDo(tXinyiDaily.getShcQyTwoDo());
-                tXinyiBigTableHour.setRbShcHyOneDo(tXinyiDaily.getShcHyOneDo());
-                tXinyiBigTableHour.setRbShcHyTwoDo(tXinyiDaily.getShcHyTwoDo());
-                tXinyiBigTableHour.setRbJsl(tXinyiDaily.getJSL());
-                tXinyiBigTableHour.setRbCsl(tXinyiDaily.getCSL());
-                tXinyiBigTableHour.setRbSdclcxsl(tXinyiDaily.getSDCLCXSL());
-                tXinyiBigTableHour.setRbQsb(tXinyiDaily.getQSB());
-                tXinyiBigTableHour.setRbFM(tXinyiDaily.getFM());
-                tXinyiBigTableHour.setRbYyHrt(tXinyiDaily.getYyHrt());
-                tXinyiBigTableHour.setRbHyHrt(tXinyiDaily.getHyHrt());
-                tXinyiBigTableHour.setRbQyHrt(tXinyiDaily.getQyHrt());
-                tXinyiBigTableHour.setRbNhlR(tXinyiDaily.getNhlR());
-                tXinyiBigTableHour.setRbWhlR(tXinyiDaily.getWhlR());
-                tXinyiBigTableHour.setRbSrt(tXinyiDaily.getSRT());
-                tXinyiBigTableHour.setRbCnl(tXinyiDaily.getCNL());
-                tXinyiBigTableHour.setRbTyqBod5Tn(tXinyiDaily.getTyqBod5Tn());
-                tXinyiBigTableHour.setRbTyhBod5Tn(tXinyiDaily.getTyhBod5Tn());
-                tXinyiBigTableHour.setRbHycRjyAll(tXinyiDaily.getHycRjyAll());
-                tXinyiBigTableHour.setRbHycWnndAll(tXinyiDaily.getHycWnndAll());
-                tXinyiBigTableHour.setRbYycRjyAll(tXinyiDaily.getYycRjyAll());
-                tXinyiBigTableHour.setRbQycRjyAll(tXinyiDaily.getQycRjyAll());
-                tXinyiBigTableHour.setRbWncjbAll(tXinyiDaily.getWncjbAll());
-                tXinyiBigTableHour.setRbWntjzsAll(tXinyiDaily.getWntjzsAll());
-                tXinyiBigTableHour.setRbHfxwnndAll(tXinyiDaily.getHfxwnndAll());
-                tXinyiBigTableHour.setRbChuniliang(tXinyiDaily.getCHUNILIANG());
-                tXinyiBigTableHour.setRbCnhsl(tXinyiDaily.getCNHSL());
-                tXinyiBigTableHour.setRbGwnl(tXinyiDaily.getGWNL());
-                tXinyiBigTableHour.setRbDf(tXinyiDaily.getDF());
-                tXinyiBigTableHour.setRbXnjf(tXinyiDaily.getXNJF());
-                tXinyiBigTableHour.setRbClf(tXinyiDaily.getCLF());
-                tXinyiBigTableHour.setRbTyf(tXinyiDaily.getTYF());
-                tXinyiBigTableHour.setRbXdjf(tXinyiDaily.getXDJF());
-                tXinyiBigTableHour.setRbQtyjf(tXinyiDaily.getQTYJF());
-                tXinyiBigTableHour.setRbCnf(tXinyiDaily.getCNF());
-                tXinyiBigTableHour.setRbZlsf(tXinyiDaily.getZLSF());
-                tXinyiBigTableHour.setRbZjcb(tXinyiDaily.getZJCB());
-                tXinyiBigTableHour.setRbDwcb(tXinyiDaily.getDWCB());
-
+                addDailyData(tXinyiDaily, tXinyiBigTableHour);
                 //更新数据库
                 this.xinyiBigTableHourMapper.updateTXinyiBigTableHour(tXinyiBigTableHour);
             }
         }
+        //2024年08月13日14:23:37 兜底处理：如果定时任务生成昨日的大表-天数据的时候，还没有填写周报，则会一直没有周报数据了，这时候需要再这里查询是否存在，如果有，就更新它（化验室的数据操作起来就太复杂，暂时没有这种问题 todo）
+        List<TXinyiBigTableDay> tXinyiBigTableDays = this.xinyiBigTableDayMapper.selectTXinyiBigTableDayList(TXinyiBigTableDay.builder().testDate(tXinyiDaily.getTestDate()).build());
+        if(!CollectionUtils.isEmpty(tXinyiBigTableDays)){
+            log.info("~~~~进入了兜底处理因为定时任务生成大表天维度时，还没有填写日报的问题@@@###");
+            TXinyiBigTableDay tXinyiBigTableDay = tXinyiBigTableDays.get(0);
+            addDailyData2Day(tXinyiDaily, tXinyiBigTableDay);
+            this.xinyiBigTableDayMapper.updateTXinyiBigTableDay(tXinyiBigTableDay);
+        }
+    }
+
+    @Override
+    public void addDailyData(TXinyiDaily tXinyiDaily, TXinyiBigTableHour tXinyiBigTableHour) {
+        //更新数据
+        tXinyiBigTableHour.setRbJsCod(tXinyiDaily.getJsCod());
+        tXinyiBigTableHour.setRbJsPh(tXinyiDaily.getJsPh());
+        tXinyiBigTableHour.setRbJsBod5(tXinyiDaily.getJsBod5());
+        tXinyiBigTableHour.setRbJsSs(tXinyiDaily.getJsSs());
+        tXinyiBigTableHour.setRbJsNh3(tXinyiDaily.getJsNh3());
+        tXinyiBigTableHour.setRbJsTn(tXinyiDaily.getJsTn());
+        tXinyiBigTableHour.setRbJsTp(tXinyiDaily.getJsTp());
+        tXinyiBigTableHour.setRbJsDcgj(tXinyiDaily.getJsDcgj());
+        tXinyiBigTableHour.setRbCsCod(tXinyiDaily.getCsCod());
+        tXinyiBigTableHour.setRbCsPh(tXinyiDaily.getCsPh());
+        tXinyiBigTableHour.setRbCsBod5(tXinyiDaily.getCsBod5());
+        tXinyiBigTableHour.setRbCsSs(tXinyiDaily.getCsSs());
+        tXinyiBigTableHour.setRbCsNh3(tXinyiDaily.getCsNh3());
+        tXinyiBigTableHour.setRbCsTn(tXinyiDaily.getCsTn());
+        tXinyiBigTableHour.setRbCsTp(tXinyiDaily.getCsTp());
+        tXinyiBigTableHour.setRbCsDcgj(tXinyiDaily.getCsDcgj());
+        tXinyiBigTableHour.setRbJsSw(tXinyiDaily.getJsSw());
+        tXinyiBigTableHour.setRbCsSw(tXinyiDaily.getCsSw());
+        tXinyiBigTableHour.setRbShcOnePh(tXinyiDaily.getShcOnePh());
+        tXinyiBigTableHour.setRbShcTwoPh(tXinyiDaily.getShcTwoPh());
+        tXinyiBigTableHour.setRbShcHyOneSv(tXinyiDaily.getShcHyOneSv());
+        tXinyiBigTableHour.setRbShcHyTwoSv(tXinyiDaily.getShcHyTwoSv());
+        tXinyiBigTableHour.setRbShcHyOneSvi(tXinyiDaily.getShcHyOneSvi());
+        tXinyiBigTableHour.setRbShcHyTwoSvi(tXinyiDaily.getShcHyTwoSvi());
+        tXinyiBigTableHour.setRbShcHyOneMlss(tXinyiDaily.getShcHyOneMlss());
+        tXinyiBigTableHour.setRbShcHyTwoMlss(tXinyiDaily.getShcHyTwoMlss());
+        tXinyiBigTableHour.setRbShcHyOneMlvss(tXinyiDaily.getShcHyOneMlvss());
+        tXinyiBigTableHour.setRbShcHyTwoMlvss(tXinyiDaily.getShcHyTwoMlvss());
+        tXinyiBigTableHour.setRbShcYyOneDo(tXinyiDaily.getShcYyOneDo());
+        tXinyiBigTableHour.setRbShcYyTwoDo(tXinyiDaily.getShcYyTwoDo());
+        tXinyiBigTableHour.setRbShcQyOneDo(tXinyiDaily.getShcQyOneDo());
+        tXinyiBigTableHour.setRbShcQyTwoDo(tXinyiDaily.getShcQyTwoDo());
+        tXinyiBigTableHour.setRbShcHyOneDo(tXinyiDaily.getShcHyOneDo());
+        tXinyiBigTableHour.setRbShcHyTwoDo(tXinyiDaily.getShcHyTwoDo());
+        tXinyiBigTableHour.setRbJsl(tXinyiDaily.getJSL());
+        tXinyiBigTableHour.setRbCsl(tXinyiDaily.getCSL());
+        tXinyiBigTableHour.setRbSdclcxsl(tXinyiDaily.getSDCLCXSL());
+        tXinyiBigTableHour.setRbQsb(tXinyiDaily.getQSB());
+        tXinyiBigTableHour.setRbFM(tXinyiDaily.getFM());
+        tXinyiBigTableHour.setRbYyHrt(tXinyiDaily.getYyHrt());
+        tXinyiBigTableHour.setRbHyHrt(tXinyiDaily.getHyHrt());
+        tXinyiBigTableHour.setRbQyHrt(tXinyiDaily.getQyHrt());
+        tXinyiBigTableHour.setRbNhlR(tXinyiDaily.getNhlR());
+        tXinyiBigTableHour.setRbWhlR(tXinyiDaily.getWhlR());
+        tXinyiBigTableHour.setRbSrt(tXinyiDaily.getSRT());
+        tXinyiBigTableHour.setRbCnl(tXinyiDaily.getCNL());
+        tXinyiBigTableHour.setRbTyqBod5Tn(tXinyiDaily.getTyqBod5Tn());
+        tXinyiBigTableHour.setRbTyhBod5Tn(tXinyiDaily.getTyhBod5Tn());
+        tXinyiBigTableHour.setRbHycRjyAll(tXinyiDaily.getHycRjyAll());
+        tXinyiBigTableHour.setRbHycWnndAll(tXinyiDaily.getHycWnndAll());
+        tXinyiBigTableHour.setRbYycRjyAll(tXinyiDaily.getYycRjyAll());
+        tXinyiBigTableHour.setRbQycRjyAll(tXinyiDaily.getQycRjyAll());
+        tXinyiBigTableHour.setRbWncjbAll(tXinyiDaily.getWncjbAll());
+        tXinyiBigTableHour.setRbWntjzsAll(tXinyiDaily.getWntjzsAll());
+        tXinyiBigTableHour.setRbHfxwnndAll(tXinyiDaily.getHfxwnndAll());
+        tXinyiBigTableHour.setRbChuniliang(tXinyiDaily.getCHUNILIANG());
+        tXinyiBigTableHour.setRbCnhsl(tXinyiDaily.getCNHSL());
+        tXinyiBigTableHour.setRbGwnl(tXinyiDaily.getGWNL());
+        tXinyiBigTableHour.setRbDf(tXinyiDaily.getDF());
+        tXinyiBigTableHour.setRbXnjf(tXinyiDaily.getXNJF());
+        tXinyiBigTableHour.setRbClf(tXinyiDaily.getCLF());
+        tXinyiBigTableHour.setRbTyf(tXinyiDaily.getTYF());
+        tXinyiBigTableHour.setRbXdjf(tXinyiDaily.getXDJF());
+        tXinyiBigTableHour.setRbQtyjf(tXinyiDaily.getQTYJF());
+        tXinyiBigTableHour.setRbCnf(tXinyiDaily.getCNF());
+        tXinyiBigTableHour.setRbZlsf(tXinyiDaily.getZLSF());
+        tXinyiBigTableHour.setRbZjcb(tXinyiDaily.getZJCB());
+        tXinyiBigTableHour.setRbDwcb(tXinyiDaily.getDWCB());
+    }
+
+
+    public void addDailyData2Day(TXinyiDaily tXinyiDaily, TXinyiBigTableDay tXinyiBigTableDay) {
+        //更新数据
+        tXinyiBigTableDay.setRbJsCod(tXinyiDaily.getJsCod());
+        tXinyiBigTableDay.setRbJsPh(tXinyiDaily.getJsPh());
+        tXinyiBigTableDay.setRbJsBod5(tXinyiDaily.getJsBod5());
+        tXinyiBigTableDay.setRbJsSs(tXinyiDaily.getJsSs());
+        tXinyiBigTableDay.setRbJsNh3(tXinyiDaily.getJsNh3());
+        tXinyiBigTableDay.setRbJsTn(tXinyiDaily.getJsTn());
+        tXinyiBigTableDay.setRbJsTp(tXinyiDaily.getJsTp());
+        tXinyiBigTableDay.setRbJsDcgj(tXinyiDaily.getJsDcgj());
+        tXinyiBigTableDay.setRbCsCod(tXinyiDaily.getCsCod());
+        tXinyiBigTableDay.setRbCsPh(tXinyiDaily.getCsPh());
+        tXinyiBigTableDay.setRbCsBod5(tXinyiDaily.getCsBod5());
+        tXinyiBigTableDay.setRbCsSs(tXinyiDaily.getCsSs());
+        tXinyiBigTableDay.setRbCsNh3(tXinyiDaily.getCsNh3());
+        tXinyiBigTableDay.setRbCsTn(tXinyiDaily.getCsTn());
+        tXinyiBigTableDay.setRbCsTp(tXinyiDaily.getCsTp());
+        tXinyiBigTableDay.setRbCsDcgj(tXinyiDaily.getCsDcgj());
+        tXinyiBigTableDay.setRbJsSw(tXinyiDaily.getJsSw());
+        tXinyiBigTableDay.setRbCsSw(tXinyiDaily.getCsSw());
+        tXinyiBigTableDay.setRbShcOnePh(tXinyiDaily.getShcOnePh());
+        tXinyiBigTableDay.setRbShcTwoPh(tXinyiDaily.getShcTwoPh());
+        tXinyiBigTableDay.setRbShcHyOneSv(tXinyiDaily.getShcHyOneSv());
+        tXinyiBigTableDay.setRbShcHyTwoSv(tXinyiDaily.getShcHyTwoSv());
+        tXinyiBigTableDay.setRbShcHyOneSvi(tXinyiDaily.getShcHyOneSvi());
+        tXinyiBigTableDay.setRbShcHyTwoSvi(tXinyiDaily.getShcHyTwoSvi());
+        tXinyiBigTableDay.setRbShcHyOneMlss(tXinyiDaily.getShcHyOneMlss());
+        tXinyiBigTableDay.setRbShcHyTwoMlss(tXinyiDaily.getShcHyTwoMlss());
+        tXinyiBigTableDay.setRbShcHyOneMlvss(tXinyiDaily.getShcHyOneMlvss());
+        tXinyiBigTableDay.setRbShcHyTwoMlvss(tXinyiDaily.getShcHyTwoMlvss());
+        tXinyiBigTableDay.setRbShcYyOneDo(tXinyiDaily.getShcYyOneDo());
+        tXinyiBigTableDay.setRbShcYyTwoDo(tXinyiDaily.getShcYyTwoDo());
+        tXinyiBigTableDay.setRbShcQyOneDo(tXinyiDaily.getShcQyOneDo());
+        tXinyiBigTableDay.setRbShcQyTwoDo(tXinyiDaily.getShcQyTwoDo());
+        tXinyiBigTableDay.setRbShcHyOneDo(tXinyiDaily.getShcHyOneDo());
+        tXinyiBigTableDay.setRbShcHyTwoDo(tXinyiDaily.getShcHyTwoDo());
+        tXinyiBigTableDay.setRbJsl(tXinyiDaily.getJSL());
+        tXinyiBigTableDay.setRbCsl(tXinyiDaily.getCSL());
+        tXinyiBigTableDay.setRbSdclcxsl(tXinyiDaily.getSDCLCXSL());
+        tXinyiBigTableDay.setRbQsb(tXinyiDaily.getQSB());
+        tXinyiBigTableDay.setRbFM(tXinyiDaily.getFM());
+        tXinyiBigTableDay.setRbYyHrt(tXinyiDaily.getYyHrt());
+        tXinyiBigTableDay.setRbHyHrt(tXinyiDaily.getHyHrt());
+        tXinyiBigTableDay.setRbQyHrt(tXinyiDaily.getQyHrt());
+        tXinyiBigTableDay.setRbNhlR(tXinyiDaily.getNhlR());
+        tXinyiBigTableDay.setRbWhlR(tXinyiDaily.getWhlR());
+        tXinyiBigTableDay.setRbSrt(tXinyiDaily.getSRT());
+        tXinyiBigTableDay.setRbCnl(tXinyiDaily.getCNL());
+        tXinyiBigTableDay.setRbTyqBod5Tn(tXinyiDaily.getTyqBod5Tn());
+        tXinyiBigTableDay.setRbTyhBod5Tn(tXinyiDaily.getTyhBod5Tn());
+        tXinyiBigTableDay.setRbHycRjyAll(tXinyiDaily.getHycRjyAll());
+        tXinyiBigTableDay.setRbHycWnndAll(tXinyiDaily.getHycWnndAll());
+        tXinyiBigTableDay.setRbYycRjyAll(tXinyiDaily.getYycRjyAll());
+        tXinyiBigTableDay.setRbQycRjyAll(tXinyiDaily.getQycRjyAll());
+        tXinyiBigTableDay.setRbWncjbAll(tXinyiDaily.getWncjbAll());
+        tXinyiBigTableDay.setRbWntjzsAll(tXinyiDaily.getWntjzsAll());
+        tXinyiBigTableDay.setRbHfxwnndAll(tXinyiDaily.getHfxwnndAll());
+        tXinyiBigTableDay.setRbChuniliang(tXinyiDaily.getCHUNILIANG());
+        tXinyiBigTableDay.setRbCnhsl(tXinyiDaily.getCNHSL());
+        tXinyiBigTableDay.setRbGwnl(tXinyiDaily.getGWNL());
+        tXinyiBigTableDay.setRbDf(tXinyiDaily.getDF());
+        tXinyiBigTableDay.setRbXnjf(tXinyiDaily.getXNJF());
+        tXinyiBigTableDay.setRbClf(tXinyiDaily.getCLF());
+        tXinyiBigTableDay.setRbTyf(tXinyiDaily.getTYF());
+        tXinyiBigTableDay.setRbXdjf(tXinyiDaily.getXDJF());
+        tXinyiBigTableDay.setRbQtyjf(tXinyiDaily.getQTYJF());
+        tXinyiBigTableDay.setRbCnf(tXinyiDaily.getCNF());
+        tXinyiBigTableDay.setRbZlsf(tXinyiDaily.getZLSF());
+        tXinyiBigTableDay.setRbZjcb(tXinyiDaily.getZJCB());
+        tXinyiBigTableDay.setRbDwcb(tXinyiDaily.getDWCB());
     }
 
     private void addExtra(TXinyiDaily tXinyiDaily, Long id) {