数据导入修改

src/main/java/com/minpay/common/action/OriginalTask.java

@@ -11,6 +11,7 @@ import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.DateUtil;
 import com.minpay.common.util.NewDBJdbcUtils;
 import com.minpay.common.util.OldDBJdbcUtils;
+import com.minpay.db.table.model.DwFileInf;
 import com.minpay.db.table.own.mapper.SequenceMapper;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.exception.MINBusinessException;
@@ -33,6 +34,8 @@ public class OriginalTask {
 	public static void tqtdData(int start,int pageSize)  throws SQLException, MINBusinessException, ParseException {
 		System.out.println("<----------------电网台区停电数据导入开始--------->");
 		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
+		//获取文件id
+		String fileId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_INF_NO");
 		//当前报表库
 		OldDBJdbcUtils oldJdbc = new OldDBJdbcUtils();
 		oldJdbc.getConnection();
@@ -59,15 +62,16 @@ public class OriginalTask {
 		
 		
 		String insertSql = "insert into dw_file_detail_00 ("
-				+ "DFD0_ID,DFD0_ADDRESS_NUM,DFD0_ADDRESS_NAME, "
+				+ "DFD0_ID,DFD0_NUMBER,DFD0_FILE_ID,DFD0_ADDRESS_NUM,DFD0_ADDRESS_NAME, "
 				+ "DFD0_DATE,DFD0_AREA,DFD0_COMONPANY_NAME,"
 				+ "DFD0_TERMINAL_NAME,DFD0_TERMINAL_NUM,DFD0_TERMINAL_ADDRESS,"
 				+ "DFD0_START_TIME,DFD0_END_TIME)"
 				+ "values ("
-				+ "?,?,?,"
+				+ "?,?,?,?,?,"
 				+ "?,?,?,"
 				+ "?,?,?,"
 				+ "?,?)";
+		int i=1;
 		while(pages>0){
 			String sql = "SELECT sus_id,sus_name_of_taiwan_district,sus_terminal_name,"
 						+ 	"sus_terminal_address_code,sus_data_date,sus_blackout_time,"
@@ -80,7 +84,7 @@ public class OriginalTask {
 						+ "ORDER BY sus_id DESC "
 						+ "limit "+start+","+ pageSize;
 			List<Map<String, Object>> resList = newJdbc.findModeResult(sql, params);
-			int i=0;
+			
 			//循环插入数据
 			for(Map<String,Object> map:resList){
 				//台区停电表导入数据
@@ -93,7 +97,11 @@ public class OriginalTask {
 				String tdsj = DateUtil.format(tdsjDate,"yyyyMMddHHmmss");
 				String ldsj = DateUtil.format(ldsjDate,"yyyyMMddHHmmss");
 				//id
-				params1.add(fileDetailId);		
+				params1.add(fileDetailId);	
+				//文件编号
+				params1.add(i);
+				//文件id
+				params1.add(fileId);
 				//台区编号
 				params1.add(map.get("sus_station_area_number"));
 				//台区名称
@@ -116,7 +124,7 @@ public class OriginalTask {
 				params1.add(ldsj);				
 				boolean a = oldJdbc.updateByPreparedStatement(insertSql, params1);
 				if(a == true){
-					System.out.println("低电压插入：" + params1 + "	数量：" + (i+1) +"	原主键："+map.get("sus_id"));
+					System.out.println("低电压插入：" + params1 + "	数量：" + (i) +"	原主键："+map.get("sus_id"));
 				}else{
 					System.out.println("!!!!!!!!!!!!————出现异常————!!!!!!!!!!!!");
 				}
@@ -127,10 +135,62 @@ public class OriginalTask {
 		}
 			oldJdbc.releaseConn();
 			newJdbc.releaseConn();
+			fileCreate(fileId,numrows,"1000001","台区停电明细");
 //			//递归处理分页
 			System.out.println("<----------------电网台区停电数据导入结束--------->");
 		
 	}
-
+	/**
+	 * 文件表插入公共方法
+	 * @param fileId  	文件id
+	 * @param number	数据总条数
+	 * @param type		数据类型
+	 * @param fileName	文件名称
+	 * @throws SQLException
+	 * @throws ParseException
+	 */
+	public static void fileCreate(String fileId,int number,String type,String fileName)  throws SQLException, ParseException {
+		//当前报表库
+		System.out.println("<----------------文件表插入开始 类型:"+type+"--------->");
+		OldDBJdbcUtils oldJdbc = new OldDBJdbcUtils();
+		oldJdbc.getConnection();
+		//插入语句
+		String insertSql = "insert into dw_file_inf ("
+				+ "DFI_ID,DFI_UPLOAD_DATE,DFI_FILE_NAME,DFI_BRANCH,DFI_CREAT_USER,"
+				+ "DFI_DATA_NUM,DFI_TYPE,DFI_STATE)"
+				+ "values ("
+				+ "?,?,?,?,?,"
+				+ "?,?,?)";
+		List<Object> params = new ArrayList<Object>();
+		//当前日期
+		String date = DateUtil.getCurrentDateString();
+		//昨日日期
+		String yesterday = DateUtil.yesterday();
+		
+		//id
+		params.add(fileId);	
+		//导入日期
+		params.add(date);
+		//文件名称
+		params.add(fileName+"_"+yesterday);
+		//默认机构
+		params.add("88888888");
+		//默认管理员导入
+		params.add("10000000");	
+		//数据条数
+		params.add(number);	
+		//类型
+		params.add(type);		
+		//状态
+		params.add("0");
+		boolean a = oldJdbc.updateByPreparedStatement(insertSql, params);
+		if(a == true){
+			System.out.println("文件表插入：" + params + "主键："+fileId);
+		}else{
+			System.out.println("!!!!!!!!!!!!————出现异常————!!!!!!!!!!!!");
+		}
+		oldJdbc.releaseConn();
+		System.out.println("<----------------文件表插入结束 类型:"+type+"--------->");
+	}
 	
 }

src/main/java/com/minpay/common/action/RunOfflineService.java

@@ -23,9 +23,9 @@ public class RunOfflineService {
 	public void execute() throws Exception{
 		Log.info("跑批任务开始...._-------------");
 		//台区停电数据导入
-//		OriginalTask.tqtdData(0,2);
-		
-		
+		OriginalTask.tqtdData(0,500);
+		//低电压 
+//		OriginalTask.ddyData(0,2);
 		Log.info("跑批任务结束...._-------------");
 	}
 }