diff --git a/RunQianUpdate/CcRpx/010普通高中学生数.rpx b/RunQianUpdate/CcRpx/010普通高中学生数.rpx
new file mode 100644
index 00000000..f1aea1ff
Binary files /dev/null and b/RunQianUpdate/CcRpx/010普通高中学生数.rpx differ
diff --git a/RunQianUpdate/RunQianUpdate.iml b/RunQianUpdate/RunQianUpdate.iml
index ee03f067..a8698d59 100644
--- a/RunQianUpdate/RunQianUpdate.iml
+++ b/RunQianUpdate/RunQianUpdate.iml
@@ -10,6 +10,7 @@
+
@@ -45,6 +46,5 @@
-
\ No newline at end of file
diff --git a/RunQianUpdate/XtRpx/010普通高中学生数.rpx b/RunQianUpdate/XtRpx/010普通高中学生数.rpx
new file mode 100644
index 00000000..b4d41d4e
Binary files /dev/null and b/RunQianUpdate/XtRpx/010普通高中学生数.rpx differ
diff --git a/RunQianUpdate/reportTrialLicense20221231.xml b/RunQianUpdate/reportTrialLicense20221231.xml
new file mode 100644
index 00000000..cf8b60b3
--- /dev/null
+++ b/RunQianUpdate/reportTrialLicense20221231.xml
@@ -0,0 +1,29 @@
+
+
+
+3
+"润乾报表"
+3
+4
+2
+"2022-12-31"
+
+2
+
+"仅限学习试用,禁止商用"
+62
+"oooo-oooo-ooxx-xxxo"
+1
+""
+""
+"北京润乾信息系统技术有限公司"
+"http://www.raqsoft.com.cn"
+"010-51295366"
+""
+"2021-2022"
+"润乾软件"
+""
+""
+"V2+VB9wpl/PibMxAm9p8weAQCI5+aQwH0V//f+cMeqdknWnDmHy+LgWpQwUueAnlw83xBVcTlbpQxE33E8YUCGRBNYcsygf89qd0v2oL0g1yfb5ms+phiSq285rdeUjt1vmEiClG9mrYnThqGA7FheEE+3AP6S7Ase1hKxzb2xI="
+
+
diff --git a/RunQianUpdate/src/HtmlToExcel.java b/RunQianUpdate/src/HtmlToExcel.java
index 4cf44b12..607b4e7f 100644
--- a/RunQianUpdate/src/HtmlToExcel.java
+++ b/RunQianUpdate/src/HtmlToExcel.java
@@ -61,6 +61,4 @@ public class HtmlToExcel {
fos.close();
workbook.dispose();
}
-
-
}
\ No newline at end of file
diff --git a/RunQianUpdate/src/RplaceChuangChunRpx.java b/RunQianUpdate/src/RplaceChuangChunRpx.java
new file mode 100644
index 00000000..076637bc
--- /dev/null
+++ b/RunQianUpdate/src/RplaceChuangChunRpx.java
@@ -0,0 +1,69 @@
+import com.raqsoft.dm.Sequence;
+import com.raqsoft.report.usermodel.IReport;
+import com.raqsoft.report.util.JsonUtil;
+import com.raqsoft.report.util.ReportUtils;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import static com.sun.org.apache.xml.internal.serialize.OutputFormat.Defaults.Encoding;
+
+public class RplaceChuangChunRpx {
+ /*
+ * Java文件操作 获取不带扩展名的文件名
+ *
+ * Created on: 2011-8-2
+ * Author: 黄海
+ */
+ public static String getFileNameNoEx(String filename) {
+ if ((filename != null) && (filename.length() > 0)) {
+ int dot = filename.lastIndexOf('.');
+ if ((dot > -1) && (dot < (filename.length()))) {
+ return filename.substring(0, dot);
+ }
+ }
+ return filename;
+ }
+
+ //读取测试报表
+ static String sourcePath = "D:/Work/dsMin/RunQianUpdate/CcRpx";
+ static String targetPath = "D:/Work/dsMin/RunQianUpdate/XtRpx";
+
+ /**
+ * 功能:将json文件转为rpx
+ */
+ public static void Convert(File f1, File f2) throws Exception {
+ FileInputStream fis = new FileInputStream(f1);
+ IReport report = ReportUtils.read(fis);
+ fis.close();
+ String json = JsonUtil.getJSONString(report);
+ json = json.replace("长春", "湘潭");
+ //另存为json文件
+ File fJson = new File("C:/json/" + getFileNameNoEx(f1.getName()) + ".json");
+ //System.out.println("json文件:"+"C:/json/" + getFileNameNoEx(f1.getName()) + ".json");
+ //System.out.println(f2.getAbsolutePath());
+ //System.out.println(fJson.getAbsolutePath());
+ FileUtils.writeStringToFile(fJson, json, Encoding);
+ JsonUtil.transfer(fJson, f2);
+ System.out.println("文件" + f1.getName() + "转换成功!");
+ System.out.println();
+ }
+
+ public static void main(String[] args) throws Exception {
+ // 设置报表授权文件
+ File flic = new File("./reportTrialLicense20221231.xml");
+ FileInputStream lis = new FileInputStream(flic);
+ Sequence.readLicense(Sequence.P_RPT, lis);
+
+ //遍历所有文件进行处理
+ File file = new File(sourcePath);
+ File[] fs = file.listFiles();
+ for (File f : fs) {
+ if (!f.isDirectory()) {
+ Convert(f, new File(targetPath + "/" + getFileNameNoEx(f.getName()) + ".rpx"));
+ }
+ }
+ System.out.println("保存成功!");
+ }
+}
diff --git a/RunQianUpdate/target/classes/DeleteBoldTitle.class b/RunQianUpdate/target/classes/DeleteBoldTitle.class
deleted file mode 100644
index 921a1902..00000000
Binary files a/RunQianUpdate/target/classes/DeleteBoldTitle.class and /dev/null differ
diff --git a/RunQianUpdate/target/classes/ExcelTransformHtml.class b/RunQianUpdate/target/classes/ExcelTransformHtml.class
deleted file mode 100644
index 3101db04..00000000
Binary files a/RunQianUpdate/target/classes/ExcelTransformHtml.class and /dev/null differ
diff --git a/RunQianUpdate/target/classes/Test.class b/RunQianUpdate/target/classes/Test.class
deleted file mode 100644
index e2b9b665..00000000
Binary files a/RunQianUpdate/target/classes/Test.class and /dev/null differ