框架更新
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
whycrzg
2021-02-23 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 
 src/main/java/com/fgkj/services/FileService.java


@@ -1,34 +1,30 @@


package com.fgkj.services;




import com.fgkj.dto.*;


import com.fgkj.fbo.CsvData;


import com.fgkj.fbo.FboDataInf;


import com.fgkj.mapper.impl.BattInfMapper;


import com.fgkj.mapper.impl.Battresdata_infMapper;


import com.fgkj.mapper.impl.Batttestdata_infMapper;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import java.util.ArrayList;


import java.util.Calendar;


import java.util.Date;


import java.util.List;




import com.fgkj.mapper.BaseDAO;


import com.fgkj.mapper.impl.BattInfMapper;


import com.fgkj.mapper.impl.Battresdata_infMapper;


import com.fgkj.dto.BattInf;


import com.fgkj.dto.Battresdata_inf;


import com.fgkj.dto.Batttestdata_inf;


import com.fgkj.dto.Com;


import com.fgkj.dto.ServiceModel;


import com.fgkj.fbo.CsvData;


import com.fgkj.fbo.FboDataInf;


import com.fgkj.mapper.impl.Batttestdata_infMapper;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


@Service


public class FileService {




   private ServiceModel model;


   ServiceModel model = new ServiceModel();




   @Autowired


   @Resource


   private BattInfMapper battInfMapper;


   @Autowired


   @Resource


   private Batttestdata_infMapper battTestDataInfMapper;


   @Autowired


   @Resource


   private Battresdata_infMapper battResDataInfMapper;






@@ -57,7 +53,7 @@


      mcld.set(Calendar.HOUR_OF_DAY, data_inf.TestStartTime.hour);


      mcld.set(Calendar.MINUTE, data_inf.TestStartTime.minute);


      mcld.set(Calendar.SECOND, data_inf.TestStartTime.second);


      //System.out.println("addBattDataToTable      "+DAOHelper.sdf.format(mcld.getTime()));


      //System.out.println("addBattDataToTable      "+DateUtil.sdf.format(mcld.getTime()));


      Date test_starttime = mcld.getTime();


      //System.out.println("test_starttime: " + test_starttime);


      boolean data_ok = true;