From ca3e74c7f82ceec90f2e4f9f7f1cbcd867b197e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 5 Nov 2024 11:39:31 +0800 Subject: [PATCH] 'commit' --- .../238463B8-A635-4E1D-85F8-91092E0A60AF.xlsx | Bin 0 -> 3988 bytes .../69E3851E-9A96-45B1-BE26-DF82C87FF715.xlsx | Bin 0 -> 3245 bytes .../79EC54FA-EDBB-4524-AC1B-47CDA620C67E.xlsx | Bin 0 -> 4474 bytes .../Controller/DataEaseController.java | 4 +- .../base/DataEase/Model/DataEaseModel.java | 47 ++++++++++-------- .../dsideal/base/Tools/Test/ExportExcel.java | 10 ++-- 6 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 WebRoot/upload/238463B8-A635-4E1D-85F8-91092E0A60AF.xlsx create mode 100644 WebRoot/upload/69E3851E-9A96-45B1-BE26-DF82C87FF715.xlsx create mode 100644 WebRoot/upload/79EC54FA-EDBB-4524-AC1B-47CDA620C67E.xlsx diff --git a/WebRoot/upload/238463B8-A635-4E1D-85F8-91092E0A60AF.xlsx b/WebRoot/upload/238463B8-A635-4E1D-85F8-91092E0A60AF.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..b8f90cf513b6ddc391f55cb9d099e60c3a02bca4 GIT binary patch literal 3988 zcmaJ^c|6qp7RFd65;Ctf`@W5#AzSvbW*b{%&)AZ|Ad(nDBm2@~D?)GHEGZ-=G_sVP z#E@lp6S8IB?@ZnMa@|{JKEIjyW6pPe=Q-#1JkK#T1W_{*ZzhBZq z`UD_+0vs(ud=V&naPU>{O7jmsZy}7k8LgkhXNTSgty~$xB(xovqEyAFPQ_&TbF5kaHU@g`gn>L0>bAZ=O{BRO3-TGj+nY zrlRKh$Y<7>m^QW&Gg))V=j+>gFGuOVQwEJYA^Arc(Ux7D@S#dAQCYtjoS(Cz`Dadg zVRrh1I2QbXXtzemnG9diVvYbVW+rp_@-D@DV)X{Pk&&$^O|xWZebWwv<&V?Zh>N#b z6}bcN$e{ZN0j}$2#ZT^NVHMMh4En~bIR1(5R?v2-$kf5(aL_c_r0^c`!x4_%CR zKdnfg!tG1%kZa3GPHLT!xv@BN&eV_wm?9}!r%X;p#zjd+X8KF)>4?}n`Xjti(qPhi zNou13K!!2KQK%i8b(Mi2hHEZVT3Tdj4=zK|6#|se-K|?oc6{<`g%n28*j>$slV7fjTUKEJsHG*}#4@bMkpw2YXvznRCO1qxT{$<&sdK*?JgJAtL zqxN+QMO#cy&x?$tokFGe#>jJCdVDS}u{P;6e_M67FHxo7g4~}B7PGM|4X&`oed7AxzPhEVDqu2I>1IgjM^u*mj)>B6UCQC zyxmvC>(}jOI$F?Wq(6dG(beQ(gC+t=#?6=A?OWZG)(`b2?iInuCXL{HnQr zOW|7i#sE4AK$)&0>^tK%((+Y-Phy7H}he%qx)Re z2Maw0kMQubs5umDzklS$kExKf9xkIMJ~PjW*RMeY5kU<0mPUCv`y*V<1N=RG+)*SP z!_0@_eWswWYt7-UQ#p3VO>}87H14|;dlAMM=vl$1Mzfo2P4XA{(&YoVg19Qfe{_T-F;bAa9yB(P?_2sKb z5>Lm-lj*|YYHb|kX{19>`Ab9zl{(O8>AHOAhO-Mll*J+#lVsoZ2E zEJ80DGs?$-!X=f#!@Mh>Ukg^vrj62xqDr1HPRRC-w=a0n2=)wm1Snn9u;#W`xbGzZ zv2YEiTFw!CyQn6R)>4kf=q!jYT*FN+DD=&6l_-ps6=;b_;@ujtvH!|LM$ zTVoW~3Trl2vr$N&OyLh!zAvBPAwuRVSr=sTD@=vbhC%hED_Nm+?WJX>FDn~c%N4Sq zH8Vk<2ILvcT;nonU4)DCPLEm`(7Et^9BzeXruHhNjGL+CjKU%zm>1d$+Tdpz(RlqV zf>>fj0o-5vivpRAi)weSuSdrk^-E2^LZ&pKtDX-Cp|Se>9!}?(I^{D%)cDyJDb6T2 zT*I$WrWq(hXf5Ba6m;dGVIEG*@V~CD%0@X%umTL4x17ghPO0C8HrW;(|xUL(yJl?LjjvK5x8 zzV3>m%^y>e5A2-u~8lWFJ zBhxGqc zohAig-eF?Z4!xd8B@oOM$8Rl2So8$`06S+Fijl3)J=i6TG)P{B^$72I?-6&%YcOm<#oV|-(Q0{xRg5jOCu^X&cc5h>!) z45Ob_BSa0MJGDaYH|40kW&wp=#hdUVQ?S`Mj-fY2lhKAQNYEfbGNjacB>|mku{nrY zT-|-}GEl(vNuIZ594+2&k8azFicBNParK}^3MQb-*)kU6z_!Il`7VVHe^4{hvl0oI z;77izN3=WaPyJnwwuXdIy|89e&Sl-awCGmWF;)2hOHl(p7Zf#&ecL9Hjdkh5AOkVN z_rB7n#)*_|9$>o>=3k{=;waotJa%vBFHL5C+88y$18?9PzxUUZcB5{6eGx*MQLrJQ zM|fB0`3sDbzRFOOoBotM6BvUv(msoJoks2KkGu&NTCNn7$5&%Ydfph_fa0r9bm?t* zQpvb?MP6GMvv#rDueTU?F5I)Cp2RvB zy1W#UqU2DM6os4uM0U799kutQ1?s=!|EyET4>;<8Nn5~S+#vqtk)7ap;!&qbGRTLK zNgVX!cKLYrQHw=#qla;YsGI*}|HqpiPd_TMBp-Gd WObw}s)sc~%AimUyZBqMD`o92?L}roz literal 0 HcmV?d00001 diff --git a/WebRoot/upload/69E3851E-9A96-45B1-BE26-DF82C87FF715.xlsx b/WebRoot/upload/69E3851E-9A96-45B1-BE26-DF82C87FF715.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..41083e27291ac1ab85eb8b06c4a49d95f75c7dbb GIT binary patch literal 3245 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 literal 0 HcmV?d00001 diff --git a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java index a9717e54..b90672d7 100644 --- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java +++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java @@ -147,7 +147,7 @@ public class DataEaseController extends Controller { String dataSetName = record.getStr("dataset_name"); //导出excel String upPath = BaseApplication.PropKit.get("upload.path") + "/"; - String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, upPath, area_name); + String excelFileName = dm.exportExcel(identity_id, tableName, upPath, area_name); //renderFile renderFile(new File(excelFileName), "【" + area_name + "】" + dataSetName + "." + "xlsx"); } @@ -179,7 +179,7 @@ public class DataEaseController extends Controller { String tableName = record.getStr("table_name"); String dataSetName = record.getStr("dataset_name"); //导出excel - String excelFileName = dm.exportExcel(identity_id, tableName, dataSetName, tempDir, area_name); + String excelFileName = dm.exportExcel(identity_id, tableName, tempDir, area_name); //renderFile renderFile(new File(excelFileName), "【样例:" + area_name + "】" + dataSetName + "." + "xlsx"); } diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index f6a58086..ca1c8a9e 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -166,25 +166,20 @@ public class DataEaseModel { * @param dataset_name 数据集名 */ public void collectDataSet(String parent_name, String table_name, String dataset_name, long dataease_id) { - String sql = "select count(1) from t_dp_dataset where table_name=?"; - if (Db.queryInt(sql, table_name) == 0) { - Record record = new Record(); - record.set("parent_name", parent_name.replace("-", "")); - record.set("table_name", table_name); - record.set("dataset_name", dataset_name); - if (parent_name.contains("省")) { - record.set("owner_id", 1); - } else if (parent_name.contains("市") || parent_name.contains("州")) { - record.set("owner_id", 2); - } else if (parent_name.contains("县")) { - record.set("owner_id", 3); - } - record.set("dataease_id", dataease_id); - Db.save("t_dp_dataset", "id", record); - System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name); - } else { - System.out.println("数据集已存在，跳过添加"); + Record record = new Record(); + record.set("parent_name", parent_name.replace("-", "")); + record.set("table_name", table_name); + record.set("dataset_name", dataset_name); + if (parent_name.contains("省")) { + record.set("owner_id", 1); + } else if (parent_name.contains("市") || parent_name.contains("州")) { + record.set("owner_id", 2); + } else if (parent_name.contains("县")) { + record.set("owner_id", 3); } + record.set("dataease_id", dataease_id); + Db.save("t_dp_dataset", "id", record); + System.out.println("添加数据集成功,parent_name=" + parent_name + ",table_name=" + table_name + ",dataset_name=" + dataset_name); } /** @@ -290,6 +285,10 @@ public class DataEaseModel { Record rRoot = Db.findFirst(sqlPara); long rootId = rRoot.getLong("id"); + //清空数据集表 + String sql = "truncate table t_dp_dataset"; + Db.update(sql); + //2、查询有哪些数据集 Kv kv = Kv.by("id", rootId); kv.set("dataset", true); @@ -358,12 +357,20 @@ public class DataEaseModel { * * @param identity_id * @param tableName - * @param dataSetName * @param exportPath * @param area_name * @throws IOException */ - public String exportExcel(int identity_id, String tableName, String dataSetName, String exportPath, String area_name) throws IOException { + public String exportExcel(int identity_id, String tableName, String exportPath, String area_name) throws IOException { + //补全默认行政区划 + if (identity_id == 2) { + String sql = "update `" + tableName + "` set `行政区划`='昆明市' where `行政区划` is null"; + Db.use(DB_NAME).update(sql); + } + if (identity_id == 3) { + String sql = "update `" + tableName + "` set `行政区划`='寻甸县' where `行政区划` is null"; + Db.use(DB_NAME).update(sql); + } //对此表中的数据进行直接导出EXCEL String sql = "select * from `" + tableName + "`"; if (identity_id > 1) { diff --git a/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java b/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java index c98db7f9..a81b440a 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java +++ b/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java @@ -32,7 +32,7 @@ public class ExportExcel { String tableName = record.getStr("table_name"); String dataSetName = record.getStr("dataset_name"); System.out.println("正在处理数据集：" + dataSetName); - dm.exportExcel(1, tableName, dataSetName, exportPath, privinceName); + dm.exportExcel(1, tableName, exportPath, privinceName); } //二、导出市的数据集 System.out.println("正在处理市数据集..."); @@ -41,12 +41,12 @@ public class ExportExcel { System.out.println("数据集个数=" + list.size()); for (Record record : list) { String tableName = record.getStr("table_name"); - String dataSetName = record.getStr("dataset_name").replace("\\","").replace("/",""); + String dataSetName = record.getStr("dataset_name").replace("\\", "").replace("/", ""); System.out.println("正在处理数据集：" + dataSetName); Record cityRecord = dm.getAreaByName(city_name); String cityName = cityRecord.getStr("area_name"); - dm.exportExcel(2, tableName, dataSetName, exportPath, cityName); + dm.exportExcel(2, tableName, exportPath, cityName); } //三、导出县区的数据集 System.out.println("正在处理县区数据集..."); @@ -55,12 +55,12 @@ public class ExportExcel { System.out.println("数据集个数=" + list.size()); for (Record record : list) { String tableName = record.getStr("table_name"); - String dataSetName = record.getStr("dataset_name").replace("\\","").replace("/",""); + String dataSetName = record.getStr("dataset_name").replace("\\", "").replace("/", ""); System.out.println("正在处理数据集：" + dataSetName); Record areaRecord = dm.getAreaByName(area_name); String areaName = areaRecord.getStr("area_name"); - dm.exportExcel(3, tableName, dataSetName, exportPath, areaName); + dm.exportExcel(3, tableName, exportPath, areaName); } System.out.println("导出完成！"); }