From e41a4b5e0b598959c0ba51e38fc55b489c878be7 Mon Sep 17 00:00:00 2001 From: revisit Date: Wed, 9 Oct 2024 16:19:22 +0800 Subject: [PATCH] update search --- .gitignore | 47 +++ build/classes/app.properties | 2 +- .../dsds/mapper/dict/DictDataMapper.class | Bin 796 -> 1121 bytes .../idsse/dsds/mapper/dict/DictDataMapper.xml | 37 ++- .../mapper/dict/DictEquipmentMapper.class | Bin 816 -> 1141 bytes .../dsds/mapper/dict/DictEquipmentMapper.xml | 36 +++ .../dsds/mapper/dict/DictPlatformMapper.class | Bin 812 -> 1137 bytes .../dsds/mapper/dict/DictPlatformMapper.xml | 37 ++- .../dsds/mapper/sample/SampleRegMapper.class | Bin 805 -> 0 bytes .../dsds/mapper/sample/SampleRegMapper.xml | 22 -- .../dsds/mapper/voyage/VoyageRegMapper.class | Bin 1069 -> 1394 bytes .../dsds/mapper/voyage/VoyageRegMapper.xml | 31 ++ .../control/sample/SampleRegControl.class | Bin 4654 -> 0 bytes .../control/search/DSDSSearchControl.class | Bin 4058 -> 7279 bytes .../service/sample/SampleRegService.class | Bin 3211 -> 0 bytes src/main/java/app.properties | 2 +- .../dsds/mapper/dict/DictDataMapper.java | 11 + .../idsse/dsds/mapper/dict/DictDataMapper.xml | 37 ++- .../dsds/mapper/dict/DictEquipmentMapper.java | 11 + .../dsds/mapper/dict/DictEquipmentMapper.xml | 36 +++ .../dsds/mapper/dict/DictPlatformMapper.java | 11 + .../dsds/mapper/dict/DictPlatformMapper.xml | 37 ++- .../dsds/mapper/sample/SampleRegMapper.java | 21 -- .../dsds/mapper/sample/SampleRegMapper.xml | 22 -- .../dsds/mapper/voyage/VoyageRegMapper.java | 11 + .../dsds/mapper/voyage/VoyageRegMapper.xml | 31 ++ .../dsds/control/sample/SampleRegControl.java | 84 ----- .../control/search/DSDSSearchControl.java | 80 ++++- .../dsds/control/search/SearchParam.java | 105 +++++++ .../dsds/service/sample/SampleRegService.java | 294 ------------------ 30 files changed, 547 insertions(+), 458 deletions(-) create mode 100644 .gitignore delete mode 100644 build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.class delete mode 100644 build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml delete mode 100644 build/classes/cn/tsy/idsse/dsds/control/sample/SampleRegControl.class delete mode 100644 build/classes/cn/tsy/idsse/dsds/service/sample/SampleRegService.class delete mode 100644 src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.java delete mode 100644 src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml delete mode 100644 src/main/java/cn/tsy/idsse/dsds/control/sample/SampleRegControl.java create mode 100644 src/main/java/cn/tsy/idsse/dsds/control/search/SearchParam.java delete mode 100644 src/main/java/cn/tsy/idsse/dsds/service/sample/SampleRegService.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..356724b --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/build +/tmp +/out-tsc +# Only exists if Bazel was run +/bazel-out + +# dependencies +/node_modules +# profiling files +chrome-profiler-events*.json +speed-measure-plugin*.json + +# IDEs and editors +/.idea +/.angular +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history/* + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +yarn-error.log +testem.log +/typings + +# System Files +.DS_Store +Thumbs.db diff --git a/build/classes/app.properties b/build/classes/app.properties index f98023c..24d07e2 100644 --- a/build/classes/app.properties +++ b/build/classes/app.properties @@ -1,5 +1,5 @@ AppDebug=true AppParamHelper=cn.tsy.idsse.dsds.helper.DSDSParamHelper -AppDatabaseStdout=InActive +AppDatabaseStdout=Active AppListener=cn.tsy.idsse.dsds.control.DSDSInitializeLisener AppName=DSDS2024Server \ No newline at end of file diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.class b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.class index 6e75d370815de19587edbabc719ffd6dad25a8a7..33cac4ff7692083142d4ab4fd85ca460f2d29366 100644 GIT binary patch delta 182 zcmbQk_K<_?)W2Q(7#J8#7^F9HZDbVYD^5);O3nz+EXfE+OiyKGIIA&nuiV5F!V^!} z>H8$->6a8&>Sv}D7pLl{6sHvHC+Fvt6y@jWL$v7!gLMZa7A59dYfk>lC_Y(^QId_d z03eW)NXuW)KC6GckxU Sh=XYf21y{z29%a!U;qGh-7iM~ delta 60 zcmaFJF^7%o)W2Q(7#J8#7$i1wZDgFhgy|zA!5il*vAO@t_ K7#JDE85jWUSPI_& diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.xml b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.xml index 3d0fea6..0d8ae1d 100644 --- a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.xml +++ b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictDataMapper.xml @@ -17,7 +17,42 @@ DESC - + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.class b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.class index 99dafb0d84f6d03066bdb7d98e0d5e06874bf056..ac6a26d92296b37addd186d833134ceee6f1e4f6 100644 GIT binary patch delta 169 zcmdnM_LYO{)W2Q(7#J8#7^F9H?Pe6>D^5);O3nz+EXfE+OiyKGI6HAcfv!(-o_!5il*vAO@t_ K7#JDE85jWk@(Vct diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml index c522f68..43d2a23 100644 --- a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml +++ b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml @@ -19,5 +19,41 @@ + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.class b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.class index 8b3268f59d9f4f27f69c2456e9e43281d6e08041..065d2d300553e53475aaac6450aab19700b41658 100644 GIT binary patch delta 175 zcmZ3(_K}0@)W2Q(7#J8#7^F9H?PL_!5il*vAO@t_ K7#JDE85jWhpbIAe diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml index 4264057..240ec13 100644 --- a/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml +++ b/build/classes/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml @@ -19,6 +19,41 @@ - + \ No newline at end of file diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.class b/build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.class deleted file mode 100644 index d14e4232d027892e5680b1f6fce669147215910d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 zcmb7C%StRU5Ur@=_gBE zXVmzbg^O@bipohn&eQY5BLM8fMjb{3?8jPq*OLi)lqzwKWa1Jhb1Vw7(qUd?B%6J> zqV&8UuEUssg${O6W~ftn(dtm_>o6|hFYC2)lGheORXsjM(5Fb z#!Tg^!rPK;kI`7JMZlQv6`VfRG^LH{L}h$g`LdY3YJdVJn<~}lOUo(QhY1e$6b)(n zb>(442UX&a<}e9m-@FkWa#x$5NAzhjyF)$>(~ m$rPVy2Qz`r209n$e4q<~F0%9zOO3!Xtn_ge))*`0b$}P8LGMQZ diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml b/build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml deleted file mode 100644 index 4a2cc20..0000000 --- a/build/classes/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/build/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.class b/build/classes/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.class index 28d3075ba43b168881e096e66de95a517d9669af..ed8020ad3b9f162fcdcf03ceb4067e67f118b77a 100644 GIT binary patch delta 219 zcmZ3>@rjG;)W2Q(7#J8#7!)>gZDSPXD^5);O3nz+EXfE+OiyKGIIA&nz2U^Ob_PDl zdHN;AmHL?}#l@-mDa9$p`pNluB}Mr;`Vc+(!CBLgSUMnCq+3z(h47#JD2fS9|OL4<{oL6kv^fr&vJD9ywm0ahl? egis-gU`jDCGf0D#$v~CMGROh>Y(ORQ3=9D7k}rS& delta 109 zcmeywwU$HR)W2Q(7#J8#7-ZQQm>3yMCVym>*r+jsaq~*13yh3RldD)FT$mU{fJ&Gc rL>V}Nv^Wz3BLf!@a~Cs+A(-L}%nTA>Ws*?kQVh~SJ{wSp3 + + - + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.java b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.java index 8ac6496..f1e7cc0 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.java +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.java @@ -7,6 +7,7 @@ import cn.hme.framework.jdbc.constant.SqlProviderConstant; import cn.hme.framework.jdbc.mapper.IHmeMapper; import cn.hme.framework.jdbc.provider.page.Pageable; import cn.tsy.data.idsse.dsds.model.dict.DictEquipment; +import cn.tsy.idsse.dsds.control.search.SearchParam; @HmeMapper public interface DictEquipmentMapper extends IHmeMapper { @@ -18,4 +19,14 @@ public interface DictEquipmentMapper extends IHmeMapper { @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.SQL_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.SQL_PAGE_START) Integer start, + @Param(SqlProviderConstant.SQL_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.SQL_PAGE_QUERY) String query, + @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, + @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); } diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml index c522f68..43d2a23 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictEquipmentMapper.xml @@ -19,5 +19,41 @@ + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.java b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.java index 67b616e..742c5c7 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.java +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.java @@ -7,6 +7,7 @@ import cn.hme.framework.jdbc.constant.SqlProviderConstant; import cn.hme.framework.jdbc.mapper.IHmeMapper; import cn.hme.framework.jdbc.provider.page.Pageable; import cn.tsy.data.idsse.dsds.model.dict.DictPlatform; +import cn.tsy.idsse.dsds.control.search.SearchParam; @HmeMapper public interface DictPlatformMapper extends IHmeMapper { @@ -18,4 +19,14 @@ public interface DictPlatformMapper extends IHmeMapper { @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type ); + + public Pageable searchWithPage( + @Param(SqlProviderConstant.SQL_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.SQL_PAGE_START) Integer start, + @Param(SqlProviderConstant.SQL_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.SQL_PAGE_QUERY) String query, + @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, + @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); } diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml index 4264057..240ec13 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/dict/DictPlatformMapper.xml @@ -19,6 +19,41 @@ - + \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.java b/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.java deleted file mode 100644 index a7a43db..0000000 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.tsy.data.idsse.dsds.mapper.sample; - -import org.apache.ibatis.annotations.Param; - -import cn.hme.framework.jdbc.annotation.HmeMapper; -import cn.hme.framework.jdbc.constant.SqlProviderConstant; -import cn.hme.framework.jdbc.mapper.IHmeMapper; -import cn.hme.framework.jdbc.provider.page.Pageable; -import cn.tsy.data.idsse.dsds.model.sample.SampleReg; - -@HmeMapper -public interface SampleRegMapper extends IHmeMapper { - public Pageable sampleWithPage( - @Param(SqlProviderConstant.SQL_PAGE_GROUP) Integer group, - @Param(SqlProviderConstant.SQL_PAGE_START) Integer start, - @Param(SqlProviderConstant.SQL_PAGE_LIMIT) Integer limit, - @Param(SqlProviderConstant.SQL_PAGE_QUERY) String query, - @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, - @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type - ); -} diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml b/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml deleted file mode 100644 index 4a2cc20..0000000 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/sample/SampleRegMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.java b/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.java index 39a2e03..aec0ae4 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.java +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.java @@ -11,6 +11,7 @@ import cn.hme.framework.jdbc.constant.SqlProviderConstant; import cn.hme.framework.jdbc.mapper.IHmeMapper; import cn.hme.framework.jdbc.provider.page.Pageable; import cn.tsy.data.idsse.dsds.model.voyage.VoyageReg; +import cn.tsy.idsse.dsds.control.search.SearchParam; @HmeMapper public interface VoyageRegMapper extends IHmeMapper { @@ -24,5 +25,15 @@ public interface VoyageRegMapper extends IHmeMapper { @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type ); + public Pageable searchWithPage( + @Param(SqlProviderConstant.SQL_PAGE_GROUP) Integer group, + @Param(SqlProviderConstant.SQL_PAGE_START) Integer start, + @Param(SqlProviderConstant.SQL_PAGE_LIMIT) Integer limit, + @Param(SqlProviderConstant.SQL_PAGE_QUERY) String query, + @Param(SqlProviderConstant.SQL_PAGE_ORDER) String order, + @Param(SqlProviderConstant.SQL_PAGE_TYPE) String type, + @Param("param") SearchParam param + ); + public List> totalVoyage(@Param("start_date") LocalDate start_date,@Param("end_date") LocalDate end_date); } diff --git a/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.xml b/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.xml index 5649f8a..91d542c 100644 --- a/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.xml +++ b/src/main/java/cn/tsy/data/idsse/dsds/mapper/voyage/VoyageRegMapper.xml @@ -21,6 +21,37 @@ + +