From d22c0aa8aacf7958949ec215fe7b805af558ad40 Mon Sep 17 00:00:00 2001 From: revisit Date: Fri, 3 Apr 2026 01:47:45 +0800 Subject: [PATCH] update report --- .settings/org.eclipse.core.resources.prefs | 2 + build/classes/.gitignore | 3 + build/classes/app.properties | 2 +- .../control/report/DSDSReportControl.class | Bin 6823 -> 7899 bytes .../control/sample/SampleStationControl.class | Bin 4253 -> 4201 bytes .../voyage/IVoyageRegReportMapper.class | Bin 2217 -> 3005 bytes .../mapper/voyage/IVoyageRegReportMapper.xml | 227 +++++++++++++++++- src/main/java/app.properties | 2 +- .../control/report/DSDSReportControl.java | 52 ++-- .../mapper/voyage/IVoyageRegReportMapper.java | 20 +- .../mapper/voyage/IVoyageRegReportMapper.xml | 227 +++++++++++++++++- 11 files changed, 494 insertions(+), 41 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 build/classes/.gitignore diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/build/classes/.gitignore b/build/classes/.gitignore new file mode 100644 index 0000000..d36383e --- /dev/null +++ b/build/classes/.gitignore @@ -0,0 +1,3 @@ +/app.properties +/cn/ +/jdbc.properties diff --git a/build/classes/app.properties b/build/classes/app.properties index 1ad8ea2..75c550e 100644 --- a/build/classes/app.properties +++ b/build/classes/app.properties @@ -1,5 +1,5 @@ AppDebug=true -AppTrace=true +AppTrace=false AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener AppName=DSDSServer \ No newline at end of file diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.class index 23b40539885a061eb48e080ba5a438b6234b82a4..65187bdaf1e90ebff0183b05b9a23059cb05d9ae 100644 GIT binary patch literal 7899 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 delta 1878 zcmbu9OKcNY6o&sB+cWWaoQIRx<3xx;iFi1!0Tm%=ivkD{h|MbwAq8p%Firw-f@4C% zv!#XdrtRVVriFw@lQsd;1X^I#1#DnlRmz$Lf)$&p<<9u>7zs9bG4eUSzrXw6^WX8` zpLI=A?*Dh|4uI+SvsXE7XC2h*SU^rk7t_tE+f_8&+1Ak58cXWUaRyJgNpIIf>-1zI zRFh6MCKI1fSQ>Ihu~o+s{=>CMtJq-vDjc2V1j9xZ4oEI^V6%)( z3{z;xHj?s`GRGF)jN#PLRI98Q>oyJ^+K_Baf7Fm}c3~#IQSmKiGvuY>tu3i^4PUS2 z%XG(;koKt9i+vPOSFuBMNY$htRQw2{ZuKrZPR;I_>@@YdtEBTPF7U7acb}K8sJM!2 zbSdw#V$iRvxWQLGE%4Jn1lG@Mabv<11>cjLMQ!t)Q{G>py-2r zXft}@z1=YWB|Rvf6MpG0^2%R?8!-GSd>mV`jc>Z0Z>qrdFG^)Z^Ycx=Zkxp~!&jJQ zc>UmO)9bsYwZohiT`AEjU+(-~li7(~#%}C88XD$jyJ>=9-9`Wn2V?UxdEf)E|4T&nbJWzDMYPHT9=n>o>k#|C=~$uO+5F zBPMp1?shY zjRmQ+LPBi)6Td+szD}22+LCP458?8H{KoGn$%@ zMJ5uNl*sG7&Nz+@oZz%r)T8p!3>=Utx+(C2#nvDzAr^ke&}^`b^b_qRc0Bk==Xk|V*zQ@vQKe)VXJXLPH&Amz!Z{fvTtFo>sqLkW49#<3 JX@5uA66P!74$`CengO4bNn8P_=RK}bIT&lQ2kA zu%75(CK+jC^O>Fm=(Njp0u#_Mi5^mczZiPaM~(^*M;gph73|RO1=22ou7L_IMrc(E zIY?{d3|c;}Yj(EBGoAsdCV&R=h9_v$t)_0?&QQ0qhp09+@9+`aWMkCcrSaO{ah$No kTe#>lw{guyeSGR)gMb?f2)MQ88^mFfw-}beifDoZzkHHRi2wiq diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.class b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.class index ba8764c63e91b946d014c73efa091094f005ae49..3ec317aa4610ddccea128221950effbc21d0f2fe 100644 GIT binary patch delta 718 zcmb7?yG{Z@6o&tqy&x-c6}c#=D5xOD!bD?-7A7Wk8VhY8p|J20L|bFw1Hd#E#$G#P zXVh3&(eW5|K7n{<*z9g%LSk`t=FHCj&v)j`L*y-Cb$(vn0aUQmvhGBWr&}MZqO0eG zkA>J{TTAuxL-E8e4gKQes44RNlU3E9ZFWneSZ3GHU;Kcxo3>UGVcif}ZJ)im$*#EP z>uIY|KRazS_sD}G&`);i$F+JxY#853zs}&p5H$D+h{M7#jcbPJn&lb^z%X)-C}Ol4 zHxQ&DL=mQlP(%ST7)9JM7*hrTMnYR0RAPfkF>OvD>1*+21j;Pd>mQIyswDKUfH8jvxyIACTe)VgV4Bfq{jQL6|{=fti65 z$Y){@W#9(VJd6yC3_L*0TMSeW(#XmP(g;*6#=rqr%r!ZU)5IC4x#A2GaHW!9b1hgA z=1L)$(v$CUD!GHq5oKkN0#Y(SjOs>NlFX{dYnB{?JltIhV0Vc#AsmD3F0j`*nZRz6 q276zTD0i>`!wu{y3)~I?Izb8OO(q6qXwa)Lr~>(HK$oa7FaQ7=YcF2_ diff --git a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml index aae5902..0a7b7c3 100644 --- a/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml +++ b/build/classes/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml @@ -3,6 +3,7 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/app.properties b/src/main/java/app.properties index 1ad8ea2..75c550e 100644 --- a/src/main/java/app.properties +++ b/src/main/java/app.properties @@ -1,5 +1,5 @@ AppDebug=true -AppTrace=true +AppTrace=false AppParamHelper=cn.tsy.cas.idsse.dsds.helper.DSDSParamHelper AppListener=cn.tsy.cas.idsse.dsds.control.DSDSInitializeListener AppName=DSDSServer \ No newline at end of file diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java index 02c3ecc..06b698f 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/report/DSDSReportControl.java @@ -43,8 +43,8 @@ public class DSDSReportControl extends HmeAjaxControl { * 科考船汇总统计属性 */ @RequestMapping("ship/total.htm") - public HmeAjax totalShip(String ship_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportShipTotal(ship_name, start, end,year)); + public HmeAjax totalShip(String unit,String ship_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportShipTotal(ship_name, start, end,year,unit)); } /*************** @@ -86,7 +86,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 无人航行潜水器 + * 水下自主式无人潜器 */ @RequestMapping("platform/auv.htm") public HmeAjax platformAuv(String platform_name, LocalDate start, LocalDate end,Integer year) { @@ -94,7 +94,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 遥控潜水器 + * 遥控水下机器人 */ @RequestMapping("platform/rov.htm") public HmeAjax platformRov(String platform_name, LocalDate start, LocalDate end,Integer year) { @@ -110,7 +110,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 无人航行潜水器 + * 水下自主式无人潜器 */ @RequestMapping("platform/auv/unit.htm") public HmeAjax platformAuvUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { @@ -118,7 +118,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 遥控潜水器 + * 遥控水下机器人 */ @RequestMapping("platform/rov/unit.htm") public HmeAjax platformRovUnit(String platform_name, LocalDate start, LocalDate end,Integer year) { @@ -135,7 +135,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 无人航行潜水器 + * 水下自主式无人潜器 */ @RequestMapping("platform/auv/unit/year.htm") public HmeAjax platformAuvUnitYear(String platform_name) { @@ -143,7 +143,7 @@ public class DSDSReportControl extends HmeAjaxControl { } /*************** - * 遥控潜水器 + * 遥控水下机器人 */ @RequestMapping("platform/rov/unit/year.htm") public HmeAjax platformRovUnitYear(String platform_name) { @@ -154,25 +154,45 @@ public class DSDSReportControl extends HmeAjaxControl { * 载人潜水器 */ @RequestMapping("platform/hov/diving.htm") - public HmeAjax platformHovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'载人潜水器'", platform_name, start, end,year)); + public HmeAjax platformHovDiving(String unit,String platform_name, LocalDate start, LocalDate end,Integer year) { + System.out.println("--------------------------"); + return new HmeAjax(this.iRegReport.reportPlatformDiving(unit,"'载人潜水器'", platform_name, start, end,year)); } /*************** - * 无人航行潜水器 + * 潜次统计：水下自主式无人潜器 */ @RequestMapping("platform/auv/diving.htm") - public HmeAjax platformAuvDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'水下自主式无人潜器'", platform_name, start, end,year)); + public HmeAjax platformAuvDiving(String unit,String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformDiving(unit,"'水下自主式无人潜器'", platform_name, start, end,year)); } /*************** - * 遥控潜水器 + * 潜次统计：遥控水下机器人 */ @RequestMapping("platform/rov/diving.htm") - public HmeAjax platformRovDiving(String platform_name, LocalDate start, LocalDate end,Integer year) { - return new HmeAjax(this.iRegReport.reportPlatformDiving("'遥控水下机器人'", platform_name, start, end, year)); + public HmeAjax platformRovDiving(String unit,String platform_name, LocalDate start, LocalDate end,Integer year) { + return new HmeAjax(this.iRegReport.reportPlatformDiving(unit,"'遥控水下机器人'", platform_name, start, end, year)); + } + + + + + /*************** + * 统计科学家 + */ + @RequestMapping("unit/member.htm") + public HmeAjax unitMember(String unit) { + return new HmeAjax(this.iRegReport.reportMember(unit)); } + /*************** + * 潜次统计：遥控水下机器人 + */ + @RequestMapping("unit/total.htm") + public HmeAjax unitTotal(String year,String unit) { + return new HmeAjax(this.iRegReport.reportUnit(year,unit)); + } + } diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java index 04c361a..a8f603a 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.java @@ -16,9 +16,10 @@ public interface IVoyageRegReportMapper extends IHmeMapper { * 科考船的汇总统计：目前有探索一号，探索二号、探索三号，海警101船（名字待定） * * @param ship_name 船的名称，如果不传，返回所有的 + * 2026-04-02 增加根据单位检索 */ public List> reportShipTotal(@Param("ship_name") String ship_name, @Param("start") LocalDate start, - @Param("end") LocalDate end,@Param("year") Integer year); + @Param("end") LocalDate end,@Param("year") Integer year,@Param("unit") String unit); /*************** * 统计参航单位 @@ -41,8 +42,21 @@ public interface IVoyageRegReportMapper extends IHmeMapper { public List> reportPlatfromUnitWithYear(@Param("platform_type") String platform_type,@Param("platform_name") String platform_name); - - public List> reportPlatformDiving(@Param("platform_type") String platform_type, + /****************** + * 统计参航航次 + */ + public List> reportPlatformDiving(@Param("unit") String unit,@Param("platform_type") String platform_type, @Param("platform_name") String platfrom_name, @Param("start") LocalDate start, @Param("end") LocalDate end,@Param("year") Integer year); + + + + /****************** + * 统计参航单位 + */ + public List> reportUnit(@Param("year") String year,@Param("unit") String unit); + /****************** + * 统计科学家 + */ + public List> reportMember(@Param("unit") String unit); } diff --git a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml index aae5902..0a7b7c3 100644 --- a/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml +++ b/src/main/java/cn/tsy/data/cas/idsse/dsds/mapper/voyage/IVoyageRegReportMapper.xml @@ -3,6 +3,7 @@ + + + + + + + + + \ No newline at end of file