Merge branch 'web_backend_develope' of https://git.trustie.net/fhx569287825/aggregation-platform into develope

WebContent/WEB-INF/config/config.properties

@@ -69,4 +69,4 @@ HttpClientConstant_URL_IP_PORT=http://192.168.0.110:8088/jfinal/
 #=============================================================================================================
 file_upload_path=D:\\test\\
 
-file_download_path=D:\\test\\uuu.xls
+file_download_path=D:\\test\\export.xlsx

WebContent/WEB-INF/config/mybatis-applicationConfig.xml

@@ -17,7 +17,7 @@
 		<mapper resource="com/dao/mapper/data-details-mapper.xml" />
 		<mapper resource="com/dao/mapper/config-details-mapper.xml"/>	
 		<mapper resource="com/dao/mapper/dataInfoMoveTmpmapper.xml"/>
-		<mapper resource="com/dao/mapper/pre-data-details-mapper.xml" />
+		<mapper resource="com/dao/mapper/standard_data_details-mapper.xml" />
 		<mapper resource="com/dao/mapper/RegionalismMapper.xml"/>
 		<mapper resource="com/dao/mapper/SystemCodeMapper.xml"/>
 		<mapper resource="com/dao/mapper/VolumeMapper.xml"/>

src/com/dao/mapper/standard_data_details-mapper.xml

@@ -161,7 +161,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	
 	<!-- 批量插入 -->
 	<select id="insertBatch" parameterType="java.util.List">
-	    INSERT INTO standard_data_info ( <include refid="Batch_Column_List" /> ) 
+	    INSERT INTO default_data_description ( <include refid="Batch_Column_List" /> ) 
 	    VALUES 
 	    <foreach collection="list" item="item" index="index" separator=",">
 	        (#{item.areaCode,jdbcType=VARCHAR},#{item.sysCode,jdbcType=INTEGER},#{item.areaLevel,jdbcType=VARCHAR},#{item.dataVersion,jdbcType=VARCHAR},#{item.beginUseTime},#{item.functionDetails},
@@ -175,7 +175,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"
 	<!-- 更新字段 -->
 	<update id="update" parameterType="com.platform.entities.PreDataInfoFull">
 		UPDATE
-		standard_data_info
+		default_data_description
 		<set>
 			<trim suffixOverrides=",">
 				<if test="collection != null and collection != ''">

src/com/platform/controller/ExcelController.java

@@ -14,6 +14,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletException;
@@ -233,8 +235,16 @@ public class ExcelController extends BaseController{
 		}
 		log.info(jsonlist.size());
 		List<String> listPath = new ArrayList<String>();
+		// 末尾 含有 /
+		Pattern pattern2 = Pattern.compile("\\/$");
+		Matcher matcher2 = pattern2.matcher(Configs.FILE_UPLOAD_PATH);
+		// 加上 最后 的 / 
+		String dirPath = Configs.FILE_UPLOAD_PATH;
+		if (!matcher2.find()) {
+			dirPath = dirPath+"/";
+		}
 		for (String p : jsonlist) {
-			listPath.add(Configs.FILE_UPLOAD_PATH + p);
+			listPath.add(dirPath + p);
 		}
 		Map<String, List> result = new HashMap<String, List>();
 		if (listPath.size() > 0) {

test/com/platform/test/ExcelTest.java

@@ -31,12 +31,13 @@ public class ExcelTest {
 		Date date = new Date();
 		PreDataInfo info = new PreDataInfo();
 		info.setAnalysisOfFinancialEconomicProsperity("否");
+		info.setGovernmentDebtManage("是");;
 		info.setAreaCode("321167");
 		info.setBeginUseTime("201107");
 		info.setFunctionDetails("这是一个神奇的功能");
 		info.setDataVersion("2");
 		List<PreDataInfo> list = new ArrayList<PreDataInfo>();
-		for (int i = 0; i < 400; i++) {
+		for (int i = 0; i < 4; i++) {
 			list.add(info);
 		}
 //		InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(templateFilePath), "UTF-8");
@@ -46,7 +47,7 @@ public class ExcelTest {
 		XSSFWorkbook result = null;
 		try {
 			workbook = new XSSFWorkbook(res.getInputStream());
-			result = ExcelOperation.writeExcelTemplate(workbook, Constant.EXCEL_TEMPLATE_INIT_ROW, list);
+			result = ExcelOperation.writeExcelTemplate(workbook, Constant.EXCEL_TEMPLATE_INIT_ROW, 0, 25, list,"id", "workRange");
 		} catch (IllegalArgumentException
 				| IllegalAccessException | IOException e) {
 			// TODO Auto-generated catch block
@@ -83,7 +84,7 @@ public class ExcelTest {
 		XSSFWorkbook workbook = null;
 		try {
 			workbook = new XSSFWorkbook(f);
-			list = ExcelOperation.readExcel4Update(workbook,  Constant.EXCEL_TEMPLATE_INIT_ROW, PreDataInfo.class);
+			list = ExcelOperation.readExcel4Update(workbook,  Constant.EXCEL_TEMPLATE_INIT_ROW, 0, PreDataInfo.class,"id");
 		} catch (IllegalArgumentException
 				| IllegalAccessException | InstantiationException | InvalidFormatException | IOException e) {
 			e.printStackTrace();