From 608098e40f884cb340eb4740909ca6ff1e01d4ea Mon Sep 17 00:00:00 2001 From: revisit Date: Fri, 31 Oct 2025 16:37:06 +0800 Subject: [PATCH] update with init --- .../control/api/DSDSApiVoyageControl.class | Bin 0 -> 2795 bytes .../service/sample/SampleLineService.class | Bin 4164 -> 4397 bytes src/main/data/readme.txt | 25 ++++++++++- .../control/api/DSDSApiVoyageControl.java | 42 ++++++++++++++++++ .../service/sample/SampleLineService.java | 3 ++ 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class create mode 100644 src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class new file mode 100644 index 0000000000000000000000000000000000000000..8d99962a6bfaa73617b3a3a2afd0faeab5486ff5 GIT binary patch literal 2795 zcmbVO+jCPz82@dO_Jk(o5-u794A)+0b5sOM1JzQ5BB5XdL8wqSIosrv7wRm7?SgK$G58@Z+mv3 zBBmY3^|^1mj>j;Ob!Ex)YSMN}OOjW`sw;1s1;HK9T;fIFl?{`349w}e@2=WXSmd_< zr0v-L6hnA;B+n3;aV;@`Fb3n;fB}Y0S=$kF^=d)LE1cpoB(iRiSMpriiVm0&zijJ7 zUJpD0o0>MeO*+^GxCS7;JO zWZJjFD|M}ELe+BYJOw~?ab zqkD6@k-Jl2I6j>1-oBi#?m}jvht;}}nUNN&?%NeJOJ|=ku#aJjHr32o?v<%e2Cx@{ z1`aZ8?aHR5P9I@%-T3uL!9t zSnma1?kI?RK_8`;rc zkvts!9pNV43ghAv?7jX7`{$nE0PTk+BV$brF--P9#MNYf6XOg|ab&VD*_Sxl#PJY* zLuS$#PZ~{p5W;=zPDYY_P0WOFjhKO#CeDU6tu3BnxUHf*e#~(H`NQ$VTr$$qdxFc? z#~)$-XR0IuRp~Jd(z=rX+eMY_rmsENPjA8`QZz;OB8PprNt`MU;vVt8!Vtcvp`(zQ z)hIj&kO|`lTt!|Z^fj*GQ$lGczQlFhAn*I}1r~@GA$&lvgD+H72)SJq6`DfK*7MUfg`k%w>0n^Q;5DG(egCuDskc^h7{T& U=OGAP+zv`$iRcpjx<_697sPuCng9R* literal 0 HcmV?d00001 diff --git a/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class b/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class index 1613deda1e4326fd76dbcf0574864906ebc57b30..e076467569f7acaf97396e8b213bb79414a3541b 100644 GIT binary patch delta 1194 zcmZvaTTql`7{`Av%kH=P@v;c018T$|f#N1(nG!ZOhGfoIH0_1iG(!u0G2pUGy9t$~x)n3JVtujtcr4LTAMH06JZqaO|MG;OrnWki-&q=k$WD2+E zKF$3^6}rQb(PF7gYdn^*S;K>xVIDGPt=jf&nn&CoTY8!kw@-D{@|b4(e~uDC>JZnaRi+#`Yf;kzi3>se4%;P2VM{rKH z;cA;byk_z0v<9B&&70bto=j&lp?TfZhspwPXx?P6xjwW!@U~_jdk=04H7WIxIc2X5 zoX~tG#gc;lz?Yn|_{!`kSfsu-M+r5@FUR5>Bcq9!sa4w8c+m zP}k+3QB;_%y24E8j)kQZ%UWoZSU)9{idW2J7I_pxUX&n~q#DdEg~LM!*ci!iXO_Dn zSq8=lM|?TTvJ8#VCz*S5Jg|$npocxwCg@QQ-7M&F58W`;w{xoGI_Y(tly~MB5j2ox z)N=DW{61%%_2Bnz@7x)DV-s>S6&sEMyCHvPThFh{cRh&(I#0@IIF@ z$rYSt8E06|Svmfj{N{J@e~SN`D^)&?D#QvE<|;LtRq7(HQHxlumT|48_pO9nP0#D? zq9wfJzJZ{3858YYw4Vbqbcw3rAcx3j>1{-LkE}dY11&O0j)2f<4s!&*5Ek+QA4>J8 z+;A?|IW|~STa;TI`-e;C{zbd!5T0psTp9{}LW L{3Ac}3+4X;Cbk=# delta 1008 zcmY+CTWnNS6o$Xu>CBlqvu8?+7Yf*ND^xj9MQ-+?q^XT>)}$svV$vMSq(aAOoeo8A zj#RMX1(hw@s?@4rxmBsaFa<@qXpxZc=9>wRylCQ+k%Y_Ir((jx-s@lMUuXSmt$jx4 zT$<%xxqapw(8!fBcbl`yWdUi;%Pdrsb)<4lU76lgwr$h;b-9-;*QM#EMUm|JpYyXR z-%?pkj~R|W7}==lWs^A@UC_Q+vxQcLE2Ww<>)O(O&ZchDY`0-8;ntj=&9$YwGM30| zUcWEjhWps*@P=Z_2EW&@OZ%CQx~ID~u1%*jyLi(y$7&;Q@wUTm(-T`9dWUz-f!M5Q zAA2-2dEZ=(O^^2>lkMdr2V?$@O{?CAmifA~>oZorz4Q63-=2!If=@I944PVZMdUNh z=M0`mxlKxaYYxX7A}2H_h5R$VIdYaC9eyxry-=Mq19~WaCdzq*Qc*6N#>B&=zbb0X zeq9rBxU8rWSY-|-I#h*8B&%c1L~%eZHp`Ozd9Og{1W7McWLkmD2)z<{rATg&w4hf5 zv{um80Ie4ET7aIN%-bfP@mugRPnfy|&v5enY&L1q{y4V|H|B~mpDdq0) zlq#iOX&Tg2R;k%EDvu`0Mfyczc8k)$RPii&g8kB_MMHc+Nq~m=QW~yMGx>_IDU~)` zIlw`}QoV(5@{AA>In5ysOYjZ}j&M}aF{wEN=Qe8`<~dY4jQ-1_@_%S|*qeO7> array = this.iVoayge.mapBySql(sql); + Map>> mapReturn = new HashMap<>(); + List> arrayReturn = new ArrayList<>(); + for(Map map:array) { + String voyage_name = map.get("voyage_name").toString(); + if(!mapReturn.containsKey(voyage_name)) { + arrayReturn.add(map); + mapReturn.put(voyage_name, new ArrayList<>()); + } + mapReturn.get(voyage_name).add(map); + } + mapReturn.put("VoyageArray", arrayReturn); + return new HmeAjax(mapReturn); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java index fcd0dea..4e2c955 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.helper.lang.HmeGsonHelper; import cn.hme.framework.helper.lang.HmeStringHelper; import cn.hme.framework.jdbc.entity.SqlCondition; import cn.hme.industry.gnss.GnssCoordinateHelper; @@ -40,6 +41,7 @@ public class SampleLineService { line.setSample_name(dataset.getDataset_name() + "_" + seq); line.setCreate_time(LocalDateTime.now()); } + System.out.println(HmeGsonHelper.fromObject(line)); // 计算覆盖面积 if (line.getConver_width() == null) line.setConver_area(0); @@ -59,6 +61,7 @@ public class SampleLineService { } } } + if (line.getTsy_id() == null) this.mLine.insert(line); else