From 4d84fada5fba522726d0d29a4967d2d64e11200b 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 08:02:49 +0800
Subject: [PATCH] 'commit'

---
 .../C67F1A88-A247-459B-AD26-D5BAB3A371EB.xlsx | Bin 0 -> 5798 bytes
 .../EF737C21-0DDA-43AF-A602-AB00B01BD391.xlsx | Bin 0 -> 4180 bytes
 .../Controller/DataEaseController.java        |   8 ++-
 .../base/DataEase/Model/DataEaseModel.java    |  61 +++++++++++++++---
 src/main/resources/application.yaml           |   1 +
 5 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 WebRoot/upload/C67F1A88-A247-459B-AD26-D5BAB3A371EB.xlsx
 create mode 100644 WebRoot/upload/EF737C21-0DDA-43AF-A602-AB00B01BD391.xlsx

diff --git a/WebRoot/upload/C67F1A88-A247-459B-AD26-D5BAB3A371EB.xlsx b/WebRoot/upload/C67F1A88-A247-459B-AD26-D5BAB3A371EB.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9c737dd002f34919dfc659c799d66d179efe3b3c
GIT binary patch
literal 5798
zcmaJ_1zc2X(+8K%U07X8I+l<HL<Es=VWp8J1*JhiV(IRXmTpB{LPbzSKxyeN1t~$w
z0HjO$JB#<e^7_5^&i>Bs{+=^4&&+@3JZEM!R6qn!JQ5NTJSQnjeY{gd3;e$&hjDPV
zbZ|A+_HwjzF%<N)w=37`a%dC+AEdMo^NDS0=$s9bV`)40Y!h_bC+X%-u9uHjcMOTe
zlQkpBoYu|nSl!Xvwy1EbFpxvi`Zl%tHuJ6WS<hDA^Aj*y@X<9*HBw=`Dr!gGe&<7n
z86!S_;nqlr^tYd^1cl5G<eAw$kz?@>x?NQtMrdBJB%W~>t)k`oNg+L4X<afuM`}=6
zTIv010yclIgRU4Yq9yQZdrz@!l6;-OeaZyGJ_!!e>0{I!Eti9fINfV<GL_JpV5H=x
zr#y~2H}(<Uf327)#Svb};Ch}Gq9s<+Cy~ZmudEOp-0p%z$BWiC?+cwfOY^|;W&})v
z*)3W)XmA8%VI{FG66D_(Y4l+Q%*gK#ev!_BS&HOM#sfL`koI>z6g^7b*Hi531E&se
zAgG#-5c~M@!UD5$RKmV1^OrSLh)EIz;5Cx?czEXt@bEPL5qoj~dt+xyI~Rl??z=d#
zK^Y_rzGuwUU7KZ32(cN9CaH}aB&JImohZptRlGh?SKAO>VRx-zR_NmAW8n^WnQ*0A
zEy3*EAh!>}SnJW<5k^l5=@-kgXB)md&L|S8Yn#-MOMeK})a#tmLZ?8YgRXH-*c$$j
z#aC&HG+T0g08+l-@{)E8;`2VMqIPJP2h^LfFhwyJax3JD*|HKvchb?+)jE+lwU&>q
zyaO0y<zh`faRnv_D_~))8ffG`>RT;daU)}qyI}LPh$uNq!6D`D8Oyb;8NC>Xb1?!|
zds*+d6b6C_&Xf705uux-EF*qraOgOQkf?kCd{;j6Z|Hyl4hxLAhBL;|1!3ywh)YYg
z`we73TFS2kAA_ASZ@j??qWP@BJU;!@B=aAMGSw7y=f7noc|V~4x~BbR4^<;<345AS
zU6pXA<KDo)>y)_t{41U6n9Fw++04ws^^=Le==OH65yUUWOwLtxYp3#ZV%|1yh6<_m
z&Pa@;DVU91?!kAo%!9P?`3Gq}mu_v*Z$cq=2B3L#4tj*gwZV@<j)3qIlZZKluq6TJ
zz6Gv-4maeqL*^J~OPojc@e|6;Lg4Gh`Ezv-3ofufUSjVI&Urf(HDjpQS}}4EFJHaC
zUEo$c<()Ps>5}fd^);t;j`kr-i~~uJb7Ic9>r_>??H~NJj1rrPUvRO+w%%hJNK(5+
z-WBTf)}<9o4%*}NF0*PB%cE`(!9#d!f3iyG7xulVz6O5z0@T$axdM*5T8|eNq{1xT
z-8lH-y0fP8E54<0MpzIukb`fq0n`IOD8+xceoQ6Mq0D?xqWMA8QmfL@iGvKW;}O@j
zKA-cgo}AO(PxIn*JaMuTw8XLORpO($%9^@SjMA++RElQi*P%MNzD{YWcky)Jfxv+@
z<FHW+(p%M?`pv~R(!-9rF8hQy5E1zWb40*1^9s2B8AK=mqNg3g#oE-_(n8DC*~Y=j
z1&5=b?u0t6DY*9X+WE{{kL~^OmA103u*e%Z)cx<s)V`mqj$Wf#DU?-((nJQEVAJWK
zw6Q67eKQ=$G1K6hR})Q>OWoO+UXQQcWj$eS6GN@JMaHh)Ui^ui*z2i??bIu~&iqvY
zE6W#HF63Rth(=@W1hzkJl%CCKz8<?(v*9RJ?Q(XF?e40C*FcnRr}L6K6D*ov|Bayr
z=0camM$Yg`g^K?YqOHY1#ujmwUtiZ<&zvhXwt7jOIll*+B-Z7+=caw$PHa}hzBMi3
zx%Jk@xaX#ip!d4z`tH7+YpIWc{Xu4IHjBNQ`;qo7tD&hDJBO>jVp5WI%h6rR;R;Ey
z5EkhyE#$MzmFG{!U!$LeP;eeeT^#*+tYTM}y<Ag_u)ff-ck%r~kHS~dg!km@Rm@jL
zCnN((bq+nLb5aSA%*+p|E9l){9Xog*SW;!Ym1TfP`}G?1TniP`cq&Som$;YwRg<b;
zJCj0D330X(4^Fk+)|BKW6&yxU%>6`zSA}7qf6m^oQ&NuXouG7WA)9q<=s_8W4IXhq
z{2Aq#a6}u2Sewx$rormw1k^Xab1j~(tE4`d`}vnviA30_p<>xICe(z)Z4$(`Yk`Zq
zx?Vw}`tG#Wd9I%V;<ZQ}R7w&#-#U@}U}|qc;~fqfX$2Rc;t7Q2)2(G=of>C5wk#mM
zjAZYa#ULY{sb>-mRz)05vfG2qG*uMH%B~R#h&FM8lXi1s^QZ1o4AaG2u(|t@JrmI}
z&Y|d-9CQ@lz&WCqDzJGrjy0#TPDGaMPREffjkkznKAE$%gQ$(GWW$&K!s@cK3$L4_
zhmyi8-Y;BP^z6@;*9^X*Kw5hL`TkbSuJP?X7%q(|TW-jO0SDU#>A$5h<zH#+>Sbqn
zlE3BJhAK@$P(RoKHQUOITbEIJOR|q=Hn@Lgmd`VED=3u?>@C(Rjk&eo6W_|O+}V8K
zf^o>??$UKEdom`(rFAt+RTx{U!Id-)t$(qR<x|uB;w6o_q`Kav{BuFbOz7}OF>16$
zR3@1jcj052No{3vGq$1ecG1kl_u>gt=&KJWQNcoyujQBJ1&gkQjVWc#@ZK-Y({z^q
zDvqabCf%RyXx+0#REBiQha_>?+hol6ge$RIn@B-=#WKBQ*y&czFiF1i7~3F7QkE1V
z(`nqu>w6r8vNoaBeD1L+5@IwB11Y!entm3hl1&wDHYl{DB3+nu8}5gyaP2o{?@(5A
z?j7nUEh|pL;5F!~&=3~o&olU)H0u21XL>5iZx!GD)S6PREUO_>s*~twB>`_8N{Bzc
zZK8OIX@@tHe>G*3{26Am{?LR>Mqq$gXffEi&bjE#g3u~GMNP5BTXIBxHBq}CtsKdd
z!SDud&fepZ3!W^ay@*njz1ynHlkA6R#Pv(;YE9L*E3Y3=lD^CRc0cXw?XaJHeDa6d
ztPBB$qdX@st~ut}$H4Kl@~^LT>R++-z&P8QVKBD1(<%1;wHr-B6k#ih2jT4=sZelm
z;k+P;&1KHkWuuuF1DSbIO|5-AOM?vwNr#)+GWB;3mx!IP&4NUfL&`xpCRn%WoN1SR
z_Z^DG?d<}IHrG#Wo=`59n{tmfZmM(?@Wj<bafHpd3VU^<3PR?DAqLBlr7Ux`nm69(
zk~^{u&dbD%xb^niiW+Al>ttyt(^YOQPqg<NW!3VS3Ttg)nJ>AD3kBI_b&N_}*}ym^
zo>6n>8JjT*$#h=7;kaC*3h7U}7iaTQHg8Oy(#D)cw)?1{{VunFm9y92ulHZGI5+D!
z;I+}e9^DMTaQRj7oJQwY^^>4x3qT}$95vwQ^uB>E*8ySPZ!6;;Sdt<x`YJZRysQ3Y
zb<;;#V#!U;m{lL@vfBZ%Ay?2}rHMdlIw4q-+(kL7sgh$)Z^D+~hG{T}K0U&;*1*9=
zme+V>CsN0hKx_*2KI@~MRBXGBDzvj8)=QqZ@6&wfcEtI4lwtjM->yIjE&B&SHBOXI
zrM}*8#`Ec(b5B%Z&?CI9tA#zbHXq+koy<LC;%z@)o!xNlbDaLC=62EkS^m0b0rQUn
zw!Wpu{fL}1FuK0+J&~p1()GR<wN)p@fz=}R=@8($=)YDwbicsC!Qx_VY3b?$yyAc#
zVO;hUKTyMrUx%W02=`bBmTWWRdgDp$h?O`V8$#iGm8te)=ggGuH8=0>rdY_`*jOg?
z(z5t4)-nCzLHoJ5js(P{pP}^qy0WY#v)U>qnANvgbaj>fXF=VawAuRO%)`N$&xVIT
zn_4!!H*EI%D<-Tx-re<)@c&-*<V{k?_SeUTy>F}*pSYLrXH{?Akyvqm<gm;${zOf(
zUW%#A_d)2!hNylo?D^VI%aYmXi|sh^u`-Xe*`1bg{fDhd&!a&HeOSNAY~QP6GTU3;
zhc?F@FW;oiPB2vOZarEu_xVs>-B;c7%{^d~fa=lt)Q$Z+uH%zEGBWM~MUMh(U^~<k
z>X(*pdk{|)vAhXCzMmR>SpUwm>_LFk!LgUqxYQ5n!d@h8bUKnL&OsVey|w;1tzP2l
z^7pC<_tz+^F7aNnm#-T=(sk;3`RbdB7Tk0#UuV7+NqNj$=cViW@N9ik)%(Sw&0{My
zqwL<Mq+_Sao|l4Ri{A$B9Q!UaTOT*<Ph6~)G?8SsH$K|z8rp4{>pJS!n*q_F)DL3h
z+au!?lO=>v*v?3Lnl(jLcO!*L$7FJz@X#i<jt(}oqy#4ePk1vUPq_T_QHoWqVu2p>
zmh#nBsY@*2HGf4<nRTJ%-G?;I<lF2SCT`H8Rk|Iw4SWb9A{53+JzMv)fM6}SR*{=7
zE*KIQsSf_n4ai?N((eb8#yNEz2S&i;8_5&Ho!XOGjY?o01dF*QQa@=zLU-h_jxSkR
zAfygkS|Tkc+qgjO?ipKv*X~(FT$bm2+m?~YI|+zTd}gBjOi|y-Iz!n3#zZKtzRb0V
zy8Htr(lqm_cl}!vLNs(O(Jtl<r)pr5RK~2-e#Y%hPOGSC7*k^)oF0U2CkPlbagi-c
z>p)$wkD9JvBk^RX!R~Oz$oPPXq_&!Qi=4>VoJl~~h#a`-T?AjUx=d2E!6Fp-156|j
zxrT21`GM;eRm4Jv*3Atla`W#+F{>_ow3Hv2?IUCa3$PPAJW6$bKkx#v{1yRUQBc%0
z2|KWn=DEovp(7?`y3IkArzKFn&~xk*5$wU((4f~(`{fQ*1@EG?NtER2z$gL~DaZ=V
z7QL5ouovite%B5^w1t>XG2qkBqUdLD<c2no6MDl47qP6a5K~zw1j-d76I=Qv@aZIK
zdM+`}u}9(U_Yg(WG(Qp$%s-i5=D&DR1?xPp3MTMSHT))w@Nx7nZ$(m$>638=3zB_A
z;d6kDqwiHm#NwkZ_yQQXD54e&p+(Wb{islU^!ux<QL0~V<l0HF7J8sd1j(8V<>L$2
zvF(98^t824`ca3f%QlA4P(gNzD0UFmg5m)xOmM-<8U4##4JbXB%X~_J&lN3`^!a9q
zAYa%bPHp462||(9W1-Ge&<<=<kgqse8L%w`Pz$G@^$9vL4Or})7Gx*!PQ1AWYbBxe
zLzGCc?osYEt2;!In#$9Oa=E;NW_%9`>cQ8ljZx;$)r502=I~~K3fkr0lEU+V9kUD=
zQX0Abv-*g_jw*e@UfX~%1<42@QtMz6LUHf0)Q&O<4b46+6Xy$`jbMc<FURaYHxG@h
zyAK%TeLh83Azwow^qQ7)IE89Lq;%Yf_dD&r-1qBGq3aPs*2>GtLA)XZJCIw{=?i|^
z`Ybv~76_3lDX1W3ZQ|WW&_3;^Y@t9rA6q<0NWq)~eR?9lf;1CO2O_VN>=}a~XK)U@
zQeX~|0O8*IiUU7PTc1q_$p+Y$a7{~7akYgXstLG~{ewkQ3``mZIF90OfW0h@RXou^
zBgp)>E4vF^6q%>wJHBuL4(={kE&>R}^YQ21eH%{_jGfD-{}ISR{UtX|2wn)&v<%Ze
z(aLqX2f&jc>o61v1W=1VPZ`b$;8|%)RM5_8Tx%y~0x*{$qZ%JxY7FGf0*x~!D3#Qs
z;d%btm&=h+Cl)Im2J(t@=pk@mgh7krXB^pt^VYCUw+cyT&KI1yxM<~kgFFvTKx6tV
zGkjTI;SyP4U=L2_Cr<}GKWVNO&ybB~i`xSpW{XGVr30B3lo4b;#T^%}7%Skia2Q>7
zB?@^SLWBz6xlNn5?bMtK!g@2IqI1QW6e#d-n66whpHk6_$o1!jm5WCqnE-Ucq((xY
z`4N>$m=w05%l=-hJ+)XWuH5*A1LxPQ8mZPkg@wyh55${^D>|368DiS6Jrb{$K4!(5
z1u8gM6vb_YHdPQaog!2+xr2M0-I7DEuv28RhZM9A)_IJcB#DJra_CiHk<6!*RIBM$
zdZ;uG*~MJW%@du;fKDD9R{l-<1L~9U1vMOMBsk0?;XkEyCesRFnx#nPrm$u(_-utG
zEs=5jNodggd7MxhoKb0N>8-<3CtxQR#V2Yg0%>Y$E@sN`Xy;eB?8CIl)8a@#1$Or@
zbE(cgPZKg3>zgakRV@F-YYXuH9a?~w8b%{0t38sXM(25rCS4zQ9I_4lor)I!r4^Tl
zXWgx63)Z~)J_4w)4FO6WLt=%j`Rw|*PqwlK@&#wW3F|hFb*KwqMY5@>`%`v)IH)_c
zud6gJs>oe*8!k>uo85SQSU)`BJyD)@XjP4g2zU4QIhcD@yGS+YS?0ByFA*MBz4c-7
z)xPmt=Ytkmy<>b_^?Q53w<LrF4^LGQ*V*8of#UrhDV`p9;YN!8P5)!S_@{!?Ga=ku
z>^J!WMdhg}*`I=^XD_&s(QnEG3a&o~NPkM79y;LWGr!3ebV~Z~Y0aPFr<*<8Wa2lK
z04>7*np6C#!QoU(folqXlLzrH4gYBo{}er4b>n)D-=qcfp1|g(YwSOTPgkY5!u&Vc
slAQ?uLz(`kp3_Nzt6_gr1Q5o*jQD>Qt%eFA5ss4-_{acZLZ5*5f8g1i4gdfE

literal 0
HcmV?d00001

diff --git a/WebRoot/upload/EF737C21-0DDA-43AF-A602-AB00B01BD391.xlsx b/WebRoot/upload/EF737C21-0DDA-43AF-A602-AB00B01BD391.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a18bce77687e85a5d343c7bf7a5744959ae6bfbd
GIT binary patch
literal 4180
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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 bbb8542e..dab0b3ad 100644
--- a/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
+++ b/src/main/java/com/dsideal/base/DataEase/Controller/DataEaseController.java
@@ -49,11 +49,15 @@ public class DataEaseController extends Controller {
         //发布的地址
         String publish_url = BaseApplication.PropKit.get("dataEase.publish_url");
         //先更新一下数据表
-        boolean success = dm.updateCity(dataVisualizationName, city_name);
-        if (!success) {
+        int res = dm.updateCity(dataVisualizationName, city_name);
+        if (res == -1) {
             renderJson(CommonUtil.returnMessageJson(false, dataVisualizationName + "名称的大屏不唯一，无法完成更新操作！"));
             return;
         }
+        if (res == -2) {
+            renderJson(CommonUtil.returnMessageJson(false, dataVisualizationName + "名称的大屏并不是隶属于云南教科院项目，无法完成更新操作！"));
+            return;
+        }
         //拼接一下URL的最终地址
         JSONObject jo = new JSONObject();
         jo.put("city_name", city_name);
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 51e1aac8..1f6ff990 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -1,5 +1,6 @@
 package com.dsideal.base.DataEase.Model;
 
+import com.dsideal.base.BaseApplication;
 import com.dsideal.base.Util.ExcelCommonUtil;
 import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Db;
@@ -16,9 +17,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -99,16 +98,22 @@ public class DataEaseModel {
      * @param dataVisualizationName 大屏名称
      * @param cityName              城市名称
      */
-    public boolean updateCity(String dataVisualizationName, String cityName) {
+    public int updateCity(String dataVisualizationName, String cityName) {
         //取出大屏的ID值
         //云南省教育决策支持系统
         String sql = "select * from data_visualization_info where name =?";
         List<Record> L1 = Db.use(DB_NAME).find(sql, dataVisualizationName);
         if (L1.size() > 1) {
-            return false;
+            return -1;
         }
         Record dataVisualizationInfo = L1.getFirst();
         long bigScreenId = dataVisualizationInfo.getLong("id");
+        //这个名称确实是存在，但它是不是我想要的这个云南省项目中的大屏呢
+        Set<Long> set = getFamilyNodes();
+        if (!set.contains(bigScreenId)) {
+            return -2;
+        }
+
         // 配置的内容
         List<Record> list = getMap(bigScreenId);
 
@@ -118,18 +123,18 @@ public class DataEaseModel {
             //获取城市编码
             String area_code = getCityCode(cityName);
             //修改前
-            System.out.println("修改前=" + jo.getJSONObject("map"));
+            //System.out.println("修改前=" + jo.getJSONObject("map"));
 
             //修改城市编码
             jo.getJSONObject("map").put("id", area_code);
             jo.getJSONObject("map").put("level", "city");
 
-            System.out.println("修改后=" + jo.getJSONObject("map"));
+            //System.out.println("修改后=" + jo.getJSONObject("map"));
             //写到数据库
             String jsonString = jo.toString();
             Db.use(DB_NAME).update("update core_chart_view set custom_attr=? where id=?", jsonString, id);
         }
-        return true;
+        return 0;
     }
 
 
@@ -383,7 +388,7 @@ public class DataEaseModel {
      */
     public static List<String> getColumnNamesFromExcel(String filePath) {
         List<String> columnNames = new ArrayList<>();
-        try (FileInputStream fis = new FileInputStream(new File(filePath));
+        try (FileInputStream fis = new FileInputStream(filePath);
              Workbook workbook = new XSSFWorkbook(fis)) {
 
             Sheet sheet = workbook.getSheetAt(0); // 读取第一个工作表
@@ -434,4 +439,42 @@ public class DataEaseModel {
         String sql = "select area_name from t_dataease_last_area where id=1";
         return Db.findFirst(sql).getStr("area_name");
     }
+
+    /**
+     * 获取云南教科院项目的根节点
+     *
+     * @return
+     */
+    public Record getVisuallizationRoot() {
+        String rootName = BaseApplication.PropKit.get("dataEase.dataVisualizationRootName");
+        String sql = "select * from data_visualization_info where name =?";
+        return Db.use(DB_NAME).findFirst(sql, rootName);
+    }
+
+    /**
+     * 递归获取所有子节点
+     *
+     * @param id 节点id
+     * @return
+     */
+    public List<Long> getChildren(long id) {
+        List<Long> list = new ArrayList<>();
+        list.add(id);
+        String sql = "select * from data_visualization_info where pid=?";
+        List<Record> children = Db.use(DB_NAME).find(sql, id);
+        for (Record r : children) {
+            list.addAll(getChildren(r.getLong("id")));
+        }
+        return list;
+    }
+
+    /**
+     * 获取这个项目中有多少个节点，都是什么号
+     *
+     * @return
+     */
+    public Set<Long> getFamilyNodes() {
+        long rootId = getVisuallizationRoot().getLong("id");
+        return new HashSet<>(getChildren(rootId));
+    }
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index d61dd626..5f48ab56 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -23,6 +23,7 @@ redis:
 
 # 数据可视化
 dataEase:
+  dataVisualizationRootName: 云南省教科院
   dataVisualizationName: 云南省教育决策支持系统【市州】
   publish_url: http://10.10.14.203:8100
   ShiZhou_url: /#/de-link/X4l1qGNH