From 3617cb0ce277f638cda9f99274e118d53cd14856 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 28 May 2024 11:52:37 +0800 Subject: [PATCH 01/43] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BA=8Eimport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/web/api/AppApi.java | 12 +-- .../controller/cms/CmsContentController.java | 31 +++----- .../controller/common/CaptchaController.java | 26 +++---- .../controller/monitor/ServerController.java | 6 +- .../monitor/SysLogininforController.java | 20 +++-- .../monitor/SysOperlogController.java | 18 ++--- .../monitor/SysUserOnlineController.java | 8 +- .../system/CmsDataSourceController.java | 6 +- .../system/CmsMaterialEntityController.java | 31 +++----- .../controller/system/CmsTagController.java | 6 +- .../system/CmsUserCollectController.java | 33 +++------ .../system/SysConfigController.java | 27 +++---- .../controller/system/SysDeptController.java | 28 +++---- .../system/SysDictDataController.java | 23 +++--- .../system/SysDictTypeController.java | 14 +--- .../system/SysExceptionLogController.java | 8 +- .../controller/system/SysInfoController.java | 19 ++--- .../controller/system/SysMenuController.java | 2 +- .../system/SysModuleController.java | 31 +++----- .../system/SysNoticeController.java | 27 +++---- .../controller/system/SysPostController.java | 24 ++---- .../system/SysProfileController.java | 19 ++--- .../controller/system/SysRoleController.java | 8 +- .../system/SysUploadController.java | 8 +- .../controller/system/SysUserController.java | 10 +-- .../controller/system/SysXzqhController.java | 20 +---- .../controller/tool/SwaggerController.java | 3 +- .../web/controller/tool/TestController.java | 21 ++---- .../kms/web/core/config/SwaggerConfig.java | 18 ++--- .../kms/web/synchronous/YgSynchronous.java | 17 +---- .../web/utils/scheduled/WaterScheduled.java | 1 - .../com/kms/web/utils/view/InitLabel.java | 8 +- .../shuili/common/annotation/DataScope.java | 6 +- .../shuili/common/annotation/DataSource.java | 8 +- .../com/shuili/common/annotation/Log.java | 8 +- .../common/annotation/RepeatSubmit.java | 7 +- .../shuili/common/core/domain/AddParam.java | 4 +- .../shuili/common/core/domain/AjaxResult.java | 3 +- .../common/core/domain/SearchParam.java | 10 +-- .../shuili/common/core/domain/TimeView.java | 2 - .../shuili/common/core/text/CharsetKit.java | 3 +- .../com/shuili/common/core/text/Convert.java | 3 +- .../file/InvalidExtensionException.java | 3 +- .../com/shuili/common/utils/CsvUtils.java | 6 +- .../com/shuili/common/utils/DateUtils.java | 4 +- .../shuili/common/utils/ExceptionUtil.java | 3 +- .../com/shuili/common/utils/RSAUtils.java | 13 +--- .../com/shuili/common/utils/StringUtils.java | 14 +--- .../java/com/shuili/common/utils/Threads.java | 7 +- .../shuili/common/utils/file/FileUtils.java | 11 +-- .../shuili/common/utils/html/HTMLFilter.java | 6 +- .../shuili/common/utils/http/HttpHelper.java | 3 +- .../shuili/common/utils/http/HttpUtils.java | 21 ++---- .../com/shuili/common/utils/ip/IpUtils.java | 9 +-- .../shuili/common/utils/password/Digests.java | 4 +- .../shuili/common/utils/password/Encodes.java | 8 +- .../common/utils/reflect/ReflectUtils.java | 12 +-- .../shuili/common/utils/sign/Md5Utils.java | 3 +- .../com/shuili/common/utils/uuid/UUID.java | 3 +- .../java/com/kms/cms/domain/CmsContent.java | 9 +-- .../com/kms/cms/mapper/CmsContentMapper.java | 2 +- .../kms/cms/service/CmsContentService.java | 4 +- .../kms/common/GlobalExceptionHandler.java | 18 ++--- .../java/com/kms/common/api/CommonApi.java | 4 +- .../com/kms/common/entity/SearchView.java | 8 +- .../common/http/utils/HttpClientUtils.java | 2 +- .../com/kms/common/utils/DataTypeUtil.java | 2 +- .../kms/common/utils/Itext5HtmlToPDF2.java | 3 +- .../com/kms/sys/progress/ChunkController.java | 2 +- .../com/kms/sys/progress/ChunkService.java | 8 +- .../java/com/kms/sys/progress/StdOut.java | 4 +- .../java/com/kms/system/base/EditView.java | 4 +- .../kms/system/base/analysis/FileUtils.java | 46 ++++-------- .../kms/system/domain/CmsMaterialEntity.java | 9 +-- .../domain/CmsMaterialEntityRelation.java | 9 +-- .../com/kms/system/domain/CmsUserCollect.java | 9 +-- .../kms/system/domain/CmsUserFavorites.java | 9 +-- .../java/com/kms/system/domain/LabField.java | 9 +-- .../com/kms/system/domain/LabLaboratory.java | 9 +-- .../com/kms/system/domain/LabTeacher.java | 9 +-- .../java/com/kms/system/domain/SysConfig.java | 9 +-- .../kms/system/domain/SysExceptionLog.java | 1 - .../java/com/kms/system/domain/SysInfo.java | 9 +-- .../system/domain/SysLabelsAttributeView.java | 2 +- .../com/kms/system/domain/SysLogininfor.java | 4 +- .../java/com/kms/system/domain/SysModule.java | 9 +-- .../java/com/kms/system/domain/SysNotice.java | 8 +- .../com/kms/system/domain/SysOperLog.java | 4 +- .../java/com/kms/system/domain/SysPost.java | 10 +-- .../java/com/kms/system/domain/SysXzqh.java | 8 +- .../com/kms/system/domain/vo/RouterVo.java | 1 + .../com/kms/system/es/DataSearchEntity.java | 2 +- .../com/kms/system/mapper/LabFieldMapper.java | 2 +- .../com/kms/system/mapper/LabNodeMapper.java | 1 - .../kms/system/mapper/LabRelationMapper.java | 1 - .../kms/system/mapper/LabTeacherMapper.java | 2 +- .../kms/system/mapper/SysConfigMapper.java | 4 +- .../com/kms/system/mapper/SysDeptMapper.java | 6 +- .../kms/system/mapper/SysDictTypeMapper.java | 4 +- .../com/kms/system/mapper/SysInfoMapper.java | 2 +- .../com/kms/system/mapper/SysMenuMapper.java | 6 +- .../kms/system/mapper/SysModuleMapper.java | 2 +- .../kms/system/mapper/SysNoticeMapper.java | 4 +- .../com/kms/system/mapper/SysPostMapper.java | 4 +- .../kms/system/mapper/SysRoleDeptMapper.java | 4 +- .../com/kms/system/mapper/SysRoleMapper.java | 4 +- .../com/kms/system/mapper/SysUserMapper.java | 6 +- .../dd/controller/AttDiscBaseController.java | 28 ++----- .../com/kms/yg/dd/domain/AttDiscBase.java | 8 +- .../kms/yg/dd/mapper/AttDiscBaseMapper.java | 2 +- .../df/controller/BsSgcDfAqjcController.java | 31 ++------ .../controller/BsSgcDfAqjdxxController.java | 35 +++------ .../df/controller/BsSgcDfAqrwController.java | 28 ++----- .../df/controller/BsSgcDfBydyController.java | 30 ++------ .../controller/BsSgcDfBydyzbController.java | 30 ++------ .../df/controller/BsSgcDfBzbpController.java | 37 +++------- .../df/controller/BsSgcDfBzhController.java | 37 +++------- .../df/controller/BsSgcDfBzhjsController.java | 32 +++----- .../df/controller/BsSgcDfDaglController.java | 32 +++----- .../df/controller/BsSgcDfDfhdmController.java | 36 +++------ .../df/controller/BsSgcDfDfrwController.java | 30 ++------ .../df/controller/BsSgcDfFxwzController.java | 34 +++------ .../controller/BsSgcDfFxyhdcController.java | 32 +++----- .../df/controller/BsSgcDfFxzzController.java | 35 ++------- .../controller/BsSgcDfFxzzcyController.java | 30 ++------ .../df/controller/BsSgcDfFzrController.java | 74 +++++-------------- .../df/controller/BsSgcDfGcglController.java | 33 +++------ .../df/controller/BsSgcDfGcxyController.java | 38 +++------- .../controller/BsSgcDfHdmtzzController.java | 39 +++------- .../df/controller/BsSgcDfHzxxController.java | 32 ++------ .../df/controller/BsSgcDfJbxxController.java | 35 +++------ .../df/controller/BsSgcDfJdsbController.java | 32 ++------ .../df/controller/BsSgcDfJfglController.java | 32 +++----- .../df/controller/BsSgcDfJyjlController.java | 38 +++------- .../df/controller/BsSgcDfQqhjController.java | 33 +++------ .../df/controller/BsSgcDfQtxxController.java | 32 +++----- .../controller/BsSgcDfSafeJbxxController.java | 36 ++------- .../df/controller/BsSgcDfSjcsController.java | 32 ++------ .../df/controller/BsSgcDfSwtzController.java | 38 +++------- .../df/controller/BsSgcDfSyxjlController.java | 34 +++------ .../df/controller/BsSgcDfXlnlController.java | 32 ++------ .../df/controller/BsSgcDfYaxxController.java | 30 ++------ .../df/controller/BsSgcDfYhxxController.java | 38 +++------- .../df/controller/BsSgcDfZxxxController.java | 34 ++------- .../df/controller/DfContrastController.java | 4 - .../com/kms/yg/df/domain/BsSgcDfAqjc.java | 5 +- .../com/kms/yg/df/domain/BsSgcDfAqjdxx.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfAqrw.java | 9 +-- .../com/kms/yg/df/domain/BsSgcDfBydy.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfBydyzb.java | 5 +- .../com/kms/yg/df/domain/BsSgcDfBzbp.java | 5 +- .../java/com/kms/yg/df/domain/BsSgcDfBzh.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfBzhjs.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfDagl.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfDfhdm.java | 9 ++- .../com/kms/yg/df/domain/BsSgcDfDfrw.java | 8 +- .../com/kms/yg/df/domain/BsSgcDfFxwz.java | 9 +-- .../com/kms/yg/df/domain/BsSgcDfFxyhdc.java | 9 ++- .../com/kms/yg/df/domain/BsSgcDfFxzz.java | 5 +- .../com/kms/yg/df/domain/BsSgcDfFxzzcy.java | 5 +- .../java/com/kms/yg/df/domain/BsSgcDfFzr.java | 7 +- .../com/kms/yg/df/domain/BsSgcDfGcgl.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfGcxy.java | 9 ++- .../com/kms/yg/df/domain/BsSgcDfHdmtzz.java | 9 ++- .../domain/BsSgcDfHydrographicFeatures.java | 9 ++- .../com/kms/yg/df/domain/BsSgcDfHzxx.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfJbxx.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfJdsb.java | 5 +- .../com/kms/yg/df/domain/BsSgcDfJfgl.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfJyjl.java | 9 ++- .../com/kms/yg/df/domain/BsSgcDfQqhj.java | 10 +-- .../com/kms/yg/df/domain/BsSgcDfQtxx.java | 5 +- .../com/kms/yg/df/domain/BsSgcDfSjcs.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfSwtz.java | 11 ++- .../com/kms/yg/df/domain/BsSgcDfSyxjl.java | 10 +-- .../com/kms/yg/df/domain/BsSgcDfXlnl.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfYaxx.java | 6 +- .../com/kms/yg/df/domain/BsSgcDfYhxx.java | 10 +-- .../com/kms/yg/df/domain/BsSgcDfZxxx.java | 10 +-- .../kms/yg/df/domain/dto/BsSgcDfFxzzDto.java | 2 - .../com/kms/yg/df/domain/dto/DfFzrDto.java | 1 - .../kms/yg/df/mapper/BsSgcDfAqjdxxMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfBydyzbMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfBzhMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfBzhjsMapper.java | 5 +- .../kms/yg/df/mapper/BsSgcDfDfhdmMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfFxzzcyMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfSjcsMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfSwtzMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfSyxjlMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfXlnlMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfYaxxMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfYhxxMapper.java | 3 +- .../kms/yg/df/mapper/BsSgcDfZxxxMapper.java | 3 +- .../kms/yg/df/service/BsSgcDfAqjcService.java | 2 - .../yg/df/service/BsSgcDfAqjdxxService.java | 4 - .../kms/yg/df/service/BsSgcDfAqrwService.java | 1 - .../kms/yg/df/service/BsSgcDfBydyService.java | 2 - .../yg/df/service/BsSgcDfBydyzbService.java | 3 - .../kms/yg/df/service/BsSgcDfBzbpService.java | 5 +- .../kms/yg/df/service/BsSgcDfBzhService.java | 4 +- .../yg/df/service/BsSgcDfBzhjsService.java | 6 +- .../kms/yg/df/service/BsSgcDfDaglService.java | 6 +- .../yg/df/service/BsSgcDfDfhdmService.java | 4 +- .../kms/yg/df/service/BsSgcDfDfrwService.java | 7 +- .../kms/yg/df/service/BsSgcDfFxwzService.java | 2 - .../yg/df/service/BsSgcDfFxyhdcService.java | 4 +- .../kms/yg/df/service/BsSgcDfFxzzService.java | 2 - .../yg/df/service/BsSgcDfFxzzcyService.java | 2 - .../kms/yg/df/service/BsSgcDfFzrService.java | 4 - .../kms/yg/df/service/BsSgcDfGcglService.java | 3 - .../kms/yg/df/service/BsSgcDfGcxyService.java | 3 - .../yg/df/service/BsSgcDfHdmtzzService.java | 4 +- .../kms/yg/df/service/BsSgcDfHzxxService.java | 2 - .../kms/yg/df/service/BsSgcDfJdsbService.java | 2 - .../kms/yg/df/service/BsSgcDfJfglService.java | 5 +- .../kms/yg/df/service/BsSgcDfJyjlService.java | 4 +- .../kms/yg/df/service/BsSgcDfQqhjService.java | 2 - .../kms/yg/df/service/BsSgcDfQtxxService.java | 4 +- .../kms/yg/df/service/BsSgcDfSjcsService.java | 2 - .../kms/yg/df/service/BsSgcDfSwtzService.java | 2 - .../yg/df/service/BsSgcDfSyxjlService.java | 2 - .../kms/yg/df/service/BsSgcDfXlnlService.java | 2 - .../kms/yg/df/service/BsSgcDfYaxxService.java | 2 - .../kms/yg/df/service/BsSgcDfYhxxService.java | 3 - .../kms/yg/df/service/BsSgcDfZxxxService.java | 2 - .../ly/controller/AttBasBaseController.java | 28 ++----- .../java/com/kms/yg/ly/domain/AttBasBase.java | 11 +-- .../kms/yg/ly/mapper/AttBasBaseMapper.java | 2 +- .../yg/rv/controller/AttRvBaseController.java | 28 ++----- .../java/com/kms/yg/rv/domain/AttRvBase.java | 11 +-- .../sk/controller/AttResBaseController.java | 28 ++----- .../sk/controller/AttResRsppController.java | 28 ++----- .../java/com/kms/yg/sk/domain/AttResBase.java | 9 ++- .../java/com/kms/yg/sk/domain/AttResRspp.java | 11 +-- .../kms/yg/sk/mapper/AttResBaseMapper.java | 2 +- .../kms/yg/sk/mapper/AttResRsppMapper.java | 2 +- .../sz/controller/BsSgcSzAqjcController.java | 33 +++------ .../controller/BsSgcSzAqjdxxController.java | 33 +++------ .../sz/controller/BsSgcSzAqrwController.java | 34 +++------ .../sz/controller/BsSgcSzBydyController.java | 32 +++----- .../controller/BsSgcSzBydyzbController.java | 28 ++----- .../sz/controller/BsSgcSzBzbpController.java | 36 +++------ .../sz/controller/BsSgcSzBzhController.java | 41 ++++------ .../sz/controller/BsSgcSzBzhjsController.java | 32 +++----- .../sz/controller/BsSgcSzCxjlController.java | 37 +++------- .../sz/controller/BsSgcSzDaglController.java | 32 +++----- .../sz/controller/BsSgcSzFxwzController.java | 36 +++------ .../sz/controller/BsSgcSzFxzzController.java | 28 ++----- .../controller/BsSgcSzFxzzcyController.java | 32 +++----- .../sz/controller/BsSgcSzFzrController.java | 39 +++------- .../sz/controller/BsSgcSzGcdaController.java | 34 +++------ .../sz/controller/BsSgcSzGcglController.java | 33 +++------ .../sz/controller/BsSgcSzGcjgController.java | 38 +++------- .../sz/controller/BsSgcSzGctxController.java | 38 +++------- .../sz/controller/BsSgcSzGcxyController.java | 28 ++----- .../sz/controller/BsSgcSzHzxxController.java | 28 ++----- .../sz/controller/BsSgcSzJdsbController.java | 28 ++----- .../sz/controller/BsSgcSzJfglController.java | 32 +++----- .../sz/controller/BsSgcSzQqhjController.java | 35 +++------ .../controller/BsSgcSzSafeJbxxController.java | 35 ++------- .../sz/controller/BsSgcSzSjcsController.java | 35 +++------ .../sz/controller/BsSgcSzSwtzController.java | 31 ++------ .../sz/controller/BsSgcSzSyxjlController.java | 36 +++------ .../sz/controller/BsSgcSzSzrwController.java | 32 +++----- .../sz/controller/BsSgcSzXlnlController.java | 33 +++------ .../sz/controller/BsSgcSzYaxxController.java | 32 +++----- .../sz/controller/BsSgcSzYhxxController.java | 41 ++++------ .../sz/controller/BsSgcSzZxxxController.java | 36 +++------ .../com/kms/yg/sz/domain/BsSgcSzAqjc.java | 5 +- .../com/kms/yg/sz/domain/BsSgcSzAqrw.java | 9 +-- .../com/kms/yg/sz/domain/BsSgcSzBydy.java | 6 +- .../com/kms/yg/sz/domain/BsSgcSzBzbp.java | 5 +- .../java/com/kms/yg/sz/domain/BsSgcSzBzh.java | 6 +- .../com/kms/yg/sz/domain/BsSgcSzCxjl.java | 9 ++- .../com/kms/yg/sz/domain/BsSgcSzDagl.java | 6 +- .../com/kms/yg/sz/domain/BsSgcSzFxwz.java | 9 +-- .../com/kms/yg/sz/domain/BsSgcSzFxzz.java | 5 +- .../java/com/kms/yg/sz/domain/BsSgcSzFzr.java | 7 +- .../com/kms/yg/sz/domain/BsSgcSzGcda.java | 6 +- .../kms/yg/sz/mapper/BsSgcSzAqjdxxMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java | 4 +- .../kms/yg/sz/mapper/BsSgcSzFxwzMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzFxzzMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzGcglMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzGcjgMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzGctxMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzGcxyMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzHzxxMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzJdsbMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzJfglMapper.java | 5 +- .../kms/yg/sz/mapper/BsSgcSzQqhjMapper.java | 4 +- .../kms/yg/sz/mapper/BsSgcSzSjcsMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzSwtzMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzSyxjlMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzSzrwMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzXlnlMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzYaxxMapper.java | 2 +- .../kms/yg/sz/mapper/BsSgcSzYhxxMapper.java | 4 +- .../kms/yg/sz/service/BsSgcSzAqjcService.java | 4 +- .../yg/sz/service/BsSgcSzAqjdxxService.java | 7 +- .../kms/yg/sz/service/BsSgcSzAqrwService.java | 6 +- .../kms/yg/sz/service/BsSgcSzBydyService.java | 4 +- .../yg/sz/service/BsSgcSzBydyzbService.java | 1 - .../kms/yg/sz/service/BsSgcSzBzbpService.java | 5 +- .../kms/yg/sz/service/BsSgcSzBzhService.java | 4 +- .../yg/sz/service/BsSgcSzBzhjsService.java | 4 +- .../kms/yg/sz/service/BsSgcSzCxjlService.java | 4 +- .../kms/yg/sz/service/BsSgcSzDaglService.java | 4 +- .../kms/yg/sz/service/BsSgcSzFxwzService.java | 4 +- .../yg/sz/service/BsSgcSzFxzzcyService.java | 4 +- .../kms/yg/sz/service/BsSgcSzFzrService.java | 3 - .../kms/yg/sz/service/BsSgcSzGcglService.java | 1 - .../kms/yg/sz/service/BsSgcSzGcjgService.java | 4 +- .../kms/yg/sz/service/BsSgcSzGctxService.java | 4 +- .../kms/yg/sz/service/BsSgcSzGcxyService.java | 1 - .../kms/yg/sz/service/BsSgcSzJfglService.java | 4 +- .../kms/yg/sz/service/BsSgcSzQqhjService.java | 4 +- .../yg/sz/service/BsSgcSzSyxjlService.java | 4 +- .../kms/yg/sz/service/BsSgcSzSzrwService.java | 5 +- .../kms/yg/sz/service/BsSgcSzYaxxService.java | 4 +- .../kms/yg/sz/service/BsSgcSzYhxxService.java | 5 +- .../kms/yg/sz/service/BsSgcSzZxxxService.java | 4 +- .../controller/AttDpdsBaseController.java | 28 ++----- .../com/kms/yg/xgxd/domain/AttDpdsBase.java | 9 ++- .../kms/yg/xgxd/mapper/AttDpdsBaseMapper.java | 2 +- .../yg/znjg/controller/SyDirController.java | 3 - .../yg/znjg/controller/SyLayerController.java | 6 +- .../SySceneConfigRelationController.java | 1 - .../yg/znjg/controller/SySceneController.java | 3 - .../java/com/kms/yg/znjg/domain/SyScene.java | 8 +- .../yg/znjg/domain/SySceneConfigRelation.java | 8 +- .../yg/znjg/domain/SySceneDirRelation.java | 7 +- .../com/kms/yg/znjg/mapper/SyLayerMapper.java | 1 - .../mapper/SySceneConfigRelationMapper.java | 2 +- .../znjg/mapper/SySceneDirRelationMapper.java | 2 +- .../com/kms/yg/znjg/mapper/SySceneMapper.java | 2 +- .../kms/yg/znjg/service/SyLayerService.java | 2 - .../yg/znjg/service/SyLayerStyleService.java | 2 +- .../CreateAndUpdateMetaObjectHandler.java | 4 +- .../java/com/kms/yxgh/base/DfException.java | 2 - .../main/java/com/kms/yxgh/base/Response.java | 3 +- .../java/com/kms/yxgh/base/SyBaseEntity.java | 3 +- .../java/com/kms/yxgh/base/SzException.java | 1 - .../yxgh/base/domain/monitor/MsHdmGate.java | 1 - .../yxgh/base/enums/DataSyncBasicEnum.java | 14 +++- .../java/com/kms/yxgh/common/job/Job.java | 1 - .../common/service/VideoWarningService.java | 4 +- .../df/controller/DfAnimalPlanController.java | 1 - .../controller/DfAnimalRecordController.java | 1 - .../DfDangerousProjectController.java | 1 - .../yxgh/df/controller/DfPlanController.java | 14 +--- .../df/controller/DfProjectController.java | 1 - .../df/controller/DfRecordController.java | 11 +-- .../kms/yxgh/df/domain/DfAnimalOperator.java | 6 +- .../kms/yxgh/df/domain/DfAnimalRecord.java | 1 - .../java/com/kms/yxgh/df/domain/DfPlan.java | 6 ++ .../kms/yxgh/df/domain/DfPlanOperator.java | 2 - .../java/com/kms/yxgh/df/domain/DfPoint.java | 3 +- .../yxgh/df/domain/DfProjectCheckingRel.java | 1 + .../java/com/kms/yxgh/df/domain/DfTrace.java | 3 +- .../java/com/kms/yxgh/df/domain/DfYhPlan.java | 2 +- .../kms/yxgh/df/dto/DfRecordSearchDto.java | 3 +- .../df/dto/DfSuperviseProblemDetailDto.java | 1 - .../kms/yxgh/df/dto/DfSuperviseWayDto.java | 1 - .../yxgh/df/mapper/DfAnimalDrugMapper.java | 2 +- .../df/mapper/DfAnimalOperatorMapper.java | 2 +- .../df/mapper/DfAnimalPlanDetailMapper.java | 2 +- .../yxgh/df/mapper/DfAnimalRecordMapper.java | 3 +- .../yxgh/df/mapper/DfCheckingItemMapper.java | 2 +- .../yxgh/df/mapper/DfPlanOperatorMapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfPointMapper.java | 3 +- .../df/mapper/DfProjectCheckingRelMapper.java | 1 + .../yxgh/df/mapper/DfRecordImageMapper.java | 2 +- .../yxgh/df/mapper/DfRecordItemMapper.java | 2 +- .../DfSuperviseWayProjectItemMapper.java | 1 - .../com/kms/yxgh/df/mapper/DfTraceMapper.java | 2 +- .../yxgh/df/mapper/DfYhOperatorMapper.java | 2 +- .../df/service/DfCheckingItemService.java | 4 +- .../df/service/DfPlanOperatorService.java | 4 +- .../kms/yxgh/df/service/DfPointService.java | 4 +- .../kms/yxgh/df/service/DfProjectService.java | 1 - .../yxgh/df/service/DfRecordItemService.java | 4 +- .../DfSuperviseEngineeringService.java | 1 - .../kms/yxgh/df/service/DfTraceService.java | 4 +- .../sz/controller/SzProjectController.java | 1 - .../sz/controller/SzRecordController.java | 11 +-- .../controller/SzSuperviseWayController.java | 5 +- .../sz/controller/SzYhPlanController.java | 10 +-- .../com/kms/yxgh/sz/domain/SzChecking.java | 2 - .../kms/yxgh/sz/domain/SzCheckingItem.java | 2 - .../kms/yxgh/sz/domain/SzPlanOperator.java | 2 - .../java/com/kms/yxgh/sz/domain/SzPoint.java | 2 - .../java/com/kms/yxgh/sz/domain/SzTrace.java | 3 +- .../java/com/kms/yxgh/sz/domain/SzYhPlan.java | 2 +- .../com/kms/yxgh/sz/dto/SzAqjdProjecDto.java | 1 - .../kms/yxgh/sz/dto/SzCheckingDetailDto.java | 3 +- .../kms/yxgh/sz/dto/SzRecordSearchDto.java | 3 +- .../dto/SzSuperviseEngineeringParamDto.java | 1 - .../kms/yxgh/sz/dto/SzYhPlanDetailDto.java | 2 +- .../kms/yxgh/sz/service/SzProjectService.java | 1 - .../SzSuperviseEngineeringService.java | 1 - .../java/com/kms/yxgh/util/BeanCopyUtils.java | 5 +- .../java/com/kms/yxgh/util/StreamUtils.java | 15 +--- 409 files changed, 1472 insertions(+), 2913 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/api/AppApi.java b/shuili-admin/src/main/java/com/kms/web/api/AppApi.java index e3852f67..cd07e84a 100644 --- a/shuili-admin/src/main/java/com/kms/web/api/AppApi.java +++ b/shuili-admin/src/main/java/com/kms/web/api/AppApi.java @@ -1,6 +1,12 @@ package com.kms.web.api; import cn.dev33.satoken.stp.StpUtil; +import com.kms.cms.domain.CmsContent; +import com.kms.cms.service.CmsContentService; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.framework.manager.AsyncManager; +import com.kms.framework.manager.factory.AsyncFactory; +import com.kms.system.service.SysUserService; import com.shuili.common.constant.Constants; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.domain.AjaxResult; @@ -11,12 +17,6 @@ import com.shuili.common.exception.BaseException; import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.password.PasswordUtil; -import com.kms.cms.domain.CmsContent; -import com.kms.cms.service.CmsContentService; -import com.kms.common.utils.BaseEntityUtils; -import com.kms.framework.manager.AsyncManager; -import com.kms.framework.manager.factory.AsyncFactory; -import com.kms.system.service.SysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.log4j.Log4j2; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/cms/CmsContentController.java b/shuili-admin/src/main/java/com/kms/web/controller/cms/CmsContentController.java index 4f79b92a..187cb46a 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/cms/CmsContentController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/cms/CmsContentController.java @@ -1,33 +1,22 @@ package com.kms.web.controller.cms; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.cms.domain.CmsContent; +import com.kms.cms.service.CmsContentService; +import com.kms.common.utils.BaseEntityUtils; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.cms.domain.CmsContent; -import com.kms.cms.service.CmsContentService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-admin/src/main/java/com/kms/web/controller/common/CaptchaController.java b/shuili-admin/src/main/java/com/kms/web/controller/common/CaptchaController.java index 37d38e89..974499d5 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/common/CaptchaController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/common/CaptchaController.java @@ -1,13 +1,11 @@ package com.kms.web.controller.common; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; - +import com.google.code.kaptcha.Producer; +import com.shuili.common.constant.Constants; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.redis.RedisCache; +import com.shuili.common.utils.sign.Base64; +import com.shuili.common.utils.uuid.IdUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -16,12 +14,12 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.code.kaptcha.Producer; -import com.shuili.common.constant.Constants; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.core.redis.RedisCache; -import com.shuili.common.utils.sign.Base64; -import com.shuili.common.utils.uuid.IdUtils; +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * 验证码操作处理 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/monitor/ServerController.java b/shuili-admin/src/main/java/com/kms/web/controller/monitor/ServerController.java index 32056fe0..80083477 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/monitor/ServerController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/monitor/ServerController.java @@ -2,12 +2,12 @@ package com.kms.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.kms.framework.web.domain.Server; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.AjaxResult; -import com.kms.framework.web.domain.Server; /** * 服务器监控 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysLogininforController.java b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysLogininforController.java index 36b30221..328b900f 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysLogininforController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysLogininforController.java @@ -1,24 +1,22 @@ package com.kms.web.controller.monitor; -import java.util.Arrays; -import java.util.List; - +import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.MongoOperType; -import com.shuili.common.core.domain.SearchParam; -import com.kms.system.service.SysLogininforService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import com.kms.system.domain.SysLogininfor; +import com.kms.system.service.SysLogininforService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.MongoOperType; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; +import java.util.Arrays; +import java.util.List; /** * 系统访问记录 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysOperlogController.java b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysOperlogController.java index 5ce08e71..f7fdf37b 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysOperlogController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysOperlogController.java @@ -1,32 +1,30 @@ package com.kms.web.controller.monitor; -import java.util.Arrays; -import java.util.List; - import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.domain.SysOperLog; import com.shuili.aspect.LogMapper; - import com.shuili.aspect.LogMongoService; +import com.shuili.common.annotation.Log; import com.shuili.common.constant.YesOrNo; - +import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.TableSupport; +import com.shuili.common.enums.BusinessType; import com.shuili.common.page.PageDomain; import com.shuili.common.utils.StringUtils; +import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.enums.BusinessType; -import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.system.domain.SysOperLog; + +import java.util.Arrays; +import java.util.List; /** * 操作日志记录 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysUserOnlineController.java b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysUserOnlineController.java index 4a148634..71d976ec 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysUserOnlineController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/monitor/SysUserOnlineController.java @@ -6,18 +6,20 @@ import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.system.service.SysUserOnlineService; +import com.kms.system.service.SysUserService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.StringUtils; -import com.kms.system.service.SysUserOnlineService; -import com.kms.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 在线用户监控 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsDataSourceController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsDataSourceController.java index bc618620..54f364e9 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsDataSourceController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsDataSourceController.java @@ -3,6 +3,9 @@ package com.kms.web.controller.system; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.CmsDataSource; +import com.kms.system.service.CmsDataSourceService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.MongoOperType; @@ -11,9 +14,6 @@ import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.DictUtils; import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; -import com.kms.system.domain.CmsDataSource; -import com.kms.system.service.CmsDataSourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsMaterialEntityController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsMaterialEntityController.java index 6c4f0dcd..96fa6269 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsMaterialEntityController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsMaterialEntityController.java @@ -1,33 +1,22 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.CmsMaterialEntity; +import com.kms.system.service.CmsMaterialEntityService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.system.domain.CmsMaterialEntity; -import com.kms.system.service.CmsMaterialEntityService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsTagController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsTagController.java index 6a788e2a..cdbbb5e0 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsTagController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsTagController.java @@ -1,6 +1,9 @@ package com.kms.web.controller.system; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.CmsTag; +import com.kms.system.service.CmsTagService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.controller.BaseController; @@ -11,9 +14,6 @@ import com.shuili.common.enums.BusinessType; import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; -import com.kms.system.domain.CmsTag; -import com.kms.system.service.CmsTagService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsUserCollectController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsUserCollectController.java index 58f14de8..c3ee1325 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsUserCollectController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsUserCollectController.java @@ -1,34 +1,23 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.CmsUserCollect; +import com.kms.system.service.CmsUserCollectService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import com.shuili.common.mybaitsplus.BeanToWrapper; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.system.domain.CmsUserCollect; -import com.kms.system.service.CmsUserCollectService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysConfigController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysConfigController.java index 891efbab..a34f31cb 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysConfigController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysConfigController.java @@ -1,33 +1,24 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - +import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; -import com.kms.system.service.SysConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.kms.system.domain.SysConfig; +import com.kms.system.service.SysConfigService; import com.shuili.common.annotation.Log; import com.shuili.common.annotation.RepeatSubmit; import com.shuili.common.constant.UserConstants; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; +import java.util.Arrays; +import java.util.List; /** * 参数配置 信息操作处理 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java index fa79c44b..85d139d9 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDeptController.java @@ -1,23 +1,8 @@ package com.kms.web.controller.system; -import java.util.Iterator; -import java.util.List; - +import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.kms.system.service.SysDeptService; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - import com.shuili.common.annotation.Log; import com.shuili.common.constant.UserConstants; import com.shuili.common.core.controller.BaseController; @@ -26,9 +11,14 @@ import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.FastDfsUtil; import com.shuili.common.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; -import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; +import java.util.Iterator; +import java.util.List; /** * 部门信息 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java index 019f5b6f..0dee0a00 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictDataController.java @@ -1,29 +1,26 @@ package com.kms.web.controller.system; -import com.kms.yxgh.base.Response; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import java.util.Map; - import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; import com.kms.system.service.SysDictDataService; import com.kms.system.service.SysDictTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - +import com.kms.yxgh.base.Response; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDictData; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import cn.dev33.satoken.annotation.SaCheckPermission; +import java.util.List; +import java.util.Map; /** * 数据字典信息 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java index e3ec3893..30b5def3 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysDictTypeController.java @@ -15,18 +15,12 @@ import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.Arrays; -import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; /** * 数据字典信息 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysExceptionLogController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysExceptionLogController.java index 17cacffc..8d1ba6ca 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysExceptionLogController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysExceptionLogController.java @@ -2,6 +2,9 @@ package com.kms.web.controller.system; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.kms.system.domain.SysExceptionLog; +import com.kms.system.domain.SysOperLog; +import com.kms.system.service.SysExceptionLogService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.controller.BaseController; @@ -9,12 +12,7 @@ import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.MongoOperType; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; - import com.shuili.common.utils.poi.ExcelUtil; - -import com.kms.system.domain.SysExceptionLog; -import com.kms.system.domain.SysOperLog; -import com.kms.system.service.SysExceptionLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysInfoController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysInfoController.java index e8cb40a6..a6d7adce 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysInfoController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysInfoController.java @@ -1,25 +1,22 @@ package com.kms.web.controller.system; -import java.util.List; - +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.SysInfo; +import com.kms.system.service.SysInfoService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.FastDfsUtil; import com.shuili.common.utils.StringUtils; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.system.domain.SysInfo; -import com.kms.system.service.SysInfoService; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * 系统基本信息Controller diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysMenuController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysMenuController.java index 93746b66..8637a113 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysMenuController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysMenuController.java @@ -3,6 +3,7 @@ package com.kms.web.controller.system; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.stp.StpUtil; +import com.kms.system.service.SysMenuService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.Constants; import com.shuili.common.constant.UserConstants; @@ -11,7 +12,6 @@ import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.entity.SysMenu; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.StringUtils; -import com.kms.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysModuleController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysModuleController.java index 08245074..f23cadda 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysModuleController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysModuleController.java @@ -1,33 +1,22 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.SysModule; +import com.kms.system.service.SysModuleService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.system.domain.SysModule; -import com.kms.system.service.SysModuleService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysNoticeController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysNoticeController.java index b6140a81..971f7d66 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysNoticeController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysNoticeController.java @@ -1,33 +1,24 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.StringUtils; import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.domain.SysNotice; import com.kms.system.service.SysNoticeService; import com.kms.system.service.SysUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.kms.system.domain.SysNotice; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; +import com.shuili.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import cn.dev33.satoken.annotation.SaCheckPermission; +import java.util.Arrays; +import java.util.List; /** * 公告 信息操作处理 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysPostController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysPostController.java index 29d1ba1f..34a1a4fd 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysPostController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysPostController.java @@ -1,29 +1,21 @@ package com.kms.web.controller.system; -import java.util.Arrays; -import java.util.List; - import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; -import com.kms.system.service.SysPostService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.kms.system.domain.SysPost; +import com.kms.system.service.SysPostService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.UserConstants; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; /** * 岗位信息操作处理 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysProfileController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysProfileController.java index 456ab1fb..fbf000e7 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysProfileController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysProfileController.java @@ -1,18 +1,7 @@ package com.kms.web.controller.system; -import java.io.IOException; - +import com.kms.common.utils.UserUtils; import com.kms.system.service.SysUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -20,7 +9,11 @@ import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.FastDfsUtil; import com.shuili.common.utils.password.PasswordUtil; -import com.kms.common.utils.UserUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; /** * 个人信息 业务处理 diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java index 46932d27..875bc469 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysRoleController.java @@ -3,6 +3,10 @@ package com.kms.web.controller.system; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.framework.web.service.SysPermissionService; +import com.kms.system.service.SysRoleMenuService; +import com.kms.system.service.SysRoleService; +import com.kms.system.service.SysUserService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.UserConstants; import com.shuili.common.core.controller.BaseController; @@ -11,10 +15,6 @@ import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysRole; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.framework.web.service.SysPermissionService; -import com.kms.system.service.SysRoleMenuService; -import com.kms.system.service.SysRoleService; -import com.kms.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUploadController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUploadController.java index d982b9ae..4f839d1f 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUploadController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUploadController.java @@ -1,13 +1,13 @@ package com.kms.web.controller.system; +import com.kms.system.domain.SysBatchUpload; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.enums.BusinessType; - import com.shuili.common.utils.poi.ExcelUtil; - -import com.kms.system.domain.SysBatchUpload; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java index 5ab77877..047758ac 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysUserController.java @@ -3,6 +3,11 @@ package com.kms.web.controller.system; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.UserUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysPostService; +import com.kms.system.service.SysRoleService; +import com.kms.system.service.SysUserService; import com.shuili.common.annotation.Log; import com.shuili.common.constant.UserConstants; import com.shuili.common.core.controller.BaseController; @@ -15,11 +20,6 @@ import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.password.PasswordUtil; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.UserUtils; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysPostService; -import com.kms.system.service.SysRoleService; -import com.kms.system.service.SysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index f0864c59..4af32287 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -1,15 +1,9 @@ package com.kms.web.controller.system; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.common.utils.BaseEntityUtils; - - import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; @@ -25,16 +19,10 @@ import com.shuili.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-admin/src/main/java/com/kms/web/controller/tool/SwaggerController.java b/shuili-admin/src/main/java/com/kms/web/controller/tool/SwaggerController.java index 58715c73..441dd9df 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/tool/SwaggerController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/tool/SwaggerController.java @@ -2,12 +2,11 @@ package com.kms.web.controller.tool; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.shuili.common.core.controller.BaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.shuili.common.core.controller.BaseController; - /** * swagger 接口 * diff --git a/shuili-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/shuili-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 72fafa3f..4912a582 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -1,24 +1,15 @@ package com.kms.web.controller.tool; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.utils.StringUtils; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.shuili.common.core.controller.BaseController; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.utils.StringUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; /** * swagger 用户测试方法 diff --git a/shuili-admin/src/main/java/com/kms/web/core/config/SwaggerConfig.java b/shuili-admin/src/main/java/com/kms/web/core/config/SwaggerConfig.java index fc086fac..278f88c2 100644 --- a/shuili-admin/src/main/java/com/kms/web/core/config/SwaggerConfig.java +++ b/shuili-admin/src/main/java/com/kms/web/core/config/SwaggerConfig.java @@ -1,29 +1,23 @@ package com.kms.web.core.config; -import java.util.ArrayList; -import java.util.List; - +import com.shuili.common.config.ShuiliConfig; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - -import com.shuili.common.config.ShuiliConfig; - -import io.swagger.annotations.ApiOperation; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +import java.util.ArrayList; +import java.util.List; + /** * Swagger2的接口配置 * diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index e3b3c967..9359e1b9 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -1,11 +1,7 @@ package com.kms.web.synchronous; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.kms.yg.dd.domain.AttDiscBase; import com.kms.yg.dd.service.AttDiscBaseService; @@ -19,25 +15,16 @@ import com.kms.yg.sk.service.AttResBaseService; import com.kms.yg.sk.service.AttResRsppService; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; -import io.swagger.models.auth.In; import lombok.Data; -import org.apache.commons.lang.SerializationUtils; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; @Configuration @RestController diff --git a/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java b/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java index 1b83589c..fe13475e 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java +++ b/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java @@ -28,7 +28,6 @@ import org.springframework.scheduling.annotation.Scheduled; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Configuration public class WaterScheduled { diff --git a/shuili-admin/src/main/java/com/kms/web/utils/view/InitLabel.java b/shuili-admin/src/main/java/com/kms/web/utils/view/InitLabel.java index 5106635a..7f0a9b5c 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/view/InitLabel.java +++ b/shuili-admin/src/main/java/com/kms/web/utils/view/InitLabel.java @@ -1,15 +1,17 @@ package com.kms.web.utils.view; -import com.shuili.common.utils.StringUtils; -import com.shuili.common.utils.poi.ExcelUtil; import com.kms.system.constants.RootConstants; import com.kms.system.domain.CmsTag; import com.kms.system.service.CmsTagService; +import com.shuili.common.utils.StringUtils; +import com.shuili.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.FileInputStream; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Component diff --git a/shuili-common/src/main/java/com/shuili/common/annotation/DataScope.java b/shuili-common/src/main/java/com/shuili/common/annotation/DataScope.java index c8b026f3..c6a2ba52 100644 --- a/shuili-common/src/main/java/com/shuili/common/annotation/DataScope.java +++ b/shuili-common/src/main/java/com/shuili/common/annotation/DataScope.java @@ -1,10 +1,6 @@ package com.shuili.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 数据权限过滤注解 diff --git a/shuili-common/src/main/java/com/shuili/common/annotation/DataSource.java b/shuili-common/src/main/java/com/shuili/common/annotation/DataSource.java index 66896241..c3b7a9d1 100644 --- a/shuili-common/src/main/java/com/shuili/common/annotation/DataSource.java +++ b/shuili-common/src/main/java/com/shuili/common/annotation/DataSource.java @@ -1,13 +1,9 @@ package com.shuili.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import com.shuili.common.enums.DataSourceType; +import java.lang.annotation.*; + /** * 自定义多数据源切换注解 * diff --git a/shuili-common/src/main/java/com/shuili/common/annotation/Log.java b/shuili-common/src/main/java/com/shuili/common/annotation/Log.java index 9c8a3de4..26a45ed9 100644 --- a/shuili-common/src/main/java/com/shuili/common/annotation/Log.java +++ b/shuili-common/src/main/java/com/shuili/common/annotation/Log.java @@ -1,15 +1,11 @@ package com.shuili.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - import com.shuili.common.constant.YesOrNo; import com.shuili.common.enums.BusinessType; import com.shuili.common.enums.OperatorType; +import java.lang.annotation.*; + /** * 自定义操作日志记录注解 * diff --git a/shuili-common/src/main/java/com/shuili/common/annotation/RepeatSubmit.java b/shuili-common/src/main/java/com/shuili/common/annotation/RepeatSubmit.java index 2487d449..275babb3 100644 --- a/shuili-common/src/main/java/com/shuili/common/annotation/RepeatSubmit.java +++ b/shuili-common/src/main/java/com/shuili/common/annotation/RepeatSubmit.java @@ -1,11 +1,6 @@ package com.shuili.common.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 自定义注解防止表单重复提交 diff --git a/shuili-common/src/main/java/com/shuili/common/core/domain/AddParam.java b/shuili-common/src/main/java/com/shuili/common/core/domain/AddParam.java index 66269caf..3ae514ec 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/domain/AddParam.java +++ b/shuili-common/src/main/java/com/shuili/common/core/domain/AddParam.java @@ -1,11 +1,11 @@ package com.shuili.common.core.domain; +import com.shuili.common.utils.StringUtils; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.shuili.common.utils.StringUtils; - public class AddParam implements Serializable{ diff --git a/shuili-common/src/main/java/com/shuili/common/core/domain/AjaxResult.java b/shuili-common/src/main/java/com/shuili/common/core/domain/AjaxResult.java index 8466b585..c2fd7a13 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/domain/AjaxResult.java +++ b/shuili-common/src/main/java/com/shuili/common/core/domain/AjaxResult.java @@ -1,9 +1,10 @@ package com.shuili.common.core.domain; -import java.util.HashMap; import com.shuili.common.constant.HttpStatus; import com.shuili.common.utils.StringUtils; +import java.util.HashMap; + /** * 操作消息提醒 * diff --git a/shuili-common/src/main/java/com/shuili/common/core/domain/SearchParam.java b/shuili-common/src/main/java/com/shuili/common/core/domain/SearchParam.java index a3f6254a..bf1486e9 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/domain/SearchParam.java +++ b/shuili-common/src/main/java/com/shuili/common/core/domain/SearchParam.java @@ -1,15 +1,15 @@ package com.shuili.common.core.domain; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.shuili.common.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @ApiModel("查询参数") @Data public class SearchParam implements Serializable{ diff --git a/shuili-common/src/main/java/com/shuili/common/core/domain/TimeView.java b/shuili-common/src/main/java/com/shuili/common/core/domain/TimeView.java index 82644a14..9481b735 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/domain/TimeView.java +++ b/shuili-common/src/main/java/com/shuili/common/core/domain/TimeView.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - @Data @ApiModel("时间查询") public class TimeView { diff --git a/shuili-common/src/main/java/com/shuili/common/core/text/CharsetKit.java b/shuili-common/src/main/java/com/shuili/common/core/text/CharsetKit.java index 13b39639..f09da4b4 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/text/CharsetKit.java +++ b/shuili-common/src/main/java/com/shuili/common/core/text/CharsetKit.java @@ -1,8 +1,9 @@ package com.shuili.common.core.text; +import com.shuili.common.utils.StringUtils; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.shuili.common.utils.StringUtils; /** * 字符集工具类 diff --git a/shuili-common/src/main/java/com/shuili/common/core/text/Convert.java b/shuili-common/src/main/java/com/shuili/common/core/text/Convert.java index a9790818..686c83a7 100644 --- a/shuili-common/src/main/java/com/shuili/common/core/text/Convert.java +++ b/shuili-common/src/main/java/com/shuili/common/core/text/Convert.java @@ -1,12 +1,13 @@ package com.shuili.common.core.text; +import com.shuili.common.utils.StringUtils; + import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.shuili.common.utils.StringUtils; /** * 类型转换器 diff --git a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java index ce7b321b..338c2c60 100644 --- a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java +++ b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java @@ -1,8 +1,9 @@ package com.shuili.common.exception.file; -import java.util.Arrays; import org.apache.commons.fileupload.FileUploadException; +import java.util.Arrays; + /** * 文件上传 误异常类 * diff --git a/shuili-common/src/main/java/com/shuili/common/utils/CsvUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/CsvUtils.java index dffd3978..fa3e3b1d 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/CsvUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/CsvUtils.java @@ -3,9 +3,11 @@ package com.shuili.common.utils; import com.alibaba.fastjson.JSONObject; import com.csvreader.CsvReader; -import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * csv 超大数据解析 abstract diff --git a/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java index ed933b85..1ed2d0ec 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java @@ -1,5 +1,7 @@ package com.shuili.common.utils; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -8,8 +10,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang3.time.DateFormatUtils; - /** * 时间工具类 * diff --git a/shuili-common/src/main/java/com/shuili/common/utils/ExceptionUtil.java b/shuili-common/src/main/java/com/shuili/common/utils/ExceptionUtil.java index ec19bf1f..202f3f6e 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/ExceptionUtil.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/ExceptionUtil.java @@ -1,8 +1,9 @@ package com.shuili.common.utils; +import org.apache.commons.lang3.exception.ExceptionUtils; + import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; /** * 错误信息处理类。 diff --git a/shuili-common/src/main/java/com/shuili/common/utils/RSAUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/RSAUtils.java index ecda0997..86118339 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/RSAUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/RSAUtils.java @@ -1,19 +1,14 @@ package com.shuili.common.utils; -import java.security.Key; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import java.security.*; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.HashMap; import java.util.Map; -import javax.crypto.Cipher; - -import org.apache.commons.codec.binary.Base64; - public class RSAUtils { private static final String KEYALGORITHM = "RSA"; diff --git a/shuili-common/src/main/java/com/shuili/common/utils/StringUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/StringUtils.java index 7244a0de..f3be4a5b 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/StringUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/StringUtils.java @@ -1,17 +1,11 @@ package com.shuili.common.utils; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +import com.shuili.common.core.text.StrFormatter; import org.apache.commons.lang3.StringEscapeUtils; -import com.shuili.common.core.text.StrFormatter; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 字符串工具类 diff --git a/shuili-common/src/main/java/com/shuili/common/utils/Threads.java b/shuili-common/src/main/java/com/shuili/common/utils/Threads.java index d43ab756..e42a5795 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/Threads.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/Threads.java @@ -1,13 +1,10 @@ package com.shuili.common.utils; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.concurrent.*; + /** * 线程相关工具类. * diff --git a/shuili-common/src/main/java/com/shuili/common/utils/file/FileUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/file/FileUtils.java index 3cbb166a..511fad98 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/file/FileUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/file/FileUtils.java @@ -1,18 +1,11 @@ package com.shuili.common.utils.file; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import javax.servlet.http.HttpServletRequest; +import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -import javax.servlet.http.HttpServletRequest; - //import sun.misc.BASE64Encoder; /** diff --git a/shuili-common/src/main/java/com/shuili/common/utils/html/HTMLFilter.java b/shuili-common/src/main/java/com/shuili/common/utils/html/HTMLFilter.java index 9b8e6f0f..f33bffd1 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/html/HTMLFilter.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/html/HTMLFilter.java @@ -1,10 +1,6 @@ package com.shuili.common.utils.html; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; diff --git a/shuili-common/src/main/java/com/shuili/common/utils/http/HttpHelper.java b/shuili-common/src/main/java/com/shuili/common/utils/http/HttpHelper.java index 31878de8..570fbd31 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/http/HttpHelper.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/http/HttpHelper.java @@ -1,10 +1,9 @@ package com.shuili.common.utils.http; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.lang3.exception.ExceptionUtils; - import javax.servlet.ServletRequest; import java.io.BufferedReader; import java.io.IOException; diff --git a/shuili-common/src/main/java/com/shuili/common/utils/http/HttpUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/http/HttpUtils.java index 18d40dbc..c4997542 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/http/HttpUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/http/HttpUtils.java @@ -1,25 +1,16 @@ package com.shuili.common.utils.http; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; +import com.shuili.common.constant.Constants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.*; +import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; import java.net.URL; import java.net.URLConnection; import java.security.cert.X509Certificate; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; - -import com.shuili.common.constant.Constants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * 通用http发送方法 diff --git a/shuili-common/src/main/java/com/shuili/common/utils/ip/IpUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/ip/IpUtils.java index 7b3f0cd8..5cf0b847 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/ip/IpUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/ip/IpUtils.java @@ -1,5 +1,9 @@ package com.shuili.common.utils.ip; +import com.shuili.common.utils.StringUtils; +import com.shuili.common.utils.html.EscapeUtil; + +import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -8,11 +12,6 @@ import java.net.UnknownHostException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; - -import com.shuili.common.utils.StringUtils; -import com.shuili.common.utils.html.EscapeUtil; - /** * 获取IP方法 * diff --git a/shuili-common/src/main/java/com/shuili/common/utils/password/Digests.java b/shuili-common/src/main/java/com/shuili/common/utils/password/Digests.java index db6e47eb..342246f1 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/password/Digests.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/password/Digests.java @@ -1,13 +1,13 @@ package com.shuili.common.utils.password; +import org.apache.commons.lang3.Validate; + import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; import java.security.MessageDigest; import java.security.SecureRandom; -import org.apache.commons.lang3.Validate; - /** * 支持SHA-1/MD5消息摘要的工具类. * 返回ByteSource，可进一步被编码为Hex, Base64或UrlSafeBase64 diff --git a/shuili-common/src/main/java/com/shuili/common/utils/password/Encodes.java b/shuili-common/src/main/java/com/shuili/common/utils/password/Encodes.java index cad7c265..b6c06031 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/password/Encodes.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/password/Encodes.java @@ -1,14 +1,14 @@ package com.shuili.common.utils.password; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; - import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.lang3.StringEscapeUtils; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; + /** * 封装各种格式的编码解码工具类. * 1.Commons-Codec的 hex/base64 编码 diff --git a/shuili-common/src/main/java/com/shuili/common/utils/reflect/ReflectUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/reflect/ReflectUtils.java index 31f6cc9f..c25790f3 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/reflect/ReflectUtils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/reflect/ReflectUtils.java @@ -1,20 +1,14 @@ package com.shuili.common.utils.reflect; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.Date; - import com.shuili.common.core.text.Convert; +import com.shuili.common.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.shuili.common.utils.DateUtils; +import java.lang.reflect.*; +import java.util.Date; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/shuili-common/src/main/java/com/shuili/common/utils/sign/Md5Utils.java b/shuili-common/src/main/java/com/shuili/common/utils/sign/Md5Utils.java index 5ba71c2d..a3d798e2 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/sign/Md5Utils.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/sign/Md5Utils.java @@ -1,9 +1,10 @@ package com.shuili.common.utils.sign; -import java.security.MessageDigest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.security.MessageDigest; + /** * Md5加密方法 * diff --git a/shuili-common/src/main/java/com/shuili/common/utils/uuid/UUID.java b/shuili-common/src/main/java/com/shuili/common/utils/uuid/UUID.java index be93396e..928d234b 100644 --- a/shuili-common/src/main/java/com/shuili/common/utils/uuid/UUID.java +++ b/shuili-common/src/main/java/com/shuili/common/utils/uuid/UUID.java @@ -1,11 +1,12 @@ package com.shuili.common.utils.uuid; +import com.shuili.common.exception.UtilException; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.shuili.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 diff --git a/shuili-system/src/main/java/com/kms/cms/domain/CmsContent.java b/shuili-system/src/main/java/com/kms/cms/domain/CmsContent.java index c1577954..efd0b1c0 100644 --- a/shuili-system/src/main/java/com/kms/cms/domain/CmsContent.java +++ b/shuili-system/src/main/java/com/kms/cms/domain/CmsContent.java @@ -1,14 +1,11 @@ package com.kms.cms.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 内容记录对象 cms_content diff --git a/shuili-system/src/main/java/com/kms/cms/mapper/CmsContentMapper.java b/shuili-system/src/main/java/com/kms/cms/mapper/CmsContentMapper.java index 8a30ad20..f6b6b8a6 100644 --- a/shuili-system/src/main/java/com/kms/cms/mapper/CmsContentMapper.java +++ b/shuili-system/src/main/java/com/kms/cms/mapper/CmsContentMapper.java @@ -1,8 +1,8 @@ package com.kms.cms.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.cms.domain.CmsContent; +import org.springframework.stereotype.Repository; /** * 内容记录Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java b/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java index 67bed2d3..b3120aa6 100644 --- a/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java +++ b/shuili-system/src/main/java/com/kms/cms/service/CmsContentService.java @@ -1,10 +1,8 @@ package com.kms.cms.service; -import com.shuili.common.annotation.DataSource; -import com.shuili.common.core.service.BaseService; import com.kms.cms.domain.CmsContent; import com.kms.cms.mapper.CmsContentMapper; -import com.shuili.common.enums.DataSourceType; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/common/GlobalExceptionHandler.java b/shuili-system/src/main/java/com/kms/common/GlobalExceptionHandler.java index b528ad43..306c668d 100644 --- a/shuili-system/src/main/java/com/kms/common/GlobalExceptionHandler.java +++ b/shuili-system/src/main/java/com/kms/common/GlobalExceptionHandler.java @@ -1,10 +1,15 @@ package com.kms.common; - - +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.exception.NotPermissionException; import com.kms.system.domain.SysExceptionLog; import com.kms.system.service.SysExceptionLogService; +import com.shuili.common.constant.HttpStatus; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.exception.BaseException; +import com.shuili.common.exception.CustomException; +import com.shuili.common.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -14,15 +19,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.NoHandlerFoundException; -import com.shuili.common.constant.HttpStatus; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.exception.BaseException; -import com.shuili.common.exception.CustomException; -import com.shuili.common.utils.StringUtils; - -import cn.dev33.satoken.exception.NotLoginException; -import cn.dev33.satoken.exception.NotPermissionException; - import java.util.Date; /** diff --git a/shuili-system/src/main/java/com/kms/common/api/CommonApi.java b/shuili-system/src/main/java/com/kms/common/api/CommonApi.java index 4791c8e3..fde6abab 100644 --- a/shuili-system/src/main/java/com/kms/common/api/CommonApi.java +++ b/shuili-system/src/main/java/com/kms/common/api/CommonApi.java @@ -2,13 +2,13 @@ package com.kms.common.api; import com.alibaba.fastjson.JSONObject; +import com.kms.common.entity.Chunk; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.entity.SysDictData; import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.DictUtils; import com.shuili.common.utils.FastDfsUtil; import com.shuili.common.utils.file.FileUtils; -import com.kms.common.entity.Chunk; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.java.Log; @@ -24,7 +24,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.*; +import java.util.List; /** * 通用的api diff --git a/shuili-system/src/main/java/com/kms/common/entity/SearchView.java b/shuili-system/src/main/java/com/kms/common/entity/SearchView.java index 2824db10..cbf9c4e1 100644 --- a/shuili-system/src/main/java/com/kms/common/entity/SearchView.java +++ b/shuili-system/src/main/java/com/kms/common/entity/SearchView.java @@ -1,18 +1,14 @@ package com.kms.common.entity; import com.alibaba.fastjson.JSONObject; -import com.shuili.common.utils.StringUtils; import com.kms.common.ir.Node; import com.kms.common.ir.OrderItem; import com.kms.common.ir.PermissionParam; import com.kms.common.ir.SearchDate; +import com.shuili.common.utils.StringUtils; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public class SearchView implements Serializable { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/common/http/utils/HttpClientUtils.java b/shuili-system/src/main/java/com/kms/common/http/utils/HttpClientUtils.java index 2e023032..07d48c46 100644 --- a/shuili-system/src/main/java/com/kms/common/http/utils/HttpClientUtils.java +++ b/shuili-system/src/main/java/com/kms/common/http/utils/HttpClientUtils.java @@ -1,8 +1,8 @@ package com.kms.common.http.utils; import com.alibaba.fastjson.JSON; -import com.shuili.common.utils.StringUtils; import com.kms.common.http.entity.CodeResult; +import com.shuili.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.stereotype.Component; diff --git a/shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java b/shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java index 143db50b..003a8aff 100644 --- a/shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java +++ b/shuili-system/src/main/java/com/kms/common/utils/DataTypeUtil.java @@ -1,9 +1,9 @@ package com.kms.common.utils; +import com.kms.common.constant.DictConstant; import com.shuili.common.core.domain.entity.SysDictData; import com.shuili.common.utils.DictUtils; import com.shuili.common.utils.StringUtils; -import com.kms.common.constant.DictConstant; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/common/utils/Itext5HtmlToPDF2.java b/shuili-system/src/main/java/com/kms/common/utils/Itext5HtmlToPDF2.java index aedb12b3..f39d14d5 100644 --- a/shuili-system/src/main/java/com/kms/common/utils/Itext5HtmlToPDF2.java +++ b/shuili-system/src/main/java/com/kms/common/utils/Itext5HtmlToPDF2.java @@ -5,9 +5,8 @@ import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.FontSelector; import com.itextpdf.text.pdf.PdfWriter; import com.itextpdf.text.pdf.codec.Base64; -import com.shuili.common.utils.StringUtils; import com.kms.system.base.analysis.FileUtils; - +import com.shuili.common.utils.StringUtils; import org.htmlcleaner.CleanerProperties; import org.htmlcleaner.HtmlCleaner; import org.jsoup.Jsoup; diff --git a/shuili-system/src/main/java/com/kms/sys/progress/ChunkController.java b/shuili-system/src/main/java/com/kms/sys/progress/ChunkController.java index ca8a1bff..cf450467 100644 --- a/shuili-system/src/main/java/com/kms/sys/progress/ChunkController.java +++ b/shuili-system/src/main/java/com/kms/sys/progress/ChunkController.java @@ -4,7 +4,7 @@ import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; diff --git a/shuili-system/src/main/java/com/kms/sys/progress/ChunkService.java b/shuili-system/src/main/java/com/kms/sys/progress/ChunkService.java index d763899c..5e30f9f6 100644 --- a/shuili-system/src/main/java/com/kms/sys/progress/ChunkService.java +++ b/shuili-system/src/main/java/com/kms/sys/progress/ChunkService.java @@ -1,5 +1,9 @@ package com.kms.sys.progress; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -7,10 +11,6 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.util.UUID; - -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; public class ChunkService { public String chunkUploadByMappedByteBuffer(MultipartFileParam param, String filePath) throws IOException, NotSameFileExpection { diff --git a/shuili-system/src/main/java/com/kms/sys/progress/StdOut.java b/shuili-system/src/main/java/com/kms/sys/progress/StdOut.java index 64962e74..899317cd 100644 --- a/shuili-system/src/main/java/com/kms/sys/progress/StdOut.java +++ b/shuili-system/src/main/java/com/kms/sys/progress/StdOut.java @@ -1,10 +1,10 @@ package com.kms.sys.progress; +import com.alibaba.fastjson.JSON; + import java.util.List; import java.util.Map; -import com.alibaba.fastjson.JSON; - public class StdOut { public static final int SUCCESS = 200; public static final int FAIL = 400; diff --git a/shuili-system/src/main/java/com/kms/system/base/EditView.java b/shuili-system/src/main/java/com/kms/system/base/EditView.java index 4aa3c77d..d0908f33 100644 --- a/shuili-system/src/main/java/com/kms/system/base/EditView.java +++ b/shuili-system/src/main/java/com/kms/system/base/EditView.java @@ -1,9 +1,9 @@ package com.kms.system.base; -import java.util.List; - import lombok.Data; +import java.util.List; + @Data public class EditView { diff --git a/shuili-system/src/main/java/com/kms/system/base/analysis/FileUtils.java b/shuili-system/src/main/java/com/kms/system/base/analysis/FileUtils.java index d350d2ad..2c068460 100644 --- a/shuili-system/src/main/java/com/kms/system/base/analysis/FileUtils.java +++ b/shuili-system/src/main/java/com/kms/system/base/analysis/FileUtils.java @@ -1,37 +1,6 @@ package com.kms.system.base.analysis; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.RandomAccessFile; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.shuili.common.utils.password.Encodes; import org.apache.commons.lang3.StringUtils; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipFile; @@ -45,7 +14,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; -import com.shuili.common.utils.password.Encodes; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; /** diff --git a/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntity.java b/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntity.java index 20cd9c01..72cdf91c 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntity.java +++ b/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntity.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 素材实体对象 cms_material_entity diff --git a/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntityRelation.java b/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntityRelation.java index 152dad21..f93df8f5 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntityRelation.java +++ b/shuili-system/src/main/java/com/kms/system/domain/CmsMaterialEntityRelation.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 实体关系对象 cms_material_entity_relation diff --git a/shuili-system/src/main/java/com/kms/system/domain/CmsUserCollect.java b/shuili-system/src/main/java/com/kms/system/domain/CmsUserCollect.java index 1180639d..7423c590 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/CmsUserCollect.java +++ b/shuili-system/src/main/java/com/kms/system/domain/CmsUserCollect.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 收藏对象 cms_user_collect diff --git a/shuili-system/src/main/java/com/kms/system/domain/CmsUserFavorites.java b/shuili-system/src/main/java/com/kms/system/domain/CmsUserFavorites.java index 2e00c53f..7b893ea6 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/CmsUserFavorites.java +++ b/shuili-system/src/main/java/com/kms/system/domain/CmsUserFavorites.java @@ -1,16 +1,13 @@ package com.kms.system.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import com.shuili.common.mybaitsplus.NoQuery; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 收藏夹对象 cms_user_favorites diff --git a/shuili-system/src/main/java/com/kms/system/domain/LabField.java b/shuili-system/src/main/java/com/kms/system/domain/LabField.java index 4a58013c..09315a32 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/LabField.java +++ b/shuili-system/src/main/java/com/kms/system/domain/LabField.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 领域信息对象 lab_field diff --git a/shuili-system/src/main/java/com/kms/system/domain/LabLaboratory.java b/shuili-system/src/main/java/com/kms/system/domain/LabLaboratory.java index ba05e08c..073528a0 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/LabLaboratory.java +++ b/shuili-system/src/main/java/com/kms/system/domain/LabLaboratory.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 实验室信息对象 lab_laboratory diff --git a/shuili-system/src/main/java/com/kms/system/domain/LabTeacher.java b/shuili-system/src/main/java/com/kms/system/domain/LabTeacher.java index 43589f15..6e3c273f 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/LabTeacher.java +++ b/shuili-system/src/main/java/com/kms/system/domain/LabTeacher.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 教师信息对象 lab_teacher diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysConfig.java b/shuili-system/src/main/java/com/kms/system/domain/SysConfig.java index b4f3b34a..3e7ad410 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysConfig.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysConfig.java @@ -1,14 +1,13 @@ package com.kms.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 参数配置表 sys_config diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysExceptionLog.java b/shuili-system/src/main/java/com/kms/system/domain/SysExceptionLog.java index 8c122ffe..a0d0c5c2 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysExceptionLog.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysExceptionLog.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.util.Date; @Data diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysInfo.java b/shuili-system/src/main/java/com/kms/system/domain/SysInfo.java index 58872c70..4125cdf5 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysInfo.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysInfo.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 系统基本信息对象 sys_info diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysLabelsAttributeView.java b/shuili-system/src/main/java/com/kms/system/domain/SysLabelsAttributeView.java index 5026e7ec..768ff905 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysLabelsAttributeView.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysLabelsAttributeView.java @@ -1,8 +1,8 @@ package com.kms.system.domain; +import com.kms.common.constant.DictConstant; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; -import com.kms.common.constant.DictConstant; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysLogininfor.java b/shuili-system/src/main/java/com/kms/system/domain/SysLogininfor.java index 8e7615fe..bd9b6498 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysLogininfor.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysLogininfor.java @@ -1,12 +1,12 @@ package com.kms.system.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; + /** * 系统访问记录表 sys_logininfor * diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysModule.java b/shuili-system/src/main/java/com/kms/system/domain/SysModule.java index 0eaaf162..08c24856 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysModule.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysModule.java @@ -1,14 +1,11 @@ package com.kms.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; /** * 前端模块对象 sys_module diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysNotice.java b/shuili-system/src/main/java/com/kms/system/domain/SysNotice.java index 74c17cbf..9e1fd92e 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysNotice.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysNotice.java @@ -1,14 +1,14 @@ package com.kms.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.core.domain.BaseEntity; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.shuili.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 通知公告表 sys_notice diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysOperLog.java b/shuili-system/src/main/java/com/kms/system/domain/SysOperLog.java index 0187eea4..e3332e7e 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysOperLog.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysOperLog.java @@ -1,13 +1,13 @@ package com.kms.system.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import lombok.Data; +import java.util.Date; + /** * 操作日志记录表 oper_log diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysPost.java b/shuili-system/src/main/java/com/kms/system/domain/SysPost.java index 00db6235..9ba148ac 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysPost.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysPost.java @@ -1,18 +1,16 @@ package com.kms.system.domain; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.mybaitsplus.NoQuery; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; - +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java b/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java index 92540368..531ac032 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java +++ b/shuili-system/src/main/java/com/kms/system/domain/SysXzqh.java @@ -1,17 +1,13 @@ package com.kms.system.domain; -import java.math.BigDecimal; - +import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; diff --git a/shuili-system/src/main/java/com/kms/system/domain/vo/RouterVo.java b/shuili-system/src/main/java/com/kms/system/domain/vo/RouterVo.java index 2c6692b8..b5a11feb 100644 --- a/shuili-system/src/main/java/com/kms/system/domain/vo/RouterVo.java +++ b/shuili-system/src/main/java/com/kms/system/domain/vo/RouterVo.java @@ -1,6 +1,7 @@ package com.kms.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; + import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/system/es/DataSearchEntity.java b/shuili-system/src/main/java/com/kms/system/es/DataSearchEntity.java index 8aa8ebf2..ccdf7258 100644 --- a/shuili-system/src/main/java/com/kms/system/es/DataSearchEntity.java +++ b/shuili-system/src/main/java/com/kms/system/es/DataSearchEntity.java @@ -1,7 +1,7 @@ package com.kms.system.es; -import com.shuili.common.utils.StringUtils; import com.kms.common.entity.SearchView; +import com.shuili.common.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/system/mapper/LabFieldMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/LabFieldMapper.java index a88dfc5a..32f08691 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/LabFieldMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/LabFieldMapper.java @@ -1,8 +1,8 @@ package com.kms.system.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.LabField; +import org.springframework.stereotype.Repository; /** * 领域信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/system/mapper/LabNodeMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/LabNodeMapper.java index 2ea92f05..fc8ca0a6 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/LabNodeMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/LabNodeMapper.java @@ -1,7 +1,6 @@ package com.kms.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.system.domain.LabField; import com.kms.system.domain.LabNode; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/system/mapper/LabRelationMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/LabRelationMapper.java index cdcd5923..303e10b1 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/LabRelationMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/LabRelationMapper.java @@ -1,7 +1,6 @@ package com.kms.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.system.domain.LabNode; import com.kms.system.domain.LabRelation; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/system/mapper/LabTeacherMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/LabTeacherMapper.java index e952c682..4a611de2 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/LabTeacherMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/LabTeacherMapper.java @@ -1,8 +1,8 @@ package com.kms.system.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.LabTeacher; +import org.springframework.stereotype.Repository; /** * 教师信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysConfigMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysConfigMapper.java index ffcb6d6d..fd2856ca 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysConfigMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysConfigMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysConfig; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 参数配置 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysDeptMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysDeptMapper.java index 331630ec..047c5ea9 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysDeptMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysDeptMapper.java @@ -1,12 +1,12 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import com.shuili.common.core.domain.entity.SysDept; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 部门管理 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysDictTypeMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysDictTypeMapper.java index 1817ddc1..7b3a9ced 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysDictTypeMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysDictTypeMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shuili.common.core.domain.entity.SysDictType; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 字典表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysInfoMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysInfoMapper.java index e1bcd388..cc905057 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysInfoMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysInfoMapper.java @@ -1,8 +1,8 @@ package com.kms.system.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysInfo; +import org.springframework.stereotype.Repository; /** * 系统基本信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysMenuMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysMenuMapper.java index 2ea405cb..1f5aae40 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysMenuMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysMenuMapper.java @@ -1,12 +1,12 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import com.shuili.common.core.domain.entity.SysMenu; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 菜单表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysModuleMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysModuleMapper.java index ad0b5367..84783834 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysModuleMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysModuleMapper.java @@ -1,8 +1,8 @@ package com.kms.system.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysModule; +import org.springframework.stereotype.Repository; /** * 前端模块Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysNoticeMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysNoticeMapper.java index 2f03dd0d..440df9f7 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysNoticeMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysNoticeMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysNotice; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 通知公告表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysPostMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysPostMapper.java index 5cc18749..e476f7dc 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysPostMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysPostMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysPost; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 岗位信息 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysRoleDeptMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysRoleDeptMapper.java index 92a02ae5..52b10c30 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysRoleDeptMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysRoleDeptMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysRoleDept; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 角色与部门关联表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysRoleMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysRoleMapper.java index 1406e135..55aafeb6 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysRoleMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysRoleMapper.java @@ -1,11 +1,11 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.shuili.common.core.domain.entity.SysRole; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 角色表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/system/mapper/SysUserMapper.java b/shuili-system/src/main/java/com/kms/system/mapper/SysUserMapper.java index 973c27d5..53a22d74 100644 --- a/shuili-system/src/main/java/com/kms/system/mapper/SysUserMapper.java +++ b/shuili-system/src/main/java/com/kms/system/mapper/SysUserMapper.java @@ -1,13 +1,13 @@ package com.kms.system.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.domain.model.LoginBody; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 用户表 数据层 * diff --git a/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java b/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java index fc155565..17e978bd 100644 --- a/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java @@ -1,34 +1,22 @@ package com.kms.yg.dd.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.dd.domain.AttDiscBase; import com.kms.yg.dd.service.AttDiscBaseService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java index 770ad9d5..8a72bd66 100644 --- a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java +++ b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java @@ -1,13 +1,11 @@ package com.kms.yg.dd.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; /** diff --git a/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java index 7a3e0cb1..bbd62dcf 100644 --- a/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.dd.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.dd.domain.AttDiscBase; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 堤段基本信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjcController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjcController.java index ac5fe39b..82c90366 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjcController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjcController.java @@ -1,37 +1,22 @@ package com.kms.yg.df.controller; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; -import java.util.Arrays; -import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.df.domain.BsSgcDfAqjc; import com.kms.yg.df.service.BsSgcDfAqjcService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzAqjc; -import com.kms.yg.sz.service.BsSgcSzAqjcService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java index a10ff859..ecdf2807 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqjdxxController.java @@ -1,9 +1,7 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfAqjdxx; @@ -12,35 +10,20 @@ import com.kms.yg.df.domain.BsSgcDfDfrw; import com.kms.yg.df.service.BsSgcDfAqjdxxService; import com.kms.yg.df.service.BsSgcDfAqrwService; import com.kms.yg.df.service.BsSgcDfDfrwService; -import com.kms.yg.sz.domain.BsSgcSzAqrw; -import com.kms.yg.sz.domain.BsSgcSzSzrw; -import com.kms.yg.sz.service.BsSgcSzAqrwService; -import com.kms.yg.sz.service.BsSgcSzSzrwService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzAqjdxx; -import com.kms.yg.sz.service.BsSgcSzAqjdxxService; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java index 06e9842b..7edc063b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfAqrwController.java @@ -1,42 +1,30 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfAqrw; import com.kms.yg.df.service.BsSgcDfAqrwService; - import com.kms.yg.sz.domain.dto.AqrwDto; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyController.java index c3091953..f941ca8e 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfBydy; import com.kms.yg.df.service.BsSgcDfBydyService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzBydy; -import com.kms.yg.sz.service.BsSgcSzBydyService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java index 331eb489..b6475927 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBydyzbController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfBydyzb; import com.kms.yg.df.service.BsSgcDfBydyzbService; -import com.kms.yg.sz.domain.BsSgcSzBydyzb; -import com.kms.yg.sz.service.BsSgcSzBydyzbService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java index 04fccc48..f1592868 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java @@ -1,45 +1,30 @@ package com.kms.yg.df.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfJbxx; -import com.kms.yg.sz.domain.BsSgcSzBzbp; +import com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.df.service.BsSgcDfBzbpService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfBzbp; -import com.kms.yg.df.service.BsSgcDfBzbpService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhController.java index c1ed1494..85d0714e 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhController.java @@ -1,17 +1,15 @@ package com.kms.yg.df.controller; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.*; - -import com.kms.yg.sz.domain.BsSgcSzBzh; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfBzh; +import com.kms.yg.df.service.BsSgcDfBzhService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Row; @@ -19,23 +17,12 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfBzh; -import com.kms.yg.df.service.BsSgcDfBzhService; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.*; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java index e1196c85..fa9bdab0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzhjsController.java @@ -1,34 +1,22 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfBzhjs; +import com.kms.yg.df.service.BsSgcDfBzhjsService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfBzhjs; -import com.kms.yg.df.service.BsSgcDfBzhjsService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDaglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDaglController.java index 3d1eb096..7caa80d8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDaglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDaglController.java @@ -1,34 +1,22 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfDagl; +import com.kms.yg.df.service.BsSgcDfDaglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfDagl; -import com.kms.yg.df.service.BsSgcDfDaglService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java index 2ac6cb55..1b5a6bd5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java @@ -1,40 +1,28 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfDfhdm; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.service.BsSgcDfDfhdmService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfDfhdm; -import com.kms.yg.df.service.BsSgcDfDfhdmService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java index 7e01d00d..dfe3fdb3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfrwController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfDfrw; import com.kms.yg.df.service.BsSgcDfDfrwService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzSzrw; -import com.kms.yg.sz.service.BsSgcSzSzrwService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java index fedab82d..a1c9ba0f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxwzController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFxwz; import com.kms.yg.df.service.BsSgcDfFxwzService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzFxwz; -import com.kms.yg.sz.service.BsSgcSzFxwzService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸防汛物资Controller * diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java index 5115fbc9..39f6d93b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxyhdcController.java @@ -1,34 +1,22 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfFxyhdc; +import com.kms.yg.df.service.BsSgcDfFxyhdcService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfFxyhdc; -import com.kms.yg.df.service.BsSgcDfFxyhdcService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java index ba617a24..ac154e16 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzController.java @@ -1,10 +1,9 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFxzz; @@ -14,38 +13,20 @@ import com.kms.yg.df.domain.dto.BsSgcDfFxzzDto; import com.kms.yg.df.service.BsSgcDfFxzzService; import com.kms.yg.df.service.BsSgcDfFxzzcyService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzFxzz; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.BsSgcSzFxzzDto; -import com.kms.yg.sz.service.BsSgcSzFxzzService; -import com.kms.yg.sz.service.BsSgcSzFxzzcyService; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzcyController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzcyController.java index c96c40c5..b95d38aa 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzcyController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFxzzcyController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFxzzcy; import com.kms.yg.df.service.BsSgcDfFxzzcyService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; -import com.kms.yg.sz.service.BsSgcSzFxzzcyService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java index 85f2c5ac..b64f7172 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java @@ -1,54 +1,28 @@ package com.kms.yg.df.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.UserUtils; -import com.kms.system.domain.SysXzqh; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfFzrService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzFzr; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.FzrDto; -import com.kms.yg.sz.domain.dto.HistogramDto; -import com.kms.yg.sz.service.BsSgcSzFzrService; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysDept; -import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; /** @@ -60,8 +34,7 @@ import com.shuili.common.enums.BusinessType; @RestController @RequestMapping("/df/fzr") @Api(tags = "水闸负责人") -public class BsSgcDfFzrController extends BaseController -{ +public class BsSgcDfFzrController extends BaseController { @Autowired private BsSgcDfFzrService bsSgcSzFzrService; @@ -77,12 +50,12 @@ public class BsSgcDfFzrController extends BaseController @GetMapping("/getHistogram") - public HashMap> getHistogram() { + public HashMap> getHistogram() { Integer layer = sysXzqhService.getLayer(); String xzqh = sysXzqhService.getXzqh(); - HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); + HashMap> dto = bsSgcSzFzrService.getHistogram(layer, xzqh); return dto; @@ -90,15 +63,13 @@ public class BsSgcDfFzrController extends BaseController } - /** * 查询水闸负责人列表 */ @PostMapping("/list") @ApiOperation("水闸负责人列表") - public IPage list(@RequestBody SearchParam sp) - { - return bsSgcSzFzrService.selectPage(sp); + public IPage list(@RequestBody SearchParam sp) { + return bsSgcSzFzrService.selectPage(sp); } /** @@ -107,8 +78,7 @@ public class BsSgcDfFzrController extends BaseController @Log(title = "水闸负责人导出", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("水闸负责人导出") - public AjaxResult export(@RequestBody BsSgcDfFzr bsSgcSzFzr) - { + public AjaxResult export(@RequestBody BsSgcDfFzr bsSgcSzFzr) { List list = bsSgcSzFzrService.listByIds(bsSgcSzFzr.getIds()); ExcelUtil util = new ExcelUtil<>(BsSgcDfFzr.class); return util.exportExcel(list, "fzr"); @@ -119,8 +89,7 @@ public class BsSgcDfFzrController extends BaseController */ @ApiOperation(" 水闸负责人详情") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(bsSgcSzFzrService.getById(id)); } @@ -130,8 +99,7 @@ public class BsSgcDfFzrController extends BaseController @Log(title = "水闸负责人新增", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("水闸负责人新增") - public AjaxResult add(@RequestBody BsSgcDfFzr bsSgcSzFzr) - { + public AjaxResult add(@RequestBody BsSgcDfFzr bsSgcSzFzr) { BaseEntityUtils.preInsert(bsSgcSzFzr); String dikeCode = bsSgcSzFzr.getDikeCode(); BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) @@ -148,8 +116,7 @@ public class BsSgcDfFzrController extends BaseController @ApiOperation("水闸负责人修改") @Log(title = "水闸负责人修改", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody BsSgcDfFzr bsSgcSzFzr) - { + public AjaxResult edit(@RequestBody BsSgcDfFzr bsSgcSzFzr) { String dikeCode = bsSgcSzFzr.getDikeCode(); @@ -165,9 +132,8 @@ public class BsSgcDfFzrController extends BaseController */ @ApiOperation("水闸负责人删除") @Log(title = "水闸负责人删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { return toAjax(bsSgcSzFzrService.removeByIds(Arrays.asList(ids))); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java index 9ffd9b96..6835f979 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java @@ -1,37 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.df.domain.BsSgcDfGcgl; import com.kms.yg.df.service.BsSgcDfGcglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.BeanUtils; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java index df36d461..7dec631c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java @@ -1,48 +1,30 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfDfhdm; import com.kms.yg.df.domain.BsSgcDfGcxy; -import com.kms.yg.df.domain.BsSgcDfJyjl; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfGcxyService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzGcxy; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.service.BsSgcSzGcxyService; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java index c2e253c7..bd4d88d7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java @@ -1,43 +1,28 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfDfhdm; -import com.kms.yg.df.domain.BsSgcDfGcxy; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfHdmtzz; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.service.BsSgcDfHdmtzzService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.ParameterResolutionDelegate; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfHdmtzz; -import com.kms.yg.df.service.BsSgcDfHdmtzzService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java index 7c66d215..5c9b8604 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHzxxController.java @@ -1,43 +1,27 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfHzxx; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfHzxxService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzHzxx; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.service.BsSgcSzHzxxService; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java index 090f5b4d..22ba1b7b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java @@ -1,46 +1,31 @@ package com.kms.yg.df.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.df.service.BsSgcDfJbxxService; -import com.kms.yg.sz.domain.BsSgcSzGcda; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.utils.BeanUtils; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJdsbController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJdsbController.java index 90e086a5..2de9d6cb 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJdsbController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJdsbController.java @@ -1,42 +1,26 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfJdsb; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfJdsbService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzJdsb; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.service.BsSgcSzJdsbService; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java index 901b7184..3d0be087 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJfglController.java @@ -1,34 +1,22 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfJfgl; +import com.kms.yg.df.service.BsSgcDfJfglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfJfgl; -import com.kms.yg.df.service.BsSgcDfJfglService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java index e2cf9f7a..0e73c933 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java @@ -1,42 +1,28 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfHdmtzz; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfJyjl; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; -import com.kms.yg.df.domain.BsSgcDfSwtz; +import com.kms.yg.df.service.BsSgcDfJyjlService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfJyjl; -import com.kms.yg.df.service.BsSgcDfJyjlService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQqhjController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQqhjController.java index 6c7983f1..540bd742 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQqhjController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQqhjController.java @@ -1,37 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfQqhj; import com.kms.yg.df.service.BsSgcDfQqhjService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzQqhj; -import com.kms.yg.sz.service.BsSgcSzQqhjService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸确权划界Controller diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQtxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQtxxController.java index fc6379c9..676e4349 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQtxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfQtxxController.java @@ -1,34 +1,22 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.df.domain.BsSgcDfQtxx; +import com.kms.yg.df.service.BsSgcDfQtxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.df.domain.BsSgcDfQtxx; -import com.kms.yg.df.service.BsSgcDfQtxxService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 8aca9a04..74737d84 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -1,48 +1,26 @@ package com.kms.yg.df.controller; -import java.math.BigDecimal; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.common.utils.UserUtils; -import com.kms.system.domain.SysXzqh; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; -import com.kms.yg.sz.domain.BsSgcSzBzbp; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysDept; -import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.*; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java index c27dede2..09ea69c4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSjcsController.java @@ -1,43 +1,27 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.BsSgcDfSjcs; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.df.service.BsSgcDfSjcsService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzSjcs; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; -import com.kms.yg.sz.service.BsSgcSzSjcsService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java index 2d442879..fa546b5a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java @@ -1,48 +1,30 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfHdmtzz; -import com.kms.yg.df.domain.BsSgcDfJyjl; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.df.service.BsSgcDfSwtzService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzSwtz; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; -import com.kms.yg.sz.service.BsSgcSzSwtzService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSyxjlController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSyxjlController.java index 43b99ee6..320c4da0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSyxjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSyxjlController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSyxjl; import com.kms.yg.df.service.BsSgcDfSyxjlService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzSyxjl; -import com.kms.yg.sz.service.BsSgcSzSyxjlService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸备用电源试运行记录Controller diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfXlnlController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfXlnlController.java index 8cca12fe..f675c8b1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfXlnlController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfXlnlController.java @@ -1,42 +1,26 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.BsSgcDfXlnl; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.df.service.BsSgcDfXlnlService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzXlnl; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; -import com.kms.yg.sz.service.BsSgcSzXlnlService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java index bea8b14c..1581c815 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYaxxController.java @@ -1,38 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfYaxx; import com.kms.yg.df.service.BsSgcDfYaxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzYaxx; -import com.kms.yg.sz.service.BsSgcSzYaxxService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java index c5f3c4b3..350760c6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java @@ -1,42 +1,26 @@ package com.kms.yg.df.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfYhxx; import com.kms.yg.df.service.BsSgcDfYhxxService; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzYhxx; -import com.kms.yg.sz.service.BsSgcSzYhxxService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; /** * 水闸隐患信息Controller diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfZxxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfZxxxController.java index 552e37c1..2008ef83 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfZxxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfZxxxController.java @@ -1,42 +1,24 @@ package com.kms.yg.df.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.BsSgcDfZxxx; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.df.service.BsSgcDfZxxxService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzZxxx; -import com.kms.yg.sz.service.BsSgcSzZxxxService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸注销信息Controller diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java index 62b1c916..a2ff703a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java @@ -4,10 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yg.df.domain.*; import com.kms.yg.df.service.*; -import com.kms.yg.sz.controller.SzContrastController; -import com.kms.yg.sz.domain.BsSgcSzGcda; -import com.kms.yg.sz.domain.BsSgcSzGcgl; -import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.domain.AjaxResult; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjc.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjc.java index 7611d172..2f2032e4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjc.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjc.java @@ -1,12 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java index e1b6577f..28ea790d 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqjdxx.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqrw.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqrw.java index 1190c6e4..b2bdebe2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqrw.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfAqrw.java @@ -1,17 +1,16 @@ package com.kms.yg.df.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydy.java index 5db332fe..57988034 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydy.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydy.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java index 2ecf54c1..253e46e0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBydyzb.java @@ -1,12 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java index 2ded9b87..728ea5a5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java @@ -1,14 +1,13 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzh.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzh.java index ac80f88b..bea257be 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzh.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzh.java @@ -1,11 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java index 3977cccb..0d02ac52 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzhjs.java @@ -1,12 +1,12 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java index 694e4075..bbd52598 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDagl.java @@ -1,12 +1,12 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java index 31529cc9..e05a4b62 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java index 567e4e21..a6efe134 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfrw.java @@ -1,17 +1,17 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; import lombok.NoArgsConstructor; +import java.util.Date; + /** * 水闸鉴定任务关联对象 bs_sgc_df_dfrw diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java index d87e6dbb..2161c408 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxwz.java @@ -1,15 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; - -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** * 水闸防汛物资对象 bs_sgc_df_fxwz diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java index 1eb612ff..819ee6d4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxyhdc.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java index a2e8f8c5..e4586b26 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzz.java @@ -1,13 +1,12 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzzcy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzzcy.java index 810d6886..969d59db 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzzcy.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFxzzcy.java @@ -1,12 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java index 8422c1e2..ed8e3caf 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfFzr.java @@ -1,16 +1,15 @@ package com.kms.yg.df.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java index affe0272..a373036b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java index be58f857..ffefa8d3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java index dfc8c379..df4e2960 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java index d8f2e1a7..a55e2082 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHydrographicFeatures.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHzxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHzxx.java index 8fddb58b..a98d461f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHzxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHzxx.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java index a23b0440..4dc61405 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJdsb.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJdsb.java index 4a9f4071..9451f285 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJdsb.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJdsb.java @@ -1,13 +1,12 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java index 33f1e565..23f3d11b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJfgl.java @@ -1,12 +1,12 @@ package com.kms.yg.df.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java index c5ea17cd..9172e939 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java @@ -1,13 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java index bb4945cb..53cba1d6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQqhj.java @@ -1,17 +1,15 @@ package com.kms.yg.df.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** * 水闸确权划界对象 bs_sgc_df_qqhj diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQtxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQtxx.java index 705e2788..13c702e2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQtxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfQtxx.java @@ -1,12 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java index 02e502a3..c34ac171 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSjcs.java @@ -1,11 +1,11 @@ package com.kms.yg.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java index b9d38501..f760dafd 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java @@ -1,15 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSyxjl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSyxjl.java index 02b495fb..39bd470c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSyxjl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSyxjl.java @@ -1,16 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** * 水闸备用电源试运行记录对象 bs_sgc_df_syxjl * diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfXlnl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfXlnl.java index 2535b5f2..1c8dd82c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfXlnl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfXlnl.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java index 19ae2396..be4cac7b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYaxx.java @@ -1,14 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java index 51ee512b..a1d8cb8d 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfYhxx.java @@ -1,15 +1,15 @@ package com.kms.yg.df.domain; -import java.math.BigDecimal; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; -import com.shuili.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.Date; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfZxxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfZxxx.java index 77eb7673..d8ec9ae7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfZxxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfZxxx.java @@ -1,16 +1,14 @@ package com.kms.yg.df.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; - - -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** * 水闸注销信息对象 bs_sgc_df_zxxx * diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfFxzzDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfFxzzDto.java index d803e4b8..9c2a4b36 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfFxzzDto.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfFxzzDto.java @@ -2,8 +2,6 @@ package com.kms.yg.df.domain.dto; import com.kms.yg.df.domain.BsSgcDfFxzz; import com.kms.yg.df.domain.BsSgcDfFxzzcy; -import com.kms.yg.sz.domain.BsSgcSzFxzz; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; import lombok.Data; import java.io.Serializable; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfFzrDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfFzrDto.java index 6ff3d3fc..1181f48a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfFzrDto.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/DfFzrDto.java @@ -1,7 +1,6 @@ package com.kms.yg.df.domain.dto; import com.kms.yg.df.domain.BsSgcDfFzr; -import com.kms.yg.sz.domain.BsSgcSzFzr; import lombok.Data; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqjdxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqjdxxMapper.java index d944cbae..11066ab2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqjdxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfAqjdxxMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfAqjdxx; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java index 0ae7f415..295d876e 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBydyzbMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBydyzb; -import com.kms.yg.sz.domain.BsSgcSzBydyzb; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸备用电源主Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhMapper.java index 723597e8..2530f969 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBzh; +import org.springframework.stereotype.Repository; /** * 堤防标准化Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java index 85bf05d3..19cf0f9b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java @@ -1,10 +1,9 @@ package com.kms.yg.df.mapper; -import com.kms.yg.sz.domain.BsSgcSzJfgl; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfBzhjs; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDfhdmMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDfhdmMapper.java index 5bd519a2..ddf3a36f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDfhdmMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDfhdmMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfDfhdm; +import org.springframework.stereotype.Repository; /** * 堤防横断面Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java index a1cf4272..12dbacb2 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxyhdcMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfFxyhdc; +import org.springframework.stereotype.Repository; /** * 风险隐患调查Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxzzcyMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxzzcyMapper.java index fad2f8ee..f6f4db3d 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxzzcyMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFxzzcyMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfFxzzcy; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; /** * 水闸防汛组织成员Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index ff7fd19c..110e4882 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -1,11 +1,11 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.dto.PieDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java index 6f6d3418..c08c1de6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfHdmtzzMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfHdmtzz; +import org.springframework.stereotype.Repository; /** * 横断面特征值Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSjcsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSjcsMapper.java index 2d1f0f3b..69babd66 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSjcsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSjcsMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfSjcs; -import com.kms.yg.sz.domain.BsSgcSzSjcs; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSwtzMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSwtzMapper.java index 3fa71ca2..5fe10700 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSwtzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSwtzMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfSwtz; -import com.kms.yg.sz.domain.BsSgcSzSwtz; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSyxjlMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSyxjlMapper.java index 75ef26da..8738fab1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSyxjlMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSyxjlMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfSyxjl; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzSyxjl; /** * 水闸备用电源试运行记录Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfXlnlMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfXlnlMapper.java index ae0e36aa..9628b196 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfXlnlMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfXlnlMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfXlnl; -import com.kms.yg.sz.domain.BsSgcSzXlnl; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java index 3e6912bf..f8052752 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYaxxMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfYaxx; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzYaxx; /** * 水闸预案Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java index 84a38c1b..b8b3cde8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfYhxxMapper.java @@ -1,11 +1,10 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfYhxx; import com.kms.yg.sz.domain.dto.PieDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzYhxx; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfZxxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfZxxxMapper.java index 259d5922..3cab75ac 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfZxxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfZxxxMapper.java @@ -1,9 +1,8 @@ package com.kms.yg.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfZxxx; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzZxxx; /** * 水闸注销信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjcService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjcService.java index 4c474022..090d0700 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjcService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjcService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfAqjc; import com.kms.yg.df.mapper.BsSgcDfAqjcMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzAqjcMapper; -import com.kms.yg.sz.domain.BsSgcSzAqjc; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjdxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjdxxService.java index b38e5211..b60562c0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjdxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqjdxxService.java @@ -1,12 +1,8 @@ package com.kms.yg.df.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yg.df.domain.BsSgcDfAqjdxx; import com.kms.yg.df.mapper.BsSgcDfAqjdxxMapper; -import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * 水闸安全鉴定信息Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java index dde7e09b..abe9cc43 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfAqrwService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; - import com.kms.yg.df.domain.BsSgcDfAqrw; import com.kms.yg.df.domain.BsSgcDfDfrw; import com.kms.yg.df.mapper.BsSgcDfAqrwMapper; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyService.java index 681b5fec..a674ec57 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfBydy; import com.kms.yg.df.mapper.BsSgcDfBydyMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzBydyMapper; -import com.kms.yg.sz.domain.BsSgcSzBydy; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java index d9a9c17e..31103b60 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBydyzbService.java @@ -2,10 +2,7 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfBydyzb; import com.kms.yg.df.mapper.BsSgcDfBydyzbMapper; -import com.kms.yg.sz.domain.BsSgcSzBydyzb; -import com.kms.yg.sz.mapper.BsSgcSzBydyzbMapper; import com.shuili.common.core.service.BaseService; - import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java index 62167061..c552f56c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -3,11 +3,10 @@ package com.kms.yg.df.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfJbxx; +import com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.df.mapper.BsSgcDfBzbpMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfBzbpMapper; -import com.kms.yg.df.domain.BsSgcDfBzbp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhService.java index 2a8cd4ef..e92716b8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfBzhMapper; import com.kms.yg.df.domain.BsSgcDfBzh; +import com.kms.yg.df.mapper.BsSgcDfBzhMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 堤防标准化Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index 42daf902..3862b1d5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java @@ -3,12 +3,10 @@ package com.kms.yg.df.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzBzhjs; -import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.kms.yg.df.domain.BsSgcDfBzhjs; +import com.kms.yg.df.mapper.BsSgcDfBzhjsMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfBzhjsMapper; -import com.kms.yg.df.domain.BsSgcDfBzhjs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index 52483beb..a01347a7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -3,12 +3,10 @@ package com.kms.yg.df.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzDagl; -import com.kms.yg.sz.mapper.BsSgcSzDaglMapper; +import com.kms.yg.df.domain.BsSgcDfDagl; +import com.kms.yg.df.mapper.BsSgcDfDaglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfDaglMapper; -import com.kms.yg.df.domain.BsSgcDfDagl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfhdmService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfhdmService.java index 1a277b49..db2ea232 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfhdmService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfhdmService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfDfhdmMapper; import com.kms.yg.df.domain.BsSgcDfDfhdm; +import com.kms.yg.df.mapper.BsSgcDfDfhdmMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java index 5a80cd81..2dc3cc40 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDfrwService.java @@ -9,15 +9,10 @@ import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.dto.DfrwDto; import com.kms.yg.df.mapper.BsSgcDfDfrwMapper; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.SzrwDto; -import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; +import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; -import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.shuili.common.mybaitsplus.BeanToWrapper; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java index 7cff2c32..34001712 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxwzService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfFxwz; import com.kms.yg.df.mapper.BsSgcDfFxwzMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzFxwzMapper; -import com.kms.yg.sz.domain.BsSgcSzFxwz; import org.springframework.stereotype.Service; /** * 水闸防汛物资Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java index e8a5fb11..de55c615 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxyhdcService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfFxyhdcMapper; import com.kms.yg.df.domain.BsSgcDfFxyhdc; +import com.kms.yg.df.mapper.BsSgcDfFxyhdcMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 风险隐患调查Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzService.java index 41ea09a0..5236ad45 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfFxzz; import com.kms.yg.df.mapper.BsSgcDfFxzzMapper; -import com.kms.yg.sz.domain.BsSgcSzFxzz; -import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzcyService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzcyService.java index 84bb459b..84e54597 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzcyService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFxzzcyService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfFxzzcy; import com.kms.yg.df.mapper.BsSgcDfFxzzcyMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzFxzzcyMapper; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java index 49e323de..0c4c74f5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java @@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.df.mapper.BsSgcDfFzrMapper; -import com.kms.yg.sz.domain.BsSgcSzFxzz; import com.kms.yg.sz.domain.BsSgcSzFzr; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; -import com.kms.yg.sz.mapper.BsSgcSzFzrMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java index a9840fed..7e41a8d6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java @@ -5,14 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.df.domain.BsSgcDfGcgl; import com.kms.yg.df.mapper.BsSgcDfGcglMapper; -import com.kms.yg.sz.domain.BsSgcSzGcda; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Map; - /** * 水闸工程管理信息Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcxyService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcxyService.java index 994ef1af..3f95e557 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcxyService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcxyService.java @@ -2,10 +2,7 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfGcxy; import com.kms.yg.df.mapper.BsSgcDfGcxyMapper; -import com.kms.yg.sz.domain.BsSgcSzGcxy; -import com.kms.yg.sz.mapper.BsSgcSzGcxyMapper; import com.shuili.common.core.service.BaseService; - import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java index 606954e5..e5474f54 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHdmtzzService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfHdmtzzMapper; import com.kms.yg.df.domain.BsSgcDfHdmtzz; +import com.kms.yg.df.mapper.BsSgcDfHdmtzzMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 横断面特征值Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHzxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHzxxService.java index 1c86089c..b0af8377 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHzxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfHzxxService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfHzxx; import com.kms.yg.df.mapper.BsSgcDfHzxxMapper; -import com.kms.yg.sz.domain.BsSgcSzHzxx; -import com.kms.yg.sz.mapper.BsSgcSzHzxxMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJdsbService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJdsbService.java index f1793227..139904ee 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJdsbService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJdsbService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfJdsb; import com.kms.yg.df.mapper.BsSgcDfJdsbMapper; -import com.kms.yg.sz.domain.BsSgcSzJdsb; -import com.kms.yg.sz.mapper.BsSgcSzJdsbMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java index e8b28414..a5fa5fc1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJfglService.java @@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.kms.yg.df.domain.BsSgcDfJfgl; +import com.kms.yg.df.mapper.BsSgcDfJfglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfJfglMapper; -import com.kms.yg.df.domain.BsSgcDfJfgl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJyjlService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJyjlService.java index 30778805..5ebc01f7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJyjlService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJyjlService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfJyjlMapper; import com.kms.yg.df.domain.BsSgcDfJyjl; +import com.kms.yg.df.mapper.BsSgcDfJyjlMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQqhjService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQqhjService.java index 536397f5..042f9b99 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQqhjService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQqhjService.java @@ -7,8 +7,6 @@ import com.kms.yg.df.domain.BsSgcDfQqhj; import com.kms.yg.df.mapper.BsSgcDfQqhjMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzQqhjMapper; -import com.kms.yg.sz.domain.BsSgcSzQqhj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQtxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQtxxService.java index f46d2ea7..165aea54 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQtxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfQtxxService.java @@ -1,8 +1,8 @@ package com.kms.yg.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.df.mapper.BsSgcDfQtxxMapper; import com.kms.yg.df.domain.BsSgcDfQtxx; +import com.kms.yg.df.mapper.BsSgcDfQtxxMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSjcsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSjcsService.java index 36e61d5f..ada9e446 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSjcsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSjcsService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfSjcs; import com.kms.yg.df.mapper.BsSgcDfSjcsMapper; -import com.kms.yg.sz.domain.BsSgcSzSjcs; -import com.kms.yg.sz.mapper.BsSgcSzSjcsMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSwtzService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSwtzService.java index d12aaddd..e271f18b 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSwtzService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSwtzService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.df.mapper.BsSgcDfSwtzMapper; -import com.kms.yg.sz.domain.BsSgcSzSwtz; -import com.kms.yg.sz.mapper.BsSgcSzSwtzMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSyxjlService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSyxjlService.java index 62eb4496..48bf964a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSyxjlService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSyxjlService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfSyxjl; import com.kms.yg.df.mapper.BsSgcDfSyxjlMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzSyxjlMapper; -import com.kms.yg.sz.domain.BsSgcSzSyxjl; import org.springframework.stereotype.Service; /** * 水闸备用电源试运行记录Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfXlnlService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfXlnlService.java index 2fc43037..224f8020 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfXlnlService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfXlnlService.java @@ -2,8 +2,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfXlnl; import com.kms.yg.df.mapper.BsSgcDfXlnlMapper; -import com.kms.yg.sz.domain.BsSgcSzXlnl; -import com.kms.yg.sz.mapper.BsSgcSzXlnlMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java index d5218ac0..8a4233a9 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYaxxService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfYaxx; import com.kms.yg.df.mapper.BsSgcDfYaxxMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper; -import com.kms.yg.sz.domain.BsSgcSzYaxx; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java index b2b5e594..f96f31c6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfYhxxService.java @@ -6,12 +6,9 @@ import com.kms.yg.df.mapper.BsSgcDfYhxxMapper; import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper; -import com.kms.yg.sz.domain.BsSgcSzYhxx; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfZxxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfZxxxService.java index cf4980be..3de9e597 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfZxxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfZxxxService.java @@ -3,8 +3,6 @@ package com.kms.yg.df.service; import com.kms.yg.df.domain.BsSgcDfZxxx; import com.kms.yg.df.mapper.BsSgcDfZxxxMapper; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzZxxxMapper; -import com.kms.yg.sz.domain.BsSgcSzZxxx; import org.springframework.stereotype.Service; /** * 水闸注销信息Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java b/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java index 72e4aa83..204f290d 100644 --- a/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java @@ -1,34 +1,22 @@ package com.kms.yg.ly.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.ly.domain.AttBasBase; import com.kms.yg.ly.service.AttBasBaseService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java b/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java index 4b091c1a..56ea5360 100644 --- a/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java +++ b/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java @@ -1,14 +1,15 @@ package com.kms.yg.ly.domain; -import java.math.BigDecimal; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java index 4106afe1..616140d2 100644 --- a/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.ly.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.ly.domain.AttBasBase; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 流域基础信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java b/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java index 4fd1aeb5..5fe4c73e 100644 --- a/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java @@ -1,34 +1,22 @@ package com.kms.yg.rv.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.rv.domain.AttRvBase; import com.kms.yg.rv.service.AttRvBaseService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java b/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java index 825fd8e4..966a9471 100644 --- a/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java +++ b/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java @@ -1,14 +1,15 @@ package com.kms.yg.rv.domain; -import java.math.BigDecimal; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java index 9fc8403d..2d423bb2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -1,34 +1,22 @@ package com.kms.yg.sk.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sk.domain.AttResBase; import com.kms.yg.sk.service.AttResBaseService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java index 942ea469..1efde695 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java @@ -1,34 +1,22 @@ package com.kms.yg.sk.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sk.domain.AttResRspp; import com.kms.yg.sk.service.AttResRsppService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java index 5dda4f66..f9071e40 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java @@ -1,13 +1,14 @@ package com.kms.yg.sk.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java index 5867018a..618aa7ac 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java @@ -1,14 +1,15 @@ package com.kms.yg.sk.domain; -import java.io.Serializable; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java index 4ee5486f..0598f831 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sk.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sk.domain.AttResBase; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java index 762aa5f0..56a1c73b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sk.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sk.domain.AttResRspp; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java index 61de9b0a..710d488d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java @@ -1,35 +1,24 @@ package com.kms.yg.sz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import java.util.Arrays; -import java.util.List; - +import com.kms.yg.sz.domain.BsSgcSzAqjc; +import com.kms.yg.sz.service.BsSgcSzAqjcService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzAqjc; -import com.kms.yg.sz.service.BsSgcSzAqjcService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java index eb2a7bd9..f148140b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjdxxController.java @@ -1,40 +1,29 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzAqjdxx; import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.BsSgcSzSzrw; +import com.kms.yg.sz.service.BsSgcSzAqjdxxService; import com.kms.yg.sz.service.BsSgcSzAqrwService; import com.kms.yg.sz.service.BsSgcSzSzrwService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzAqjdxx; -import com.kms.yg.sz.service.BsSgcSzAqjdxxService; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java index eae148ea..11fa6416 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqrwController.java @@ -1,44 +1,30 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.dto.AqrwDto; +import com.kms.yg.sz.service.BsSgcSzAqrwService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzAqrw; -import com.kms.yg.sz.service.BsSgcSzAqrwService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyController.java index ab3ec583..d3b53a23 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzBydy; +import com.kms.yg.sz.service.BsSgcSzBydyService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzBydy; -import com.kms.yg.sz.service.BsSgcSzBydyService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java index 9014a9fb..eecf7f11 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBydyzbController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzBydyzb; import com.kms.yg.sz.service.BsSgcSzBydyzbService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java index 6702b8c1..5c3f2744 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java @@ -1,44 +1,30 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.sz.domain.BsSgcSzBzbp; +import com.kms.yg.sz.service.BsSgcSzBzbpService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzBzbp; -import com.kms.yg.sz.service.BsSgcSzBzbpService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhController.java index 0e30a878..6a8a4299 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhController.java @@ -1,39 +1,28 @@ package com.kms.yg.sz.controller; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.*; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzBzh; +import com.kms.yg.sz.service.BsSgcSzBzhService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzBzh; -import com.kms.yg.sz.service.BsSgcSzBzhService; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.*; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java index ceba5e60..59e91b09 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzhjsController.java @@ -1,34 +1,22 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzBzhjs; +import com.kms.yg.sz.service.BsSgcSzBzhjsService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzBzhjs; -import com.kms.yg.sz.service.BsSgcSzBzhjsService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java index ec0b4466..69e9c7d8 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java @@ -1,41 +1,28 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sz.domain.BsSgcSzGcjg; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzCxjl; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzCxjlService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzCxjl; -import com.kms.yg.sz.service.BsSgcSzCxjlService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDaglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDaglController.java index 50b4dc5b..23c97fc6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDaglController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzDaglController.java @@ -1,34 +1,22 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzDagl; +import com.kms.yg.sz.service.BsSgcSzDaglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzDagl; -import com.kms.yg.sz.service.BsSgcSzDaglService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java index 483c3f4d..8f5c6795 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxwzController.java @@ -1,39 +1,27 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzFxwz; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzFxwzService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzFxwz; -import com.kms.yg.sz.service.BsSgcSzFxwzService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸防汛物资Controller * diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java index 8a26d8aa..94ccba7c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzController.java @@ -1,10 +1,9 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzFxzz; @@ -14,31 +13,20 @@ import com.kms.yg.sz.domain.dto.BsSgcSzFxzzDto; import com.kms.yg.sz.service.BsSgcSzFxzzService; import com.kms.yg.sz.service.BsSgcSzFxzzcyService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzcyController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzcyController.java index e2214391..73daf269 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzcyController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFxzzcyController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzFxzzcy; +import com.kms.yg.sz.service.BsSgcSzFxzzcyService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzFxzzcy; -import com.kms.yg.sz.service.BsSgcSzFxzzcyService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java index 113ded93..07d74c39 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzFzrController.java @@ -1,49 +1,28 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.common.utils.UserUtils; -import com.kms.system.domain.SysXzqh; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.FzrDto; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.service.BsSgcSzFzrService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysDept; -import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java index 0991d5b0..ecbfddef 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java @@ -1,45 +1,31 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.service.BsSgcSzGcdaService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; -import com.shuili.common.utils.BeanUtils; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java index 8f18adbd..ae1fe1f4 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java @@ -1,37 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sz.domain.BsSgcSzGcgl; import com.kms.yg.sz.service.BsSgcSzGcglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.utils.BeanUtils; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java index ad6d8222..35dccb7d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java @@ -1,42 +1,28 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sz.domain.BsSgcSzCxjl; -import com.kms.yg.sz.domain.BsSgcSzGctx; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzGcjg; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzGcjgService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzGcjg; -import com.kms.yg.sz.service.BsSgcSzGcjgService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java index 33510a8f..1ad76499 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java @@ -1,42 +1,28 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sz.domain.BsSgcSzGcjg; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzGctx; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzXlnl; +import com.kms.yg.sz.service.BsSgcSzGctxService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzGctx; -import com.kms.yg.sz.service.BsSgcSzGctxService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java index aa061948..88044bdc 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcxyController.java @@ -1,38 +1,26 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzGcxy; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.service.BsSgcSzGcxyService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java index 4cfb6aa9..cd49b9fa 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzHzxxController.java @@ -1,39 +1,27 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzHzxx; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.service.BsSgcSzHzxxService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java index f2957722..902aaac9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJdsbController.java @@ -1,38 +1,26 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzJdsb; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.service.BsSgcSzJdsbService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java index 58377592..ece8a12b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzJfglController.java @@ -1,34 +1,22 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.kms.yg.sz.service.BsSgcSzJfglService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzJfgl; -import com.kms.yg.sz.service.BsSgcSzJfglService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzQqhjController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzQqhjController.java index 78ecb624..ac8bda1c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzQqhjController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzQqhjController.java @@ -1,35 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzQqhj; +import com.kms.yg.sz.service.BsSgcSzQqhjService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzQqhj; -import com.kms.yg.sz.service.BsSgcSzQqhjService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸确权划界Controller diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 9620013c..1c2cc4a9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -1,47 +1,26 @@ package com.kms.yg.sz.controller; -import java.math.BigDecimal; -import java.util.*; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.common.utils.UserUtils; -import com.kms.system.domain.SysXzqh; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.domain.entity.SysDept; -import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.*; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java index 27f4d980..7239c3b9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java @@ -1,43 +1,28 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; -import com.kms.yg.df.domain.BsSgcDfSwtz; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzSjcsService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java index fd689be7..dcabd6ac 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSwtzController.java @@ -1,41 +1,26 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzGctx; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSwtz; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzSwtzService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSyxjlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSyxjlController.java index f11768c2..c26700b9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSyxjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSyxjlController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzSyxjl; +import com.kms.yg.sz.service.BsSgcSzSyxjlService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzSyxjl; -import com.kms.yg.sz.service.BsSgcSzSyxjlService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸备用电源试运行记录Controller diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java index 6004e793..7d9fa307 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSzrwController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzSzrw; +import com.kms.yg.sz.service.BsSgcSzSzrwService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzSzrw; -import com.kms.yg.sz.service.BsSgcSzSzrwService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java index 08e00b37..ad3d98c7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java @@ -1,43 +1,30 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.UUID; - +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.domain.BsSgcSzXlnl; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzXlnlService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java index a19d4155..e39a3a61 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYaxxController.java @@ -1,36 +1,24 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzYaxx; +import com.kms.yg.sz.service.BsSgcSzYaxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzYaxx; -import com.kms.yg.sz.service.BsSgcSzYaxxService; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java index d8342864..2c92e9d1 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzYhxxController.java @@ -1,40 +1,27 @@ package com.kms.yg.sz.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import com.kms.yg.sz.domain.dto.HistogramDto; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.dto.PieDto; +import com.kms.yg.sz.service.BsSgcSzYhxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzYhxx; -import com.kms.yg.sz.service.BsSgcSzYhxxService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; /** * 水闸隐患信息Controller diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzZxxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzZxxxController.java index a86b89d8..6cd5f69b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzZxxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzZxxxController.java @@ -1,38 +1,26 @@ package com.kms.yg.sz.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzZxxx; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.kms.yg.sz.service.BsSgcSzZxxxService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; +import org.springframework.web.bind.annotation.*; -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; -import com.kms.yg.sz.domain.BsSgcSzZxxx; -import com.kms.yg.sz.service.BsSgcSzZxxxService; -import com.kms.system.service.SysDeptService; -import com.kms.system.service.SysXzqhService; +import java.util.Arrays; +import java.util.List; /** * 水闸注销信息Controller diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjc.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjc.java index 8694d0a7..9e512058 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjc.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqjc.java @@ -1,12 +1,11 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java index 27638e82..cf708910 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzAqrw.java @@ -1,17 +1,16 @@ package com.kms.yg.sz.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydy.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydy.java index 66a8259c..2230a794 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydy.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBydy.java @@ -1,14 +1,14 @@ package com.kms.yg.sz.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java index b7115e2e..e20d0d45 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java @@ -1,14 +1,13 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzh.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzh.java index 7f0a4d12..1362f8e4 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzh.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzh.java @@ -1,11 +1,11 @@ package com.kms.yg.sz.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java index 16fa67f3..87b6abf9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java @@ -1,13 +1,14 @@ package com.kms.yg.sz.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java index cd47a138..59921dc1 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzDagl.java @@ -1,12 +1,12 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java index e3831a01..437efcdf 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxwz.java @@ -1,15 +1,14 @@ package com.kms.yg.sz.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; - -import com.shuili.common.core.domain.BaseEntity; +import java.util.Date; /** * 水闸防汛物资对象 bs_sgc_sz_fxwz diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java index c3aded53..b61564a2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFxzz.java @@ -1,13 +1,12 @@ package com.kms.yg.sz.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java index 7d77da99..94b2e936 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java @@ -1,16 +1,15 @@ package com.kms.yg.sz.domain; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java index 879ab299..cc83be39 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java @@ -1,14 +1,14 @@ package com.kms.yg.sz.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqjdxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqjdxxMapper.java index 2a056d52..81153adf 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqjdxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzAqjdxxMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzAqjdxx; +import org.springframework.stereotype.Repository; /** * 水闸安全鉴定信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java index 065ef885..99ae2a89 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBydyzbMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzBydyzb; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 水闸备用电源主Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java index 1b380e32..519325f6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java @@ -1,10 +1,10 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sz.domain.BsSgcSzBzhjs; import com.kms.yg.sz.domain.BsSgcSzJfgl; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzBzhjs; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java index 7296f21e..dcb4e220 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxwzMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzFxwz; +import org.springframework.stereotype.Repository; /** * 水闸防汛物资Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzMapper.java index 14a13eea..174e7600 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzFxzz; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.java index 185b8583..3d27345a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFxzzcyMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzFxzzcy; +import org.springframework.stereotype.Repository; /** * 水闸防汛组织成员Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java index 1e9fc36d..7b4a3ec7 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGcgl; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcjgMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcjgMapper.java index 4283fc54..60e5dfbc 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcjgMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcjgMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGcjg; +import org.springframework.stereotype.Repository; /** * 工程结构Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGctxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGctxMapper.java index ef24961a..814c5668 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGctxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGctxMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGctx; +import org.springframework.stereotype.Repository; /** * 工程特性Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcxyMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcxyMapper.java index 3f34f4dc..9154bf40 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcxyMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcxyMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzGcxy; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 工程效益Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzHzxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzHzxxMapper.java index cc5d7bf2..ee2b085e 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzHzxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzHzxxMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzHzxx; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJdsbMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJdsbMapper.java index 3de69cb5..5e92b15f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJdsbMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJdsbMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzJdsb; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java index 0f284c6d..9d6f778a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzJfglMapper.java @@ -1,10 +1,9 @@ package com.kms.yg.sz.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzJfgl; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java index 2a55f369..da6b40d4 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzQqhjMapper.java @@ -1,9 +1,9 @@ package com.kms.yg.sz.mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzQqhj; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSjcsMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSjcsMapper.java index ebe191a5..0a7aab00 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSjcsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSjcsMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzSjcs; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSwtzMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSwtzMapper.java index 09270b2f..17c380fb 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSwtzMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSwtzMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzSwtz; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSyxjlMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSyxjlMapper.java index 30efd0d6..0381c279 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSyxjlMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSyxjlMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzSyxjl; +import org.springframework.stereotype.Repository; /** * 水闸备用电源试运行记录Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSzrwMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSzrwMapper.java index c673cec2..90932d33 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSzrwMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzSzrwMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzSzrw; +import org.springframework.stereotype.Repository; /** * 水闸鉴定任务关联Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzXlnlMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzXlnlMapper.java index 271689e2..51915336 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzXlnlMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzXlnlMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzXlnl; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java index 1c76264c..f4474982 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYaxxMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.sz.domain.BsSgcSzYaxx; +import org.springframework.stereotype.Repository; /** * 水闸预案Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java index d0c44c87..259b85b8 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzYhxxMapper.java @@ -1,10 +1,10 @@ package com.kms.yg.sz.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.dto.PieDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sz.domain.BsSgcSzYhxx; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjcService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjcService.java index 858e6013..5adbc0e8 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjcService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjcService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzAqjcMapper; import com.kms.yg.sz.domain.BsSgcSzAqjc; +import com.kms.yg.sz.mapper.BsSgcSzAqjcMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java index 5d69cec3..eaa26461 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqjdxxService.java @@ -1,11 +1,8 @@ package com.kms.yg.sz.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.core.domain.SearchParam; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzAqjdxxMapper; import com.kms.yg.sz.domain.BsSgcSzAqjdxx; -import org.springframework.beans.factory.annotation.Autowired; +import com.kms.yg.sz.mapper.BsSgcSzAqjdxxMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 水闸安全鉴定信息Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java index 550d9aaa..8f8af142 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java @@ -8,17 +8,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzAqrw; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.domain.dto.AqrwDto; import com.kms.yg.sz.domain.dto.NumDto; +import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzAqrwMapper; -import com.kms.yg.sz.domain.BsSgcSzAqrw; -import com.shuili.common.mybaitsplus.BeanToWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyService.java index 7f3b482e..65fb706f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzBydyMapper; import com.kms.yg.sz.domain.BsSgcSzBydy; +import com.kms.yg.sz.mapper.BsSgcSzBydyMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java index 710a0687..8a780cb8 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBydyzbService.java @@ -3,7 +3,6 @@ package com.kms.yg.sz.service; import com.kms.yg.sz.domain.BsSgcSzBydyzb; import com.kms.yg.sz.mapper.BsSgcSzBydyzbMapper; import com.shuili.common.core.service.BaseService; - import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java index 5df7bb3b..a2519ca3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java @@ -3,11 +3,10 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.sz.domain.BsSgcSzBzbp; +import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper; -import com.kms.yg.sz.domain.BsSgcSzBzbp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhService.java index 356ff9d7..bb32872a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzBzhMapper; import com.kms.yg.sz.domain.BsSgcSzBzh; +import com.kms.yg.sz.mapper.BsSgcSzBzhMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 水闸标准化Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java index ea7da8b5..99190f4c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java @@ -3,11 +3,11 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzBzhjs; import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.kms.yg.sz.mapper.BsSgcSzBzhjsMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzBzhjsMapper; -import com.kms.yg.sz.domain.BsSgcSzBzhjs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzCxjlService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzCxjlService.java index bd2c2dba..a0d90e05 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzCxjlService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzCxjlService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzCxjlMapper; import com.kms.yg.sz.domain.BsSgcSzCxjl; +import com.kms.yg.sz.mapper.BsSgcSzCxjlMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 出险记录Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java index 47a0678a..4b9fdc75 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java @@ -3,10 +3,10 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzDagl; +import com.kms.yg.sz.mapper.BsSgcSzDaglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzDaglMapper; -import com.kms.yg.sz.domain.BsSgcSzDagl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java index 2887828f..e44ba8ed 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxwzService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzFxwzMapper; import com.kms.yg.sz.domain.BsSgcSzFxwz; +import com.kms.yg.sz.mapper.BsSgcSzFxwzMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 水闸防汛物资Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxzzcyService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxzzcyService.java index e9b6ac68..a72c9e8d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxzzcyService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFxzzcyService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzFxzzcyMapper; import com.kms.yg.sz.domain.BsSgcSzFxzzcy; +import com.kms.yg.sz.mapper.BsSgcSzFxzzcyMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java index 7acc6713..9fd6d2ed 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; -import com.kms.yg.sz.domain.BsSgcSzFxzz; import com.kms.yg.sz.domain.BsSgcSzFzr; -import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; -import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; import com.kms.yg.sz.mapper.BsSgcSzFxzzMapper; import com.kms.yg.sz.mapper.BsSgcSzFzrMapper; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java index 61aca173..512485dc 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java @@ -3,7 +3,6 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfGcgl; import com.kms.yg.sz.domain.BsSgcSzGcgl; import com.kms.yg.sz.mapper.BsSgcSzGcglMapper; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcjgService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcjgService.java index dc706293..9cc4f103 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcjgService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcjgService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzGcjgMapper; import com.kms.yg.sz.domain.BsSgcSzGcjg; +import com.kms.yg.sz.mapper.BsSgcSzGcjgMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 工程结构Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGctxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGctxService.java index 44ef4fce..f4fe1801 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGctxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGctxService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzGctxMapper; import com.kms.yg.sz.domain.BsSgcSzGctx; +import com.kms.yg.sz.mapper.BsSgcSzGctxMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 工程特性Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcxyService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcxyService.java index 481c610b..a3289aaf 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcxyService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcxyService.java @@ -3,7 +3,6 @@ package com.kms.yg.sz.service; import com.kms.yg.sz.domain.BsSgcSzGcxy; import com.kms.yg.sz.mapper.BsSgcSzGcxyMapper; import com.shuili.common.core.service.BaseService; - import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java index f9082edf..0d35d5ce 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzJfglService.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzJfgl; +import com.kms.yg.sz.mapper.BsSgcSzJfglMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzJfglMapper; -import com.kms.yg.sz.domain.BsSgcSzJfgl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java index 52cb7f0e..8799b705 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzQqhjService.java @@ -3,10 +3,10 @@ package com.kms.yg.sz.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzQqhj; +import com.kms.yg.sz.mapper.BsSgcSzQqhjMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzQqhjMapper; -import com.kms.yg.sz.domain.BsSgcSzQqhj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSyxjlService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSyxjlService.java index 297aa795..23182257 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSyxjlService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSyxjlService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzSyxjlMapper; import com.kms.yg.sz.domain.BsSgcSzSyxjl; +import com.kms.yg.sz.mapper.BsSgcSzSyxjlMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 水闸备用电源试运行记录Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java index d5ab09e6..51819a3c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSzrwService.java @@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.domain.dto.SzrwDto; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; +import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzSzrwMapper; -import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.shuili.common.mybaitsplus.BeanToWrapper; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java index afba7030..2846d816 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYaxxService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper; import com.kms.yg.sz.domain.BsSgcSzYaxx; +import com.kms.yg.sz.mapper.BsSgcSzYaxxMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java index 2cf2a351..4f5825bd 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzYhxxService.java @@ -1,15 +1,14 @@ package com.kms.yg.sz.service; import com.kms.system.service.SysXzqhService; +import com.kms.yg.sz.domain.BsSgcSzYhxx; import com.kms.yg.sz.domain.dto.HistogramDto; import com.kms.yg.sz.domain.dto.PieDto; -import com.shuili.common.core.service.BaseService; import com.kms.yg.sz.mapper.BsSgcSzYhxxMapper; -import com.kms.yg.sz.domain.BsSgcSzYhxx; +import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzZxxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzZxxxService.java index cc1db634..8b6f61b0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzZxxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzZxxxService.java @@ -1,8 +1,8 @@ package com.kms.yg.sz.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yg.sz.mapper.BsSgcSzZxxxMapper; import com.kms.yg.sz.domain.BsSgcSzZxxx; +import com.kms.yg.sz.mapper.BsSgcSzZxxxMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** * 水闸注销信息Service接口 diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java b/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java index 1e8f8648..d4ae069f 100644 --- a/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java @@ -1,34 +1,22 @@ package com.kms.yg.xgxd.controller; -import java.util.Arrays; -import java.util.List; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; +import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; import com.shuili.common.utils.poi.ExcelUtil; -import com.kms.common.utils.BaseEntityUtils; - - import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.shuili.common.mybaitsplus.BeanToWrapper; - -import com.shuili.common.annotation.Log; -import com.shuili.common.core.domain.AjaxResult; -import com.shuili.common.enums.BusinessType; +import java.util.Arrays; +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java index 40d7e82e..21344710 100644 --- a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java @@ -1,13 +1,14 @@ package com.kms.yg.xgxd.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; -import com.shuili.common.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; + +import java.util.Date; diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java index 6212df5c..4a8ce0e8 100644 --- a/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.xgxd.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.xgxd.domain.AttDpdsBase; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 堤段基本信息Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java index 314ceaee..2dbf94ce 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java @@ -8,10 +8,8 @@ import com.kms.yg.znjg.mapper.SyDirLayerMapper; import com.kms.yg.znjg.mapper.SyLayerMapper; import com.kms.yg.znjg.mapper.SySceneDirRelationMapper; import com.kms.yg.znjg.mapper.SySceneMapper; -import com.kms.yg.znjg.service.SyDirLayerService; import com.kms.yg.znjg.service.SyDirService; import com.kms.yg.znjg.service.SyLayerService; -import com.kms.yg.znjg.service.SySceneDirRelationService; import com.kms.yg.znjg.vo.SyDirVo; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; @@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 图层目录管理 diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java index e96e6478..25c40a5f 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; -import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.znjg.domain.SyLayer; import com.kms.yg.znjg.service.SyLayerService; import com.kms.yxgh.base.Response; @@ -16,7 +15,10 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static com.kms.yg.znjg.service.SyDirService.generateLayerResourceDirectoryNumber; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java index 42b6a5d0..82784ffd 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java @@ -6,7 +6,6 @@ import com.kms.yg.znjg.domain.SySceneConfigRelation; import com.kms.yg.znjg.mapper.SySceneConfigRelationMapper; import com.kms.yg.znjg.mapper.SySceneMapper; import com.kms.yg.znjg.service.SySceneConfigRelationService; -import com.kms.yg.znjg.service.SySceneService; import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java index ef045bdb..239a239b 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java @@ -1,8 +1,6 @@ package com.kms.yg.znjg.controller; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -13,7 +11,6 @@ import com.kms.yg.znjg.domain.*; import com.kms.yg.znjg.mapper.*; import com.kms.yg.znjg.service.SySceneService; import com.kms.yg.znjg.vo.LayerForm; -import com.kms.yg.znjg.vo.SyDirVo; import com.kms.yg.znjg.vo.SySceneVo; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java index 0644a8a9..dd06f04d 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java @@ -1,17 +1,15 @@ package com.kms.yg.znjg.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * @TableName bs_sgc_qqjd_scene */ diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java index 4134547b..45116f33 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java @@ -1,17 +1,15 @@ package com.kms.yg.znjg.domain; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * @TableName bs_sgc_qqjd_scene_config_relation */ diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java index 9a804688..0a2eed5a 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java @@ -3,14 +3,13 @@ package com.kms.yg.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - -import java.io.Serializable; -import java.util.Date; - import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * @TableName bs_sgc_qqjd_scene_dir_relation */ diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java index 84e309c9..60033499 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java @@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Map; @Repository @Mapper diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java index 24ba3213..469f817f 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java @@ -1,7 +1,7 @@ package com.kms.yg.znjg.mapper; -import com.kms.yg.znjg.domain.SySceneConfigRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.znjg.domain.SySceneConfigRelation; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java index 07a5ffbc..87740927 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java @@ -1,7 +1,7 @@ package com.kms.yg.znjg.mapper; -import com.kms.yg.znjg.domain.SySceneDirRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.znjg.domain.SySceneDirRelation; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java index cb3327b2..b3d87ce6 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java @@ -1,8 +1,8 @@ package com.kms.yg.znjg.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.znjg.domain.SyScene; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.znjg.vo.SySceneVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java index 9feaa9cf..41017342 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java @@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.znjg.domain.SyDirLayer; import com.kms.yg.znjg.domain.SyLayer; import com.kms.yg.znjg.domain.SyLayerField; import com.kms.yg.znjg.mapper.SyDirLayerMapper; import com.kms.yg.znjg.mapper.SyLayerFieldMapper; import com.kms.yg.znjg.mapper.SyLayerMapper; -import com.shuili.common.core.domain.SearchParam; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java index 8d27c208..e07f2be2 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java @@ -1,6 +1,5 @@ package com.kms.yg.znjg.service; -import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,6 +10,7 @@ import com.kms.yxgh.util.BeanCopyUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; + import java.util.Date; import java.util.Map; diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java index e9896956..ee002ddd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java @@ -3,14 +3,14 @@ package com.kms.yxgh.base; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; - import com.kms.common.utils.BaseEntityUtils; import com.shuili.common.exception.BaseException; -import java.util.Date; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Service; +import java.util.Date; + /** * MP注入处理器 * diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java index 4116871f..3e886710 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java @@ -1,7 +1,5 @@ package com.kms.yxgh.base; -import com.shuili.common.exception.BaseException; - /** * 用户信息异常类 * diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/Response.java b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java index dccbb49f..b8e47ee2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/Response.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java @@ -1,9 +1,10 @@ package com.kms.yxgh.base; -import java.io.Serializable; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 响应信息主体 * diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java index cb09111e..4e9d9955 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java @@ -8,9 +8,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * @ClassName: SyBaseEntity * @Description: TODO diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java index 1823a500..fc387c10 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java @@ -1,6 +1,5 @@ package com.kms.yxgh.base; -import com.shuili.common.exception.BaseException; /** * 用户信息异常类 diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java index d5ec492e..4d77e8fa 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hpm_gate") diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java index c92ee832..bd6d789a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java @@ -1,9 +1,15 @@ package com.kms.yxgh.base.enums; -import com.kms.yxgh.base.domain.*; -import com.kms.yxgh.base.domain.sk.*; -import com.kms.yxgh.base.domain.sz.*; -import com.kms.yxgh.base.domain.df.*; +import com.kms.yxgh.base.domain.DwsRelBasAd; +import com.kms.yxgh.base.domain.DwsRelLkBas; +import com.kms.yxgh.base.domain.DwsRelRvRv; +import com.kms.yxgh.base.domain.df.DfDwsRelDikeRv; +import com.kms.yxgh.base.domain.sk.SkDwsRelResDscdnm; +import com.kms.yxgh.base.domain.sk.SkDwsRelResRv; +import com.kms.yxgh.base.domain.sz.SzDwsRelWagaDike; +import com.kms.yxgh.base.domain.sz.SzDwsRelWagaLk; +import com.kms.yxgh.base.domain.sz.SzDwsRelWagaRes; +import com.kms.yxgh.base.domain.sz.SzDwsRelWagaRv; import lombok.Getter; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java b/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java index fc3e75fc..0a9b0dce 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; -import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.kms.yxgh.common.domain.Indicator; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/VideoWarningService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/VideoWarningService.java index d704eba8..a66589ae 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/VideoWarningService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/VideoWarningService.java @@ -11,7 +11,9 @@ import com.shuili.common.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * @ClassName: videoWarningService diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalPlanController.java index 15b0139f..dab6bca9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalPlanController.java @@ -2,7 +2,6 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.DfAnimalPlan; import com.kms.yxgh.df.dto.DfAnimalPlanDto; import com.kms.yxgh.df.dto.DfAnimalPlanSimpleDto; import com.kms.yxgh.df.service.DfAnimalPlanService; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalRecordController.java index efe295b1..4f9ee595 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalRecordController.java @@ -2,7 +2,6 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.DfAnimalRecord; import com.kms.yxgh.df.dto.DfAnimalRecordDto; import com.kms.yxgh.df.service.DfAnimalRecordService; import com.shuili.common.annotation.Log; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java index 8fe47387..2fc921b0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java @@ -1,7 +1,6 @@ package com.kms.yxgh.df.controller; import com.kms.yxgh.base.Response; -import com.kms.yxgh.df.domain.DfDangerousProjectItem; import com.kms.yxgh.df.dto.DfDangerousProjectDto; import com.kms.yxgh.df.dto.DfDangerousProjectItemDto; import com.kms.yxgh.df.service.DfDangerousProjectService; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index ef1c0f01..f01d07f7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -2,26 +2,20 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfPlanSimpleDto; import com.kms.yxgh.df.dto.DfPointDto; -import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.service.DfPlanService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.util.List; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java index 684c0500..5138d306 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java @@ -1,7 +1,6 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yxgh.base.Response; import com.kms.yxgh.df.dto.*; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java index 7cec74f3..381d1737 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfRecordController.java @@ -2,10 +2,10 @@ package com.kms.yxgh.df.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.domain.DfRecord; import com.kms.yxgh.df.dto.DfRecordDetailDto; import com.kms.yxgh.df.dto.DfRecordSearchDto; import com.kms.yxgh.df.dto.StartPlan; -import com.kms.yxgh.df.domain.DfRecord; import com.kms.yxgh.df.service.DfRecordService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; @@ -13,14 +13,7 @@ import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java index 54e8a60e..9a5c4759 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java @@ -1,13 +1,11 @@ package com.kms.yxgh.df.domain; +import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; -import com.shuili.common.core.domain.BaseEntity; +import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.shuili.common.annotation.Excel; - -import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalRecord.java index 8d989f6a..f2995930 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalRecord.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalRecord.java @@ -1,6 +1,5 @@ package com.kms.yxgh.df.domain; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java index d0c29d03..c12537fe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java @@ -68,6 +68,12 @@ public class DfPlan extends SyBaseEntity { @ApiModelProperty("是否提醒") private Boolean isReminder; + /** + * 状态 + */ + @ApiModelProperty("状态") + private String status; + /** * 提醒时间 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java index e3b4df21..b90c36c2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java @@ -1,12 +1,10 @@ package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java index c6670819..5e085844 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java @@ -1,12 +1,10 @@ package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; @@ -19,6 +17,7 @@ import lombok.Data; @TableName("bs_sgc_df_xsjhdw") @Data @ApiModel("堤防巡视检查计划点位") +@Deprecated public class DfPoint extends SyBaseEntity { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java index cd2db966..07b0f823 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfProjectCheckingRel.java @@ -17,6 +17,7 @@ import lombok.Data; @TableName("bs_sgc_df_xspj") @Data @ApiModel("堤防与巡检关联表") +@Deprecated public class DfProjectCheckingRel extends SyBaseEntity { private static final long serialVersionUID = 1L; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java index 71968035..e453c33d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java @@ -7,9 +7,10 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * 堤防巡视检查检查记录轨迹对象 bs_sgc_df_xsjhjgj diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java index 66763219..db3642e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java @@ -6,10 +6,10 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java index 42422f48..d33af998 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordSearchDto.java @@ -2,9 +2,10 @@ package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.List; import lombok.Data; +import java.util.List; + /** * @ClassName: DfRecordSearchDto * @Description: TODO diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDetailDto.java index 7186724d..21f245c5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDetailDto.java @@ -1,6 +1,5 @@ package com.kms.yxgh.df.dto; -import com.kms.yxgh.sz.dto.SzSuperviseTaskCommonDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java index 6a3eb7b6..7e86b2b2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java @@ -1,7 +1,6 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalDrugMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalDrugMapper.java index d22df26a..bd2ae50c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalDrugMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalDrugMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfAnimalDrug; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 害堤动物防治计划执行记录用药Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalOperatorMapper.java index e06795cc..0399d323 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalOperatorMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfAnimalOperator; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 害堤动物防治计划执行人Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanDetailMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanDetailMapper.java index 5148acd4..c722f466 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanDetailMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanDetailMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfAnimalPlanDetail; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 害堤动物防治计划详情Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java index 2c112d95..c40db8fd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java @@ -1,17 +1,16 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfAnimalRecord; import com.kms.yxgh.df.dto.DfAnimalRecordDto; -import com.kms.yxgh.df.dto.DfYhPlanDto; import com.shuili.common.utils.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; import org.apache.ibatis.jdbc.SQL; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.Date; import java.util.Map; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java index f229acf2..318a7be2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingItemMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfCheckingItem; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java index b2361fe5..9b1b12d1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfPlanOperator; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查计划执行人Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java index 7934074a..bbe52005 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPointMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfPoint; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查计划点位Mapper接口 @@ -10,6 +10,7 @@ import com.kms.yxgh.df.domain.DfPoint; * @author sy * @date 2023-11-09 */ +@Deprecated @Repository public interface DfPointMapper extends BaseMapper { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java index 57b23e53..12b27703 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfProjectCheckingRelMapper.java @@ -14,6 +14,7 @@ import java.util.List; * @author sy * @date 2023-11-09 */ +@Deprecated @Repository public interface DfProjectCheckingRelMapper extends BaseMapper { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordImageMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordImageMapper.java index 5c61a449..dd89c5dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordImageMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordImageMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfRecordImage; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 害堤动物防治计划执行记录图片Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java index 8e3eb1d4..fead645b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordItemMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfRecordItem; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查检查记录子项Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseWayProjectItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseWayProjectItemMapper.java index e8052f1c..6eec7864 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseWayProjectItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseWayProjectItemMapper.java @@ -3,7 +3,6 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfSuperviseWayProjectItem; import com.kms.yxgh.df.dto.DfSuperviseWayProjectItemDto; -import com.kms.yxgh.sz.dto.SzSuperviseWayProjectItemDto; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java index f0a74cd5..d8de880e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfTraceMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfTrace; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查检查记录轨迹Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java index 457e22e3..c786a6b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhOperatorMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfYhOperator; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 堤防维修养护执行人Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java index da1daee1..ee304b19 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfCheckingItemMapper; import com.kms.yxgh.df.domain.DfCheckingItem; +import com.kms.yxgh.df.mapper.DfCheckingItemMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java index f3d5dcdc..4dd9b760 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanOperatorService.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; import com.kms.yxgh.df.domain.DfPlanOperator; +import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java index 79411bef..efa1d547 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfPointMapper; import com.kms.yxgh.df.domain.DfPoint; +import com.kms.yxgh.df.mapper.DfPointMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java index 608c1f85..01958864 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java @@ -3,7 +3,6 @@ package com.kms.yxgh.df.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; import com.kms.yxgh.df.domain.DfChecking; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java index f1dc1cca..f9826a3f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfRecordItemMapper; import com.kms.yxgh.df.domain.DfRecordItem; +import com.kms.yxgh.df.mapper.DfRecordItemMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java index 743d04c5..1a72ac9c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java @@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * 堤防监督检查任务管理实现类 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java index 2cdd87fe..8c95d456 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.service; -import com.shuili.common.core.service.BaseService; -import com.kms.yxgh.df.mapper.DfTraceMapper; import com.kms.yxgh.df.domain.DfTrace; +import com.kms.yxgh.df.mapper.DfTraceMapper; +import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java index 97de5ffc..1ec1c352 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzProjectController.java @@ -1,7 +1,6 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yxgh.base.Response; import com.kms.yxgh.sz.dto.*; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java index 8a634e69..a9d9cc58 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -2,9 +2,9 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; +import com.kms.yxgh.sz.domain.SzRecord; import com.kms.yxgh.sz.dto.StartPlan; import com.kms.yxgh.sz.dto.SzRecordDetailDto; -import com.kms.yxgh.sz.domain.SzRecord; import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.service.SzRecordService; import com.shuili.common.annotation.Log; @@ -13,14 +13,7 @@ import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java index 76a71561..e41324eb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java @@ -3,10 +3,10 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; import com.kms.yxgh.sz.domain.SzSuperviseWay; -import com.kms.yxgh.sz.dto.SzSuperviseWayProjectDto; -import com.kms.yxgh.sz.dto.SzSuperviseWayProjectItemDto; import com.kms.yxgh.sz.dto.SzSuperviseWayDto; import com.kms.yxgh.sz.dto.SzSuperviseWayOtherDto; +import com.kms.yxgh.sz.dto.SzSuperviseWayProjectDto; +import com.kms.yxgh.sz.dto.SzSuperviseWayProjectItemDto; import com.kms.yxgh.sz.service.SzSuperviseWayService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; @@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.List; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java index f67fadfa..4fe6c8e5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYhPlanController.java @@ -2,7 +2,6 @@ package com.kms.yxgh.sz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; -import com.kms.yxgh.sz.domain.SzYhPlan; import com.kms.yxgh.sz.dto.SzYhPlanDetailDto; import com.kms.yxgh.sz.dto.SzYhPlanSearchDto; import com.kms.yxgh.sz.service.SzYhPlanService; @@ -13,14 +12,7 @@ import com.shuili.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java index 7c3bbf1b..af687074 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java @@ -1,12 +1,10 @@ package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java index 2b19e750..e1b2f687 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java @@ -1,12 +1,10 @@ package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java index ec53e3df..ee3a3198 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPlanOperator.java @@ -1,12 +1,10 @@ package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java index 8762b2ff..ea73fddd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java @@ -1,12 +1,10 @@ package com.kms.yxgh.sz.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java index 768125a4..bab5e0cf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java @@ -7,9 +7,10 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; +import java.util.Date; + /** * 水闸巡视检查检查记录轨迹对象 bs_sgc_sz_xsjhjgj diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java index b07c9c2b..2ceda552 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java @@ -6,10 +6,10 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java index ae920ba7..27b7d397 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java @@ -1,7 +1,6 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.df.dto.DfProjectListDto; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java index a20e7a47..ca0e08fd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java @@ -2,9 +2,10 @@ package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.List; import lombok.Data; +import java.util.List; + /** * @ClassName: CheckingVo * @Description: TODO diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java index d9c58358..87f88766 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzRecordSearchDto.java @@ -2,9 +2,10 @@ package com.kms.yxgh.sz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.List; import lombok.Data; +import java.util.List; + /** * @ClassName: SzRecordSearchDto * @Description: TODO diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java index 47b191fa..7c6656a7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; -import java.util.Map; /** * @author hry diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java index fd0e8e47..da0ef801 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java @@ -3,10 +3,10 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java index 63633c68..4f11b1db 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzProjectService.java @@ -3,7 +3,6 @@ package com.kms.yxgh.sz.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.mapper.BsSgcSzSafeJbxxMapper; import com.kms.yxgh.sz.domain.SzChecking; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java index 9441ff97..4545602d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java @@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; /** * 水闸监督检查任务管理实现类 diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java index 0e45aef9..7500986a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java +++ b/shuili-system/src/main/java/com/kms/yxgh/util/BeanCopyUtils.java @@ -6,14 +6,15 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import java.util.List; -import java.util.Map; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanMap; import org.springframework.cglib.core.Converter; +import java.util.List; +import java.util.Map; + /** * bean深拷贝工具(基于 cglib 性能优异) * diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java index 3fbfc020..6dd7fd96 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java +++ b/shuili-system/src/main/java/com/kms/yxgh/util/StreamUtils.java @@ -3,21 +3,14 @@ package com.kms.yxgh.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; /** * stream 流工具类 From 19f638bde1695ac73d7bc583260fe76f123786a1 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Tue, 28 May 2024 18:10:03 +0800 Subject: [PATCH 02/43] =?UTF-8?q?feat:=20=E5=B7=A1=E6=A3=80=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../df/controller/BsSgcDfFzrController.java | 9 ++ .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 15 ++ .../yg/df/mapper/BsSgcDfSafeJbxxMapper.java | 51 ++++++- .../kms/yxgh/common/dto/DutyHolderDto.java | 17 +++ .../controller/DfCheckingLineController.java | 85 ++++++++++++ .../df/controller/DfProjectController.java | 6 + .../kms/yxgh/df/domain/DfCheckingLine.java | 66 +++++++++ .../yxgh/df/domain/DfCheckingPlanContent.java | 66 +++++++++ .../kms/yxgh/df/dto/DfCheckingLineDto.java | 100 ++++++++++++++ .../df/dto/DfCheckingLineProjectListDto.java | 26 ++++ .../yxgh/df/dto/DfCheckingLineSearchDto.java | 31 +++++ .../com/kms/yxgh/df/dto/DfProjectListDto.java | 5 + .../yxgh/df/mapper/DfCheckingLineMapper.java | 63 +++++++++ .../kms/yxgh/df/mapper/DfCheckingMapper.java | 2 +- .../mapper/DfCheckingPlanContentMapper.java | 16 +++ .../df/service/DfCheckingLineService.java | 129 ++++++++++++++++++ .../kms/yxgh/df/service/DfInfoService.java | 10 ++ .../kms/yxgh/df/service/DfProjectService.java | 8 ++ sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql | 18 +-- sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql | 38 +++++- 21 files changed, 740 insertions(+), 23 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/DutyHolderDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingLineController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingLine.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineProjectListDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingLineService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfInfoService.java diff --git a/pom.xml b/pom.xml index a5c7132a..8c6dc618 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 4.0.1 5.2.14.RELEASE 2.3.10.RELEASE - 1.2.75 + 1.2.83 5.6.0 3.4.2 1.4.1.Final diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java index b64f7172..97a569fa 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfFzrController.java @@ -7,6 +7,7 @@ import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.mapper.BsSgcDfFzrMapper; import com.kms.yg.df.service.BsSgcDfFzrService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.shuili.common.annotation.Log; @@ -47,6 +48,14 @@ public class BsSgcDfFzrController extends BaseController { @Autowired private SysDeptService sysDeptService; + @Autowired + private BsSgcDfFzrMapper bsSgcDfFzrMapper; + + @GetMapping("/test") + public String test() { + bsSgcDfFzrMapper.getByDikeCode("1"); + return "test"; + } @GetMapping("/getHistogram") diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index 110e4882..849639e4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yg.df.domain.BsSgcDfFzr; import com.kms.yg.sz.domain.BsSgcSzFzr; import com.kms.yg.sz.domain.dto.PieDto; +import com.kms.yxgh.common.dto.DutyHolderDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import java.util.List; @@ -19,6 +21,19 @@ import java.util.List; @Repository public interface BsSgcDfFzrMapper extends BaseMapper { + @Select({ + "" + }) + List getByDikeCode(@Param("dikeCode") String dikeCode); + List getList(@Param("id") String id, @Param("dikeCode") String dikeCode, @Param("adcd") String adcd, diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java index 94a7fcc1..c2cb36cf 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java @@ -22,6 +22,9 @@ import java.util.List; @Repository public interface BsSgcDfSafeJbxxMapper extends BaseMapper { + @Select("SELECT * FROM att_dike_base WHERE dike_code = #{dikeCode} AND expr_date IS NULL") + BsSgcDfSafeJbxx getByDikeCode(@Param("dikeCode") String dikeCode); + List getPie(@Param("layer") Integer layer, @Param("adcd") String adcd); @@ -55,7 +58,10 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { @Result(property = "dikeCode", column = "dike_code"), @Result(property = "dikeName", column = "dike_name"), @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"), - @Result(property = "lastTime", column = "dike_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode")) + @Result(property = "lastTime", column = "dike_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode")), + @Result(property = "dutyHolders", column = "dike_code", + javaType = List.class, + many = @Many(select = "com.kms.yg.df.mapper.BsSgcDfFzrMapper.getByDikeCode")) }) IPage getDfProjectListWithPage(Page page, @Param("dto") BsSgcDfSafeJbxx dfProject); @@ -121,9 +127,9 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { "" + "AND df.dike_name LIKE CONCAT('%', #{dfProject.dikeName}, '%') " + "" + - ""+ - "and df.adcd like concat(#{dfProject.adcd}, '%') "+ - ""+ + "" + + "and df.adcd like concat(#{dfProject.adcd}, '%') " + + "" + "") IPage getDfYqProjectListWithPage(Page page, @Param("dfProject") DfYqProjectQueDto dfProject); @@ -147,4 +153,41 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { @Result(property = "waterLevel", column = "dike_code", javaType = Double.class, one = @One(select = "com.kms.yxgh.df.mapper.DfWaterRegimeMapper.getTodayWaterLevel")), }) IPage getDfYqStatisticsProjectListWithPage(Page page, @Param("dfProject") DfYqStatisticsProjectQueDto dfProject); + + + @Select({ + "" + }) + @Results(value = { + @Result(property = "dikeCode", column = "dike_code"), + @Result(property = "dutyHolders", column = "dike_code", + javaType = List.class, + many = @Many(select = "com.kms.yg.df.mapper.BsSgcDfFzrMapper.getByDikeCode")) + }) + IPage getDfCheckingLineProjectListWithPage(Page page, @Param("dto") DfCheckingLineSearchDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/DutyHolderDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DutyHolderDto.java new file mode 100644 index 00000000..30bb4409 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DutyHolderDto.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.common.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("巡查责任人") +public class DutyHolderDto { + + @ApiModelProperty("巡查责任人类型") + private String dutyHolderType; + @ApiModelProperty("巡查责任人名称") + private String name; + @ApiModelProperty("巡查责任人电话") + private String phone; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingLineController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingLineController.java new file mode 100644 index 00000000..ffa25729 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingLineController.java @@ -0,0 +1,85 @@ +package com.kms.yxgh.df.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.df.dto.DfCheckingLineDto; +import com.kms.yxgh.df.dto.DfCheckingLineSearchDto; +import com.kms.yxgh.df.service.DfCheckingLineService; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + + +/** + * 堤防巡视检查路线Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/checking-line") +@Api(tags = "堤防巡视检查路线管理") +public class DfCheckingLineController { + + private final DfCheckingLineService dfCheckingLineService; + + /** + * 查询堤防巡视检查路线列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查路线列表") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingLineService.search(sp); + } + + + /** + * 获取堤防巡视检查路线详细信息 + */ + @ApiOperation("堤防巡视检查路线详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfCheckingLineService.getDetailById(id)); + } + + /** + * 新增堤防巡视检查路线 + */ + @Log(title = "堤防巡视检查路线新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查路线新增") + public Response add(@Validated(AddGroup.class) + @RequestBody DfCheckingLineDto dfCheckingLineDto) { + return Response.ok(dfCheckingLineService.add(dfCheckingLineDto)); + } + + /** + * 修改堤防巡视检查路线 + */ + @ApiOperation("堤防巡视检查路线修改") + @Log(title = "堤防巡视检查路线修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@Validated(UpdateGroup.class) + @RequestBody DfCheckingLineDto dfCheckingLineDto) { + return Response.ok(dfCheckingLineService.update(dfCheckingLineDto)); + } + + /** + * 删除堤防巡视检查路线 + */ + @ApiOperation("堤防巡视检查路线删除") + @Log(title = "堤防巡视检查路线删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfCheckingLineService.deleteById(id)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java index 5138d306..5b233f95 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfProjectController.java @@ -67,4 +67,10 @@ public class DfProjectController { return Response.ok(dfProjectService.getRelChecking(dikeCode)); } + @PostMapping("/checking-line") + @ApiOperation("检查项线路") + public IPage checkingLine(@RequestBody SearchParam sp) { + return dfProjectService.checkingLine(sp); + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingLine.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingLine.java new file mode 100644 index 00000000..87fc019f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingLine.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.df.domain; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 堤防巡视检查路线表 bs_sgc_df_xslx + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xslx") +@Data +@ApiModel("堤防巡视检查路线表") +public class DfCheckingLine extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + /** + * 巡查名称 + */ + @ApiModelProperty("巡查名称") + private String name; + + /** + * 巡查路线类型 + */ + @ApiModelProperty("巡查路线类型") + private String type; + + /** + * 巡查责任人类型 + */ + @ApiModelProperty("巡查责任人类型") + private String dutyHolderType; + + /** + * 巡查ID + */ + @ApiModelProperty("巡查ID") + private String xcId; + + /** + * 巡查路线点位 + */ + @ApiModelProperty("巡查路线点位") + private String points; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private String status = "0"; + + +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java new file mode 100644 index 00000000..096050bb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.df.domain; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 堤防巡视检查计划详情表 bs_sgc_df_xsjhxq + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xsjhxq") +@Data +@ApiModel("堤防巡视检查计划详情表") +public class DfCheckingPlanContent extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 巡查路线ID + */ + @Excel(name = "巡查路线ID") + @ApiModelProperty("巡查路线ID") + private Integer lineId; + + /** + * 计划开始时间 + */ + @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("计划开始时间") + private Date startDate; + + /** + * 计划结束时间 + */ + @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("计划结束时间") + private Date endDate; + + /** + * 巡查范围 + */ + @Excel(name = "巡查范围") + @ApiModelProperty("巡查范围") + private String scope; + + /** + * 执行人 + */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operator; + + /** + * 状态 + */ + @Excel(name = "状态") + @ApiModelProperty("状态") + private Integer status; +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineDto.java new file mode 100644 index 00000000..e3513e8c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineDto.java @@ -0,0 +1,100 @@ +package com.kms.yxgh.df.dto; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DutyHolderDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; + +/** + * 堤防巡视检查路线详情 + * + * @author sy + * @date 2024-01-04 + */ +@Data +@ApiModel("堤防巡视检查路线表") +public class DfCheckingLineDto { + + @NotBlank(message = "堤防巡视检查路线表ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("堤防巡视检查路线表ID") + private String id; + + /** + * 堤防代码 + */ + @NotBlank(message = "堤防代码不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("堤防代码") + private String dikeCode; + + @ApiModelProperty("堤防名称") + private String dikeName; + + @ApiModelProperty("堤防类型") + private String dikeType; + + @ApiModelProperty("责任人列表") + private List dutyHolders; + + /** + * 巡查名称 + */ + @NotBlank(message = "巡查名称不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @Size(max = 50, message = "巡查名称长度不能超过50个字符", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查名称") + private String name; + + /** + * 巡查路线类型 + */ + @NotBlank(message = "巡查路线类型不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查路线类型") + private String type; + + /** + * 巡查责任人类型 + */ + @NotBlank(message = "巡查责任人类型不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查责任人类型") + private String dutyHolderType; + + /** + * 巡查ID + */ + @NotBlank(message = "巡查ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查ID") + private String xcId; + + @ApiModelProperty("巡查详情") + private DfCheckingDetailDto checkingDetail; + + /** + * 巡查路线点位 + */ + @ApiModelProperty("巡查路线点位") + private List points; + + /** + * 状态 + */ + @NotBlank(message = "状态不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("状态") + private String status; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("更新时间") + private Date updateTime; + +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineProjectListDto.java new file mode 100644 index 00000000..46af2aef --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineProjectListDto.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.df.dto; + +import com.kms.yxgh.common.dto.DutyHolderDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +/** + * DfCheckingLineProjectListDto类是一个数据传输对象，用于表示堤防项目列表的信息。 + * 包含堤防编号、堤防名称、工程管理单位、水务行政部门和最后巡查时间等属性。 + */ +@Data +public class DfCheckingLineProjectListDto { + @ApiModelProperty(value = "堤防编号") + private String dikeCode; + @ApiModelProperty(value = "堤防名称") + private String dikeName; + @ApiModelProperty(value = "堤防类型") + private String dikeType; + + @ApiModelProperty("责任人列表") + private List dutyHolders; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java new file mode 100644 index 00000000..d7d75c1d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingLineSearchDto.java @@ -0,0 +1,31 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel("堤防巡视检查路线查询") +public class DfCheckingLineSearchDto { + + @ApiModelProperty("堤防编码") + private String dikeCode; + + @ApiModelProperty("堤防名称") + private String dikeName; + + @ApiModelProperty("巡查路线名称") + private String lineName; + + @ApiModelProperty("堤防类型") + private String dikeType; + + @ApiModelProperty("行政区划") + private String adcd; + + @ApiModelProperty("巡查路线类型") + private String type; + + @ApiModelProperty("巡查责任人类型") + private String dutyHolderType; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java index 08364c29..b5be9dd9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java @@ -1,10 +1,12 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.DutyHolderDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** @@ -45,4 +47,7 @@ public class DfProjectListDto { @ApiModelProperty("堤防型式") private String dikePatt; + @ApiModelProperty("责任人列表") + private List dutyHolders; + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java new file mode 100644 index 00000000..ccbbbabd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.domain.DfCheckingLine; +import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.dto.DfCheckingLineDto; +import com.kms.yxgh.df.dto.DfCheckingLineSearchDto; +import org.apache.ibatis.annotations.*; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 堤防巡视检查路线Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfCheckingLineMapper extends BaseMapper { + + //根据条件查询堤防巡视检查路线 + @Select({ + "" + }) + @Results(value = { + @Result(property = "dikeCode", column = "dike_code"), + @Result(property = "dutyHolders", column = "dike_code", + javaType = List.class, + many = @Many(select = "com.kms.yg.df.mapper.BsSgcDfFzrMapper.getByDikeCode")) + }) + IPage search(Page page, @Param("dto") DfCheckingLineSearchDto dto); + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java index 60a9bc9f..523fd00a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingMapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; -import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfChecking; +import org.springframework.stereotype.Repository; /** * 堤防巡视检查Mapper接口 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java new file mode 100644 index 00000000..f2c206e4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfCheckingPlanContent; +import org.springframework.stereotype.Repository; + +/** + * 堤防巡视检查计划详情Mapper接口 + * + * @author sy + * @date 2023-11-09 + */ +@Repository +public interface DfCheckingPlanContentMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingLineService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingLineService.java new file mode 100644 index 00000000..828d1655 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingLineService.java @@ -0,0 +1,129 @@ +package com.kms.yxgh.df.service; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfFzr; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.mapper.BsSgcDfFzrMapper; +import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; +import com.kms.yxgh.base.DfException; +import com.kms.yxgh.common.dto.DutyHolderDto; +import com.kms.yxgh.df.domain.DfCheckingLine; +import com.kms.yxgh.df.domain.DfCheckingPlanContent; +import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.dto.DfCheckingLineDto; +import com.kms.yxgh.df.dto.DfCheckingLineSearchDto; +import com.kms.yxgh.df.dto.DfPointDto; +import com.kms.yxgh.df.mapper.DfCheckingLineMapper; +import com.kms.yxgh.df.mapper.DfCheckingPlanContentMapper; +import com.kms.yxgh.util.BeanCopyUtils; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * 堤防巡视检查路线Service接口 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingLineService extends BaseService { + + private final DfCheckingPlanContentMapper dfCheckingPlanContentMapper; + private final BsSgcDfFzrMapper dfFzrMapper; + private final DfCheckingService dfCheckingService; + private final BsSgcDfSafeJbxxMapper dfSafeJbxxMapper; + + + public IPage search(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + DfCheckingLineSearchDto searchDto = Optional.ofNullable(sp.getData()).orElse(new DfCheckingLineSearchDto()); + return this.baseMapper.search(page, searchDto); + } + + public DfCheckingLineDto getDetailById(String id) { + DfCheckingLine checkingLine = this.getById(id); + DfCheckingLineDto dto = BeanCopyUtils.copy(checkingLine, DfCheckingLineDto.class); + if (dto != null) { + dto.setPoints(JSON.parseArray(checkingLine.getPoints(), DfPointDto.class)); + dto.setCheckingDetail(dfCheckingService.getDetailById(dto.getXcId())); + BsSgcDfSafeJbxx df = dfSafeJbxxMapper.getByDikeCode(dto.getDikeCode()); + if (df != null) { + dto.setDikeName(df.getDikeName()); + dto.setDikeType(df.getDikeType()); + } + List fzrList = dfFzrMapper.selectList(Wrappers.lambdaQuery().eq(BsSgcDfFzr::getDikeCode, dto.getDikeCode())); + dto.setDutyHolders(fzrList.stream().map(fzr -> { + DutyHolderDto dutyHolderDto = new DutyHolderDto(); + dutyHolderDto.setName(fzr.getName()); + dutyHolderDto.setPhone(fzr.getPhone()); + dutyHolderDto.setDutyHolderType(fzr.getType()); + return dutyHolderDto; + }).collect(Collectors.toList())); + } + return dto; + } + + + @Transactional(rollbackFor = Exception.class) + public DfCheckingLineDto add(DfCheckingLineDto dto) { + DfCheckingLine checkingLine = BeanCopyUtils.copy(dto, DfCheckingLine.class); + if (checkingLine != null) { + checkingLine.setId(null); + checkingLine.setPoints(JSON.toJSONString(dto.getPoints())); + getBaseMapper().insert(checkingLine); + String id = checkingLine.getId(); + return this.getDetailById(id); + } + return null; + } + + @Transactional(rollbackFor = Exception.class) + public DfCheckingLineDto update(DfCheckingLineDto dto) { + if (exist(dto.getId())) { + DfCheckingLine checkingLine = BeanCopyUtils.copy(dto, DfCheckingLine.class); + if (checkingLine != null) { + checkingLine.setPoints(JSON.toJSONString(dto.getPoints())); + getBaseMapper().updateById(checkingLine); + String id = checkingLine.getId(); + return this.getDetailById(id); + } + } + throw new DfException("源数据不存在，请确认id值是否正确"); + + } + + + @Transactional(rollbackFor = Exception.class) + public Boolean deleteById(String id) { + if (isUsed(id)) { + throw new DfException("该路线已被使用，无法删除"); + } + return removeById(id); + } + + private boolean isUsed(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingPlanContent::getLineId, planId); + return dfCheckingPlanContentMapper.selectCount(wp) > 0; + } + + private boolean exist(String id) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingLine::getId, id); + return this.getBaseMapper().selectCount(wp) > 0; + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfInfoService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfInfoService.java new file mode 100644 index 00000000..1874716b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfInfoService.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.df.service; + + +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class DfInfoService { +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java index 01958864..ee18eb93 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java @@ -108,4 +108,12 @@ public class DfProjectService { dfProjectCheckingRelDto.setCheckings(checkings); return dfProjectCheckingRelDto; } + + public IPage checkingLine(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + + DfCheckingLineSearchDto dfProject = Optional.ofNullable(sp.getData()).orElseGet(DfCheckingLineSearchDto::new); + + return dfProjectMapper.getDfCheckingLineProjectListWithPage(page, dfProject); + } } \ No newline at end of file diff --git a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql index 6589ee94..7dd76ad7 100644 --- a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql +++ b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql @@ -38,10 +38,10 @@ CREATE TABLE `bs_sgc_df_xsx` ( CREATE TABLE `bs_sgc_df_xsjh` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划编号', - `XC_ID` int NOT NULL COMMENT '巡查ID', `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划名称', - `TYPE` int DEFAULT NULL COMMENT '巡查类型', + `TYPE` int DEFAULT NULL COMMENT '巡查计划类型', + `STATUS` int NOT NULL COMMENT '状态', `FREQUENCY` int COLLATE utf8mb4_general_ci COMMENT '检查次数', `CYCLE_TYPE` int COLLATE utf8mb4_general_ci COMMENT '周期', `IS_REMINDER` int COLLATE utf8mb4_general_ci COMMENT '是否提醒', @@ -69,20 +69,6 @@ CREATE TABLE `bs_sgc_df_xsjhzx` ( PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划执行人表'; -CREATE TABLE `bs_sgc_df_xsjhdw` ( - `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划点位编号', - `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', - `LONGITUDE` decimal(11,8) DEFAULT NULL COMMENT '经度', - `LATITUDE` decimal(10,8) DEFAULT NULL COMMENT '纬度', - `ALTITUDE` decimal(10,2) DEFAULT NULL COMMENT '海拔', - `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', - `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', - `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', - `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划点位表'; - CREATE TABLE `bs_sgc_df_xsjhjl` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录编号', diff --git a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql index 025f4c3f..0e37f535 100644 --- a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql +++ b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql @@ -1 +1,37 @@ -SET NAMES utf8mb4; \ No newline at end of file +SET NAMES utf8mb4; + +CREATE TABLE `bs_sgc_df_xslx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查路线查编号', + `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci COMMENT '堤防代码', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查路线类型', + `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `POINTS` text COLLATE utf8mb4_general_ci COMMENT '巡查路线点位', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查路线表'; + +ALTER TABLE `bs_sgc_df_xsjh` ADD `STATUS` int NOT NULL COMMENT '状态'; + +CREATE TABLE `bs_sgc_df_xsjhxq` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划详情编号', + `LINE_ID` int NOT NULL COMMENT '巡查路线ID', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `START_TIME` datetime DEFAULT NULL COMMENT '计划开始时间', + `END_TIME` datetime DEFAULT NULL COMMENT '计划结束时间', + `SCOPE` text COLLATE utf8mb4_general_ci COMMENT '巡查范围', + `OPERATOR` text COLLATE utf8mb4_general_ci COMMENT '执行人', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划详情表'; + From 016d3229951645dcb2fdfd2b87ead0469bbc5471 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 29 May 2024 18:17:39 +0800 Subject: [PATCH 03/43] =?UTF-8?q?feat:=20=E5=B7=A1=E6=A3=80=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 3 +- .../com/kms/yxgh/common/dto/OperatorDto.java | 20 +++ .../yxgh/df/controller/DfPlanController.java | 109 +++++------- .../yxgh/df/domain/DfCheckingPlanContent.java | 18 +- .../java/com/kms/yxgh/df/domain/DfPlan.java | 12 ++ .../kms/yxgh/df/domain/DfPlanOperator.java | 45 ++--- .../com/kms/yxgh/df/dto/DfAnimalPlanDto.java | 14 +- .../yxgh/df/dto/DfCheckingPlanContentDto.java | 75 ++++++++ .../com/kms/yxgh/df/dto/DfPlanDetailDto.java | 21 +-- .../com/kms/yxgh/df/dto/DfPlanSearchDto.java | 26 +++ .../com/kms/yxgh/df/dto/DfPlanSimpleDto.java | 27 ++- .../kms/yxgh/df/dto/DfYhRecordDetailDto.java | 13 +- .../mapper/DfCheckingPlanContentMapper.java | 14 ++ .../com/kms/yxgh/df/mapper/DfPlanMapper.java | 30 ++++ .../yxgh/df/mapper/DfPlanOperatorMapper.java | 1 + .../yxgh/df/service/DfAnimalPlanService.java | 5 +- .../service/DfCheckingPlanContentService.java | 13 ++ .../kms/yxgh/df/service/DfPlanService.java | 165 +++++++++--------- .../yxgh/df/service/DfYhRecordService.java | 2 +- .../com/kms/yxgh/sz/dto/SzPlanDetailDto.java | 13 +- .../kms/yxgh/sz/dto/SzYhRecordDetailDto.java | 13 +- .../kms/yxgh/sz/service/SzPlanService.java | 2 +- .../yxgh/sz/service/SzYhRecordService.java | 2 +- sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql | 13 ++ sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql | 22 ++- 25 files changed, 426 insertions(+), 252 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingPlanContentService.java diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index 849639e4..a7a77b43 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -24,11 +24,12 @@ public interface BsSgcDfFzrMapper extends BaseMapper { @Select({ "" }) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java new file mode 100644 index 00000000..be2d3486 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/OperatorDto.java @@ -0,0 +1,20 @@ +package com.kms.yxgh.common.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel("操作人员") +@Data +public class OperatorDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("用户id") + private String uid; + @ApiModelProperty("用户名称") + private String name; + +} + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java index f01d07f7..dd83b03d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfPlanController.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.Response; import com.kms.yxgh.df.domain.DfPlan; import com.kms.yxgh.df.dto.DfPlanDetailDto; +import com.kms.yxgh.df.dto.DfPlanSearchDto; import com.kms.yxgh.df.dto.DfPlanSimpleDto; -import com.kms.yxgh.df.dto.DfPointDto; import com.kms.yxgh.df.service.DfPlanService; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; @@ -15,8 +15,6 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 堤防巡视检查计划Controller @@ -30,74 +28,59 @@ import java.util.List; @Api(tags = "堤防巡视检查计划") public class DfPlanController { - private final DfPlanService dfPlanService; - - /** - * 查询堤防巡视检查计划列表 - */ - @PostMapping("/list") - @ApiOperation("堤防巡视检查计划列表") - public IPage list(@RequestBody SearchParam sp) { - return dfPlanService.search(sp); - } + private final DfPlanService dfPlanService; + /** + * 查询堤防巡视检查计划列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查计划列表") + public IPage list(@RequestBody SearchParam sp) { + return dfPlanService.search(sp); + } - /** - * 获取堤防巡视检查计划详细信息 - */ - @ApiOperation("堤防巡视检查计划详情") - @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") String id) { - return Response.ok(dfPlanService.getDetailById(id)); - } - - /** - * 新增堤防巡视检查计划 - */ - @Log(title = "堤防巡视检查计划新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("堤防巡视检查计划新增") - public Response add(@RequestBody DfPlanDetailDto dfPlan) { - return Response.ok(dfPlanService.add(dfPlan)); - } - /** - * 修改堤防巡视检查计划 - */ - @ApiOperation("堤防巡视检查计划修改") - @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) - @PutMapping - public Response edit(@RequestBody DfPlanDetailDto dfPlan) { - return Response.ok(dfPlanService.update(dfPlan)); - } + /** + * 获取堤防巡视检查计划详细信息 + */ + @ApiOperation("堤防巡视检查计划详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfPlanService.getDetailById(id)); + } - /** - * 删除堤防巡视检查计划 - */ - @ApiOperation("堤防巡视检查计划删除") - @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{id}") - public Response remove(@PathVariable String id) { - return Response.ok(dfPlanService.deleteById(id)); - } + /** + * 新增堤防巡视检查计划 + */ + @Log(title = "堤防巡视检查计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查计划新增") + public Response add(@RequestBody DfPlanDetailDto dfPlan) { + return Response.ok(dfPlanService.add(dfPlan)); + } - @ApiOperation("堤防巡视检查计划巡查点设置") - @Log(title = "堤防巡视检查计划巡查点设置", businessType = BusinessType.UPDATE) - @PostMapping("/points/{id}") - public Response addPoints(@PathVariable("id") String id, - @RequestBody List points) { - return Response.ok(dfPlanService.addPoints(id, points)); - } + /** + * 修改堤防巡视检查计划 + */ + @ApiOperation("堤防巡视检查计划修改") + @Log(title = "堤防巡视检查计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfPlanDetailDto dfPlan) { + return Response.ok(dfPlanService.update(dfPlan)); + } + /** + * 删除堤防巡视检查计划 + */ + @ApiOperation("堤防巡视检查计划删除") + @Log(title = "堤防巡视检查计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public Response remove(@PathVariable String id) { + return Response.ok(dfPlanService.deleteById(id)); + } - @ApiOperation("堤防巡视检查计划巡查点位数据") - @Log(title = "堤防巡视检查计划巡查点位数据", businessType = BusinessType.SEARCH) - @GetMapping("/points/{id}") - public Response> addPoints(@PathVariable("id") String id) { - return Response.ok(dfPlanService.getPoints(id)); - } - //当天已巡查 + //当天已巡查 @ApiOperation("堤防巡视检查计划当天已巡查") @Log(title = "堤防巡视检查计划当天已巡查", businessType = BusinessType.SEARCH) @GetMapping("/today/{id}") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java index 096050bb..76050c0f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java @@ -3,7 +3,6 @@ package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; -import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,45 +21,46 @@ import java.util.Date; public class DfCheckingPlanContent extends SyBaseEntity { private static final long serialVersionUID = 1L; + + @ApiModelProperty("计划ID") + private String planId; + /** * 巡查路线ID */ - @Excel(name = "巡查路线ID") @ApiModelProperty("巡查路线ID") - private Integer lineId; + private String lineId; + + @ApiModelProperty("名称") + private String name; /** * 计划开始时间 */ - @Excel(name = "计划开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("计划开始时间") private Date startDate; /** * 计划结束时间 */ - @Excel(name = "计划结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("计划结束时间") private Date endDate; /** * 巡查范围 */ - @Excel(name = "巡查范围") @ApiModelProperty("巡查范围") private String scope; /** * 执行人 */ - @Excel(name = "执行人") @ApiModelProperty("执行人") private String operator; /** * 状态 */ - @Excel(name = "状态") @ApiModelProperty("状态") - private Integer status; + private String status; } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java index c12537fe..de689f58 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java @@ -91,4 +91,16 @@ public class DfPlan extends SyBaseEntity { private String files; + /** + * 计划开始时间 + */ + @ApiModelProperty("计划开始时间") + private Date startDate; + + /** + * 计划结束时间 + */ + @ApiModelProperty("计划结束时间") + private Date endDate; + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java index b90c36c2..776c5364 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java @@ -14,32 +14,33 @@ import lombok.Data; * @author sy * @date 2023-11-09 */ +@Deprecated @TableName("bs_sgc_df_xsjhzx") @Data @ApiModel("堤防巡视检查计划执行人") public class DfPlanOperator extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 巡查计划ID - */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; - - /** - * 执行人 - */ - @Excel(name = "执行人") - @ApiModelProperty("执行人") - private String operatorUid; - - /** - * 执行人 - */ - @Excel(name = "执行人名称") - @ApiModelProperty("执行人名称") - private String operatorName; + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; + + /** + * 执行人 + */ + @Excel(name = "执行人") + @ApiModelProperty("执行人") + private String operatorUid; + + /** + * 执行人 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanDto.java index ec2cd433..de9db6d6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanDto.java @@ -2,6 +2,7 @@ package com.kms.yxgh.df.dto; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -109,19 +110,6 @@ public class DfAnimalPlanDto { private List details; - @Data - public static class OperatorDto { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; - - } - @Data public static class DetailDto { /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java new file mode 100644 index 00000000..4b125d45 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java @@ -0,0 +1,75 @@ +package com.kms.yxgh.df.dto; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 堤防巡视检查计划内容 bs_sgc_df_xsjhxq + * + * @author sy + * @date 2024-01-04 + */ +@Data +@ApiModel("堤防巡视检查计划内容") +public class DfCheckingPlanContentDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("计划ID") + private String planId; + + /** + * 巡查路线ID + */ + @ApiModelProperty("巡查路线ID") + private String lineId; + + /** + * 计划开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("计划开始时间") + private Date startDate; + + /** + * 计划结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("计划结束时间") + private Date endDate; + + /** + * 巡查范围 + */ + @ApiModelProperty("巡查范围") + private String scope; + + /** + * 执行人 + */ + @ApiModelProperty("执行人") + private List operator; + + /** + * 状态 + */ + @ApiModelProperty("状态") + private String status; + + + @ApiModelProperty("备注") + private String remark; + + +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java index b17130e0..dae6e053 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Size; import java.util.Collections; import java.util.Date; import java.util.List; @@ -53,8 +54,13 @@ public class DfPlanDetailDto { private JSONObject otherConfig; @ApiModelProperty("执行人") - private List operators; + private String status = "1"; + @Size(max = 50, message = "执行计划内容最多50个") + @ApiModelProperty("执行计划内容") + private List contents; + + @Size(max = 5, message = "检查依据文档最多5个") @ApiModelProperty("检查依据文档") private List files = Collections.emptyList(); @@ -64,17 +70,4 @@ public class DfPlanDetailDto { return cycleType; } - @Data - public static class OperatorDto { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; - - } - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java new file mode 100644 index 00000000..5914fc3c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "堤防巡视检查计划查询") +public class DfPlanSearchDto { + + @ApiModelProperty(value = "堤防编号") + private String dikeCode; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "状态") + private String status; + @ApiModelProperty(value = "巡查人员id") + private List userIds; + @ApiModelProperty(value = "开始时间") + private Date startTime; + @ApiModelProperty(value = "结束时间") + private Date endTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java index 14b8f62d..4c0df622 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java @@ -19,6 +19,12 @@ import java.util.Date; @Data public class DfPlanSimpleDto { + @ApiModelProperty("堤防编码") + private String dikeCode; + @ApiModelProperty("堤防名称") + private String dikeName; + @ApiModelProperty("堤防类型") + private String dikeType; @ApiModelProperty("主键") private String id; @@ -26,14 +32,18 @@ public class DfPlanSimpleDto { @ApiModelProperty("名称") private String name; - @ApiModelProperty("巡查ID") - private String xcId; + @ApiModelProperty("巡查计划类型") + private String planType; + + @ApiModelProperty("巡查频次") + private String frequency; + + @ApiModelProperty("子项数量") + private Integer itemCount; + + @ApiModelProperty("状态") + private String status; - @ApiModelProperty("巡查类型") - private String type; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("最后巡检时间") - private Date lastTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("最近修改时间") private Date updateTime; @@ -41,4 +51,7 @@ public class DfPlanSimpleDto { @ApiModelProperty("创建时间") private Date createTime; + @ApiModelProperty("创建人") + private String createUid; + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java index 4614338a..9334f3b2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -79,17 +80,5 @@ public class DfYhRecordDetailDto { private List audios; } - @Data - public static class OperatorDto { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; - - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java index f2c206e4..4214ee57 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingPlanContentMapper.java @@ -2,8 +2,12 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.yxgh.df.domain.DfCheckingPlanContent; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 堤防巡视检查计划详情Mapper接口 * @@ -13,4 +17,14 @@ import org.springframework.stereotype.Repository; @Repository public interface DfCheckingPlanContentMapper extends BaseMapper { + @Insert({ + "" + }) + void insertBatch(@Param("list") List list); } + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index 5d4ab461..6f740f6e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.dto.DfPlanSearchDto; import com.kms.yxgh.df.dto.DfPlanSimpleDto; import com.shuili.common.utils.StringUtils; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; import org.apache.ibatis.jdbc.SQL; import org.springframework.stereotype.Repository; @@ -25,6 +27,34 @@ public interface DfPlanMapper extends BaseMapper { @SelectProvider(type = DfPlanSqlProvider.class, method = "selectByDikeCode") IPage selectByDikeCode(Page page, @Param("dikeCode") String dikeCode, @Param("planName") String planName); + @Select("") + IPage search(Page page, @Param("dto") DfPlanSearchDto searchDto); + class DfPlanSqlProvider { public String selectByDikeCode(final Map param) { return new SQL() {{ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java index 9b1b12d1..12083b38 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Repository; * @author sy * @date 2023-11-09 */ +@Deprecated @Repository public interface DfPlanOperatorMapper extends BaseMapper { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalPlanService.java index aeb749a3..94fbad1b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalPlanService.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.mapper.BsSgcDfSafeJbxxMapper; import com.kms.yxgh.base.DfException; +import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.df.domain.DfAnimalOperator; import com.kms.yxgh.df.domain.DfAnimalPlan; import com.kms.yxgh.df.domain.DfAnimalPlanDetail; @@ -83,7 +84,7 @@ public class DfAnimalPlanService extends BaseService { - DfAnimalPlanDto.OperatorDto itemDto = new DfAnimalPlanDto.OperatorDto(); + OperatorDto itemDto = new OperatorDto(); itemDto.setId(o.getId()); itemDto.setUid(o.getOperatorUid()); itemDto.setName(o.getOperatorName()); @@ -126,7 +127,7 @@ public class DfAnimalPlanService extends BaseService insertOperator(String id) { + private Consumer insertOperator(String id) { return (o) -> { DfAnimalOperator item = new DfAnimalOperator(); item.setPlanId(id); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingPlanContentService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingPlanContentService.java new file mode 100644 index 00000000..d9966a41 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingPlanContentService.java @@ -0,0 +1,13 @@ +package com.kms.yxgh.df.service; + +import com.kms.yxgh.df.domain.DfCheckingPlanContent; +import com.kms.yxgh.df.mapper.DfCheckingPlanContentMapper; +import com.shuili.common.core.service.BaseService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + + +@Service +@AllArgsConstructor +public class DfCheckingPlanContentService extends BaseService { +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index f18886cc..943f83e5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -1,30 +1,27 @@ package com.kms.yxgh.df.service; -import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.DfException; +import com.kms.yxgh.common.dto.OperatorDto; +import com.kms.yxgh.df.domain.DfCheckingPlanContent; import com.kms.yxgh.df.domain.DfPlan; -import com.kms.yxgh.df.domain.DfPlanOperator; -import com.kms.yxgh.df.domain.DfPoint; import com.kms.yxgh.df.domain.DfRecord; +import com.kms.yxgh.df.dto.DfCheckingPlanContentDto; import com.kms.yxgh.df.dto.DfPlanDetailDto; -import com.kms.yxgh.df.dto.DfPlanDetailDto.OperatorDto; +import com.kms.yxgh.df.dto.DfPlanSearchDto; import com.kms.yxgh.df.dto.DfPlanSimpleDto; -import com.kms.yxgh.df.dto.DfPointDto; import com.kms.yxgh.df.mapper.DfPlanMapper; -import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; -import com.kms.yxgh.df.mapper.DfPointMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; -import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; import lombok.AllArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +29,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.Date; import java.util.List; -import java.util.function.Consumer; +import java.util.stream.Collectors; /** * 堤防巡视检查计划Service接口 @@ -44,20 +41,14 @@ import java.util.function.Consumer; @AllArgsConstructor public class DfPlanService extends BaseService { - private final DfPlanOperatorMapper dfPlanOperatorMapper; - private final DfPointMapper dfPointMapper; private final DfRecordMapper dfRecordMapper; + private final DfCheckingPlanContentService dfCheckingPlanContentService; - public IPage search(SearchParam sp) { + public IPage search(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - String dikeCode = null; - String name = null; - DfPlan dfPlan = sp.getData(); - if (dfPlan != null) { - dikeCode = dfPlan.getDikeCode(); - name = dfPlan.getName(); - } - return this.baseMapper.selectByDikeCode(page, dikeCode, name); + DfPlanSearchDto searchDto = sp.getData(); + + return this.getBaseMapper().search(page, searchDto); } public DfPlanDetailDto getDetailById(String id) { @@ -65,20 +56,12 @@ public class DfPlanService extends BaseService { DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); if (dto != null) { dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); + dto.setContents(getContents(id).stream() + .map(this::toDto) + .collect(Collectors.toList())); if (StringUtils.isNotEmpty(dfPlan.getFiles())) { dto.setFiles(JSON.parseArray(dfPlan.getFiles(), String.class)); } - Wrapper wp = Wrappers.lambdaQuery() - .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid, - DfPlanOperator::getOperatorName) - .eq(DfPlanOperator::getPlanId, id); - dto.setOperators(StreamUtils.toList(dfPlanOperatorMapper.selectList(wp), (o) -> { - OperatorDto itemDto = new OperatorDto(); - itemDto.setId(o.getId()); - itemDto.setUid(o.getOperatorUid()); - itemDto.setName(o.getOperatorName()); - return itemDto; - })); } return dto; } @@ -92,11 +75,10 @@ public class DfPlanService extends BaseService { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); + planeTime(dfPlan, dto.getContents()); getBaseMapper().insert(dfPlan); String id = dfPlan.getId(); - if (CollectionUtil.isNotEmpty(dto.getOperators())) { - dto.getOperators().forEach(insertOperator(id)); - } + saveOrUpdateContent(id, dto.getContents()); return this.getDetailById(id); } else { throw new DfException("该名称已存在"); @@ -106,16 +88,6 @@ public class DfPlanService extends BaseService { return null; } - private Consumer insertOperator(String id) { - return (o) -> { - DfPlanOperator item = new DfPlanOperator(); - item.setPlanId(id); - item.setOperatorName(o.getName()); - item.setOperatorUid(o.getUid()); - dfPlanOperatorMapper.insert(item); - }; - } - @Transactional(rollbackFor = Exception.class) public DfPlanDetailDto update(DfPlanDetailDto dto) { if (exist(dto.getId())) { @@ -124,12 +96,10 @@ public class DfPlanService extends BaseService { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); + planeTime(dfPlan, dto.getContents()); getBaseMapper().updateById(dfPlan); String id = dfPlan.getId(); - deleteItems(id); - if (CollectionUtil.isNotEmpty(dto.getOperators())) { - dto.getOperators().forEach(insertOperator(id)); - } + saveOrUpdateContent(id, dto.getContents()); return this.getDetailById(id); } else { throw new DfException("该名称已存在"); @@ -140,7 +110,6 @@ public class DfPlanService extends BaseService { } - @Transactional(rollbackFor = Exception.class) public Boolean deleteById(String id) { if (isUsed(id)) { @@ -153,43 +122,28 @@ public class DfPlanService extends BaseService { return rt; } - private boolean isUsed(String planId) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfRecord::getPlanId, planId); - return dfRecordMapper.selectCount(wp) > 0; - } - @Transactional(rollbackFor = Exception.class) - public Boolean addPoints(String id, List points) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfPoint::getPlanId, id); - dfPointMapper.delete(wp); - if (CollectionUtil.isNotEmpty(points)) { - points.forEach(po -> { - DfPoint point = BeanCopyUtils.copy(po, DfPoint.class); - if (point != null) { - point.setPlanId(id); - dfPointMapper.insert(point); - } - }); + private void planeTime(DfPlan dfPlan, List contents) { + if (CollectionUtils.isEmpty(contents)) { + return; } - return true; + dfPlan.setStartDate(contents.stream().map(DfCheckingPlanContentDto::getStartDate).min(Date::compareTo).orElse(null)); + dfPlan.setEndDate(contents.stream().map(DfCheckingPlanContentDto::getEndDate).max(Date::compareTo).orElse(null)); } - - public List getPoints(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfPoint::getPlanId, id); - return StreamUtils.toList(dfPointMapper.selectList(wp), - (o) -> BeanCopyUtils.copy(o, DfPointDto.class)); + private void deleteItems(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingPlanContent::getPlanId, planId); + dfCheckingPlanContentService.remove(wp); } - private void deleteItems(String id) { - Wrapper wp = Wrappers.lambdaQuery() - .eq(DfPlanOperator::getPlanId, id); - dfPlanOperatorMapper.delete(wp); + private boolean isUsed(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfRecord::getPlanId, planId); + return dfRecordMapper.selectCount(wp) > 0; } + private boolean checkNameDistinct(String id, String name) { Wrapper wp = Wrappers.lambdaQuery() .eq(DfPlan::getName, name) @@ -215,4 +169,59 @@ public class DfPlanService extends BaseService { return dfRecordMapper.selectCount(wp) > 0; } + + private void saveOrUpdateContent(String planId, List contents) { + if (contents != null && !contents.isEmpty()) { + List ides = contents.stream().map(DfCheckingPlanContentDto::getId).filter(StringUtils::isNotEmpty).collect(Collectors.toList()); + + List oldContents = getContents(planId); + if (CollectionUtils.isNotEmpty(oldContents)) { + //获取删除的数据 + List deleteContents = oldContents.stream() + .map(DfCheckingPlanContent::getId) + .filter(id -> !ides.contains(id)) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(deleteContents)) { + dfCheckingPlanContentService.removeByIds(deleteContents); + } + } + dfCheckingPlanContentService.saveOrUpdateBatch(contents.stream().peek(item -> item.setPlanId(planId)).map(this::toEntity).collect(Collectors.toList())); + } else { + throw new DfException("执行计划内容不能为空"); + } + } + + private DfCheckingPlanContent toEntity(DfCheckingPlanContentDto dto) { + DfCheckingPlanContent entity = new DfCheckingPlanContent(); + entity.setId(dto.getId()); + entity.setPlanId(dto.getPlanId()); + entity.setLineId(dto.getLineId()); + entity.setName(dto.getName()); + entity.setStartDate(dto.getStartDate()); + entity.setEndDate(dto.getEndDate()); + entity.setScope(dto.getScope()); + entity.setOperator(JSON.toJSONString(dto.getOperator())); + entity.setStatus(dto.getStatus()); + return entity; + } + + private DfCheckingPlanContentDto toDto(DfCheckingPlanContent entity) { + DfCheckingPlanContentDto dto = new DfCheckingPlanContentDto(); + dto.setId(entity.getId()); + dto.setPlanId(entity.getPlanId()); + dto.setLineId(entity.getLineId()); + dto.setName(entity.getName()); + dto.setStartDate(entity.getStartDate()); + dto.setEndDate(entity.getEndDate()); + dto.setScope(entity.getScope()); + dto.setOperator(JSON.parseArray(entity.getOperator(), OperatorDto.class)); + dto.setStatus(entity.getStatus()); + return dto; + } + + private List getContents(String planId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfCheckingPlanContent::getPlanId, planId); + return dfCheckingPlanContentService.list(wp); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 867cb1c9..3fd31891 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.enums.YhRecordStatus; +import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.df.domain.DfYhOperator; import com.kms.yxgh.df.domain.DfYhRecord; import com.kms.yxgh.df.dto.DfYhRecordDetailDto; -import com.kms.yxgh.df.dto.DfYhRecordDetailDto.OperatorDto; import com.kms.yxgh.df.dto.DfYhRecordSearchDto; import com.kms.yxgh.df.mapper.DfYhOperatorMapper; import com.kms.yxgh.df.mapper.DfYhRecordMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java index d31869ef..39ad6995 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPlanDetailDto.java @@ -2,6 +2,7 @@ package com.kms.yxgh.sz.dto; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -64,17 +65,5 @@ public class SzPlanDetailDto { return cycleType; } - @Data - public static class OperatorDto { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; - - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java index cd85f77c..eb839e8d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordDetailDto.java @@ -1,6 +1,7 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,17 +84,5 @@ public class SzYhRecordDetailDto { private List audios; } - @Data - public static class OperatorDto { - - @ApiModelProperty("主键") - private String id; - - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; - - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java index 11c7bb83..68388f46 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java @@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.SzException; +import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.sz.domain.SzPlan; import com.kms.yxgh.sz.domain.SzPlanOperator; import com.kms.yxgh.sz.domain.SzPoint; import com.kms.yxgh.sz.domain.SzRecord; import com.kms.yxgh.sz.dto.SzPlanDetailDto; -import com.kms.yxgh.sz.dto.SzPlanDetailDto.OperatorDto; import com.kms.yxgh.sz.dto.SzPlanSimpleDto; import com.kms.yxgh.sz.dto.SzPointDto; import com.kms.yxgh.sz.mapper.SzPlanMapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java index 09b033ff..5cc4c2f0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhRecordService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.SzException; import com.kms.yxgh.base.enums.YhRecordStatus; +import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.sz.domain.SzYhOperator; import com.kms.yxgh.sz.domain.SzYhRecord; import com.kms.yxgh.sz.dto.SzYhRecordDetailDto; -import com.kms.yxgh.sz.dto.SzYhRecordDetailDto.OperatorDto; import com.kms.yxgh.sz.dto.SzYhRecordSearchDto; import com.kms.yxgh.sz.mapper.SzYhOperatorMapper; import com.kms.yxgh.sz.mapper.SzYhRecordMapper; diff --git a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql index 7dd76ad7..94a434fa 100644 --- a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql +++ b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql @@ -49,6 +49,8 @@ CREATE TABLE `bs_sgc_df_xsjh` ( `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', `FILES` text COLLATE utf8mb4_general_ci COMMENT '巡查依据附件文档', `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间', + `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间', `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', @@ -73,6 +75,15 @@ CREATE TABLE `bs_sgc_df_xsjhzx` ( CREATE TABLE `bs_sgc_df_xsjhjl` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录编号', `PLAN_ID` int COMMENT '巡查计划ID', + `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '计划名称', + `SUB_PLAN_ID` int COMMENT '子计划ID', + `SUB_PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '子计划名称', + `LINE_ID` int COMMENT '巡查路线ID', + `LINE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '路线名称', + `LINE_TYPE` int COMMENT '路线类型', + `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型', + `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间', + `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间', `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查记录名称', `STATUS` int NOT NULL COMMENT '状态', @@ -93,6 +104,8 @@ CREATE TABLE `bs_sgc_df_xsjhjlz` ( `PROBLEM` varchar(500) COLLATE utf8mb4_general_ci COMMENT '存在问题', `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', `DOC` text COLLATE utf8mb4_general_ci COMMENT '文档', + `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片', + `HANDLE_CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '处置描述', `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', diff --git a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql index 0e37f535..4bd2cd08 100644 --- a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql +++ b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql @@ -18,13 +18,27 @@ CREATE TABLE `bs_sgc_df_xslx` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查路线表'; ALTER TABLE `bs_sgc_df_xsjh` ADD `STATUS` int NOT NULL COMMENT '状态'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间'; + +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '计划名称'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SUB_PLAN_ID` int COMMENT '子计划ID'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SUB_PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '子计划名称'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_ID` int COMMENT '巡查路线ID'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '路线名称'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `LINE_TYPE` int COMMENT '路线类型'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间'; +ALTER TABLE `bs_sgc_df_xsjhjl` ADD `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间'; CREATE TABLE `bs_sgc_df_xsjhxq` ( - `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划详情编号', + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查计划内容编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划内容名称', `LINE_ID` int NOT NULL COMMENT '巡查路线ID', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', - `START_TIME` datetime DEFAULT NULL COMMENT '计划开始时间', - `END_TIME` datetime DEFAULT NULL COMMENT '计划结束时间', + `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间', + `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间', `SCOPE` text COLLATE utf8mb4_general_ci COMMENT '巡查范围', `OPERATOR` text COLLATE utf8mb4_general_ci COMMENT '执行人', `STATUS` int NOT NULL COMMENT '状态', @@ -33,5 +47,5 @@ CREATE TABLE `bs_sgc_df_xsjhxq` ( `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查计划详情表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡查计划内容表'; From daaa0fc3dfbe75431a87c1e08479bc50f79a631d Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Thu, 30 May 2024 09:42:51 +0800 Subject: [PATCH 04/43] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0dike=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java | 2 +- .../src/main/java/com/kms/yxgh/df/dto/DfCheckingLineDto.java | 3 +++ .../java/com/kms/yxgh/df/dto/DfCheckingLineProjectListDto.java | 2 ++ .../main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java index c2cb36cf..608df8c6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java @@ -158,7 +158,7 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { @Select({ "" }) @Results(value = { From b4bfe00be51e893b589c21f8786e0ee056d367cf Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 19:05:10 +0800 Subject: [PATCH 23/43] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C=E4=BA=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/domain/DfCheckingPlanContent.java | 5 --- .../kms/yxgh/df/domain/DfPlanOperator.java | 8 ++-- .../com/kms/yxgh/df/mapper/DfPlanMapper.java | 7 ++++ .../yxgh/df/mapper/DfPlanOperatorMapper.java | 1 - .../kms/yxgh/df/service/DfPlanService.java | 41 ++++++++++++++----- sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql | 37 +++++++++++++++++ sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql | 2 + 7 files changed, 79 insertions(+), 22 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java index 76050c0f..f9baad32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingPlanContent.java @@ -52,11 +52,6 @@ public class DfCheckingPlanContent extends SyBaseEntity { @ApiModelProperty("巡查范围") private String scope; - /** - * 执行人 - */ - @ApiModelProperty("执行人") - private String operator; /** * 状态 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java index 776c5364..fac9bf7d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlanOperator.java @@ -2,7 +2,6 @@ package com.kms.yxgh.df.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.kms.yxgh.base.SyBaseEntity; -import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,7 +13,6 @@ import lombok.Data; * @author sy * @date 2023-11-09 */ -@Deprecated @TableName("bs_sgc_df_xsjhzx") @Data @ApiModel("堤防巡视检查计划执行人") @@ -25,21 +23,21 @@ public class DfPlanOperator extends SyBaseEntity { /** * 巡查计划ID */ - @Excel(name = "巡查计划ID") @ApiModelProperty("巡查计划ID") private String planId; + + private String subPlanId; + /** * 执行人 */ - @Excel(name = "执行人") @ApiModelProperty("执行人") private String operatorUid; /** * 执行人 */ - @Excel(name = "执行人名称") @ApiModelProperty("执行人名称") private String operatorName; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index 6f740f6e..4c6ec507 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -35,6 +35,7 @@ public interface DfPlanMapper extends BaseMapper { "FROM bs_sgc_df_xsjh p " + "Left JOIN att_dike_base df ON p.dike_code = df.dike_code and df.expr_date is null " + "Left JOIN bs_sgc_df_fzr fzr ON p.dike_code = fzr.dike_code and fzr.type = 0 " + + "Left JOIN bs_sgc_df_xsjhzx op ON op.plan_id = p.id " + "WHERE 1=1 " + "" + "AND p.dike_code = #{dto.dikeCode} " + @@ -51,6 +52,12 @@ public interface DfPlanMapper extends BaseMapper { "" + "AND p.end_date <= #{dto.endTime} " + "" + + "" + + "AND op.operator_uid IN " + + "" + + "#{id}" + + "" + + "" + "ORDER BY p.create_time DESC" + "") IPage search(Page page, @Param("dto") DfPlanSearchDto searchDto); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java index 12083b38..9b1b12d1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanOperatorMapper.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Repository; * @author sy * @date 2023-11-09 */ -@Deprecated @Repository public interface DfPlanOperatorMapper extends BaseMapper { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 0d9487d5..449988b2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -10,6 +10,7 @@ import com.kms.yxgh.base.DfException; import com.kms.yxgh.common.dto.OperatorDto; import com.kms.yxgh.df.domain.DfCheckingPlanContent; import com.kms.yxgh.df.domain.DfPlan; +import com.kms.yxgh.df.domain.DfPlanOperator; import com.kms.yxgh.df.domain.DfRecord; import com.kms.yxgh.df.dto.DfCheckingPlanContentDto; import com.kms.yxgh.df.dto.DfPlanDetailDto; @@ -28,9 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.ZoneId; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -46,6 +45,7 @@ public class DfPlanService extends BaseService { private final DfRecordMapper dfRecordMapper; private final DfCheckingPlanContentService dfCheckingPlanContentService; private final SysUserService userService; + private final DfPlanOperatorService dfPlanOperatorService; public IPage search(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -62,9 +62,12 @@ public class DfPlanService extends BaseService { DfPlan dfPlan = this.getById(id); DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); if (dto != null) { + List operators = Optional.ofNullable(dfPlanOperatorService.list(Wrappers.lambdaQuery().in(DfPlanOperator::getPlanId, id))).orElse(Collections.emptyList()); + Map> operatorMap = operators.stream().collect(Collectors.groupingBy(DfPlanOperator::getSubPlanId)); + dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig(), DfPlanDetailDto.OptionConfig.class)); dto.setContents(getContents(id).stream() - .map(this::toDto) + .map(item -> toDto(item, operatorMap)) .collect(Collectors.toList())); if (StringUtils.isNotEmpty(dfPlan.getFiles())) { dto.setFiles(JSON.parseArray(dfPlan.getFiles(), String.class)); @@ -144,6 +147,7 @@ public class DfPlanService extends BaseService { Wrapper wp = Wrappers.lambdaQuery() .in(DfCheckingPlanContent::getPlanId, Arrays.asList(planIds)); dfCheckingPlanContentService.remove(wp); + dfPlanOperatorService.remove(Wrappers.lambdaQuery().in(DfPlanOperator::getPlanId, Arrays.asList(planIds))); } private boolean isUsed(String planId) { @@ -191,27 +195,42 @@ public class DfPlanService extends BaseService { .filter(id -> !ides.contains(id)) .collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(deleteContents)) { + dfPlanOperatorService.remove(Wrappers.lambdaQuery().in(DfPlanOperator::getSubPlanId, deleteContents)); dfCheckingPlanContentService.removeByIds(deleteContents); } } dfCheckingPlanContentService.saveOrUpdateBatch(contents.stream().peek(item -> item.setPlanId(planId)).map(this::toEntity).collect(Collectors.toList())); + List operators = contents.stream().flatMap(item -> item.getOperator().stream().map(operator -> { + DfPlanOperator po = new DfPlanOperator(); + po.setId(operator.getId()); + po.setSubPlanId(item.getId()); + po.setOperatorUid(operator.getUid()); + po.setPlanId(item.getPlanId()); + po.setOperatorName(operator.getName()); + return po; + })).collect(Collectors.toList()); + dfPlanOperatorService.saveOrUpdateBatch(operators); } else { throw new DfException("执行计划内容不能为空"); } } private DfCheckingPlanContent toEntity(DfCheckingPlanContentDto dto) { - DfCheckingPlanContent entity = BeanCopyUtils.copy(dto, DfCheckingPlanContent.class); - if (entity != null) { - entity.setOperator(JSON.toJSONString(dto.getOperator())); - } - return entity; + return BeanCopyUtils.copy(dto, DfCheckingPlanContent.class); } - private DfCheckingPlanContentDto toDto(DfCheckingPlanContent entity) { + private DfCheckingPlanContentDto toDto(DfCheckingPlanContent entity, Map> operatorMap) { DfCheckingPlanContentDto dto = BeanCopyUtils.copy(entity, DfCheckingPlanContentDto.class); if (dto != null) { - dto.setOperator(JSON.parseArray(entity.getOperator(), OperatorDto.class)); + dto.setOperator(operatorMap.getOrDefault(dto.getId(), Collections.emptyList()).stream() + .map(item -> { + OperatorDto operatorDto = new OperatorDto(); + operatorDto.setId(item.getId()); + operatorDto.setUid(item.getOperatorUid()); + operatorDto.setName(item.getOperatorName()); + return operatorDto; + }) + .collect(Collectors.toList())); } return dto; } diff --git a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql index 70788739..9b6fe337 100644 --- a/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql +++ b/sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql @@ -63,6 +63,7 @@ CREATE TABLE `bs_sgc_df_xsjh` ( CREATE TABLE `bs_sgc_df_xsjhzx` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查计划执行者编号', `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `SUB_PLAN_ID` int NOT NULL COMMENT '巡查子计划ID', `OPERATOR_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人ID', `OPERATOR_NAME` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行人名称', `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', @@ -102,6 +103,42 @@ CREATE TABLE `bs_sgc_df_xsjhjl` ( PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查记录表'; +CREATE TABLE `bs_sgc_df_xsjhxq` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查计划内容编号', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划内容名称', + `LINE_ID` int NOT NULL COMMENT '巡查路线ID', + `PLAN_ID` int NOT NULL COMMENT '巡查计划ID', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间', + `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间', + `SCOPE` text COLLATE utf8mb4_general_ci COMMENT '巡查范围', + `OPERATOR` text COLLATE utf8mb4_general_ci COMMENT '执行人', + `STATUS` int NOT NULL COMMENT '状态', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡查计划内容表'; + + +CREATE TABLE `bs_sgc_df_xslx` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查路线查编号', + `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci COMMENT '堤防代码', + `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查名称', + `TYPE` int DEFAULT NULL COMMENT '巡查路线类型', + `DUTY_HOLDER_TYPE` int DEFAULT NULL COMMENT '巡查责任人类型', + `XC_ID` int NOT NULL COMMENT '巡查ID', + `POINTS` text COLLATE utf8mb4_general_ci COMMENT '巡查路线点位', + `STATUS` int NOT NULL COMMENT '状态', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查路线表'; + CREATE TABLE `bs_sgc_df_xsjhjlz` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查检查记录子项编号', `RECORD_ID` int NOT NULL COMMENT '巡查记录ID', diff --git a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql index 0dc8f461..6c512278 100644 --- a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql +++ b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql @@ -44,6 +44,8 @@ ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_TIME` datetime DEFAULT NULL COMMENT ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片'; ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '处置描述'; +ALTER TABLE `bs_sgc_df_xsjhzx` ADD `SUB_PLAN_ID` int NOT NULL COMMENT '巡查子计划ID'; + CREATE TABLE `bs_sgc_df_xsjhxq` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查计划内容编号', `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '巡查计划内容名称', From 1b5ab4ac8dedb2130c4358b16cb6560baa216550 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 19:18:47 +0800 Subject: [PATCH 24/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java | 2 +- .../main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java index 608df8c6..b6b042c8 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java @@ -173,7 +173,7 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { "", "and EXISTS (SELECT 1 FROM bs_sgc_df_xslx line WHERE line.dike_code = df.dike_code ", "", - "and line.line_name like concat('%', #{dto.lineName}, '%') ", + "and line.name like concat('%', #{dto.lineName}, '%') ", "", "", "and line.type = #{dto.type} ", diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java index 9509c59c..22fcd9d2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingLineMapper.java @@ -46,7 +46,7 @@ public interface DfCheckingLineMapper extends BaseMapper { "and df.adcd like concat(#{dto.adcd}, '%') ", "", "", - "and line.line_name like concat('%', #{dto.lineName}, '%') ", + "and line.name like concat('%', #{dto.lineName}, '%') ", "", "", "and line.type = #{dto.type} ", From 052fb576113c3eba036fd7a677e5a8e4bc6bb56c Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 19:34:00 +0800 Subject: [PATCH 25/43] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index 4c6ec507..cf89efe3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -34,7 +34,6 @@ public interface DfPlanMapper extends BaseMapper { "(select count(1) from bs_sgc_df_xsjhxq su where su.plan_id = p.id) as item_count " + "FROM bs_sgc_df_xsjh p " + "Left JOIN att_dike_base df ON p.dike_code = df.dike_code and df.expr_date is null " + - "Left JOIN bs_sgc_df_fzr fzr ON p.dike_code = fzr.dike_code and fzr.type = 0 " + "Left JOIN bs_sgc_df_xsjhzx op ON op.plan_id = p.id " + "WHERE 1=1 " + "" + From d2778700c6e53814f5194df99629a0279cf5283d Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 19:49:38 +0800 Subject: [PATCH 26/43] =?UTF-8?q?fix:=20=E4=B8=8B=E8=BD=BD=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/shuili/common/config/ShuiliConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java index a66a4d78..82a61507 100644 --- a/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java +++ b/shuili-framework/src/main/java/com/shuili/common/config/ShuiliConfig.java @@ -49,7 +49,7 @@ public class ShuiliConfig private static String detectLang; - private static String uploadType; + private static String uploadType = "disk"; public static String getDetectLang() { return detectLang; From a1e18aeea3c1e826bc74b42c18f8cadff97ec0f4 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 20:06:35 +0800 Subject: [PATCH 27/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 1 + .../shuili/common/utils/poi/ExcelUtil.java | 1834 +++++++++-------- 2 files changed, 922 insertions(+), 913 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java index 8ab34b56..65ae0fb4 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java @@ -51,6 +51,7 @@ public class CommonController { * @param fileName 文件名称 * 必须登录才可以下载 */ + @ApiOperation("通用下载请求") @SaCheckLogin @GetMapping("common/download") public void fileDownload(String fileUrl, String fileName, HttpServletResponse response, HttpServletRequest request) { diff --git a/shuili-framework/src/main/java/com/shuili/common/utils/poi/ExcelUtil.java b/shuili-framework/src/main/java/com/shuili/common/utils/poi/ExcelUtil.java index 75dc595c..00b0edc4 100644 --- a/shuili-framework/src/main/java/com/shuili/common/utils/poi/ExcelUtil.java +++ b/shuili-framework/src/main/java/com/shuili/common/utils/poi/ExcelUtil.java @@ -33,920 +33,928 @@ import java.util.stream.Collectors; * @author shuili */ public class ExcelUtil { - private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); - - /** - * Excel sheet最大行数，默认65536 - */ - public static final int sheetSize = 65536; - - /** - * 工作表名称 - */ - private String sheetName; - - /** - * 导出类型（EXPORT:导出数据；IMPORT：导入模板） - */ - private Excel.Type type; - - /** - * 工作薄对象 - */ - private Workbook wb; - - /** - * 工作表对象 - */ - private Sheet sheet; - - /** - * 样式列表 - */ - private Map styles; - - /** - * 导入导出数据列表 - */ - private List list; - - /** - * 注解列表 - */ - private List fields; - - /** - * 统计列表 - */ - private Map statistics = new HashMap(); - - /** - * 数字格式 - */ - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); - - /** - * 实体对象 - */ - public Class clazz; - - public ExcelUtil(Class clazz) { - this.clazz = clazz; - } - - public void init(List list, String sheetName, Excel.Type type) { - if (list == null) { - list = new ArrayList(); - } - this.list = list; - this.sheetName = sheetName; - this.type = type; - createExcelField(); - createWorkbook(); - } - - /** - * 对excel表单默认第一个索引名转换成list - * - * @param is 输入流 - * @return 转换后集合 - */ - public List importExcel(InputStream is) throws Exception { - return importExcel(StringUtils.EMPTY, is); - } - - /** - * 对excel表单指定表格索引名转换成list - * - * @param sheetName 表格索引名 - * @param is 输入流 - * @return 转换后集合 - */ - public List importExcel(String sheetName, InputStream is) throws Exception { - this.type = Excel.Type.IMPORT; - this.wb = WorkbookFactory.create(is); - List list = new ArrayList(); - Sheet sheet = null; - if (StringUtils.isNotEmpty(sheetName)) { - // 如果指定sheet名,则取指定sheet中的内容. - sheet = wb.getSheet(sheetName); - } else { - // 如果传入的sheet名不存在则默认指向第1个sheet. - sheet = wb.getSheetAt(0); - } - - if (sheet == null) { - throw new IOException("文件sheet不存在"); - } - - int rows = sheet.getPhysicalNumberOfRows(); - - if (rows > 0) { - // 定义一个map用于存放excel列的序号和field. - Map cellMap = new HashMap(); - // 获取表头 - Row heard = sheet.getRow(0); - for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) { - Cell cell = heard.getCell(i); - if (StringUtils.isNotNull(cell)) { - String value = this.getCellValue(heard, i).toString(); - cellMap.put(value, i); - } else { - cellMap.put(null, i); - } - } - // 有数据时才处理 得到类的所有field. - Field[] fields = clazz.getDeclaredFields(); - List allFields= new ArrayList<>(Arrays.asList(fields)); - Class superclass = clazz.getSuperclass(); - while(StringUtils.isNotNull(superclass)) { - Field[] declaredFields = superclass.getDeclaredFields(); - if(StringUtils.isNotEmpty(declaredFields)) { - allFields.addAll(Arrays.asList(declaredFields)); - } - superclass = superclass.getSuperclass(); - } - // 定义一个map用于存放列的序号和field. - Map fieldsMap = new HashMap(); - for (int col = 0; col < allFields.size(); col++) { - Field field = allFields.get(col); - Excel attr = field.getAnnotation(Excel.class); - if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) { - // 设置类的私有字段属性可访问. - field.setAccessible(true); - Integer column = cellMap.get(attr.name()); - if (column != null) { - fieldsMap.put(column, field); - } - } - } - for (int i = 1; i < rows; i++) { - // 从第2行开始取数据,默认第一行是表头. - Row row = sheet.getRow(i); - T entity = null; - for (Map.Entry entry : fieldsMap.entrySet()) { - Object val = this.getCellValue(row, entry.getKey()); - - // 如果不存在实例则新建. - entity = (entity == null ? clazz.newInstance() : entity); - // 从map中得到对应列的field. - Field field = fieldsMap.get(entry.getKey()); - // 取得类型,并根据对象类型设置值. - Class fieldType = field.getType(); - if (String.class == fieldType) { - String s = Convert.toStr(val); - if (StringUtils.endsWith(s, ".0")) { - val = StringUtils.substringBefore(s, ".0"); - } else { - val = Convert.toStr(val); - } - } else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType)) { - val = Convert.toInt(val); - } else if ((Long.TYPE == fieldType) || (Long.class == fieldType)) { - val = Convert.toLong(val); - } else if ((Double.TYPE == fieldType) || (Double.class == fieldType)) { - val = Convert.toDouble(val); - } else if ((Float.TYPE == fieldType) || (Float.class == fieldType)) { - val = Convert.toFloat(val); - } else if (BigDecimal.class == fieldType) { - val = Convert.toBigDecimal(val); - } else if (Date.class == fieldType) { - if (val instanceof String) { - val = DateUtils.parseDate(val); - } else if (val instanceof Double) { - val = DateUtil.getJavaDate((Double) val); - } - } - if (StringUtils.isNotNull(fieldType)) { - Excel attr = field.getAnnotation(Excel.class); - String propertyName = field.getName(); - if (StringUtils.isNotEmpty(attr.targetAttr())) { - propertyName = field.getName() + "." + attr.targetAttr(); - } else if (StringUtils.isNotEmpty(attr.readConverterExp())) { - val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); - } else if (StringUtils.isNotEmpty(attr.dictType())) { - val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); - } - ReflectUtils.invokeSetter(entity, propertyName, val); - } - } - list.add(entity); - } - } - return list; - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @param list 导出数据集合 - * @param sheetName 工作表的名称 - * @return 结果 - */ - public AjaxResult exportExcel(List list, String sheetName) { - this.init(list, sheetName, Excel.Type.EXPORT); - return exportExcel(); - } - public AjaxResult exportExcel(List list, String sheetName,String path) { - this.init(list, sheetName, Excel.Type.EXPORT); - return exportExcelPath(path); - } - - public ExcelUtil exportExcelData(List list, String sheetName) { - this.init(list, sheetName, Excel.Type.EXPORT); - return this; - } - - /** - * 下载模板 - * @param sheetName - */ - public ExcelUtil exportExcel(String sheetName) { - this.init(list, sheetName, Excel.Type.EXPORT); - return this; - } - - /** - * 输出数据流 - * @param os 输出数据流 - */ - public ExcelUtil write(OutputStream os) throws IOException{ - wb.write(os); - return this; - } - - /** - * 输出到客户端 - * @param fileName 输出文件名 - */ - public ExcelUtil write(HttpServletResponse response, String fileName) throws IOException{ - response.reset(); + private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); + + /** + * Excel sheet最大行数，默认65536 + */ + public static final int sheetSize = 65536; + + /** + * 工作表名称 + */ + private String sheetName; + + /** + * 导出类型（EXPORT:导出数据；IMPORT：导入模板） + */ + private Excel.Type type; + + /** + * 工作薄对象 + */ + private Workbook wb; + + /** + * 工作表对象 + */ + private Sheet sheet; + + /** + * 样式列表 + */ + private Map styles; + + /** + * 导入导出数据列表 + */ + private List list; + + /** + * 注解列表 + */ + private List fields; + + /** + * 统计列表 + */ + private Map statistics = new HashMap(); + + /** + * 数字格式 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + + /** + * 实体对象 + */ + public Class clazz; + + public ExcelUtil(Class clazz) { + this.clazz = clazz; + } + + public void init(List list, String sheetName, Excel.Type type) { + if (list == null) { + list = new ArrayList(); + } + this.list = list; + this.sheetName = sheetName; + this.type = type; + createExcelField(); + createWorkbook(); + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(InputStream is) throws Exception { + return importExcel(StringUtils.EMPTY, is); + } + + /** + * 对excel表单指定表格索引名转换成list + * + * @param sheetName 表格索引名 + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(String sheetName, InputStream is) throws Exception { + this.type = Excel.Type.IMPORT; + this.wb = WorkbookFactory.create(is); + List list = new ArrayList(); + Sheet sheet = null; + if (StringUtils.isNotEmpty(sheetName)) { + // 如果指定sheet名,则取指定sheet中的内容. + sheet = wb.getSheet(sheetName); + } else { + // 如果传入的sheet名不存在则默认指向第1个sheet. + sheet = wb.getSheetAt(0); + } + + if (sheet == null) { + throw new IOException("文件sheet不存在"); + } + + int rows = sheet.getPhysicalNumberOfRows(); + + if (rows > 0) { + // 定义一个map用于存放excel列的序号和field. + Map cellMap = new HashMap(); + // 获取表头 + Row heard = sheet.getRow(0); + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) { + Cell cell = heard.getCell(i); + if (StringUtils.isNotNull(cell)) { + String value = this.getCellValue(heard, i).toString(); + cellMap.put(value, i); + } else { + cellMap.put(null, i); + } + } + // 有数据时才处理 得到类的所有field. + Field[] fields = clazz.getDeclaredFields(); + List allFields = new ArrayList<>(Arrays.asList(fields)); + Class superclass = clazz.getSuperclass(); + while (StringUtils.isNotNull(superclass)) { + Field[] declaredFields = superclass.getDeclaredFields(); + if (StringUtils.isNotEmpty(declaredFields)) { + allFields.addAll(Arrays.asList(declaredFields)); + } + superclass = superclass.getSuperclass(); + } + // 定义一个map用于存放列的序号和field. + Map fieldsMap = new HashMap(); + for (int col = 0; col < allFields.size(); col++) { + Field field = allFields.get(col); + Excel attr = field.getAnnotation(Excel.class); + if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) { + // 设置类的私有字段属性可访问. + field.setAccessible(true); + Integer column = cellMap.get(attr.name()); + if (column != null) { + fieldsMap.put(column, field); + } + } + } + for (int i = 1; i < rows; i++) { + // 从第2行开始取数据,默认第一行是表头. + Row row = sheet.getRow(i); + T entity = null; + for (Map.Entry entry : fieldsMap.entrySet()) { + Object val = this.getCellValue(row, entry.getKey()); + + // 如果不存在实例则新建. + entity = (entity == null ? clazz.newInstance() : entity); + // 从map中得到对应列的field. + Field field = fieldsMap.get(entry.getKey()); + // 取得类型,并根据对象类型设置值. + Class fieldType = field.getType(); + if (String.class == fieldType) { + String s = Convert.toStr(val); + if (StringUtils.endsWith(s, ".0")) { + val = StringUtils.substringBefore(s, ".0"); + } else { + val = Convert.toStr(val); + } + } else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType)) { + val = Convert.toInt(val); + } else if ((Long.TYPE == fieldType) || (Long.class == fieldType)) { + val = Convert.toLong(val); + } else if ((Double.TYPE == fieldType) || (Double.class == fieldType)) { + val = Convert.toDouble(val); + } else if ((Float.TYPE == fieldType) || (Float.class == fieldType)) { + val = Convert.toFloat(val); + } else if (BigDecimal.class == fieldType) { + val = Convert.toBigDecimal(val); + } else if (Date.class == fieldType) { + if (val instanceof String) { + val = DateUtils.parseDate(val); + } else if (val instanceof Double) { + val = DateUtil.getJavaDate((Double) val); + } + } + if (StringUtils.isNotNull(fieldType)) { + Excel attr = field.getAnnotation(Excel.class); + String propertyName = field.getName(); + if (StringUtils.isNotEmpty(attr.targetAttr())) { + propertyName = field.getName() + "." + attr.targetAttr(); + } else if (StringUtils.isNotEmpty(attr.readConverterExp())) { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } else if (StringUtils.isNotEmpty(attr.dictType())) { + val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); + } + ReflectUtils.invokeSetter(entity, propertyName, val); + } + } + list.add(entity); + } + } + return list; + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @return 结果 + */ + public AjaxResult exportExcel(List list, String sheetName) { + this.init(list, sheetName, Excel.Type.EXPORT); + return exportExcel(); + } + + public AjaxResult exportExcel(List list, String sheetName, String path) { + this.init(list, sheetName, Excel.Type.EXPORT); + return exportExcelPath(path); + } + + public ExcelUtil exportExcelData(List list, String sheetName) { + this.init(list, sheetName, Excel.Type.EXPORT); + return this; + } + + /** + * 下载模板 + * + * @param sheetName + */ + public ExcelUtil exportExcel(String sheetName) { + this.init(list, sheetName, Excel.Type.EXPORT); + return this; + } + + /** + * 输出数据流 + * + * @param os 输出数据流 + */ + public ExcelUtil write(OutputStream os) throws IOException { + wb.write(os); + return this; + } + + /** + * 输出到客户端 + * + * @param fileName 输出文件名 + */ + public ExcelUtil write(HttpServletResponse response, String fileName) throws IOException { + response.reset(); response.setContentType("application/octet-stream; charset=utf-8"); - response.setHeader("Content-Disposition", "attachment; filename="+ Encodes.urlEncode(fileName)); - write(response.getOutputStream()); - return this; - } - - /** - * 输出到文件 - * @param name 输出文件名 - */ - public ExcelUtil writeFile(String name) throws FileNotFoundException, IOException{ - FileOutputStream os = new FileOutputStream(name); - this.write(os); - return this; - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @param sheetName 工作表的名称 - * @return 结果 - */ - public AjaxResult importTemplateExcel(String sheetName) { - this.init(null, sheetName, Excel.Type.IMPORT); - return exportExcel(); - } - - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @return 结果 - */ - public AjaxResult exportExcel() { - OutputStream out = null; - try { - // 取出一共有多少个sheet. - double sheetNo = Math.ceil(list.size() / sheetSize); - for (int index = 0; index <= sheetNo; index++) { - createSheet(sheetNo, index); - - // 产生一行 - Row row = sheet.createRow(0); - int column = 0; - // 写入各个字段的列头名称 - for (Object[] os : fields) { - Excel excel = (Excel) os[1]; - this.createCell(excel, row, column++); - } - if (Excel.Type.EXPORT.equals(type)) { - fillExcelData(index, row); - addStatisticsRow(); - } - } - String filename = encodingFilename(sheetName); - out = new FileOutputStream(getAbsoluteFile(filename)); - wb.write(out); - return AjaxResult.success(filename); - } catch (Exception e) { - log.error("导出Excel异常{}", e.getMessage()); - throw new CustomException("导出Excel失败，请联系网站管理员！"); - } finally { - if (wb != null) { - try { - wb.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - if (out != null) { - try { - out.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } - } - public AjaxResult exportExcelPath(String path) { - OutputStream out = null; - try { - // 取出一共有多少个sheet. - double sheetNo = Math.ceil(list.size() / sheetSize); - for (int index = 0; index <= sheetNo; index++) { - createSheet(sheetNo, index); - - // 产生一行 - Row row = sheet.createRow(0); - int column = 0; - // 写入各个字段的列头名称 - for (Object[] os : fields) { - Excel excel = (Excel) os[1]; - this.createCell(excel, row, column++); - } - if (Excel.Type.EXPORT.equals(type)) { - fillExcelData(index, row); - addStatisticsRow(); - } - } - String filename = encodingFilename(sheetName); - out = new FileOutputStream(path+filename); - wb.write(out); - return AjaxResult.success(filename); - } catch (Exception e) { - log.error("导出Excel异常{}", e.getMessage()); - throw new CustomException("导出Excel失败，请联系网站管理员！"); - } finally { - if (wb != null) { - try { - wb.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - if (out != null) { - try { - out.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } - } - public ExcelUtil setDatalist() { - try { - // 取出一共有多少个sheet. - double sheetNo = Math.ceil(list.size() / sheetSize); - for (int index = 0; index <= sheetNo; index++) { - createSheet(sheetNo, index); - - // 产生一行 - Row row = sheet.createRow(0); - int column = 0; - // 写入各个字段的列头名称 - for (Object[] os : fields) { - Excel excel = (Excel) os[1]; - this.createCell(excel, row, column++); - } - if (Excel.Type.EXPORT.equals(type)) { - fillExcelData(index, row); - addStatisticsRow(); - } - } - } catch (Exception e) { - log.error("导出Excel异常{}", e.getMessage()); - throw new CustomException("导出Excel失败，请联系网站管理员！"); - } - return this; - } - - /** - * 填充excel数据 - * - * @param index 序号 - * @param row 单元格行 - */ - public void fillExcelData(int index, Row row) { - int startNo = index * sheetSize; - int endNo = Math.min(startNo + sheetSize, list.size()); - for (int i = startNo; i < endNo; i++) { - row = sheet.createRow(i + 1 - startNo); - // 得到导出对象. - T vo = (T) list.get(i); - int column = 0; - for (Object[] os : fields) { - Field field = (Field) os[0]; - Excel excel = (Excel) os[1]; - // 设置实体类私有属性可访问 - field.setAccessible(true); - this.addCell(excel, row, vo, field, column++); - } - } - } - - /** - * 创建表格样式 - * - * @param wb 工作薄对象 - * @return 样式列表 - */ - private Map createStyles(Workbook wb) { - // 写入各条记录,每条记录对应excel表中的一行 - Map styles = new HashMap(); - CellStyle style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setBorderRight(BorderStyle.THIN); - style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderLeft(BorderStyle.THIN); - style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderTop(BorderStyle.THIN); - style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setBorderBottom(BorderStyle.THIN); - style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); - Font dataFont = wb.createFont(); - dataFont.setFontName("Arial"); - dataFont.setFontHeightInPoints((short) 10); - style.setFont(dataFont); - styles.put("data", style); - - style = wb.createCellStyle(); - style.cloneStyleFrom(styles.get("data")); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); - style.setFillPattern(FillPatternType.SOLID_FOREGROUND); - Font headerFont = wb.createFont(); - headerFont.setFontName("Arial"); - headerFont.setFontHeightInPoints((short) 10); - headerFont.setBold(true); - headerFont.setColor(IndexedColors.WHITE.getIndex()); - style.setFont(headerFont); - styles.put("header", style); - - style = wb.createCellStyle(); - style.setAlignment(HorizontalAlignment.CENTER); - style.setVerticalAlignment(VerticalAlignment.CENTER); - Font totalFont = wb.createFont(); - totalFont.setFontName("Arial"); - totalFont.setFontHeightInPoints((short) 10); - style.setFont(totalFont); - styles.put("total", style); - - return styles; - } - - /** - * 创建单元格 - */ - public Cell createCell(Excel attr, Row row, int column) { - // 创建列 - Cell cell = row.createCell(column); - // 写入列信息 - cell.setCellValue(attr.name()); - setDataValidation(attr, row, column); - cell.setCellStyle(styles.get("header")); - return cell; - } - - /** - * 设置单元格信息 - * - * @param value 单元格值 - * @param attr 注解相关 - * @param cell 单元格信息 - */ - public void setCellVo(Object value, Excel attr, Cell cell) { - if (Excel.ColumnType.STRING == attr.cellType()) { - cell.setCellType(CellType.STRING); - cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix()); - } else if (Excel.ColumnType.NUMERIC == attr.cellType()) { - cell.setCellType(CellType.NUMERIC); - cell.setCellValue( - StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); - } - } - - /** - * 创建表格样式 - */ - public void setDataValidation(Excel attr, Row row, int column) { - if (attr.name().indexOf("注：") >= 0) { - sheet.setColumnWidth(column, 6000); - } else { - // 设置列宽 - sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); - row.setHeight((short) (attr.height() * 20)); - } - // 如果设置了提示信息则鼠标放上去提示. - if (StringUtils.isNotEmpty(attr.prompt())) { - // 这里默认设了2-101列提示. - setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column); - } - // 如果设置了combo属性则本列只能选择不能输入 - if (attr.combo().length > 0) { - // 这里默认设了2-101列只能选择不能输入. - setXSSFValidation(sheet, attr.combo(), 1, 100, column, column); - } - } - - /** - * 添加单元格 - */ - public Cell addCell(Excel attr, Row row, T vo, Field field, int column) { - Cell cell = null; - try { - // 设置行高 - row.setHeight((short) (attr.height() * 20)); - // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列. - if (attr.isExport()) { - // 创建cell - cell = row.createCell(column); - cell.setCellStyle(styles.get("data")); - - // 用于读取对象中的属性 - Object value = getTargetValue(vo, field, attr); - String dateFormat = attr.dateFormat(); - String readConverterExp = attr.readConverterExp(); - String separator = attr.separator(); - String dictType = attr.dictType(); - if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) { - cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value)); - } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) { - cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); - } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) { - cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); - } else if (value instanceof BigDecimal && -1 != attr.scale()) { - cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); - } else { - // 设置列类型 - setCellVo(value, attr, cell); - } - addStatisticsData(column, Convert.toStr(value), attr); - } - } catch (Exception e) { - log.error("导出Excel失败{}", e); - } - return cell; - } - - /** - * 设置 POI XSSFSheet 单元格提示 - * - * @param sheet 表单 - * @param promptTitle 提示标题 - * @param promptContent 提示内容 - * @param firstRow 开始行 - * @param endRow 结束行 - * @param firstCol 开始列 - * @param endCol 结束列 - */ - public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, - int firstCol, int endCol) { - DataValidationHelper helper = sheet.getDataValidationHelper(); - DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - DataValidation dataValidation = helper.createValidation(constraint, regions); - dataValidation.createPromptBox(promptTitle, promptContent); - dataValidation.setShowPromptBox(true); - sheet.addValidationData(dataValidation); - } - - /** - * 设置某些列的值只能输入预制的数据,显示下拉框. - * - * @param sheet 要设置的sheet. - * @param textlist 下拉框显示的内容 - * @param firstRow 开始行 - * @param endRow 结束行 - * @param firstCol 开始列 - * @param endCol 结束列 - * @return 设置好的sheet. - */ - public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) { - DataValidationHelper helper = sheet.getDataValidationHelper(); - // 加载下拉列表内容 - DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); - // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - // 数据有效性对象 - DataValidation dataValidation = helper.createValidation(constraint, regions); - // 处理Excel兼容性问题 - if (dataValidation instanceof XSSFDataValidation) { - dataValidation.setSuppressDropDownArrow(true); - dataValidation.setShowErrorBox(true); - } else { - dataValidation.setSuppressDropDownArrow(false); - } - - sheet.addValidationData(dataValidation); - } - - /** - * 解析导出值 0=男,1=女,2=未知 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String convertByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); - break; - } - } - } else { - if (itemArray[0].equals(propertyValue)) { - return itemArray[1]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 反向解析值 男=0,女=1,未知=2 - * - * @param propertyValue 参数值 - * @param converterExp 翻译注解 - * @param separator 分隔符 - * @return 解析后值 - */ - public static String reverseByExp(String propertyValue, String converterExp, String separator) { - StringBuilder propertyString = new StringBuilder(); - String[] convertSource = converterExp.split(","); - for (String item : convertSource) { - String[] itemArray = item.split("="); - if (StringUtils.containsAny(separator, propertyValue)) { - for (String value : propertyValue.split(separator)) { - if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); - break; - } - } - } else { - if (itemArray[1].equals(propertyValue)) { - return itemArray[0]; - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 解析字典值 - * - * @param dictValue 字典值 - * @param dictType 字典类型 - * @param separator 分隔符 - * @return 字典标签 - */ - public static String convertDictByExp(String dictValue, String dictType, String separator) { - return DictUtils.getDictLabel(dictType, dictValue, separator); - } - - /** - * 反向解析值字典值 - * - * @param dictLabel 字典标签 - * @param dictType 字典类型 - * @param separator 分隔符 - * @return 字典值 - */ - public static String reverseDictByExp(String dictLabel, String dictType, String separator) { - return DictUtils.getDictValue(dictType, dictLabel, separator); - } - - /** - * 合计统计信息 - */ - private void addStatisticsData(Integer index, String text, Excel entity) { - if (entity != null && entity.isStatistics()) { - Double temp = 0D; - if (!statistics.containsKey(index)) { - statistics.put(index, temp); - } - try { - temp = Double.valueOf(text); - } catch (NumberFormatException e) { - } - statistics.put(index, statistics.get(index) + temp); - } - } - - /** - * 创建统计行 - */ - public void addStatisticsRow() { - if (statistics.size() > 0) { - Cell cell = null; - Row row = sheet.createRow(sheet.getLastRowNum() + 1); - Set keys = statistics.keySet(); - cell = row.createCell(0); - cell.setCellStyle(styles.get("total")); - cell.setCellValue("合计"); - - for (Integer key : keys) { - cell = row.createCell(key); - cell.setCellStyle(styles.get("total")); - cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); - } - statistics.clear(); - } - } - - /** - * 编码文件名 - */ - public String encodingFilename(String filename) { - filename = StringUtils.isEmpty(filename)?IdUtils.fastSimpleUUID():filename + ".xlsx"; - return filename; - } - - /** - * 获取下载路径 - * - * @param filename 文件名称 - */ - public String getAbsoluteFile(String filename) { - String downloadPath = ShuiliConfig.getDownloadPath() + filename; - File desc = new File(downloadPath); - if (!desc.getParentFile().exists()) { - desc.getParentFile().mkdirs(); - } - return downloadPath; - } - - /** - * 获取bean中的属性值 - * - * @param vo 实体对象 - * @param field 字段 - * @param excel 注解 - * @return 最终的属性值 - * @throws Exception - */ - private Object getTargetValue(T vo, Field field, Excel excel) throws Exception { - Object o = field.get(vo); - if (StringUtils.isNotEmpty(excel.targetAttr())) { - String target = excel.targetAttr(); - if (target.indexOf(".") > -1) { - String[] targets = target.split("[.]"); - for (String name : targets) { - o = getValue(o, name); - } - } else { - o = getValue(o, target); - } - } - return o; - } - - /** - * 以类的属性的get方法方法形式获取值 - * - * @param o - * @param name - * @return value - * @throws Exception - */ - private Object getValue(Object o, String name) throws Exception { - if (StringUtils.isNotEmpty(name)) { - Class clazz = o.getClass(); - Field field = clazz.getDeclaredField(name); - field.setAccessible(true); - o = field.get(o); - } - return o; - } - - /** - * 得到所有定义字段 - */ - private void createExcelField() { - this.fields = new ArrayList(); - List tempFields = new ArrayList<>(); - tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); - tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); - for (Field field : tempFields) { - // 单注解 - if (field.isAnnotationPresent(Excel.class)) { - putToField(field, field.getAnnotation(Excel.class)); - } - - // 多注解 - if (field.isAnnotationPresent(Excels.class)) { - Excels attrs = field.getAnnotation(Excels.class); - Excel[] excels = attrs.value(); - for (Excel excel : excels) { - putToField(field, excel); - } - } - } - this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())) - .collect(Collectors.toList()); - } - - /** - * 放到字段集合中 - */ - private void putToField(Field field, Excel attr) { - if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) { - this.fields.add(new Object[] { field, attr }); - } - } - - /** - * 创建一个工作簿 - */ - public void createWorkbook() { - this.wb = new SXSSFWorkbook(500); - } - - /** - * 创建工作表 - * - * @param sheetNo sheet数量 - * @param index 序号 - */ - public void createSheet(double sheetNo, int index) { - this.sheet = wb.createSheet(); - this.styles = createStyles(wb); - // 设置工作表的名称. - if (sheetNo == 0) { - wb.setSheetName(index, sheetName); - } else { - wb.setSheetName(index, sheetName + index); - } - } - - /** - * 获取单元格值 - * - * @param row 获取的行 - * @param column 获取单元格列号 - * @return 单元格值 - */ - public Object getCellValue(Row row, int column) { - if (row == null) { - return row; - } - Object val = ""; - try { - Cell cell = row.getCell(column); - if (StringUtils.isNotNull(cell)) { + response.setHeader("Content-Disposition", "attachment; filename=" + Encodes.urlEncode(fileName)); + write(response.getOutputStream()); + return this; + } + + /** + * 输出到文件 + * + * @param name 输出文件名 + */ + public ExcelUtil writeFile(String name) throws FileNotFoundException, IOException { + FileOutputStream os = new FileOutputStream(name); + this.write(os); + return this; + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @return 结果 + */ + public AjaxResult importTemplateExcel(String sheetName) { + this.init(null, sheetName, Excel.Type.IMPORT); + return exportExcel(); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @return 结果 + */ + public AjaxResult exportExcel() { + OutputStream out = null; + try { + // 取出一共有多少个sheet. + double sheetNo = Math.ceil(list.size() / sheetSize); + for (int index = 0; index <= sheetNo; index++) { + createSheet(sheetNo, index); + + // 产生一行 + Row row = sheet.createRow(0); + int column = 0; + // 写入各个字段的列头名称 + for (Object[] os : fields) { + Excel excel = (Excel) os[1]; + this.createCell(excel, row, column++); + } + if (Excel.Type.EXPORT.equals(type)) { + fillExcelData(index, row); + addStatisticsRow(); + } + } + String filename = encodingFilename(sheetName); + String path = getAbsoluteFile(filename); + out = new FileOutputStream(path); + wb.write(out); + return AjaxResult.success(path); + } catch (Exception e) { + log.error("导出Excel异常{}", e.getMessage()); + throw new CustomException("导出Excel失败，请联系网站管理员！"); + } finally { + if (wb != null) { + try { + wb.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + if (out != null) { + try { + out.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + } + + public AjaxResult exportExcelPath(String path) { + OutputStream out = null; + try { + // 取出一共有多少个sheet. + double sheetNo = Math.ceil(list.size() / sheetSize); + for (int index = 0; index <= sheetNo; index++) { + createSheet(sheetNo, index); + + // 产生一行 + Row row = sheet.createRow(0); + int column = 0; + // 写入各个字段的列头名称 + for (Object[] os : fields) { + Excel excel = (Excel) os[1]; + this.createCell(excel, row, column++); + } + if (Excel.Type.EXPORT.equals(type)) { + fillExcelData(index, row); + addStatisticsRow(); + } + } + String filename = encodingFilename(sheetName); + out = new FileOutputStream(path + filename); + wb.write(out); + return AjaxResult.success(filename); + } catch (Exception e) { + log.error("导出Excel异常{}", e.getMessage()); + throw new CustomException("导出Excel失败，请联系网站管理员！"); + } finally { + if (wb != null) { + try { + wb.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + if (out != null) { + try { + out.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + } + + public ExcelUtil setDatalist() { + try { + // 取出一共有多少个sheet. + double sheetNo = Math.ceil(list.size() / sheetSize); + for (int index = 0; index <= sheetNo; index++) { + createSheet(sheetNo, index); + + // 产生一行 + Row row = sheet.createRow(0); + int column = 0; + // 写入各个字段的列头名称 + for (Object[] os : fields) { + Excel excel = (Excel) os[1]; + this.createCell(excel, row, column++); + } + if (Excel.Type.EXPORT.equals(type)) { + fillExcelData(index, row); + addStatisticsRow(); + } + } + } catch (Exception e) { + log.error("导出Excel异常{}", e.getMessage()); + throw new CustomException("导出Excel失败，请联系网站管理员！"); + } + return this; + } + + /** + * 填充excel数据 + * + * @param index 序号 + * @param row 单元格行 + */ + public void fillExcelData(int index, Row row) { + int startNo = index * sheetSize; + int endNo = Math.min(startNo + sheetSize, list.size()); + for (int i = startNo; i < endNo; i++) { + row = sheet.createRow(i + 1 - startNo); + // 得到导出对象. + T vo = (T) list.get(i); + int column = 0; + for (Object[] os : fields) { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + // 设置实体类私有属性可访问 + field.setAccessible(true); + this.addCell(excel, row, vo, field, column++); + } + } + } + + /** + * 创建表格样式 + * + * @param wb 工作薄对象 + * @return 样式列表 + */ + private Map createStyles(Workbook wb) { + // 写入各条记录,每条记录对应excel表中的一行 + Map styles = new HashMap(); + CellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + style.setFont(dataFont); + styles.put("data", style); + + style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + Font headerFont = wb.createFont(); + headerFont.setFontName("Arial"); + headerFont.setFontHeightInPoints((short) 10); + headerFont.setBold(true); + headerFont.setColor(IndexedColors.WHITE.getIndex()); + style.setFont(headerFont); + styles.put("header", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font totalFont = wb.createFont(); + totalFont.setFontName("Arial"); + totalFont.setFontHeightInPoints((short) 10); + style.setFont(totalFont); + styles.put("total", style); + + return styles; + } + + /** + * 创建单元格 + */ + public Cell createCell(Excel attr, Row row, int column) { + // 创建列 + Cell cell = row.createCell(column); + // 写入列信息 + cell.setCellValue(attr.name()); + setDataValidation(attr, row, column); + cell.setCellStyle(styles.get("header")); + return cell; + } + + /** + * 设置单元格信息 + * + * @param value 单元格值 + * @param attr 注解相关 + * @param cell 单元格信息 + */ + public void setCellVo(Object value, Excel attr, Cell cell) { + if (Excel.ColumnType.STRING == attr.cellType()) { + cell.setCellType(CellType.STRING); + cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix()); + } else if (Excel.ColumnType.NUMERIC == attr.cellType()) { + cell.setCellType(CellType.NUMERIC); + cell.setCellValue( + StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + } + } + + /** + * 创建表格样式 + */ + public void setDataValidation(Excel attr, Row row, int column) { + if (attr.name().indexOf("注：") >= 0) { + sheet.setColumnWidth(column, 6000); + } else { + // 设置列宽 + sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); + row.setHeight((short) (attr.height() * 20)); + } + // 如果设置了提示信息则鼠标放上去提示. + if (StringUtils.isNotEmpty(attr.prompt())) { + // 这里默认设了2-101列提示. + setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column); + } + // 如果设置了combo属性则本列只能选择不能输入 + if (attr.combo().length > 0) { + // 这里默认设了2-101列只能选择不能输入. + setXSSFValidation(sheet, attr.combo(), 1, 100, column, column); + } + } + + /** + * 添加单元格 + */ + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) { + Cell cell = null; + try { + // 设置行高 + row.setHeight((short) (attr.height() * 20)); + // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列. + if (attr.isExport()) { + // 创建cell + cell = row.createCell(column); + cell.setCellStyle(styles.get("data")); + + // 用于读取对象中的属性 + Object value = getTargetValue(vo, field, attr); + String dateFormat = attr.dateFormat(); + String readConverterExp = attr.readConverterExp(); + String separator = attr.separator(); + String dictType = attr.dictType(); + if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) { + cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value)); + } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) { + cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); + } else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) { + cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); + } else if (value instanceof BigDecimal && -1 != attr.scale()) { + cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString()); + } else { + // 设置列类型 + setCellVo(value, attr, cell); + } + addStatisticsData(column, Convert.toStr(value), attr); + } + } catch (Exception e) { + log.error("导出Excel失败{}", e); + } + return cell; + } + + /** + * 设置 POI XSSFSheet 单元格提示 + * + * @param sheet 表单 + * @param promptTitle 提示标题 + * @param promptContent 提示内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + */ + public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, + int firstCol, int endCol) { + DataValidationHelper helper = sheet.getDataValidationHelper(); + DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + DataValidation dataValidation = helper.createValidation(constraint, regions); + dataValidation.createPromptBox(promptTitle, promptContent); + dataValidation.setShowPromptBox(true); + sheet.addValidationData(dataValidation); + } + + /** + * 设置某些列的值只能输入预制的数据,显示下拉框. + * + * @param sheet 要设置的sheet. + * @param textlist 下拉框显示的内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + * @return 设置好的sheet. + */ + public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) { + DataValidationHelper helper = sheet.getDataValidationHelper(); + // 加载下拉列表内容 + DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); + // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + // 数据有效性对象 + DataValidation dataValidation = helper.createValidation(constraint, regions); + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } else { + dataValidation.setSuppressDropDownArrow(false); + } + + sheet.addValidationData(dataValidation); + } + + /** + * 解析导出值 0=男,1=女,2=未知 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String convertByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { + propertyString.append(itemArray[1] + separator); + break; + } + } + } else { + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 反向解析值 男=0,女=1,未知=2 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(separator, propertyValue)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { + propertyString.append(itemArray[0] + separator); + break; + } + } + } else { + if (itemArray[1].equals(propertyValue)) { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 解析字典值 + * + * @param dictValue 字典值 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典标签 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 反向解析值字典值 + * + * @param dictLabel 字典标签 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典值 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 合计统计信息 + */ + private void addStatisticsData(Integer index, String text, Excel entity) { + if (entity != null && entity.isStatistics()) { + Double temp = 0D; + if (!statistics.containsKey(index)) { + statistics.put(index, temp); + } + try { + temp = Double.valueOf(text); + } catch (NumberFormatException e) { + } + statistics.put(index, statistics.get(index) + temp); + } + } + + /** + * 创建统计行 + */ + public void addStatisticsRow() { + if (statistics.size() > 0) { + Cell cell = null; + Row row = sheet.createRow(sheet.getLastRowNum() + 1); + Set keys = statistics.keySet(); + cell = row.createCell(0); + cell.setCellStyle(styles.get("total")); + cell.setCellValue("合计"); + + for (Integer key : keys) { + cell = row.createCell(key); + cell.setCellStyle(styles.get("total")); + cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); + } + statistics.clear(); + } + } + + /** + * 编码文件名 + */ + public String encodingFilename(String filename) { + filename = StringUtils.isEmpty(filename) ? IdUtils.fastSimpleUUID() : filename + ".xlsx"; + return filename; + } + + /** + * 获取下载路径 + * + * @param filename 文件名称 + */ + public String getAbsoluteFile(String filename) { + String downloadPath = ShuiliConfig.getDownloadPath() + filename; + File desc = new File(downloadPath); + if (!desc.getParentFile().exists()) { + desc.getParentFile().mkdirs(); + } + return downloadPath; + } + + /** + * 获取bean中的属性值 + * + * @param vo 实体对象 + * @param field 字段 + * @param excel 注解 + * @return 最终的属性值 + * @throws Exception + */ + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception { + Object o = field.get(vo); + if (StringUtils.isNotEmpty(excel.targetAttr())) { + String target = excel.targetAttr(); + if (target.indexOf(".") > -1) { + String[] targets = target.split("[.]"); + for (String name : targets) { + o = getValue(o, name); + } + } else { + o = getValue(o, target); + } + } + return o; + } + + /** + * 以类的属性的get方法方法形式获取值 + * + * @param o + * @param name + * @return value + * @throws Exception + */ + private Object getValue(Object o, String name) throws Exception { + if (StringUtils.isNotEmpty(name)) { + Class clazz = o.getClass(); + Field field = clazz.getDeclaredField(name); + field.setAccessible(true); + o = field.get(o); + } + return o; + } + + /** + * 得到所有定义字段 + */ + private void createExcelField() { + this.fields = new ArrayList(); + List tempFields = new ArrayList<>(); + tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); + tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); + for (Field field : tempFields) { + // 单注解 + if (field.isAnnotationPresent(Excel.class)) { + putToField(field, field.getAnnotation(Excel.class)); + } + + // 多注解 + if (field.isAnnotationPresent(Excels.class)) { + Excels attrs = field.getAnnotation(Excels.class); + Excel[] excels = attrs.value(); + for (Excel excel : excels) { + putToField(field, excel); + } + } + } + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())) + .collect(Collectors.toList()); + } + + /** + * 放到字段集合中 + */ + private void putToField(Field field, Excel attr) { + if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) { + this.fields.add(new Object[]{field, attr}); + } + } + + /** + * 创建一个工作簿 + */ + public void createWorkbook() { + this.wb = new SXSSFWorkbook(500); + } + + /** + * 创建工作表 + * + * @param sheetNo sheet数量 + * @param index 序号 + */ + public void createSheet(double sheetNo, int index) { + this.sheet = wb.createSheet(); + this.styles = createStyles(wb); + // 设置工作表的名称. + if (sheetNo == 0) { + wb.setSheetName(index, sheetName); + } else { + wb.setSheetName(index, sheetName + index); + } + } + + /** + * 获取单元格值 + * + * @param row 获取的行 + * @param column 获取单元格列号 + * @return 单元格值 + */ + public Object getCellValue(Row row, int column) { + if (row == null) { + return row; + } + Object val = ""; + try { + Cell cell = row.getCell(column); + if (StringUtils.isNotNull(cell)) { // cell.getCellType().getCode() - if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) { - val = cell.getNumericCellValue(); + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) { + val = cell.getNumericCellValue(); // DateUtil.isCellDateFormatted() - if (DateUtil.isCellDateFormatted(cell)) { - val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 - } else { - if ((Double) val % 1 > 0) { - val = new BigDecimal(val.toString()); - } else { - val = new DecimalFormat("0").format(val); - } - } - } else if (cell.getCellType() == CellType.STRING) { - val = cell.getStringCellValue(); - } else if (cell.getCellType() == CellType.BOOLEAN) { - val = cell.getBooleanCellValue(); - } else if (cell.getCellType() == CellType.ERROR) { - val = cell.getErrorCellValue(); - } - - } - } catch (Exception e) { - return val; - } - return val; - } - - public void close() { - if (wb != null) { - try { - wb.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } + if (DateUtil.isCellDateFormatted(cell)) { + val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 + } else { + if ((Double) val % 1 > 0) { + val = new BigDecimal(val.toString()); + } else { + val = new DecimalFormat("0").format(val); + } + } + } else if (cell.getCellType() == CellType.STRING) { + val = cell.getStringCellValue(); + } else if (cell.getCellType() == CellType.BOOLEAN) { + val = cell.getBooleanCellValue(); + } else if (cell.getCellType() == CellType.ERROR) { + val = cell.getErrorCellValue(); + } + + } + } catch (Exception e) { + return val; + } + return val; + } + + public void close() { + if (wb != null) { + try { + wb.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } } From 5b66675624db8754ae3683f3c078bf6d9fe6dcb6 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Jun 2024 20:17:23 +0800 Subject: [PATCH 28/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/controller/common/CommonController.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java index 65ae0fb4..59c4d0e5 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/common/CommonController.java @@ -61,17 +61,13 @@ public class CommonController { if (uploadType.equals("disk")) { - // 本地资源路径 - String localPath = ShuiliConfig.getProfile(); - // 数据库资源地址 - String downloadPath = localPath + StringUtils.substringAfter(fileName, Constants.RESOURCE_PREFIX); // 下载名称 - String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); + String downloadName = StringUtils.substringAfterLast(fileName, "/"); response.setCharacterEncoding("utf-8"); response.setContentType("multipart/form-data"); response.setHeader("Content-Disposition", "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, downloadName)); - FileUtils.writeBytes(downloadPath, response.getOutputStream()); + FileUtils.writeBytes(fileName, response.getOutputStream()); } else { response.setCharacterEncoding("utf-8"); From d5ea8a35cc88cd22ce812aa2a945694d61e4de55 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 13 Jun 2024 14:35:20 +0800 Subject: [PATCH 29/43] =?UTF-8?q?fix:=20=E6=8C=89=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/service/DfRecordService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 1bae8078..8ed448e9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -57,7 +57,8 @@ public class DfRecordService extends BaseService { .eq(StringUtils.isNotBlank(searchDto.getDikeType()), DfRecord::getDikeType, searchDto.getDikeType()) .like(StringUtils.isNotBlank(searchDto.getLineName()), DfRecord::getLineName, searchDto.getLineName()) .eq(StringUtils.isNotBlank(searchDto.getLineType()), DfRecord::getLineType, searchDto.getLineType()) - .eq(StringUtils.isNotBlank(searchDto.getDutyHolderType()), DfRecord::getDutyHolderType, searchDto.getDutyHolderType()); + .eq(StringUtils.isNotBlank(searchDto.getDutyHolderType()), DfRecord::getDutyHolderType, searchDto.getDutyHolderType()) + .orderByDesc(DfRecord::getEndDate); page = page(page, wp); if (CollectionUtil.isNotEmpty(page.getRecords())) { From eddb0c08a561f7a5b59f8227ac9753e3152d447f Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 14 Jun 2024 15:44:47 +0800 Subject: [PATCH 30/43] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 645 +++++++++--------- shuili-admin/pom.xml | 34 +- shuili-common/pom.xml | 41 +- shuili-framework/pom.xml | 43 +- .../common/mybaitsplus/BeanToWrapper.java | 25 +- .../mybaitsplus/CamelUnderlineUtil.java | 50 +- shuili-generator/pom.xml | 8 +- shuili-system/pom.xml | 187 +++-- .../yg/znjg/controller/SyLayerController.java | 12 +- .../kms/yg/znjg/service/SyLayerService.java | 2 +- .../kms/yxgh/df/service/DfPlanService.java | 43 +- 11 files changed, 530 insertions(+), 560 deletions(-) diff --git a/pom.xml b/pom.xml index 8c6dc618..daf2d940 100644 --- a/pom.xml +++ b/pom.xml @@ -1,312 +1,347 @@ - 4.0.0 - - com.slsoft - slSoft - 0.0.1-SNAPSHOT - - shuili-admin - shuili-system - shuili-framework - shuili-generator - shuili-common - - - slSoft - - http://www.example.com - pom - - - 1.8 - 1.8 - 1.8 - UTF-8 - - 5.4.6 - 6.1.7.Final - 4.0.1 - 5.2.14.RELEASE - 2.3.10.RELEASE - 1.2.83 - 5.6.0 - 3.4.2 - 1.4.1.Final - 1.1.21 - 1.2.17 - 3.12.5 - 1.34.0 - 2.0.8 - 1.2.6 - 3.9.1 - - - 1.19 - 1.3.0 - 3.9.1 - 2.9.2 - 1.6.2 - 2.11.0 - 1.3.3 - 3.17 - 1.7 - 0.9.1 - 2.3.2 - 5.8.0 - 1.27.2 - 0.10.0 - - - - - - - - org.projectlombok - lombok - provided - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.slsoft + slSoft + 0.0.1-SNAPSHOT + + shuili-admin + shuili-system + shuili-framework + shuili-generator + shuili-common + + + slSoft + + http://www.example.com + pom + + + 1.8 + 1.8 + 1.8 + UTF-8 + + 5.4.6 + 6.1.7.Final + 4.0.1 + 5.2.14.RELEASE + 2.3.10.RELEASE + 1.2.83 + 5.8.25 + 3.4.2 + 1.4.1.Final + 1.1.21 + 1.2.17 + 3.12.5 + 1.34.0 + 2.0.8 + 1.2.6 + 3.9.1 + 1.19 + 1.3.0 + 3.9.1 + 2.9.2 + 1.6.2 + 2.11.0 + 1.5 + 3.17 + 1.7 + 0.9.1 + 5.8.0 + 1.27.2 + 0.10.0 + + - - - - org.apache.thrift - libthrift - ${libthrift.version} - - - com.github.tobato - fastdfs-client - ${fastdfs.version} - - - net.java.dev.jna - jna-platform - ${jna.version} - - - - - net.java.dev.jna - jna - ${jna.version} - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - import - pom - - - - com.github.penggle - kaptcha - ${kaptcha.version} - - - - - io.jsonwebtoken - jjwt - ${jwt.version} - - - - - - org.apache.velocity - velocity - ${velocity.version} - - - - - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - - - com.github.oshi - oshi-core - ${oshi.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} - - - p6spy - p6spy - ${p6spy.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - eu.bitwalker - UserAgentUtils - ${bitwalker.version} - - - - - org.springframework.security - spring-security-core - ${spring-security.version} - - - org.springframework - spring-context-support - ${spring-web.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - org.springframework - spring-web - ${spring-web.version} - - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - - - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} - - - - - org.springframework.boot - spring-boot-starter-aop - ${spring-boot.version} - - - - io.swagger - swagger-annotations - ${io-swagger.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - + + org.projectlombok + lombok + - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - true - - - - - repackage - - - - - - - - - - nexus-aliyun - nexus-aliyun - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - - + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + cn.hutool + hutool-all + ${hutool.version} + + + + + + cn.dev33 + sa-token-spring-boot-starter + ${sa-token.version} + + + cn.dev33 + sa-token-dao-redis-jackson + ${sa-token.version} + + + + org.projectlombok + lombok + 1.18.20 + + + + org.apache.thrift + libthrift + ${libthrift.version} + + + com.github.tobato + fastdfs-client + ${fastdfs.version} + + + net.java.dev.jna + jna-platform + ${jna.version} + + + + + net.java.dev.jna + jna + ${jna.version} + + + + com.github.ben-manes.caffeine + caffeine + 2.9.3 + + + org.apache.poi + poi-ooxml + 5.2.5 + + + commons-compress + org.apache.commons + 1.26.0 + + + + pro.fessional + kaptcha + 2.3.3 + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + + org.apache.velocity + velocity + ${velocity.version} + + + + + + commons-fileupload + commons-fileupload + ${commons.fileupload.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + io.springfox + springfox-swagger2 + ${swagger.version} + + + io.swagger + swagger-annotations + + + io.swagger + swagger-models + + + + + + + io.springfox + springfox-swagger-ui + ${swagger.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + p6spy + p6spy + ${p6spy.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + org.springframework.security + spring-security-core + ${spring-security.version} + + + org.springframework + spring-context-support + ${spring-web.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.springframework + spring-web + ${spring-web.version} + + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + + + + org.hibernate.validator + hibernate-validator + ${hibernate-validator.version} + + + + + org.springframework.boot + spring-boot-starter-aop + ${spring-boot.version} + + + + io.swagger + swagger-annotations + ${io-swagger.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + true + + + + + repackage + + + + + + + + + + nexus-aliyun + nexus-aliyun + http://maven.aliyun.com/nexus/content/groups/public/ + + true + + + false + + + + diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index fbfd5297..fbe9c889 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -15,21 +15,16 @@ http://www.example.com - - 4.5.16 - - - javax.xml.ws - jaxws-api - 2.2.6 + cn.hutool + hutool-all - cn.hutool - hutool-all + com.baomidou + mybatis-plus-boot-starter com.slsoft shuili-system - 0.0.1-SNAPSHOT + ${project.version} @@ -77,23 +72,6 @@ bcprov-jdk15on 1.65 - - org.codehaus.plexus - plexus-component-annotations - 1.6 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.0.0 - - - commons-compress - org.apache.commons - - - - diff --git a/shuili-common/pom.xml b/shuili-common/pom.xml index 2f693563..77b1cf4a 100644 --- a/shuili-common/pom.xml +++ b/shuili-common/pom.xml @@ -13,18 +13,6 @@ jar boot 工程工具类 - - 1.21 - 1.2.79 - 2.11.0 - 1.4 - 3.12.0 - 4.0.1 - UTF-8 - 1.8 - 1.8 - - @@ -37,10 +25,14 @@ org.apache.poi poi-ooxml - 5.2.3 + + + commons-codec + commons-codec + + - org.dom4j dom4j @@ -50,18 +42,11 @@ io.swagger swagger-annotations - 1.5.21 - - - - org.projectlombok - lombok - 1.18.20 + javax.servlet javax.servlet-api - ${servlet-api.version} @@ -81,27 +66,23 @@ com.fasterxml.jackson.core jackson-annotations - 2.13.2 org.apache.commons commons-lang3 - ${commons-lang3.version} commons-fileupload commons-fileupload - ${commons.fileupload.version} commons-io commons-io - ${commons.io.version} @@ -109,22 +90,16 @@ com.alibaba fastjson - ${fastjson.version} - - eu.bitwalker UserAgentUtils - ${bitwalker.version} - - - + ${project.artifactId} diff --git a/shuili-framework/pom.xml b/shuili-framework/pom.xml index 97566e64..c547e183 100644 --- a/shuili-framework/pom.xml +++ b/shuili-framework/pom.xml @@ -19,13 +19,12 @@ - - com.google.guava guava - 20.0 + 33.2.1-android + com.baomidou @@ -39,13 +38,6 @@ 1.9.19 - - - - com.github.tobato fastdfs-client @@ -55,7 +47,6 @@ cn.dev33 sa-token-spring-boot-starter - 1.34.0 @@ -63,18 +54,8 @@ cn.dev33 sa-token-dao-redis-jackson - 1.34.0 - - - - - - cn.dev33 - sa-token-core - 1.34.0 - org.springframework.boot @@ -89,22 +70,12 @@ - - org.apache.poi - poi - 5.2.3 - org.apache.poi poi-ooxml - 5.2.3 - - - - com.alibaba @@ -115,20 +86,14 @@ com.slsoft shuili-common - 0.0.1-SNAPSHOT + ${project.version} - com.github.penggle + pro.fessional kaptcha - - - javax.servlet-api - javax.servlet - - diff --git a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java index 07bec8fd..fb09d9f1 100644 --- a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java +++ b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/BeanToWrapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.base.CaseFormat; import com.shuili.common.constant.YesOrNo; import com.shuili.common.core.domain.*; -import com.shuili.common.core.domain.*; import com.shuili.common.utils.StringUtils; import com.shuili.common.utils.reflect.ReflectUtils; import org.springframework.context.annotation.Lazy; @@ -257,7 +256,7 @@ public class BeanToWrapper { private static Map methodMap = new HashMap<>(); - static{ + static { try { List methods = new ArrayList<>(); Class aClass = QueryWrapper.class; @@ -290,23 +289,23 @@ public class BeanToWrapper { } } for (Method declaredMethod : methods) { - if("in".equals(declaredMethod.getName()) || "nin".equals(declaredMethod.getName()) - || "all".equals(declaredMethod.getName())){ + if ("in".equals(declaredMethod.getName()) || "nin".equals(declaredMethod.getName()) + || "all".equals(declaredMethod.getName())) { Class[] parameterTypes = declaredMethod.getParameterTypes(); for (Class parameterType : parameterTypes) { //使用collection参数的方法 - if(parameterType.getName().equals(Collection.class.getName())){ - methodMap.put(declaredMethod.getName(),declaredMethod); + if (parameterType.getName().equals(Collection.class.getName())) { + methodMap.put(declaredMethod.getName(), declaredMethod); } } - }else if("like".equals(declaredMethod.getName())){ + } else if ("like".equals(declaredMethod.getName())) { Class[] parameterTypes = declaredMethod.getParameterTypes(); - if(parameterTypes.length == 2){ // - methodMap.put(declaredMethod.getName(),declaredMethod); + if (parameterTypes.length == 2) { // + methodMap.put(declaredMethod.getName(), declaredMethod); } - }else { - methodMap.put(declaredMethod.getName(),declaredMethod); + } else { + methodMap.put(declaredMethod.getName(), declaredMethod); } } @@ -365,9 +364,9 @@ public class BeanToWrapper { recursionCriteria(wrapper, sp.getCv().getCv()); } } - if(StringUtils.isNotEmpty(sp.getConditionViews())){ + if (StringUtils.isNotEmpty(sp.getConditionViews())) { for (ConditionView conditionView : sp.getConditionViews()) { - if(StringUtils.isNotNull(conditionView.getValue())){ + if (StringUtils.isNotNull(conditionView.getValue())) { getWrapper(wrapper, conditionView); } } diff --git a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java index e75c05ed..09e507db 100644 --- a/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java +++ b/shuili-framework/src/main/java/com/shuili/common/mybaitsplus/CamelUnderlineUtil.java @@ -3,7 +3,6 @@ package com.shuili.common.mybaitsplus; import com.google.common.base.CaseFormat; import lombok.extern.slf4j.Slf4j; -import java.util.ArrayList; import java.util.List; /** @@ -14,96 +13,99 @@ public class CamelUnderlineUtil { /** - *驼峰转下划线及中划线 + * 驼峰转下划线及中划线 + * * @param list * @param resultList */ private static void camel2UnderScoreOrHyphen(List list, List resultList) { for (String key : list) { //驼峰转小写下划线 - log.info("----------驼峰转{}{}------------start","下划线","首字母小写"); + log.info("----------驼峰转{}{}------------start", "下划线", "首字母小写"); String to = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key); log.info(to); to = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, key); log.info(to); - log.info("----------驼峰转{}{}------------end","下划线","首字母小写"); + log.info("----------驼峰转{}{}------------end", "下划线", "首字母小写"); - log.info("----------驼峰转{}{}------------start","大写下划线",""); + log.info("----------驼峰转{}{}------------start", "大写下划线", ""); to = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, key); log.info(to); to = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, key); log.info(to); - log.info("----------驼峰转大{}{}------------end","大写下划线",""); + log.info("----------驼峰转大{}{}------------end", "大写下划线", ""); - log.info("----------驼峰转{}{}------------start","小写中划线",""); + log.info("----------驼峰转{}{}------------start", "小写中划线", ""); to = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_HYPHEN, key); log.info(to); to = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, key); log.info(to); - log.info("----------驼峰转{}{}------------end","小写中划线",""); + log.info("----------驼峰转{}{}------------end", "小写中划线", ""); resultList.add(to); } } /** - *下划线转驼峰及中划线 + * 下划线转驼峰及中划线 + * * @param list * @param resultList */ private static void underScore2CamelOrHyphen(List list, List resultList) { for (String key : list) { - log.info("----------下划线转{}{}------------start","驼峰","首字母小写"); + log.info("----------下划线转{}{}------------start", "驼峰", "首字母小写"); String to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, key); log.info(to); to = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, key); log.info(to); - log.info("----------下划线转{}{}------------end","驼峰","首字母小写"); + log.info("----------下划线转{}{}------------end", "驼峰", "首字母小写"); - log.info("----------下划线转{}{}------------start","驼峰","首字母大写"); + log.info("----------下划线转{}{}------------start", "驼峰", "首字母大写"); to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, key); log.info(to); to = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, key); log.info(to); - log.info("----------下划线转{}{}------------end","驼峰","首字母大写"); + log.info("----------下划线转{}{}------------end", "驼峰", "首字母大写"); - log.info("----------下划线转{}{}------------start","小写中划线",""); + log.info("----------下划线转{}{}------------start", "小写中划线", ""); to = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, key); log.info(to); - log.info("----------下划线转{}{}------------end","小写中划线",""); + log.info("----------下划线转{}{}------------end", "小写中划线", ""); resultList.add(to); } } /** - *中划线转驼峰及下划线 + * 中划线转驼峰及下划线 + * * @param list * @param resultList */ private static void hyphen2CamelOrUnderScore(List list, List resultList) { for (String key : list) { - log.info("----------中划线转{}{}------------start","驼峰","首字母小写"); + log.info("----------中划线转{}{}------------start", "驼峰", "首字母小写"); String to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_CAMEL, key); log.info(to); - log.info("----------中划线转{}{}------------end","驼峰","首字母小写"); + log.info("----------中划线转{}{}------------end", "驼峰", "首字母小写"); - log.info("----------中划线转{}{}------------start","驼峰","首字母大写"); + log.info("----------中划线转{}{}------------start", "驼峰", "首字母大写"); to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, key); log.info(to); - log.info("----------中划线转{}{}------------end","驼峰","首字母大写"); + log.info("----------中划线转{}{}------------end", "驼峰", "首字母大写"); - log.info("----------中划线转{}{}------------start","小写下划线",""); + log.info("----------中划线转{}{}------------start", "小写下划线", ""); to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_UNDERSCORE, key); log.info(to); - log.info("----------中划线转{}{}------------end","小写下划线",""); + log.info("----------中划线转{}{}------------end", "小写下划线", ""); - log.info("----------中划线转{}{}------------start","大写下划线",""); + log.info("----------中划线转{}{}------------start", "大写下划线", ""); to = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, key); log.info(to); - log.info("----------中划线转{}{}------------end","大写下划线",""); + log.info("----------中划线转{}{}------------end", "大写下划线", ""); resultList.add(to); } } diff --git a/shuili-generator/pom.xml b/shuili-generator/pom.xml index 39452e1e..e49162e6 100644 --- a/shuili-generator/pom.xml +++ b/shuili-generator/pom.xml @@ -24,13 +24,19 @@ org.apache.velocity velocity + + + commons-collections + commons-collections + + com.slsoft shuili-framework - 0.0.1-SNAPSHOT + ${project.version} diff --git a/shuili-system/pom.xml b/shuili-system/pom.xml index 87d83d2d..5d4579c3 100644 --- a/shuili-system/pom.xml +++ b/shuili-system/pom.xml @@ -1,99 +1,98 @@ - - slSoft - com.slsoft - 0.0.1-SNAPSHOT - - 4.0.0 - - shuili-system - - shuili-system - - http://www.example.com - - 4.5.16 - - - - - - - org.springframework.boot - spring-boot-starter-web - 2.6.6 - - - - - mysql - mysql-connector-java - - - - org.apache.ant - ant - 1.10.10 - - - - - com.itextpdf - itextpdf - 5.4.3 - - - - - com.slsoft - shuili-generator - 0.0.1-SNAPSHOT - - - - com.slsoft - shuili-common - 0.0.1-SNAPSHOT - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - - net.sourceforge.htmlcleaner - htmlcleaner - 2.25 - - - - org.jsoup - jsoup - 1.15.3 - - - - cn.hutool - hutool-core - 5.8.5 - - - - - com.github.ben-manes.caffeine - caffeine - 2.9.3 - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + slSoft + com.slsoft + 0.0.1-SNAPSHOT + + 4.0.0 + + shuili-system + + shuili-system + + http://www.example.com + + + + + com.baomidou + mybatis-plus-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + + + mysql + mysql-connector-java + 8.0.23 + + + + org.apache.ant + ant + 1.10.10 + + + + + com.itextpdf + itextpdf + 5.4.3 + + + + com.slsoft + shuili-common + ${project.version} + + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + net.sourceforge.htmlcleaner + htmlcleaner + 2.25 + + + + org.jsoup + jsoup + 1.15.3 + + + + cn.hutool + hutool-core + + + + + com.github.ben-manes.caffeine + caffeine + + + + com.slsoft + shuili-framework + ${project.version} + compile + + + + diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java index 25c40a5f..bf31f419 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java @@ -9,9 +9,9 @@ import com.kms.yg.znjg.service.SyLayerService; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -72,10 +72,7 @@ public class SyLayerController { } SysUser user = UserUtils.getUser(); syLayer.setCreateUser(user.getNickName()); - Boolean insertDataFlag = false; - if (StringUtils.isBlank(syLayer.getId())) { - insertDataFlag = true; - } + boolean insertDataFlag = StringUtils.isBlank(syLayer.getId()); if (insertDataFlag) { //同一层下图层名称不同 Boolean serviceIsRepeat = syLayerService.checkNameIsRepeat(syLayer.getServiceName(), syLayer.getId()); @@ -133,6 +130,7 @@ public class SyLayerController { /** * 分页查询全部资源信息 + * * @param spLayer * @return */ @@ -140,8 +138,8 @@ public class SyLayerController { @ApiOperation("根据查询条件分页查询全部资源信息") public IPage getLayers(@RequestBody SearchParam spLayer) { SyLayer syLayerInfo = spLayer.getData(); - Page page = new Page<>(spLayer.getPageNum(),spLayer.getPageSize()); + Page page = new Page<>(spLayer.getPageNum(), spLayer.getPageSize()); Map params = spLayer.getParams(); - return syLayerService.selectPage(page,syLayerInfo,params); + return syLayerService.selectPage(page, syLayerInfo, params); } } diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java index 41017342..9bbca92e 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java @@ -13,7 +13,7 @@ import com.kms.yg.znjg.domain.SyLayerField; import com.kms.yg.znjg.mapper.SyDirLayerMapper; import com.kms.yg.znjg.mapper.SyLayerFieldMapper; import com.kms.yg.znjg.mapper.SyLayerMapper; -import org.apache.commons.lang.StringUtils; +import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 449988b2..5bb273ed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -16,6 +16,7 @@ import com.kms.yxgh.df.dto.DfCheckingPlanContentDto; import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfPlanSearchDto; import com.kms.yxgh.df.dto.DfPlanSimpleDto; +import com.kms.yxgh.df.mapper.DfCheckingPlanContentMapper; import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; @@ -32,6 +33,8 @@ import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; +import static com.alibaba.fastjson.JSON.toJSONString; + /** * 堤防巡视检查计划Service接口 * @@ -44,6 +47,7 @@ public class DfPlanService extends BaseService { private final DfRecordMapper dfRecordMapper; private final DfCheckingPlanContentService dfCheckingPlanContentService; + private final DfCheckingPlanContentMapper dfCheckingPlanContentMapper; private final SysUserService userService; private final DfPlanOperatorService dfPlanOperatorService; @@ -83,8 +87,8 @@ public class DfPlanService extends BaseService { if (dfPlan != null) { dfPlan.setId(null); if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { - dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); + dfPlan.setOtherConfig(toJSONString(dto.getOtherConfig())); + dfPlan.setFiles(toJSONString(dto.getFiles())); planeTime(dfPlan, dto.getContents()); getBaseMapper().insert(dfPlan); String id = dfPlan.getId(); @@ -104,8 +108,8 @@ public class DfPlanService extends BaseService { DfPlan dfPlan = BeanCopyUtils.copy(dto, DfPlan.class); if (dfPlan != null) { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { - dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); - dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); + dfPlan.setOtherConfig(toJSONString(dto.getOtherConfig())); + dfPlan.setFiles(toJSONString(dto.getFiles())); planeTime(dfPlan, dto.getContents()); getBaseMapper().updateById(dfPlan); String id = dfPlan.getId(); @@ -199,17 +203,26 @@ public class DfPlanService extends BaseService { dfCheckingPlanContentService.removeByIds(deleteContents); } } - dfCheckingPlanContentService.saveOrUpdateBatch(contents.stream().peek(item -> item.setPlanId(planId)).map(this::toEntity).collect(Collectors.toList())); - List operators = contents.stream().flatMap(item -> item.getOperator().stream().map(operator -> { - DfPlanOperator po = new DfPlanOperator(); - po.setId(operator.getId()); - po.setSubPlanId(item.getId()); - po.setOperatorUid(operator.getUid()); - po.setPlanId(item.getPlanId()); - po.setOperatorName(operator.getName()); - return po; - })).collect(Collectors.toList()); - dfPlanOperatorService.saveOrUpdateBatch(operators); + contents.forEach(content -> { + content.setPlanId(planId); + DfCheckingPlanContent entity = toEntity(content); + if (entity.getId() == null) { + dfCheckingPlanContentMapper.insert(entity); + } else { + dfCheckingPlanContentMapper.updateById(entity); + } + String contentId = entity.getId(); + List operators = content.getOperator().stream().map(operator -> { + DfPlanOperator po = new DfPlanOperator(); + po.setId(operator.getId()); + po.setSubPlanId(contentId); + po.setOperatorUid(operator.getUid()); + po.setPlanId(planId); + po.setOperatorName(operator.getName()); + return po; + }).collect(Collectors.toList()); + dfPlanOperatorService.saveOrUpdateBatch(operators); + }); } else { throw new DfException("执行计划内容不能为空"); } From ac90b5fc981051664f5d69584ccb1f6a13247cb6 Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 14 Jun 2024 19:00:55 +0800 Subject: [PATCH 31/43] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index fbe9c889..abbeff2e 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -16,6 +16,15 @@ http://www.example.com + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-web + cn.hutool From 3d474edab9a3a058d706fb6fb4bb724f72453a68 Mon Sep 17 00:00:00 2001 From: hxh Date: Sat, 15 Jun 2024 11:04:52 +0800 Subject: [PATCH 32/43] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java | 4 +++- .../main/java/com/kms/yxgh/df/dto/DfProjectListDto.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java index b6b042c8..7e1860d3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java @@ -36,7 +36,9 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { @Select({ "") From 712d73e28adf900272e17c141bb495227bad90e7 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 13:59:53 +0800 Subject: [PATCH 36/43] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/service/DfCheckingService.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index 5d0a678d..d5fe8657 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -8,14 +8,12 @@ import com.kms.yxgh.base.DfException; import com.kms.yxgh.common.dto.CommonCheckingTreeDto; import com.kms.yxgh.df.domain.DfChecking; import com.kms.yxgh.df.domain.DfCheckingItem; -import com.kms.yxgh.df.domain.DfPlan; -import com.kms.yxgh.df.domain.DfProjectCheckingRel; +import com.kms.yxgh.df.domain.DfCheckingLine; import com.kms.yxgh.df.dto.DfCheckingDetailDto; import com.kms.yxgh.df.dto.DfCheckingDetailDto.DfCheckingItemDto; import com.kms.yxgh.df.mapper.DfCheckingItemMapper; +import com.kms.yxgh.df.mapper.DfCheckingLineMapper; import com.kms.yxgh.df.mapper.DfCheckingMapper; -import com.kms.yxgh.df.mapper.DfPlanMapper; -import com.kms.yxgh.df.mapper.DfProjectCheckingRelMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.kms.yxgh.util.StreamUtils; import com.shuili.common.core.domain.SearchParam; @@ -43,9 +41,8 @@ import java.util.stream.Stream; public class DfCheckingService extends BaseService { private final DfCheckingItemMapper dfCheckingItemMapper; - private final DfPlanMapper dfPlanMapper; private final SysDictDataMapper dictDataMapper; - private final DfProjectCheckingRelMapper dfProjectCheckingRelMapper; + private final DfCheckingLineMapper dfCheckingLineMapper; public final static String PART_SEPARATOR = ":"; @@ -166,10 +163,8 @@ public class DfCheckingService extends BaseService } public Boolean isUsed(String id) { - return dfPlanMapper.selectCount(Wrappers.lambdaQuery() - .eq(DfPlan::getXcId, id)) > 0 - || dfProjectCheckingRelMapper.selectCount(Wrappers.lambdaQuery() - .eq(DfProjectCheckingRel::getXcId, id)) > 0; + return dfCheckingLineMapper.selectCount(Wrappers.lambdaQuery() + .eq(DfCheckingLine::getXcId, id)) > 0; } private void deleteItems(String id) { From d78a35e48a5f44e70a9448d95283101dc0e87e49 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 14:10:48 +0800 Subject: [PATCH 37/43] =?UTF-8?q?fix:=20=E8=BF=81=E7=A7=BBmybatis=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shuili/common}/config/MybatisPlusConfig.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename {shuili-generator/src/main/java/com/kms/generator => shuili-framework/src/main/java/com/shuili/common}/config/MybatisPlusConfig.java (93%) diff --git a/shuili-generator/src/main/java/com/kms/generator/config/MybatisPlusConfig.java b/shuili-framework/src/main/java/com/shuili/common/config/MybatisPlusConfig.java similarity index 93% rename from shuili-generator/src/main/java/com/kms/generator/config/MybatisPlusConfig.java rename to shuili-framework/src/main/java/com/shuili/common/config/MybatisPlusConfig.java index 6b4d332e..140b484a 100644 --- a/shuili-generator/src/main/java/com/kms/generator/config/MybatisPlusConfig.java +++ b/shuili-framework/src/main/java/com/shuili/common/config/MybatisPlusConfig.java @@ -1,9 +1,7 @@ -package com.kms.generator.config; +package com.shuili.common.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.beans.factory.annotation.Value; From 8acbf54d0a3139207f688d9f02fe2f7a066510c4 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 16:34:51 +0800 Subject: [PATCH 38/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/service/DfCheckingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index d5fe8657..2d718bc7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -153,7 +153,7 @@ public class DfCheckingService extends BaseService @Transactional(rollbackFor = Exception.class) public Boolean deleteById(String id) { if (isUsed(id)) { - throw new DfException("已被巡查计划关联，不能删除！"); + throw new DfException("已被巡查路线关联，不能删除！"); } boolean rt = removeById(id); if (rt) { From 4b9cf40f7fc4008962b265b7062b594ed4746ce7 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 16:44:17 +0800 Subject: [PATCH 39/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/service/DfRecordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 50fbd5fd..dbaa4a8e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -164,7 +164,7 @@ public class DfRecordService extends BaseService { if (record == null) { throw new DfException("巡查记录不存在"); } - record.setHandleStatus(handleStatus(dfRecord)); + dfRecord.setHandleStatus(handleStatus(dfRecord)); if (CollectionUtil.isNotEmpty(dfRecord.getItems())) { List items = dfRecord.getItems() .stream().map(getDfRecordItemDtoDfRecordItemFunction(dfRecord.getId())) From 20e17d556e4f6275d90c352a51bfb2a66bcd0991 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 17:45:15 +0800 Subject: [PATCH 40/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/service/DfRecordService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index dbaa4a8e..61c8735d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -62,7 +62,6 @@ public class DfRecordService extends BaseService { .orderByDesc(DfRecord::getEndDate); page = page(page, wp); if (CollectionUtil.isNotEmpty(page.getRecords())) { - List records = page.getRecords().stream().map(r -> { DfRecordSimpleDto dto = BeanCopyUtils.copy(r, DfRecordSimpleDto .class); From 50d765e73e1ebe16a179c74f070a764d6af475eb Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 19:06:37 +0800 Subject: [PATCH 41/43] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/base/enums/DataSyncBasicEnum.java | 1 + sql/sy/v1.3.0/全量脚本/menu.sql | 1018 ++++++++--------- sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql | 10 +- 3 files changed, 513 insertions(+), 516 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java index ddc27a7f..04a6515f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java @@ -4,6 +4,7 @@ import com.kms.yxgh.base.domain.DwsRelBasAd; import com.kms.yxgh.base.domain.DwsRelLkBas; import com.kms.yxgh.base.domain.DwsRelRvRv; import com.kms.yxgh.base.domain.df.DfDwsRelDikeRv; +import com.kms.yxgh.base.domain.df.DfDwsRelDiscDike; import com.kms.yxgh.base.domain.sk.SkDwsRelResDscdnm; import com.kms.yxgh.base.domain.sk.SkDwsRelResRv; import com.kms.yxgh.base.domain.sz.SzDwsRelWagaDike; diff --git a/sql/sy/v1.3.0/全量脚本/menu.sql b/sql/sy/v1.3.0/全量脚本/menu.sql index ee7df70c..2208e86d 100644 --- a/sql/sy/v1.3.0/全量脚本/menu.sql +++ b/sql/sy/v1.3.0/全量脚本/menu.sql @@ -1,514 +1,510 @@ SET NAMES utf8mb4; -ALTER TABLE sys_menu ADD parent_name varchar(100) NULL; - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('a56aab90c27d4d9bb9f896de8e537944', '运行管护', '4820885a4cca4930872d7d7caeb2d802', 1, 'runManage', '', 1, 'M', '0', '0', '', 'swagger', '1', '2024-01-15 16:29:14', '1', '2024-01-16 17:18:13', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('00ac3d79c1ee4993a415e6f793df1593', '监督检查', 'a56aab90c27d4d9bb9f896de8e537944', 3, 'supervisionInspetion', 'sluice/runManage/supervisionInspetion/index', 1, 'M', '0', '0', '', 'icon-hddwfzjhgl', '1', '2024-03-04 16:16:30', '1', '2024-03-06 20:33:35', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('06d65eac04b24c82b8b9b6512ddbd6ad', '动态监测', 'a56aab90c27d4d9bb9f896de8e537944', 9, 'monitoring', 'sluice/runManage/monitoring/index', 1, 'M', '0', '0', NULL, 'dashboard', '1', '2024-03-11 11:06:08', '', '2024-03-11 11:06:08', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2d26df05dea643b5842ac12e39f25785', '维修养护', 'a56aab90c27d4d9bb9f896de8e537944', 1, 'maintenance', 'sluice/runManage/maintenance/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-01-16 10:19:04', '1', '2024-01-16 17:33:03', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2e2e13824d9c4a81b14314c8bcb307b0', '调度运用', 'a56aab90c27d4d9bb9f896de8e537944', 2, 'dispatch', 'sluice/runManage/dispatch/index', 1, 'M', '0', '0', NULL, 'chart', '1', '2024-03-11 10:43:56', '', '2024-03-11 10:43:56', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9643924e57ad464abdfb233614b9a7b5', '病险工程核查', 'a56aab90c27d4d9bb9f896de8e537944', 4, 'dangerWeakProject', 'sluice/runManage/dangerWeakProject/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-03-19 09:35:27', '1', '2024-03-21 09:53:22', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('966888dd429c42ad87810410e045b988', '水闸水雨情测报', 'a56aab90c27d4d9bb9f896de8e537944', 2, 'waterRainReport', 'sluice/runManage/waterRainReport/index', 1, 'M', '0', '0', '', 'international', '1', '2024-02-04 13:57:15', '1', '2024-02-04 14:00:40', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('bc79940eb32443fea3ac016fd224de0a', '工程巡查', 'a56aab90c27d4d9bb9f896de8e537944', 0, 'enginerring', 'sluice/runManage/enginerring/index', 1, 'M', '0', '0', '', 'cascader', '1', '2024-01-15 16:38:21', '1', '2024-01-16 11:02:25', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('038691476a374368ac1934371a22ed2d', '维修养护计划', '2d26df05dea643b5842ac12e39f25785', 1, 'maintenancePlan', 'sluice/runManage/maintenance/maintenancePlan/index', 1, 'C', '1', '0', '', 'cascader', '1', '2024-01-16 10:19:55', '1', '2024-02-28 11:38:01', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('03f68d9c626b4160be11c2fe954e5cd3', '水闸水雨情监测', '966888dd429c42ad87810410e045b988', 3, 'waterRainMonitoring', 'sluice/runManage/waterRainReport/monitoring/index', 1, 'C', '1', '0', '', 'cascader', '1', '2024-02-04 14:02:15', '1', '2024-03-04 15:38:53', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0c6db2ab60f44f3e9aed1cf86ef457fa', '水闸动态监测', '06d65eac04b24c82b8b9b6512ddbd6ad', 0, 'sluice', 'sluice/runManage/monitoring/sluice/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-11 11:08:13', '', '2024-03-11 11:08:13', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0e5d2ec8976b4f2a86773a604789fdd0', '工程管理', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectManage', 'sluice/runManage/supervisionInspetion/projectManage/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-12 14:32:16', '1', '2024-03-15 10:17:27', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('1cd0041896bd41dcac9e1cd6d203ccbc', '巡查计划管理', 'bc79940eb32443fea3ac016fd224de0a', 1, 'inspectionPlan', 'sluice/runManage/enginerring/inspectionPlan/index', 1, 'C', '1', '0', '', 'clipboard', '1', '2024-01-15 16:52:22', '1', '2024-03-18 17:05:33', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2b74d23af5f5435594b1c12cb573700d', '调度运用管理', '2e2e13824d9c4a81b14314c8bcb307b0', 0, 'utilize', 'sluice/runManage/dispatch/utilize/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-11 10:48:59', '1', '2024-03-11 10:51:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('313252ed616148be88f072f65b8a60b2', '巡查项目管理', 'bc79940eb32443fea3ac016fd224de0a', 0, 'inspectionItems', 'sluice/runManage/enginerring/inspectionItems/index', 1, 'C', '0', '0', '', 'dashboard', '1', '2024-01-15 16:39:46', '1', '2024-01-15 16:52:58', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('3219e42af6bb45919ecb805626c5a6d9', '办法项目配置', '00ac3d79c1ee4993a415e6f793df1593', 1, 'methodsItemsList', 'sluice/runManage/supervisionInspetion/methodsManage/itemsList', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 16:19:46', '1', '2024-03-04 16:20:17', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('3dfde024752148348cf6173bcb8d3cf5', '水闸动态监测历史记录', '06d65eac04b24c82b8b9b6512ddbd6ad', 2, 'record', 'sluice/runManage/monitoring/sluice/record/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-11 11:10:04', '1', '2024-03-15 11:32:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('3e82ff82619048c3af822e81f1dc8d42', '办法管理', '00ac3d79c1ee4993a415e6f793df1593', 0, 'methodsManage', 'sluice/runManage/supervisionInspetion/methodsManage/index', 1, 'C', '0', '0', '', 'education', '1', '2024-03-04 16:17:58', '1', '2024-03-15 10:17:16', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('4b874673cedb45dea6e8cd398d1bc073', '核查报告', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectReportPage', 'sluice/runManage/dangerWeakProject/inspectReport/reportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-20 17:53:45', '1', '2024-03-20 17:54:56', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('4c8de95bf8d44fbaacddff983977d399', '核查项目设置', '9643924e57ad464abdfb233614b9a7b5', 0, 'inspectItemsSetting', 'sluice/runManage/dangerWeakProject/inspectItemsSetting/index', 1, 'C', '0', '0', '', 'icon-wxyh', '1', '2024-03-19 09:36:58', '1', '2024-03-19 09:38:59', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('528ae03de41149bba0aa3446721cb205', '巡查项详情', 'bc79940eb32443fea3ac016fd224de0a', 2, 'inspectionItemDetails', 'sluice/runManage/enginerring/inspectionItems/inspectionItemDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-18 17:04:38', '1', '2024-03-18 17:18:32', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('57f194c1c0544120b2ec9ee358fe0bd3', '核查任务管理', '9643924e57ad464abdfb233614b9a7b5', 1, 'inspectTasks', 'sluice/runManage/dangerWeakProject/inspectTasks/index', 1, 'C', '0', '0', '', 'dict', '1', '2024-03-19 14:50:14', '1', '2024-03-19 14:51:05', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('583d8233adc741d3a7610e464a3555ea', '水闸操作记录', '2e2e13824d9c4a81b14314c8bcb307b0', 1, 'record', 'sluice/runManage/dispatch/record/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 10:52:08', '1', '2024-03-11 10:54:20', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('67e1cf6a5af643dc8f57b5643f678bbb', '工程上报', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectReport', 'sluice/runManage/supervisionInspetion/projectManage/projectReport', 1, 'C', '1', '0', '', '#', '1', '2024-03-12 15:46:22', '1', '2024-03-15 10:17:10', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('6956f7271aa449aebaafb7cc8a8479da', '水闸测报管理', '966888dd429c42ad87810410e045b988', 2, 'testReportManage', 'sluice/runManage/waterRainReport/testReportManage/index', 1, 'C', '0', '0', NULL, 'cascader', '1', '2024-02-04 13:59:09', '', '2024-02-04 13:59:09', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('773200b686d14ed3bdc4f0486229547f', '调度计划管理', '2e2e13824d9c4a81b14314c8bcb307b0', 2, 'plan', 'sluice/runManage/dispatch/plan/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 10:55:01', '1', '2024-03-11 11:55:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('78a92540a49e4199b8b87f748a8bf54f', '办法项目配置项配置', '00ac3d79c1ee4993a415e6f793df1593', 1, 'methodsItemsDetails', 'sluice/runManage/supervisionInspetion/methodsManage/itemsDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 16:21:31', '1', '2024-03-04 16:21:59', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('8a2611f560f8481e86dd3e7e2c785b1a', '工程核查', '9643924e57ad464abdfb233614b9a7b5', 1, 'inspectProjects', 'sluice/runManage/dangerWeakProject/inspectProjects/index', 1, 'C', '0', '0', NULL, 'exit-fullscreen', '1', '2024-03-19 15:42:16', '', '2024-03-19 15:42:16', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('8ae9829895a44194a4e5f42979f0bd88', '工程报告', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectReportPage', 'sluice/runManage/supervisionInspetion/projectManage/projectReportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-13 14:44:53', '1', '2024-03-15 10:17:52', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('93ff2af3fa124749bd21d657f9fa82ad', '核查分组管理', '9643924e57ad464abdfb233614b9a7b5', 0, 'inspectGroup', 'sluice/runManage/dangerWeakProject/inspectGroup/index', 1, 'C', '0', '0', NULL, 'peoples', '1', '2024-03-19 11:24:08', '', '2024-03-19 11:24:08', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('95be40b74cb04133bd114e573a1364cf', '统计分析', '00ac3d79c1ee4993a415e6f793df1593', 2, 'supervisionStatisticAnalysis', 'sluice/runManage/supervisionInspetion/statisticAnalysis/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-14 10:01:48', '1', '2024-03-15 10:19:14', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('98e4ee10e7a8422a8283ecc8764cbcf1', '核查填报', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectFillReport', 'sluice/runManage/dangerWeakProject/inspectProjects/fillReport', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-20 15:18:30', '', '2024-03-20 15:18:30', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9ab0791b65c64b189158a1a0098c8244', '水闸巡查管理', 'bc79940eb32443fea3ac016fd224de0a', 2, 'patrolManage', 'sluice/runManage/enginerring/patrolManage/index', 1, 'C', '0', '0', '', 'icon-wxjl', '1', '2024-02-01 09:59:21', '1', '2024-02-01 10:35:38', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9ec49b88c37845729ca18d924c69bb59', '水闸水雨情智能分析', '966888dd429c42ad87810410e045b988', 2, 'waterRainSmartAnalyse', 'sluice/runManage/waterRainReport/smartAnalyse/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-04 15:37:30', '1', '2024-03-14 11:08:30', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('aa8dfb9b75d444d4900dc078bb7141d9', '核查任务详情', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectTaskDetails', 'sluice/runManage/dangerWeakProject/inspectTasks/taskDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-19 16:38:37', '', '2024-03-19 16:38:37', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('bf67c547f2824a74b15c80386ab5181c', '核查报告管理', '9643924e57ad464abdfb233614b9a7b5', 2, 'inspectReport', 'sluice/runManage/dangerWeakProject/inspectReport/index', 1, 'C', '0', '0', NULL, 'education', '1', '2024-03-20 16:33:00', '', '2024-03-20 16:33:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e2af6c74c8b1427f83ddb23b888769be', '核查项目详情', '9643924e57ad464abdfb233614b9a7b5', 2, 'inspectItemDetails', 'sluice/runManage/dangerWeakProject/inspectItemsSetting/itemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-19 10:34:42', '', '2024-03-19 10:34:42', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ebf0a83ac12b4611b8b04e5bfe35d9a1', '任务管理', '00ac3d79c1ee4993a415e6f793df1593', 0, 'supervisionTasksManage', 'sluice/runManage/supervisionInspetion/tasksManage/index', 1, 'C', '0', '0', '', 'drag', '1', '2024-03-11 11:15:45', '1', '2024-03-15 10:17:22', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ebfbabbfc44f45deb4f77c2a80af1a13', '水闸动态监测管理', '06d65eac04b24c82b8b9b6512ddbd6ad', 1, 'manage', 'sluice/runManage/monitoring/sluice/manage/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-11 11:09:11', '', '2024-03-11 11:09:11', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ecb557f1429d4e7a894fc686f6ba2dcd', '办法详情', '00ac3d79c1ee4993a415e6f793df1593', 4, 'methodManageDetails', 'sluice/runManage/supervisionInspetion/methodsManage/details', 1, 'C', '1', '0', '', '#', '1', '2024-03-05 10:27:59', '1', '2024-03-15 10:19:20', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f3e4f97a9aa8493892e8fbb3eeaa0efe', '维修养护记录', '2d26df05dea643b5842ac12e39f25785', 1, 'maintenanceRecords', 'sluice/runManage/maintenance/maintenanceRecords/index', 1, 'C', '1', '0', '', 'checkbox', '1', '2024-01-16 10:20:54', '1', '2024-02-28 11:38:08', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f512341df2a8454e830fd2635e34b1bb', '维修养护管理', '2d26df05dea643b5842ac12e39f25785', 0, 'maintenanceManage', 'sluice/runManage/maintenance/maintenanceManage/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-02-28 11:37:48', '', '2024-02-28 11:37:48', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f6f3db8b9a71461487c1d366d5d2e6ba', '巡查记录', 'bc79940eb32443fea3ac016fd224de0a', 2, 'inspectionRecords', 'sluice/runManage/enginerring/inspectionRecords/index', 1, 'C', '1', '0', '', 'documentation', '1', '2024-01-16 10:04:51', '1', '2024-02-01 14:43:18', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f776499a2d70446dbd31c5aff7ebdc0b', '问题管理', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionQuestionManage', 'sluice/runManage/supervisionInspetion/questionManage/index', 1, 'C', '0', '0', '', 'documentation', '1', '2024-03-13 17:03:31', '1', '2024-03-15 10:17:57', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f90eb9f2c7c44413872499de126aa99d', '任务详情', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionTasksDetails', 'sluice/runManage/supervisionInspetion/tasksManage/tasksDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 11:29:20', '1', '2024-03-15 10:18:03', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('fc2598ec4cd24788a33385bb342271f4', '巡查路线设置', 'bc79940eb32443fea3ac016fd224de0a', 0, 'patrolRouteSettings', 'sluice/runManage/enginerring/patrolRouteSettings/index', 1, 'C', '1', '0', '', 'guide', '1', '2024-01-16 10:06:14', '1', '2024-01-16 18:34:18', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ff98c8675e57413d965d5408fe5ee5c1', '统计分析', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectStatistics', 'sluice/runManage/dangerWeakProject/inspectStatistics/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-21 14:01:01', '1', '2024-03-21 14:13:20', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('01712fe5dc6d49c28add161e7a2835b2', '新增', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:add', '#', '1', '2024-03-25 15:40:51', '', '2024-03-25 15:40:51', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0251f86314524d8baa05f9db9f833ed6', '查看记录', '2b74d23af5f5435594b1c12cb573700d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:record:view', '#', '1', '2024-03-25 16:04:27', '', '2024-03-25 16:04:27', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('025ea8a420a64bc399d6547d74542b24', '计划查看', 'f512341df2a8454e830fd2635e34b1bb', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:view', '#', '1', '2024-03-25 15:52:49', '', '2024-03-25 15:52:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0b0612650bc04baabf83683bb4bcc7bc', '添加', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:add', '#', '1', '2024-03-25 16:16:48', '', '2024-03-25 16:16:48', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('12bb52317e5744889ae32a89a57de3c8', '删除', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:delete', '#', '1', '2024-03-25 16:24:49', '', '2024-03-25 16:24:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('1e52f525b387400e87afff319e26fd24', '配置', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:config', '#', '1', '2024-03-25 15:44:05', '1', '2024-03-25 15:44:13', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2af1e46844a04dc1898f7bf27afd09bd', '删除', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:delete', '#', '1', '2024-03-25 15:55:25', '', '2024-03-25 15:55:25', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2b13d8a727a04eb99e5f2e6f839dd78c', '编辑', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:edit', '#', '1', '2024-03-25 16:24:33', '', '2024-03-25 16:24:33', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('2be2e1dec90e451b9a9f740d5216fa79', '添加', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:add', '#', '1', '2024-03-25 15:47:32', '', '2024-03-25 15:47:32', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('35898e2fca3b4f16b49bc486b044dd8d', '记录', '583d8233adc741d3a7610e464a3555ea', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:record:add', '#', '1', '2024-03-25 16:09:22', '', '2024-03-25 16:09:22', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('364978e25acc4fd189be1b7015110d9b', '删除', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:delete', '#', '1', '2024-03-25 15:40:07', '1', '2024-03-25 15:40:59', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('385993aea2c44283a21f09772b909bc3', '添加', 'f3e4f97a9aa8493892e8fbb3eeaa0efe', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:add', '#', '1', '2024-03-25 15:58:23', '', '2024-03-25 15:58:23', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('46bfac468a154a67bdc1090492384013', '删除', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:delete', '#', '1', '2024-03-25 16:19:34', '', '2024-03-25 16:19:34', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('49f9b0b8eec2491e8d16d7c2e48729f8', '记录查看', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:record:view', '#', '1', '2024-03-25 15:43:38', '', '2024-03-25 15:43:38', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('56cdcf1cfeb54ade90f519b7e51eabc9', '下载', '8ae9829895a44194a4e5f42979f0bd88', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:project:down', '#', '1', '2024-03-25 16:22:17', '', '2024-03-25 16:22:17', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('56e81a03344d400189573844cedee3e5', '查看记录', '6956f7271aa449aebaafb7cc8a8479da', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:yq:record:view', '#', '1', '2024-03-25 16:11:50', '', '2024-03-25 16:11:50', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('5c58088f65b14d1d9682c591372d9725', '查看计划', '2b74d23af5f5435594b1c12cb573700d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:view', '#', '1', '2024-03-25 16:04:05', '', '2024-03-25 16:04:05', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('76c511953df4492bbda1b01bd57c9261', '删除', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:delete', '#', '1', '2024-03-25 16:27:02', '', '2024-03-25 16:27:02', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('76da8bc3c84f4ece847c87122e2198db', '编辑', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:edit', '#', '1', '2024-03-25 16:16:32', '', '2024-03-25 16:16:32', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('7789c3d7444d452c9d4eed3cf6720745', '导出', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:down', '#', '1', '2024-03-25 16:16:12', '', '2024-03-25 16:16:12', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('778aa09ec6b94350a38b114b3249cb8f', '编辑', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:edit', '#', '1', '2024-03-25 15:48:00', '', '2024-03-25 15:48:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('88a90a6452fb4af7b070b37b83fb73a4', '新增', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:add', '#', '1', '2024-03-25 15:54:55', '', '2024-03-25 15:54:55', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('89e6e5dde0aa42c4a171a0d665f1a3db', '编辑', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:edit', '#', '1', '2024-03-25 16:20:10', '', '2024-03-25 16:20:10', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('941ec809c7e44f43a5a050c4ae33a646', '新增', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:add', '#', '1', '2024-03-25 16:06:28', '', '2024-03-25 16:06:28', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9825a6decd54473d89f9018a88536b64', '删除', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:delete', '#', '1', '2024-03-25 16:29:50', '', '2024-03-25 16:29:50', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9a725e61d2fe4c70887c7c50e0cf9dd0', '查看', 'bf67c547f2824a74b15c80386ab5181c', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:report:view', '#', '1', '2024-03-25 16:28:49', '', '2024-03-25 16:28:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('a4e2592fd2b84ac5beee5f706366c789', '预览', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:view', '#', '1', '2024-03-25 16:17:07', '', '2024-03-25 16:17:07', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('a6b7f717b0af4076963b023e05b837a4', '路线配置', 'f6f3db8b9a71461487c1d366d5d2e6ba', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:records:trace:view', '#', '1', '2024-03-25 15:50:56', '', '2024-03-25 15:50:56', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('b0e0261bbb954af3af1aa453a757c865', '新增', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:add', '#', '1', '2024-03-25 16:24:16', '', '2024-03-25 16:24:16', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('b6219e0f288b49429ddc41ff0d0c9894', '编辑', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:edit', '#', '1', '2024-03-25 16:06:50', '', '2024-03-25 16:06:50', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('bb937859509240d4b7002b0b37db0ed4', '查询分析', '6956f7271aa449aebaafb7cc8a8479da', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:yq:analyse:view', '#', '1', '2024-03-25 16:11:27', '', '2024-03-25 16:11:27', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('c46a2c8204904d208b3c524cf698732c', '计划查看', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:view', '#', '1', '2024-03-25 15:44:45', '', '2024-03-25 15:44:45', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('c5687c7772804e328a7175605d28dff9', '编辑', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:edit', '#', '1', '2024-03-25 16:26:29', '', '2024-03-25 16:26:29', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('c81127b578874a93a7d739d70f10427d', '编辑', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:edit', '#', '1', '2024-03-25 16:30:14', '', '2024-03-25 16:30:14', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('cbcd7d8d4c104e2db1b8d64136b6a739', '编辑', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:edit', '#', '1', '2024-03-25 15:40:27', '1', '2024-03-25 15:41:07', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d06b747a25a0495bb52a56fd66e6fba0', '配置', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:config', '#', '1', '2024-03-25 16:15:50', '', '2024-03-25 16:15:50', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d58ddc56b664431cadaa1aa9537b8f2d', '新增', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:add', '#', '1', '2024-03-25 16:26:45', '', '2024-03-25 16:26:45', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('dce5c717ecaf475ea71ca2d095232ec7', '编辑', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:edit', '#', '1', '2024-03-25 15:55:11', '', '2024-03-25 15:55:11', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('de63aa1e3a0e43aea22168b8308df420', '添加', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:add', '#', '1', '2024-03-25 16:19:51', '', '2024-03-25 16:19:51', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e6d27d32dfbe4201ac7ea1036d05494e', '查看', 'f3e4f97a9aa8493892e8fbb3eeaa0efe', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:view', '#', '1', '2024-03-25 15:59:03', '', '2024-03-25 15:59:03', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e92cae0b06d242c4aa5bfc41d7c3c26c', '记录查看', 'f512341df2a8454e830fd2635e34b1bb', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:view', '#', '1', '2024-03-25 15:53:12', '', '2024-03-25 15:53:12', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f28fcf9e797440158cc24ba05060327b', '新增', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:add', '#', '1', '2024-03-25 16:30:36', '', '2024-03-25 16:30:36', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f4d04537753644f2bb81eb5729814031', '删除', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:delete', '#', '1', '2024-03-25 16:07:05', '', '2024-03-25 16:07:05', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f53483a7234e4be2908ba8122d1a147c', '删除', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:delete', '#', '1', '2024-03-25 15:48:15', '', '2024-03-25 15:48:15', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f7363d3c7c134b408a6f67a2698d15cd', '查看', 'ebfbabbfc44f45deb4f77c2a80af1a13', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:view', '#', '1', '2024-03-25 16:33:23', '', '2024-03-25 16:33:23', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('7e4624ce1e4d49279a59394decdd28ec', '运行管护', '85664171b34a4a1d87e8677481815b2e', 1, 'runManage', NULL, 1, 'M', '0', '0', NULL, 'bug', '1', '2024-01-16 09:31:25', '', '2024-01-16 09:31:25', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0c65b8e973b245f6b7453d64260ae1c9', '维修养护', '7e4624ce1e4d49279a59394decdd28ec', 1, 'maintenance', 'dike/runManage/maintenance/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-01-16 09:55:26', '1', '2024-01-16 17:04:03', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('26db00db08f940758527b9a9b99ab387', '病险工程核查', '7e4624ce1e4d49279a59394decdd28ec', 4, 'dangerWeakProject', 'dike/runManage/dangerWeakProject/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-03-21 09:16:52', '1', '2024-03-21 09:49:55', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('4662f7d0af464f93873e9ebdfbb65595', '动态监测', '7e4624ce1e4d49279a59394decdd28ec', 4, 'monitoring', 'dike/runManage/monitoring/index', 1, 'M', '0', '0', NULL, 'dashboard', '1', '2024-03-15 10:15:42', '', '2024-03-15 10:15:42', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('a382ef796b234538a18a30cac8b8ec69', '水雨情测报', '7e4624ce1e4d49279a59394decdd28ec', 2, 'waterRainReport', 'dike/runManage/waterRainReport/index', 1, 'M', '0', '0', '', 'international', '1', '2024-02-04 10:09:33', '1', '2024-02-04 10:15:15', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d829361aed664acdbaab128c89a6ec7c', '工程巡检', '7e4624ce1e4d49279a59394decdd28ec', 0, 'enginerring', 'dike/runManage/enginerring/index', 1, 'M', '0', '0', '', 'icon-wxjl', '1', '2024-01-16 09:33:36', '1', '2024-01-16 17:03:56', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f3f80d66ae8643ff8fece7ca493db7b3', '害堤动物防治', '7e4624ce1e4d49279a59394decdd28ec', 2, 'pestAnimalControl', 'dike/runManage/pestAnimalControl/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-01-16 11:54:32', '1', '2024-01-16 17:04:14', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('08ae9a86f261444185a9a38fa2e532b9', '统计分析', 'ae58fd1b4e57475eb740598f0c7c44c2', 4, 'statisticAnalysis', 'dike/runManage/supervisionInspetion/statisticAnalysis/index', 1, 'C', '0', '0', '', 'example', '1', '2024-02-28 16:19:22', '1', '2024-03-18 09:42:47', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('09b65d8be95942d1af76848bdcce964d', '巡查项目管理', 'd829361aed664acdbaab128c89a6ec7c', 0, 'inspectionItems', 'dike/runManage/enginerring/inspectionItems/index', 1, 'C', '0', '0', '', 'form', '1', '2024-01-16 09:34:34', '1', '2024-01-16 17:04:27', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0d1e4fdf4c0843f0bfdfc10a482aad29', '问题管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 3, 'supervisionInspetionQuestionManage', 'dike/runManage/supervisionInspetion/questionManage/index', 1, 'C', '0', '0', '', 'icon-gcxc', '1', '2024-02-28 16:36:08', '1', '2024-03-18 09:42:42', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('0e55e53cf99f417d8a3cb058f7f525ec', '巡查计划管理', 'd829361aed664acdbaab128c89a6ec7c', 1, 'inspectionPlan', 'dike/runManage/enginerring/inspectionPlan/index', 1, 'C', '1', '0', '', 'documentation', '1', '2024-01-16 09:50:48', '1', '2024-01-25 15:01:30', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('25adc36ec2c74f02a84d23a40012734c', '办法管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 0, 'dikeMethodsManage', 'dike/runManage/supervisionInspetion/methodsManage/index', 1, 'C', '0', '0', '', 'build', '1', '2024-02-28 15:03:15', '1', '2024-03-18 09:47:18', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('29a31582ce3147449b6c0d6718f00d38', '修养记录', '0c65b8e973b245f6b7453d64260ae1c9', 1, 'maintenanceRecords', 'dike/runManage/maintenance/maintenanceRecords/index', 1, 'C', '1', '0', '', 'documentation', '1', '2024-01-16 09:59:25', '1', '2024-02-28 09:33:29', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('3288fa2822cb4fd2ad3f6473e4e05687', '办法项目配置', 'ae58fd1b4e57475eb740598f0c7c44c2', 6, 'methodsItemsList', 'dike/runManage/supervisionInspetion/methodsManage/itemsList', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 16:54:12', '1', '2024-03-18 09:42:54', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('364f425d93344ffa890c5ec185c28c49', '维修养护管理', '0c65b8e973b245f6b7453d64260ae1c9', 0, 'maintenanceManage', 'dike/runManage/maintenance/maintenanceManage/index', 1, 'C', '0', '0', NULL, 'bug', '1', '2024-02-28 09:32:39', '', '2024-02-28 09:32:39', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('3f7cf2a425984fc391100536d472517c', '维修养护计划', '0c65b8e973b245f6b7453d64260ae1c9', 0, 'maintenancePlan', 'dike/runManage/maintenance/maintenancePlan/index', 1, 'C', '1', '0', '', 'icon-wxjhgl', '1', '2024-01-16 09:56:54', '1', '2024-02-28 09:33:25', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('43dfa8fc4eb7439790fc83af6fca7166', '核查项目设置', '26db00db08f940758527b9a9b99ab387', 0, 'inspectItemsSetting', 'dike/runManage/dangerWeakProject/inspectItemsSetting/index', 1, 'C', '0', '0', NULL, 'form', '1', '2024-03-21 09:18:11', '', '2024-03-21 09:18:11', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('5419e3eb40504b3390e1740ada162516', '任务详情', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionTasksDetails', 'dike/runManage/supervisionInspetion/tasksManage/tasksDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 09:58:33', '1', '2024-03-18 09:42:23', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('54651202e2a24408a5134bea8bf76ea9', '核查分组管理', '26db00db08f940758527b9a9b99ab387', 1, 'inspectGroup', 'dike/runManage/dangerWeakProject/inspectGroup/index', 1, 'C', '0', '0', NULL, 'peoples', '1', '2024-03-21 09:19:17', '', '2024-03-21 09:19:17', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('5aa53d12455e40bc890365270b0092f3', '核查任务详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectTaskDetails', 'dike/runManage/dangerWeakProject/inspectTasks/taskDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:28:49', '', '2024-03-21 09:28:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('64bff55ce70243789029d311a5ad3007', '配置项配置', 'ae58fd1b4e57475eb740598f0c7c44c2', 7, 'methodsItemsDetails', 'dike/runManage/supervisionInspetion/methodsManage/itemsDetails', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 17:44:35', '1', '2024-03-18 09:42:57', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('6704078dc4ac4511a9c22182598f709c', '堤防动态监测管理', '4662f7d0af464f93873e9ebdfbb65595', 1, 'manage', 'dike/runManage/monitoring/dike/manage/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-15 10:18:14', '', '2024-03-15 10:18:14', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('69a737719e0f4726a68dfe5231e66733', '防治计划管理', 'f3f80d66ae8643ff8fece7ca493db7b3', 0, 'planManagement', 'dike/runManage/pestAnimalControl/planManagement/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 11:55:45', '1', '2024-02-22 09:55:22', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('77a5de4ee8fd4e5484b6d96667fd7c6a', '堤防测报管理', 'a382ef796b234538a18a30cac8b8ec69', 0, 'testReportManage', 'dike/runManage/waterRainReport/testReportManage/index', 1, 'C', '0', '0', '', 'cascader', '1', '2024-02-04 10:18:15', '1', '2024-03-04 14:11:29', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('7e1a4f8d8e2f4c8da0dfcc2606c59d5b', '核查项目详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectItemDetails', 'dike/runManage/dangerWeakProject/inspectItemsSetting/itemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:24:05', '', '2024-03-21 09:24:05', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('8098adaf04344108b714e7bb57a09b2b', '水雨情智能分析', 'a382ef796b234538a18a30cac8b8ec69', 2, 'waterRainSmartAnalyse', 'dike/runManage/waterRainReport/smartAnalyse/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-04 14:10:37', '1', '2024-03-14 11:08:48', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('8cb6efd0c7f8470481501d244cc00b40', '水雨情监测', 'a382ef796b234538a18a30cac8b8ec69', 1, 'waterRainMonitoring', 'dike/runManage/waterRainReport/monitoring/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 14:09:38', '1', '2024-03-04 14:12:24', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('92a7893fb8024372ae13f6598deff5ee', '堤防巡查管理', 'd829361aed664acdbaab128c89a6ec7c', 1, 'patrolManage', 'dike/runManage/enginerring/patrolManage/index', 1, 'C', '0', '0', NULL, 'cascader', '1', '2024-01-24 14:26:24', '', '2024-01-24 14:26:24', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('958437067f9d45f8988a0a97065525bf', '防治记录', 'f3f80d66ae8643ff8fece7ca493db7b3', 1, 'governanceRecords', 'dike/runManage/pestAnimalControl/governanceRecords/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 11:58:17', '1', '2024-02-22 09:55:15', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('972bb0e3caff4e3b850f4d634cc1950d', '害堤防治管理', 'f3f80d66ae8643ff8fece7ca493db7b3', 0, 'controlManage', 'dike/runManage/pestAnimalControl/controlManage/index', 1, 'C', '0', '0', '', 'bug', '1', '2024-02-22 09:54:24', '1', '2024-02-22 09:56:32', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9a2d3f85e57045b388c2920fa0d12865', '核查报告详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectReportPage', 'dike/runManage/dangerWeakProject/inspectReport/reportPage', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:26:35', '', '2024-03-21 09:26:35', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9d266937ea0b407e84fcc3f9c86335a9', '核查任务管理', '26db00db08f940758527b9a9b99ab387', 1, 'inspectTasks', 'dike/runManage/dangerWeakProject/inspectTasks/index', 1, 'C', '0', '0', '', 'documentation', '1', '2024-03-21 09:20:45', '1', '2024-03-21 09:23:12', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('aa4e642f4b004241807d622f901d9540', '堤防动态监测', '4662f7d0af464f93873e9ebdfbb65595', 0, 'dike', 'dike/runManage/monitoring/dike/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-15 10:17:22', '', '2024-03-15 10:17:22', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('abe830193d8e425c8fff4bd73f28b442', '统计分析', '26db00db08f940758527b9a9b99ab387', 3, 'inspectStatistics', 'dike/runManage/dangerWeakProject/inspectStatistics/index', 1, 'C', '0', '0', NULL, 'chart', '1', '2024-03-21 14:33:07', '', '2024-03-21 14:33:07', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ae5a74c25be942669cb148951140aedf', '工程核查', '26db00db08f940758527b9a9b99ab387', 1, 'inspectProjects', 'dike/runManage/dangerWeakProject/inspectProjects/index', 1, 'C', '0', '0', NULL, 'icon-wxyh', '1', '2024-03-21 09:21:43', '', '2024-03-21 09:21:43', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('b458e62fb98c4ebf82b8e5e01b7276d7', '核查填报', '26db00db08f940758527b9a9b99ab387', 3, 'inspectFillReport', 'dike/runManage/dangerWeakProject/inspectProjects/fillReport', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:27:46', '', '2024-03-21 09:27:46', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('bda9596e45a14b439b0841d74840da8e', '工程管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionInspetionProjectManage', 'dike/runManage/supervisionInspetion/projectManage/index', 1, 'C', '0', '0', '', 'icon-wxyh', '1', '2024-02-28 16:27:28', '1', '2024-03-18 09:42:27', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('cecc46d35c014cb9b0eec5243bdd3783', '巡查路线设置', 'd829361aed664acdbaab128c89a6ec7c', 3, 'patrolRouteSettings', 'dike/runManage/enginerring/patrolRouteSettings/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 10:49:29', '1', '2024-01-16 17:04:48', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('cfb9c2e63e5f4fee99a6c5830583b771', '办法详情', 'ae58fd1b4e57475eb740598f0c7c44c2', 5, 'methodManageDetails', 'dike/runManage/supervisionInspetion/methodsManage/details', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 10:38:15', '1', '2024-03-18 09:42:50', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d451221982b84978ac0060df4626e690', '工程报告', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionProjectReportPage', 'dike/runManage/supervisionInspetion/projectManage/projectReportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 10:23:34', '1', '2024-03-18 09:42:34', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e89e05acd8844741a95c5d95fd4d6991', '堤防动态监测历史记录', '4662f7d0af464f93873e9ebdfbb65595', 2, 'record', 'dike/runManage/monitoring/dike/record/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-15 10:19:11', '1', '2024-03-15 11:32:24', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e94a0222f17641fd9a27b5ba332076d4', '核查报告', '26db00db08f940758527b9a9b99ab387', 2, 'inspectReport', 'dike/runManage/dangerWeakProject/inspectReport/index', 1, 'C', '0', '0', NULL, 'education', '1', '2024-03-21 09:22:55', '', '2024-03-21 09:22:55', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('eb97a907232740c4b1a1ebd50cf1181a', '工程上报', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionProjectReport', 'dike/runManage/supervisionInspetion/projectManage/projectReport', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 10:22:17', '1', '2024-03-18 09:42:38', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f5597866cbda457d8966e97e7aa0a15c', '巡查项详情', 'd829361aed664acdbaab128c89a6ec7c', 1, 'inspectionItemDetails', 'dike/runManage/enginerring/inspectionItems/inspectionItemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-18 14:08:37', '', '2024-03-18 14:08:37', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f96dbc80be5e446397a3c940b1c963b4', '任务管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 1, 'tasksManage', 'dike/runManage/supervisionInspetion/tasksManage/index', 1, 'C', '0', '0', '', 'log', '1', '2024-02-28 15:08:21', '1', '2024-03-18 09:42:19', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('fe97025934b64dd5b45e35d92bfac1f2', '巡查记录', 'd829361aed664acdbaab128c89a6ec7c', 2, 'inspectionRecords', 'dike/runManage/enginerring/inspectionRecords/index', 1, 'C', '1', '0', '', 'excel', '1', '2024-01-16 09:51:56', '1', '2024-01-25 15:01:35', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('c825178955e4420a94238005a54ac084', '记录查看', '364f425d93344ffa890c5ec185c28c49', 1, '', NULL, 1, 'F', '0', '0', 'df:run:main:record:view', '#', '1', '2024-03-25 11:57:40', '', '2024-03-25 11:57:40', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('c85c1d9751174b4ba7b9284d0751dcd7', '查看记录', '29a31582ce3147449b6c0d6718f00d38', 1, '', NULL, 1, 'F', '0', '0', 'df:run:main:record:view', '#', '1', '2024-03-25 13:45:41', '', '2024-03-25 13:45:41', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ca47797137ed4ed0b6498d96970b548e', '删除', '54651202e2a24408a5134bea8bf76ea9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:group:delete', '#', '1', '2024-03-25 15:24:52', '1', '2024-03-25 15:28:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('ce1ed0f3bb5a44079a530c99efc05387', '添加', '25adc36ec2c74f02a84d23a40012734c', 1, '', NULL, 1, 'F', '0', '0', 'df:run:sup:meth:add', '#', '1', '2024-03-25 14:48:17', '', '2024-03-25 14:48:17', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d78d4f1310304af2b5bee747252de8d6', '编辑按钮', '09b65d8be95942d1af76848bdcce964d', 1, '', NULL, 1, 'F', '0', '0', 'df:run:checking:item:edit', '#', '1', '2024-03-23 19:04:35', '', '2024-03-23 19:04:35', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d919edf1156e4eb28c54a1012fa6fff5', '预览', '25adc36ec2c74f02a84d23a40012734c', 1, '', NULL, 1, 'F', '0', '0', 'df:run:sup:meth:view', '#', '1', '2024-03-25 14:50:58', '', '2024-03-25 14:50:58', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('dba71e7708a14376a5add791fb92bc6e', '查看记录', '77a5de4ee8fd4e5484b6d96667fd7c6a', 1, '', NULL, 1, 'F', '0', '0', 'df:run:yq:record:view', '#', '1', '2024-03-25 13:50:02', '', '2024-03-25 13:50:02', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('dcd64edc17294f66b21332bcee1b06b6', '删除', '9d266937ea0b407e84fcc3f9c86335a9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:task:delete', '#', '1', '2024-03-25 15:29:05', '', '2024-03-25 15:29:05', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e114418c38a141abbe5eaceb7b66f970', '编辑', '54651202e2a24408a5134bea8bf76ea9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:group:edit', '#', '1', '2024-03-25 15:24:36', '1', '2024-03-25 15:28:07', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e6abdf4e22284f279dc6d9b4a4e2a063', '记录查看', '972bb0e3caff4e3b850f4d634cc1950d', 1, '', NULL, 1, 'F', '0', '0', 'df:run:fz:record:view', '#', '1', '2024-03-25 13:53:20', '1', '2024-03-25 13:59:40', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('f777cec3473045b6b11871539232ab79', '确认', '958437067f9d45f8988a0a97065525bf', 1, '', NULL, 1, 'F', '0', '0', 'df:run:fz:record:confirm', '#', '1', '2024-03-25 13:57:46', '', '2024-03-25 13:57:46', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('fa59f283fd5448a6bd3db0900109a80b', '计划查看', '92a7893fb8024372ae13f6598deff5ee', 1, '', NULL, 1, 'F', '0', '0', 'df:run:checking:plan:view', '#', '1', '2024-03-25 11:47:55', '', '2024-03-25 11:47:55', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('cb86824acb9347dbbb0dcd90b5fef391', '智能监管', '0', 1, 'aiSupervision', 'aiSupervision/index', 1, 'M', '1', '0', '', 'example', '1', '2024-03-06 11:30:58', '1', '2024-03-29 09:22:19', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('26214fe3909d490f90b41a509b4ded96', '水利工程', 'cb86824acb9347dbbb0dcd90b5fef391', 1, 'waterSetting', 'aiSupervision/waterSetting/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-03-06 15:22:35', '1', '2024-03-06 15:26:52', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('9084032ec3f1413daf759c0cc38e1083', '图层数据配置', 'cb86824acb9347dbbb0dcd90b5fef391', 0, 'layer-manage', 'aiSupervision/layerManage/index', 1, 'M', '0', '0', '', 'tree-table', '1', '2024-03-06 11:32:08', '1', '2024-03-06 15:28:09', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('e2c98afed5b1483382ef75680594c7f0', '四预管理', 'cb86824acb9347dbbb0dcd90b5fef391', 3, 'four-predictions', 'aiSupervision/fourPredictions/index', 1, 'M', '0', '0', '', 'dashboard', '1', '2024-03-06 11:39:29', '1', '2024-03-06 14:39:06', ''); - -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('16034e02ce9b48fd91801d609ce2d1ca', '预演信息管理', 'e2c98afed5b1483382ef75680594c7f0', 2, 'previewInfo', 'aiSupervision/fourPredictions/previewInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:43:16', '', '2024-03-06 14:43:16', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('16f8801ba2e34cb29c09e4829295ba9b', '资源目录', '9084032ec3f1413daf759c0cc38e1083', 0, 'layerResource', 'aiSupervision/layerManage/resource/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 15:28:49', '', '2024-03-06 15:28:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('28e1c4dedeb842498d262c7eb5105cc7', '运行场景配置', '26214fe3909d490f90b41a509b4ded96', 0, 'runScene', 'aiSupervision/waterSetting/runScene/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-06 15:23:19', '1', '2024-03-06 15:25:00', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('407a0853686043b18bdebc77ea55f4a2', '运行场景配置详情', '26214fe3909d490f90b41a509b4ded96', 0, 'runSceneDetail', 'aiSupervision/waterSetting/runScene/detail/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-09 14:44:08', '', '2024-03-09 14:44:08', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('4255bd690aa9423096dc431dd36067f1', '预报信息管理', 'e2c98afed5b1483382ef75680594c7f0', 0, 'predictionInfo', 'aiSupervision/fourPredictions/predictionInfo/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-06 14:40:11', '1', '2024-03-06 14:45:02', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('45ecf58a79cd4c1086b78f6e85b3df28', '预案信息管理', 'e2c98afed5b1483382ef75680594c7f0', 3, 'planInfo', 'aiSupervision/fourPredictions/planInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:44:15', '', '2024-03-06 14:44:15', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('512a2961993844049573cb3b7bd2d9cb', '预警信息管理', 'e2c98afed5b1483382ef75680594c7f0', 1, 'warnInfo', 'aiSupervision/fourPredictions/warnInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:42:01', '', '2024-03-06 14:42:01', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('61e66dbf6e2247239f68b11a0b3c1456', '资源目录详情', '9084032ec3f1413daf759c0cc38e1083', 1, 'resourceDetails', 'aiSupervision/layerManage/resource/LayerDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-12 11:47:13', '', '2024-03-12 11:47:13', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('792ab4f2e013492196abd4d2df679fd8', '对象配置管理', '26214fe3909d490f90b41a509b4ded96', 1, 'objectManage', 'aiSupervision/waterSetting/objectManage/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-06 15:24:08', '1', '2024-03-29 09:22:49', ''); -INSERT INTO sys_menu -(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark) -VALUES('d53a5d18f41a4a439a7fa686b90e54dc', '资源目录详情', '26214fe3909d490f90b41a509b4ded96', 1, 'resourceDetails', 'aiSupervision/layerManage/resource/LayerDetails', 1, 'M', '1', '0', NULL, '#', '1', '2024-03-12 17:45:36', '', '2024-03-12 17:45:36', ''); - - - - - +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('00ac3d79c1ee4993a415e6f793df1593', '监督检查', 'a56aab90c27d4d9bb9f896de8e537944', 3, 'supervisionInspetion', 'sluice/runManage/supervisionInspetion/index', 1, 'M', '0', '0', '', 'icon-hddwfzjhgl', '1', '2024-03-04 16:16:30', '1', '2024-03-06 20:33:35', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('01712fe5dc6d49c28add161e7a2835b2', '新增', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:add', '#', '1', '2024-03-25 15:40:51', '', '2024-03-25 15:40:51', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0251f86314524d8baa05f9db9f833ed6', '查看记录', '2b74d23af5f5435594b1c12cb573700d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:record:view', '#', '1', '2024-03-25 16:04:27', '', '2024-03-25 16:04:27', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('025ea8a420a64bc399d6547d74542b24', '计划查看', 'f512341df2a8454e830fd2635e34b1bb', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:view', '#', '1', '2024-03-25 15:52:49', '', '2024-03-25 15:52:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('02ca1718e86e4e14bc3e5d43bb7643cb', '巡查路线管理', 'd829361aed664acdbaab128c89a6ec7c', 1, 'inspectionRouteManage', 'dike/runManage/enginerring/inspectionRouteManage/index', 1, 'C', '0', '0', '', 'guide', '1', '2024-05-25 14:49:02', '1', '2024-06-04 20:46:03', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('038691476a374368ac1934371a22ed2d', '维修养护计划', '2d26df05dea643b5842ac12e39f25785', 1, 'maintenancePlan', 'sluice/runManage/maintenance/maintenancePlan/index', 1, 'C', '1', '0', '', 'cascader', '1', '2024-01-16 10:19:55', '1', '2024-02-28 11:38:01', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('03f68d9c626b4160be11c2fe954e5cd3', '水闸水雨情监测', '966888dd429c42ad87810410e045b988', 3, 'waterRainMonitoring', 'sluice/runManage/waterRainReport/monitoring/index', 1, 'C', '1', '0', '', 'cascader', '1', '2024-02-04 14:02:15', '1', '2024-03-04 15:38:53', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('06d65eac04b24c82b8b9b6512ddbd6ad', '动态监测', 'a56aab90c27d4d9bb9f896de8e537944', 9, 'monitoring', 'sluice/runManage/monitoring/index', 1, 'M', '0', '0', NULL, 'dashboard', '1', '2024-03-11 11:06:08', '', '2024-03-11 11:06:08', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('08ae9a86f261444185a9a38fa2e532b9', '统计分析', 'ae58fd1b4e57475eb740598f0c7c44c2', 4, 'statisticAnalysis', 'dike/runManage/supervisionInspetion/statisticAnalysis/index', 1, 'C', '0', '0', '', 'example', '1', '2024-02-28 16:19:22', '1', '2024-03-18 09:42:47', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('09b65d8be95942d1af76848bdcce964d', '巡查项目管理', 'd829361aed664acdbaab128c89a6ec7c', 0, 'inspectionItems', 'dike/runManage/enginerring/inspectionItems/index', 1, 'C', '0', '0', '', 'form', '1', '2024-01-16 09:34:34', '1', '2024-01-16 17:04:27', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0b0612650bc04baabf83683bb4bcc7bc', '添加', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:add', '#', '1', '2024-03-25 16:16:48', '', '2024-03-25 16:16:48', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0c65b8e973b245f6b7453d64260ae1c9', '维修养护', '7e4624ce1e4d49279a59394decdd28ec', 1, 'maintenance', 'dike/runManage/maintenance/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-01-16 09:55:26', '1', '2024-01-16 17:04:03', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0c6db2ab60f44f3e9aed1cf86ef457fa', '水闸动态监测', '06d65eac04b24c82b8b9b6512ddbd6ad', 0, 'sluice', 'sluice/runManage/monitoring/sluice/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-11 11:08:13', '', '2024-03-11 11:08:13', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0d1e4fdf4c0843f0bfdfc10a482aad29', '问题管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 3, 'supervisionInspetionQuestionManage', 'dike/runManage/supervisionInspetion/questionManage/index', 1, 'C', '0', '0', '', 'icon-gcxc', '1', '2024-02-28 16:36:08', '1', '2024-03-18 09:42:42', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0e55e53cf99f417d8a3cb058f7f525ec', '巡查计划管理', 'd829361aed664acdbaab128c89a6ec7c', 2, 'inspectionPlan', 'dike/runManage/enginerring/inspectionPlan/index', 1, 'C', '0', '0', '', 'documentation', '1', '2024-01-16 09:50:48', '1', '2024-06-04 20:46:37', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('0e5d2ec8976b4f2a86773a604789fdd0', '工程管理', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectManage', 'sluice/runManage/supervisionInspetion/projectManage/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-12 14:32:16', '1', '2024-03-15 10:17:27', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('12bb52317e5744889ae32a89a57de3c8', '删除', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:delete', '#', '1', '2024-03-25 16:24:49', '', '2024-03-25 16:24:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('12bb52317e5744889ae32a89a57de3c8', '删除', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:delete', '#', '1', '2024-03-25 16:24:49', '', '2024-03-25 16:24:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('16034e02ce9b48fd91801d609ce2d1ca', '预演信息管理', 'e2c98afed5b1483382ef75680594c7f0', 2, 'previewInfo', 'aiSupervision/fourPredictions/previewInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:43:16', '', '2024-03-06 14:43:16', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('16f8801ba2e34cb29c09e4829295ba9b', '资源目录', '9084032ec3f1413daf759c0cc38e1083', 0, 'layerResource', 'aiSupervision/layerManage/resource/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 15:28:49', '', '2024-03-06 15:28:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('1cd0041896bd41dcac9e1cd6d203ccbc', '巡查计划管理', 'bc79940eb32443fea3ac016fd224de0a', 1, 'inspectionPlan', 'sluice/runManage/enginerring/inspectionPlan/index', 1, 'C', '1', '0', '', 'clipboard', '1', '2024-01-15 16:52:22', '1', '2024-03-18 17:05:33', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('1e52f525b387400e87afff319e26fd24', '配置', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:config', '#', '1', '2024-03-25 15:44:05', '1', '2024-03-25 15:44:13', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('25adc36ec2c74f02a84d23a40012734c', '办法管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 0, 'dikeMethodsManage', 'dike/runManage/supervisionInspetion/methodsManage/index', 1, 'C', '0', '0', '', 'build', '1', '2024-02-28 15:03:15', '1', '2024-03-18 09:47:18', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('26214fe3909d490f90b41a509b4ded96', '水利工程', 'cb86824acb9347dbbb0dcd90b5fef391', 1, 'waterSetting', 'aiSupervision/waterSetting/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-03-06 15:22:35', '1', '2024-03-06 15:26:52', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('26db00db08f940758527b9a9b99ab387', '病险工程核查', '7e4624ce1e4d49279a59394decdd28ec', 4, 'dangerWeakProject', 'dike/runManage/dangerWeakProject/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-03-21 09:16:52', '1', '2024-03-21 09:49:55', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('28e1c4dedeb842498d262c7eb5105cc7', '运行场景配置', '26214fe3909d490f90b41a509b4ded96', 0, 'runScene', 'aiSupervision/waterSetting/runScene/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-06 15:23:19', '1', '2024-03-06 15:25:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('29a31582ce3147449b6c0d6718f00d38', '修养记录', '0c65b8e973b245f6b7453d64260ae1c9', 1, 'maintenanceRecords', 'dike/runManage/maintenance/maintenanceRecords/index', 1, 'C', '1', '0', '', 'documentation', '1', '2024-01-16 09:59:25', '1', '2024-02-28 09:33:29', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2af1e46844a04dc1898f7bf27afd09bd', '删除', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:delete', '#', '1', '2024-03-25 15:55:25', '', '2024-03-25 15:55:25', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2b13d8a727a04eb99e5f2e6f839dd78c', '编辑', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:edit', '#', '1', '2024-03-25 16:24:33', '', '2024-03-25 16:24:33', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2b74d23af5f5435594b1c12cb573700d', '调度运用管理', '2e2e13824d9c4a81b14314c8bcb307b0', 0, 'utilize', 'sluice/runManage/dispatch/utilize/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-11 10:48:59', '1', '2024-03-11 10:51:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2be2e1dec90e451b9a9f740d5216fa79', '添加', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:add', '#', '1', '2024-03-25 15:47:32', '', '2024-03-25 15:47:32', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2d26df05dea643b5842ac12e39f25785', '维修养护', 'a56aab90c27d4d9bb9f896de8e537944', 1, 'maintenance', 'sluice/runManage/maintenance/index', 1, 'M', '0', '0', '', 'icon-wxyh', '1', '2024-01-16 10:19:04', '1', '2024-01-16 17:33:03', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('2e2e13824d9c4a81b14314c8bcb307b0', '调度运用', 'a56aab90c27d4d9bb9f896de8e537944', 2, 'dispatch', 'sluice/runManage/dispatch/index', 1, 'M', '0', '0', NULL, 'chart', '1', '2024-03-11 10:43:56', '', '2024-03-11 10:43:56', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('313252ed616148be88f072f65b8a60b2', '巡查项目管理', 'bc79940eb32443fea3ac016fd224de0a', 0, 'inspectionItems', 'sluice/runManage/enginerring/inspectionItems/index', 1, 'C', '0', '0', '', 'dashboard', '1', '2024-01-15 16:39:46', '1', '2024-01-15 16:52:58', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('3219e42af6bb45919ecb805626c5a6d9', '办法项目配置', '00ac3d79c1ee4993a415e6f793df1593', 1, 'methodsItemsList', 'sluice/runManage/supervisionInspetion/methodsManage/itemsList', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 16:19:46', '1', '2024-03-04 16:20:17', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('3288fa2822cb4fd2ad3f6473e4e05687', '办法项目配置', 'ae58fd1b4e57475eb740598f0c7c44c2', 6, 'methodsItemsList', 'dike/runManage/supervisionInspetion/methodsManage/itemsList', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 16:54:12', '1', '2024-03-18 09:42:54', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('35898e2fca3b4f16b49bc486b044dd8d', '记录', '583d8233adc741d3a7610e464a3555ea', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:record:add', '#', '1', '2024-03-25 16:09:22', '', '2024-03-25 16:09:22', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('364978e25acc4fd189be1b7015110d9b', '删除', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:delete', '#', '1', '2024-03-25 15:40:07', '1', '2024-03-25 15:40:59', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('364f425d93344ffa890c5ec185c28c49', '维修养护管理', '0c65b8e973b245f6b7453d64260ae1c9', 0, 'maintenanceManage', 'dike/runManage/maintenance/maintenanceManage/index', 1, 'C', '0', '0', NULL, 'bug', '1', '2024-02-28 09:32:39', '', '2024-02-28 09:32:39', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('385993aea2c44283a21f09772b909bc3', '添加', 'f3e4f97a9aa8493892e8fbb3eeaa0efe', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:add', '#', '1', '2024-03-25 15:58:23', '', '2024-03-25 15:58:23', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('3dfde024752148348cf6173bcb8d3cf5', '水闸动态监测历史记录', '06d65eac04b24c82b8b9b6512ddbd6ad', 2, 'record', 'sluice/runManage/monitoring/sluice/record/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-11 11:10:04', '1', '2024-03-15 11:32:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('3e82ff82619048c3af822e81f1dc8d42', '办法管理', '00ac3d79c1ee4993a415e6f793df1593', 0, 'methodsManage', 'sluice/runManage/supervisionInspetion/methodsManage/index', 1, 'C', '0', '0', '', 'education', '1', '2024-03-04 16:17:58', '1', '2024-03-15 10:17:16', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('3f7cf2a425984fc391100536d472517c', '维修养护计划', '0c65b8e973b245f6b7453d64260ae1c9', 0, 'maintenancePlan', 'dike/runManage/maintenance/maintenancePlan/index', 1, 'C', '1', '0', '', 'icon-wxjhgl', '1', '2024-01-16 09:56:54', '1', '2024-02-28 09:33:25', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('407a0853686043b18bdebc77ea55f4a2', '运行场景配置详情', '26214fe3909d490f90b41a509b4ded96', 0, 'runSceneDetail', 'aiSupervision/waterSetting/runScene/detail/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-09 14:44:08', '', '2024-03-09 14:44:08', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('4255bd690aa9423096dc431dd36067f1', '预报信息管理', 'e2c98afed5b1483382ef75680594c7f0', 0, 'predictionInfo', 'aiSupervision/fourPredictions/predictionInfo/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-06 14:40:11', '1', '2024-03-06 14:45:02', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('43dfa8fc4eb7439790fc83af6fca7166', '核查项目设置', '26db00db08f940758527b9a9b99ab387', 0, 'inspectItemsSetting', 'dike/runManage/dangerWeakProject/inspectItemsSetting/index', 1, 'C', '0', '0', NULL, 'form', '1', '2024-03-21 09:18:11', '', '2024-03-21 09:18:11', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('45ecf58a79cd4c1086b78f6e85b3df28', '预案信息管理', 'e2c98afed5b1483382ef75680594c7f0', 3, 'planInfo', 'aiSupervision/fourPredictions/planInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:44:15', '', '2024-03-06 14:44:15', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('4662f7d0af464f93873e9ebdfbb65595', '动态监测', '7e4624ce1e4d49279a59394decdd28ec', 4, 'monitoring', 'dike/runManage/monitoring/index', 1, 'M', '0', '0', NULL, 'dashboard', '1', '2024-03-15 10:15:42', '', '2024-03-15 10:15:42', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('46bfac468a154a67bdc1090492384013', '删除', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:delete', '#', '1', '2024-03-25 16:19:34', '', '2024-03-25 16:19:34', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('4820885a4cca4930872d7d7caeb2d802', '水闸运行管理', '0', 1, 'sluice', NULL, 1, 'M', '1', '0', '', 'list', '1', '2023-12-26 10:03:41', '1', '2024-02-21 16:54:32', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('49f9b0b8eec2491e8d16d7c2e48729f8', '记录查看', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:record:view', '#', '1', '2024-03-25 15:43:38', '', '2024-03-25 15:43:38', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('4b874673cedb45dea6e8cd398d1bc073', '核查报告', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectReportPage', 'sluice/runManage/dangerWeakProject/inspectReport/reportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-20 17:53:45', '1', '2024-03-20 17:54:56', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('4c8de95bf8d44fbaacddff983977d399', '核查项目设置', '9643924e57ad464abdfb233614b9a7b5', 0, 'inspectItemsSetting', 'sluice/runManage/dangerWeakProject/inspectItemsSetting/index', 1, 'C', '0', '0', '', 'icon-wxyh', '1', '2024-03-19 09:36:58', '1', '2024-03-19 09:38:59', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('512a2961993844049573cb3b7bd2d9cb', '预警信息管理', 'e2c98afed5b1483382ef75680594c7f0', 1, 'warnInfo', 'aiSupervision/fourPredictions/warnInfo/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-06 14:42:01', '', '2024-03-06 14:42:01', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('528ae03de41149bba0aa3446721cb205', '巡查项详情', 'bc79940eb32443fea3ac016fd224de0a', 2, 'inspectionItemDetails', 'sluice/runManage/enginerring/inspectionItems/inspectionItemDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-18 17:04:38', '1', '2024-03-18 17:18:32', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('5419e3eb40504b3390e1740ada162516', '任务详情', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionTasksDetails', 'dike/runManage/supervisionInspetion/tasksManage/tasksDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 09:58:33', '1', '2024-03-18 09:42:23', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('54651202e2a24408a5134bea8bf76ea9', '核查分组管理', '26db00db08f940758527b9a9b99ab387', 1, 'inspectGroup', 'dike/runManage/dangerWeakProject/inspectGroup/index', 1, 'C', '0', '0', NULL, 'peoples', '1', '2024-03-21 09:19:17', '', '2024-03-21 09:19:17', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('56cdcf1cfeb54ade90f519b7e51eabc9', '下载', '8ae9829895a44194a4e5f42979f0bd88', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:project:down', '#', '1', '2024-03-25 16:22:17', '', '2024-03-25 16:22:17', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('56e81a03344d400189573844cedee3e5', '查看记录', '6956f7271aa449aebaafb7cc8a8479da', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:yq:record:view', '#', '1', '2024-03-25 16:11:50', '', '2024-03-25 16:11:50', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('57f194c1c0544120b2ec9ee358fe0bd3', '核查任务管理', '9643924e57ad464abdfb233614b9a7b5', 1, 'inspectTasks', 'sluice/runManage/dangerWeakProject/inspectTasks/index', 1, 'C', '0', '0', '', 'dict', '1', '2024-03-19 14:50:14', '1', '2024-03-19 14:51:05', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('583d8233adc741d3a7610e464a3555ea', '水闸操作记录', '2e2e13824d9c4a81b14314c8bcb307b0', 1, 'record', 'sluice/runManage/dispatch/record/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 10:52:08', '1', '2024-03-11 10:54:20', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('5aa53d12455e40bc890365270b0092f3', '核查任务详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectTaskDetails', 'dike/runManage/dangerWeakProject/inspectTasks/taskDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:28:49', '', '2024-03-21 09:28:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('5c58088f65b14d1d9682c591372d9725', '查看计划', '2b74d23af5f5435594b1c12cb573700d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:view', '#', '1', '2024-03-25 16:04:05', '', '2024-03-25 16:04:05', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('61e66dbf6e2247239f68b11a0b3c1456', '资源目录详情', '9084032ec3f1413daf759c0cc38e1083', 1, 'resourceDetails', 'aiSupervision/layerManage/resource/LayerDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-12 11:47:13', '', '2024-03-12 11:47:13', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('64bff55ce70243789029d311a5ad3007', '配置项配置', 'ae58fd1b4e57475eb740598f0c7c44c2', 7, 'methodsItemsDetails', 'dike/runManage/supervisionInspetion/methodsManage/itemsDetails', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 17:44:35', '1', '2024-03-18 09:42:57', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('6704078dc4ac4511a9c22182598f709c', '堤防动态监测管理', '4662f7d0af464f93873e9ebdfbb65595', 1, 'manage', 'dike/runManage/monitoring/dike/manage/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-15 10:18:14', '', '2024-03-15 10:18:14', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('67e1cf6a5af643dc8f57b5643f678bbb', '工程上报', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectReport', 'sluice/runManage/supervisionInspetion/projectManage/projectReport', 1, 'C', '1', '0', '', '#', '1', '2024-03-12 15:46:22', '1', '2024-03-15 10:17:10', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('6956f7271aa449aebaafb7cc8a8479da', '水闸测报管理', '966888dd429c42ad87810410e045b988', 2, 'testReportManage', 'sluice/runManage/waterRainReport/testReportManage/index', 1, 'C', '0', '0', NULL, 'cascader', '1', '2024-02-04 13:59:09', '', '2024-02-04 13:59:09', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('69a737719e0f4726a68dfe5231e66733', '防治计划管理', 'f3f80d66ae8643ff8fece7ca493db7b3', 0, 'planManagement', 'dike/runManage/pestAnimalControl/planManagement/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 11:55:45', '1', '2024-02-22 09:55:22', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('76c511953df4492bbda1b01bd57c9261', '删除', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:delete', '#', '1', '2024-03-25 16:27:02', '', '2024-03-25 16:27:02', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('76da8bc3c84f4ece847c87122e2198db', '编辑', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:edit', '#', '1', '2024-03-25 16:16:32', '', '2024-03-25 16:16:32', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('773200b686d14ed3bdc4f0486229547f', '调度计划管理', '2e2e13824d9c4a81b14314c8bcb307b0', 2, 'plan', 'sluice/runManage/dispatch/plan/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 10:55:01', '1', '2024-03-11 11:55:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('7789c3d7444d452c9d4eed3cf6720745', '导出', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:down', '#', '1', '2024-03-25 16:16:12', '', '2024-03-25 16:16:12', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('778aa09ec6b94350a38b114b3249cb8f', '编辑', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:edit', '#', '1', '2024-03-25 15:48:00', '', '2024-03-25 15:48:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('77a5de4ee8fd4e5484b6d96667fd7c6a', '堤防测报管理', 'a382ef796b234538a18a30cac8b8ec69', 0, 'testReportManage', 'dike/runManage/waterRainReport/testReportManage/index', 1, 'C', '0', '0', '', 'cascader', '1', '2024-02-04 10:18:15', '1', '2024-03-04 14:11:29', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('78a92540a49e4199b8b87f748a8bf54f', '办法项目配置项配置', '00ac3d79c1ee4993a415e6f793df1593', 1, 'methodsItemsDetails', 'sluice/runManage/supervisionInspetion/methodsManage/itemsDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 16:21:31', '1', '2024-03-04 16:21:59', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('792ab4f2e013492196abd4d2df679fd8', '对象配置管理', '26214fe3909d490f90b41a509b4ded96', 1, 'objectManage', 'aiSupervision/waterSetting/objectManage/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-06 15:24:08', '1', '2024-03-29 09:22:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('7e1a4f8d8e2f4c8da0dfcc2606c59d5b', '核查项目详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectItemDetails', 'dike/runManage/dangerWeakProject/inspectItemsSetting/itemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:24:05', '', '2024-03-21 09:24:05', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('7e4624ce1e4d49279a59394decdd28ec', '运行管护', '85664171b34a4a1d87e8677481815b2e', 1, 'runManage', NULL, 1, 'M', '0', '0', NULL, 'bug', '1', '2024-01-16 09:31:25', '', '2024-01-16 09:31:25', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('8098adaf04344108b714e7bb57a09b2b', '水雨情智能分析', 'a382ef796b234538a18a30cac8b8ec69', 2, 'waterRainSmartAnalyse', 'dike/runManage/waterRainReport/smartAnalyse/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-04 14:10:37', '1', '2024-03-14 11:08:48', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('85664171b34a4a1d87e8677481815b2e', '堤防运行管理', '0', 1, 'dike', NULL, 1, 'M', '1', '0', '', 'monitor', '1', '2023-12-31 19:22:25', '1', '2024-02-21 16:59:13', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('88a90a6452fb4af7b070b37b83fb73a4', '新增', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:add', '#', '1', '2024-03-25 15:54:55', '', '2024-03-25 15:54:55', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('89e6e5dde0aa42c4a171a0d665f1a3db', '编辑', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:edit', '#', '1', '2024-03-25 16:20:10', '', '2024-03-25 16:20:10', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('8a2611f560f8481e86dd3e7e2c785b1a', '工程核查', '9643924e57ad464abdfb233614b9a7b5', 1, 'inspectProjects', 'sluice/runManage/dangerWeakProject/inspectProjects/index', 1, 'C', '0', '0', NULL, 'exit-fullscreen', '1', '2024-03-19 15:42:16', '', '2024-03-19 15:42:16', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('8ae9829895a44194a4e5f42979f0bd88', '工程报告', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionProjectReportPage', 'sluice/runManage/supervisionInspetion/projectManage/projectReportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-13 14:44:53', '1', '2024-03-15 10:17:52', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('8cb6efd0c7f8470481501d244cc00b40', '水雨情监测', 'a382ef796b234538a18a30cac8b8ec69', 1, 'waterRainMonitoring', 'dike/runManage/waterRainReport/monitoring/index', 1, 'C', '1', '0', '', '#', '1', '2024-03-04 14:09:38', '1', '2024-03-04 14:12:24', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9084032ec3f1413daf759c0cc38e1083', '图层数据配置', 'cb86824acb9347dbbb0dcd90b5fef391', 0, 'layer-manage', 'aiSupervision/layerManage/index', 1, 'M', '0', '0', '', 'tree-table', '1', '2024-03-06 11:32:08', '1', '2024-03-06 15:28:09', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('93ff2af3fa124749bd21d657f9fa82ad', '核查分组管理', '9643924e57ad464abdfb233614b9a7b5', 0, 'inspectGroup', 'sluice/runManage/dangerWeakProject/inspectGroup/index', 1, 'C', '0', '0', NULL, 'peoples', '1', '2024-03-19 11:24:08', '', '2024-03-19 11:24:08', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('941ec809c7e44f43a5a050c4ae33a646', '新增', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:add', '#', '1', '2024-03-25 16:06:28', '', '2024-03-25 16:06:28', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('958437067f9d45f8988a0a97065525bf', '防治记录', 'f3f80d66ae8643ff8fece7ca493db7b3', 1, 'governanceRecords', 'dike/runManage/pestAnimalControl/governanceRecords/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 11:58:17', '1', '2024-02-22 09:55:15', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('95be40b74cb04133bd114e573a1364cf', '统计分析', '00ac3d79c1ee4993a415e6f793df1593', 2, 'supervisionStatisticAnalysis', 'sluice/runManage/supervisionInspetion/statisticAnalysis/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-14 10:01:48', '1', '2024-03-15 10:19:14', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9643924e57ad464abdfb233614b9a7b5', '病险工程核查', 'a56aab90c27d4d9bb9f896de8e537944', 4, 'dangerWeakProject', 'sluice/runManage/dangerWeakProject/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-03-19 09:35:27', '1', '2024-03-21 09:53:22', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('966888dd429c42ad87810410e045b988', '水闸水雨情测报', 'a56aab90c27d4d9bb9f896de8e537944', 2, 'waterRainReport', 'sluice/runManage/waterRainReport/index', 1, 'M', '0', '0', '', 'international', '1', '2024-02-04 13:57:15', '1', '2024-02-04 14:00:40', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('972bb0e3caff4e3b850f4d634cc1950d', '害堤防治管理', 'f3f80d66ae8643ff8fece7ca493db7b3', 0, 'controlManage', 'dike/runManage/pestAnimalControl/controlManage/index', 1, 'C', '0', '0', '', 'bug', '1', '2024-02-22 09:54:24', '1', '2024-02-22 09:56:32', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9825a6decd54473d89f9018a88536b64', '删除', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:delete', '#', '1', '2024-03-25 16:29:50', '', '2024-03-25 16:29:50', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('98e4ee10e7a8422a8283ecc8764cbcf1', '核查填报', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectFillReport', 'sluice/runManage/dangerWeakProject/inspectProjects/fillReport', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-20 15:18:30', '', '2024-03-20 15:18:30', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9a2d3f85e57045b388c2920fa0d12865', '核查报告详情', '26db00db08f940758527b9a9b99ab387', 3, 'inspectReportPage', 'dike/runManage/dangerWeakProject/inspectReport/reportPage', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-21 09:26:35', '', '2024-03-21 09:26:35', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9a725e61d2fe4c70887c7c50e0cf9dd0', '查看', 'bf67c547f2824a74b15c80386ab5181c', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:report:view', '#', '1', '2024-03-25 16:28:49', '', '2024-03-25 16:28:49', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9ab0791b65c64b189158a1a0098c8244', '水闸巡查管理', 'bc79940eb32443fea3ac016fd224de0a', 2, 'patrolManage', 'sluice/runManage/enginerring/patrolManage/index', 1, 'C', '0', '0', '', 'icon-wxjl', '1', '2024-02-01 09:59:21', '1', '2024-02-01 10:35:38', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9d266937ea0b407e84fcc3f9c86335a9', '核查任务管理', '26db00db08f940758527b9a9b99ab387', 1, 'inspectTasks', 'dike/runManage/dangerWeakProject/inspectTasks/index', 1, 'C', '0', '0', '', 'documentation', '1', '2024-03-21 09:20:45', '1', '2024-03-21 09:23:12', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('9ec49b88c37845729ca18d924c69bb59', '水闸水雨情智能分析', '966888dd429c42ad87810410e045b988', 2, 'waterRainSmartAnalyse', 'sluice/runManage/waterRainReport/smartAnalyse/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-04 15:37:30', '1', '2024-03-14 11:08:30', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('a382ef796b234538a18a30cac8b8ec69', '水雨情测报', '7e4624ce1e4d49279a59394decdd28ec', 2, 'waterRainReport', 'dike/runManage/waterRainReport/index', 1, 'M', '0', '0', '', 'international', '1', '2024-02-04 10:09:33', '1', '2024-02-04 10:15:15', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('a4e2592fd2b84ac5beee5f706366c789', '预览', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:view', '#', '1', '2024-03-25 16:17:07', '', '2024-03-25 16:17:07', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('a56aab90c27d4d9bb9f896de8e537944', '运行管护', '4820885a4cca4930872d7d7caeb2d802', 1, 'runManage', '', 1, 'M', '0', '0', '', 'swagger', '1', '2024-01-15 16:29:14', '1', '2024-01-16 17:18:13', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('a6b7f717b0af4076963b023e05b837a4', '路线配置', 'f6f3db8b9a71461487c1d366d5d2e6ba', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:records:trace:view', '#', '1', '2024-03-25 15:50:56', '', '2024-03-25 15:50:56', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('a8916d38e7314dda91df47f39c86ed48', '巡查计划新增/编辑', 'd829361aed664acdbaab128c89a6ec7c', 4, 'createInspectionPlan', 'dike/runManage/enginerring/inspectionPlan/CreateInspectionPlan', 1, 'C', '1', '0', NULL, '#', '1', '2024-06-04 21:02:48', '', '2024-06-04 21:02:48', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('aa4e642f4b004241807d622f901d9540', '堤防动态监测', '4662f7d0af464f93873e9ebdfbb65595', 0, 'dike', 'dike/runManage/monitoring/dike/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-03-15 10:17:22', '', '2024-03-15 10:17:22', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('aa8dfb9b75d444d4900dc078bb7141d9', '核查任务详情', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectTaskDetails', 'sluice/runManage/dangerWeakProject/inspectTasks/taskDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-19 16:38:37', '', '2024-03-19 16:38:37', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('abe830193d8e425c8fff4bd73f28b442', '统计分析', '26db00db08f940758527b9a9b99ab387', 3, 'inspectStatistics', 'dike/runManage/dangerWeakProject/inspectStatistics/index', 1, 'C', '0', '0', NULL, 'chart', '1', '2024-03-21 14:33:07', '', '2024-03-21 14:33:07', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ae5a74c25be942669cb148951140aedf', '工程核查', '26db00db08f940758527b9a9b99ab387', 1, 'inspectProjects', 'dike/runManage/dangerWeakProject/inspectProjects/index', 1, 'C', '0', '0', NULL, 'icon-wxyh', '1', '2024-03-21 09:21:43', '', '2024-03-21 09:21:43', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('b0e0261bbb954af3af1aa453a757c865', '新增', '93ff2af3fa124749bd21d657f9fa82ad', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:group:add', '#', '1', '2024-03-25 16:24:16', '', '2024-03-25 16:24:16', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('b458e62fb98c4ebf82b8e5e01b7276d7', '核查填报', '26db00db08f940758527b9a9b99ab387', 3, 'inspectFillReport', 'dike/runManage/dangerWeakProject/inspectProjects/fillReport', 1, 'C', '1', '0', '', '#', '1', '2024-03-21 09:27:46', '1', '2024-06-18 17:55:19', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('b6219e0f288b49429ddc41ff0d0c9894', '编辑', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:edit', '#', '1', '2024-03-25 16:06:50', '', '2024-03-25 16:06:50', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ba5fc3168e8045c7bb77d446657db76a', '路线设置', 'd829361aed664acdbaab128c89a6ec7c', 0, 'createRoutePage', 'dike/runManage/enginerring/inspectionRouteManage/CreateRoutePage', 1, 'C', '1', '0', '', '#', '1', '2024-05-31 15:33:46', '1', '2024-05-31 15:38:34', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('bb937859509240d4b7002b0b37db0ed4', '查询分析', '6956f7271aa449aebaafb7cc8a8479da', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:yq:analyse:view', '#', '1', '2024-03-25 16:11:27', '', '2024-03-25 16:11:27', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('bc79940eb32443fea3ac016fd224de0a', '工程巡查', 'a56aab90c27d4d9bb9f896de8e537944', 0, 'enginerring', 'sluice/runManage/enginerring/index', 1, 'M', '0', '0', '', 'cascader', '1', '2024-01-15 16:38:21', '1', '2024-01-16 11:02:25', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('bda9596e45a14b439b0841d74840da8e', '工程管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionInspetionProjectManage', 'dike/runManage/supervisionInspetion/projectManage/index', 1, 'C', '0', '0', '', 'icon-wxyh', '1', '2024-02-28 16:27:28', '1', '2024-03-18 09:42:27', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('bf67c547f2824a74b15c80386ab5181c', '核查报告管理', '9643924e57ad464abdfb233614b9a7b5', 2, 'inspectReport', 'sluice/runManage/dangerWeakProject/inspectReport/index', 1, 'C', '0', '0', NULL, 'education', '1', '2024-03-20 16:33:00', '', '2024-03-20 16:33:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('c46a2c8204904d208b3c524cf698732c', '计划查看', '9ab0791b65c64b189158a1a0098c8244', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:view', '#', '1', '2024-03-25 15:44:45', '', '2024-03-25 15:44:45', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('c5687c7772804e328a7175605d28dff9', '编辑', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:edit', '#', '1', '2024-03-25 16:26:29', '', '2024-03-25 16:26:29', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('c81127b578874a93a7d739d70f10427d', '编辑', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:edit', '#', '1', '2024-03-25 16:30:14', '', '2024-03-25 16:30:14', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('c825178955e4420a94238005a54ac084', '记录查看', '364f425d93344ffa890c5ec185c28c49', 1, '', NULL, 1, 'F', '0', '0', 'df:run:main:record:view', '#', '1', '2024-03-25 11:57:40', '', '2024-03-25 11:57:40', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('c85c1d9751174b4ba7b9284d0751dcd7', '查看记录', '29a31582ce3147449b6c0d6718f00d38', 1, '', NULL, 1, 'F', '0', '0', 'df:run:main:record:view', '#', '1', '2024-03-25 13:45:41', '', '2024-03-25 13:45:41', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ca47797137ed4ed0b6498d96970b548e', '删除', '54651202e2a24408a5134bea8bf76ea9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:group:delete', '#', '1', '2024-03-25 15:24:52', '1', '2024-03-25 15:28:00', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('cb86824acb9347dbbb0dcd90b5fef391', '智能监管', '0', 1, 'aiSupervision', 'aiSupervision/index', 1, 'M', '1', '0', '', 'example', '1', '2024-03-06 11:30:58', '1', '2024-03-29 09:22:19', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('cbcd7d8d4c104e2db1b8d64136b6a739', '编辑', '313252ed616148be88f072f65b8a60b2', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:item:edit', '#', '1', '2024-03-25 15:40:27', '1', '2024-03-25 15:41:07', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ce1ed0f3bb5a44079a530c99efc05387', '添加', '25adc36ec2c74f02a84d23a40012734c', 1, '', NULL, 1, 'F', '0', '0', 'df:run:sup:meth:add', '#', '1', '2024-03-25 14:48:17', '', '2024-03-25 14:48:17', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('cecc46d35c014cb9b0eec5243bdd3783', '巡查路线设置', 'd829361aed664acdbaab128c89a6ec7c', 3, 'patrolRouteSettings', 'dike/runManage/enginerring/patrolRouteSettings/index', 1, 'C', '1', '0', '', '#', '1', '2024-01-16 10:49:29', '1', '2024-01-16 17:04:48', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('cfb9c2e63e5f4fee99a6c5830583b771', '办法详情', 'ae58fd1b4e57475eb740598f0c7c44c2', 5, 'methodManageDetails', 'dike/runManage/supervisionInspetion/methodsManage/details', 1, 'C', '1', '0', '', '#', '1', '2024-02-29 10:38:15', '1', '2024-03-18 09:42:50', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d06b747a25a0495bb52a56fd66e6fba0', '配置', '3e82ff82619048c3af822e81f1dc8d42', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:meth:config', '#', '1', '2024-03-25 16:15:50', '', '2024-03-25 16:15:50', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d451221982b84978ac0060df4626e690', '工程报告', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionProjectReportPage', 'dike/runManage/supervisionInspetion/projectManage/projectReportPage', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 10:23:34', '1', '2024-03-18 09:42:34', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d53a5d18f41a4a439a7fa686b90e54dc', '资源目录详情', '26214fe3909d490f90b41a509b4ded96', 1, 'resourceDetails', 'aiSupervision/layerManage/resource/LayerDetails', 1, 'M', '1', '0', NULL, '#', '1', '2024-03-12 17:45:36', '', '2024-03-12 17:45:36', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d58ddc56b664431cadaa1aa9537b8f2d', '新增', '57f194c1c0544120b2ec9ee358fe0bd3', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:jc:task:add', '#', '1', '2024-03-25 16:26:45', '', '2024-03-25 16:26:45', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d78d4f1310304af2b5bee747252de8d6', '编辑按钮', '09b65d8be95942d1af76848bdcce964d', 1, '', NULL, 1, 'F', '0', '0', 'df:run:checking:item:edit', '#', '1', '2024-03-23 19:04:35', '', '2024-03-23 19:04:35', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d829361aed664acdbaab128c89a6ec7c', '工程巡检', '7e4624ce1e4d49279a59394decdd28ec', 0, 'enginerring', 'dike/runManage/enginerring/index', 1, 'M', '0', '0', '', 'icon-wxjl', '1', '2024-01-16 09:33:36', '1', '2024-01-16 17:03:56', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('d919edf1156e4eb28c54a1012fa6fff5', '预览', '25adc36ec2c74f02a84d23a40012734c', 1, '', NULL, 1, 'F', '0', '0', 'df:run:sup:meth:view', '#', '1', '2024-03-25 14:50:58', '', '2024-03-25 14:50:58', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('dba71e7708a14376a5add791fb92bc6e', '查看记录', '77a5de4ee8fd4e5484b6d96667fd7c6a', 1, '', NULL, 1, 'F', '0', '0', 'df:run:yq:record:view', '#', '1', '2024-03-25 13:50:02', '', '2024-03-25 13:50:02', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('dcd64edc17294f66b21332bcee1b06b6', '删除', '9d266937ea0b407e84fcc3f9c86335a9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:task:delete', '#', '1', '2024-03-25 15:29:05', '', '2024-03-25 15:29:05', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('dce5c717ecaf475ea71ca2d095232ec7', '编辑', '038691476a374368ac1934371a22ed2d', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:plan:edit', '#', '1', '2024-03-25 15:55:11', '', '2024-03-25 15:55:11', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('de63aa1e3a0e43aea22168b8308df420', '添加', 'ebf0a83ac12b4611b8b04e5bfe35d9a1', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:sup:task:add', '#', '1', '2024-03-25 16:19:51', '', '2024-03-25 16:19:51', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e114418c38a141abbe5eaceb7b66f970', '编辑', '54651202e2a24408a5134bea8bf76ea9', 1, '', NULL, 1, 'F', '0', '0', 'df:run:jc:group:edit', '#', '1', '2024-03-25 15:24:36', '1', '2024-03-25 15:28:07', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e2af6c74c8b1427f83ddb23b888769be', '核查项目详情', '9643924e57ad464abdfb233614b9a7b5', 2, 'inspectItemDetails', 'sluice/runManage/dangerWeakProject/inspectItemsSetting/itemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-19 10:34:42', '', '2024-03-19 10:34:42', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e2c98afed5b1483382ef75680594c7f0', '四预管理', 'cb86824acb9347dbbb0dcd90b5fef391', 3, 'four-predictions', 'aiSupervision/fourPredictions/index', 1, 'M', '0', '0', '', 'dashboard', '1', '2024-03-06 11:39:29', '1', '2024-03-06 14:39:06', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e6abdf4e22284f279dc6d9b4a4e2a063', '记录查看', '972bb0e3caff4e3b850f4d634cc1950d', 1, '', NULL, 1, 'F', '0', '0', 'df:run:fz:record:view', '#', '1', '2024-03-25 13:53:20', '1', '2024-03-25 13:59:40', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e6d27d32dfbe4201ac7ea1036d05494e', '查看', 'f3e4f97a9aa8493892e8fbb3eeaa0efe', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:view', '#', '1', '2024-03-25 15:59:03', '', '2024-03-25 15:59:03', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e89e05acd8844741a95c5d95fd4d6991', '堤防动态监测历史记录', '4662f7d0af464f93873e9ebdfbb65595', 2, 'record', 'dike/runManage/monitoring/dike/record/index', 1, 'C', '0', '0', '', '#', '1', '2024-03-15 10:19:11', '1', '2024-03-15 11:32:24', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e92cae0b06d242c4aa5bfc41d7c3c26c', '记录查看', 'f512341df2a8454e830fd2635e34b1bb', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:main:record:view', '#', '1', '2024-03-25 15:53:12', '', '2024-03-25 15:53:12', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('e94a0222f17641fd9a27b5ba332076d4', '核查报告', '26db00db08f940758527b9a9b99ab387', 2, 'inspectReport', 'dike/runManage/dangerWeakProject/inspectReport/index', 1, 'C', '0', '0', NULL, 'education', '1', '2024-03-21 09:22:55', '', '2024-03-21 09:22:55', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('eb97a907232740c4b1a1ebd50cf1181a', '工程上报', 'ae58fd1b4e57475eb740598f0c7c44c2', 2, 'supervisionProjectReport', 'dike/runManage/supervisionInspetion/projectManage/projectReport', 1, 'C', '1', '0', '', '#', '1', '2024-03-15 10:22:17', '1', '2024-03-18 09:42:38', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ebf0a83ac12b4611b8b04e5bfe35d9a1', '任务管理', '00ac3d79c1ee4993a415e6f793df1593', 0, 'supervisionTasksManage', 'sluice/runManage/supervisionInspetion/tasksManage/index', 1, 'C', '0', '0', '', 'drag', '1', '2024-03-11 11:15:45', '1', '2024-03-15 10:17:22', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ebfbabbfc44f45deb4f77c2a80af1a13', '水闸动态监测管理', '06d65eac04b24c82b8b9b6512ddbd6ad', 1, 'manage', 'sluice/runManage/monitoring/sluice/manage/index', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-11 11:09:11', '', '2024-03-11 11:09:11', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ecb557f1429d4e7a894fc686f6ba2dcd', '办法详情', '00ac3d79c1ee4993a415e6f793df1593', 4, 'methodManageDetails', 'sluice/runManage/supervisionInspetion/methodsManage/details', 1, 'C', '1', '0', '', '#', '1', '2024-03-05 10:27:59', '1', '2024-03-15 10:19:20', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ed5a2ce0d47f4389bfb1e2eae3c23dc9', '巡查记录新增/编辑', 'd829361aed664acdbaab128c89a6ec7c', 5, 'CreateInspectionRecords', 'dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords', 1, 'C', '1', '0', NULL, '#', '1', '2024-06-05 09:18:23', '', '2024-06-05 09:18:23', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f28fcf9e797440158cc24ba05060327b', '新增', '0c6db2ab60f44f3e9aed1cf86ef457fa', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:add', '#', '1', '2024-03-25 16:30:36', '', '2024-03-25 16:30:36', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f3e4f97a9aa8493892e8fbb3eeaa0efe', '维修养护记录', '2d26df05dea643b5842ac12e39f25785', 1, 'maintenanceRecords', 'sluice/runManage/maintenance/maintenanceRecords/index', 1, 'C', '1', '0', '', 'checkbox', '1', '2024-01-16 10:20:54', '1', '2024-02-28 11:38:08', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f3f80d66ae8643ff8fece7ca493db7b3', '害堤动物防治', '7e4624ce1e4d49279a59394decdd28ec', 2, 'pestAnimalControl', 'dike/runManage/pestAnimalControl/index', 1, 'M', '0', '0', '', 'bug', '1', '2024-01-16 11:54:32', '1', '2024-01-16 17:04:14', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f4d04537753644f2bb81eb5729814031', '删除', '773200b686d14ed3bdc4f0486229547f', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:du:plan:delete', '#', '1', '2024-03-25 16:07:05', '', '2024-03-25 16:07:05', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f512341df2a8454e830fd2635e34b1bb', '维修养护管理', '2d26df05dea643b5842ac12e39f25785', 0, 'maintenanceManage', 'sluice/runManage/maintenance/maintenanceManage/index', 1, 'C', '0', '0', NULL, '#', '1', '2024-02-28 11:37:48', '', '2024-02-28 11:37:48', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f53483a7234e4be2908ba8122d1a147c', '删除', '1cd0041896bd41dcac9e1cd6d203ccbc', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:checking:plan:delete', '#', '1', '2024-03-25 15:48:15', '', '2024-03-25 15:48:15', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f5597866cbda457d8966e97e7aa0a15c', '巡查项详情', 'd829361aed664acdbaab128c89a6ec7c', 1, 'inspectionItemDetails', 'dike/runManage/enginerring/inspectionItems/inspectionItemDetails', 1, 'C', '1', '0', NULL, '#', '1', '2024-03-18 14:08:37', '', '2024-03-18 14:08:37', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f6f3db8b9a71461487c1d366d5d2e6ba', '巡查记录', 'bc79940eb32443fea3ac016fd224de0a', 2, 'inspectionRecords', 'sluice/runManage/enginerring/inspectionRecords/index', 1, 'C', '1', '0', '', 'documentation', '1', '2024-01-16 10:04:51', '1', '2024-02-01 14:43:18', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f7363d3c7c134b408a6f67a2698d15cd', '查看', 'ebfbabbfc44f45deb4f77c2a80af1a13', 1, '', NULL, 1, 'F', '0', '0', 'sz:run:dtjc:view', '#', '1', '2024-03-25 16:33:23', '', '2024-03-25 16:33:23', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f776499a2d70446dbd31c5aff7ebdc0b', '问题管理', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionQuestionManage', 'sluice/runManage/supervisionInspetion/questionManage/index', 1, 'C', '0', '0', '', 'documentation', '1', '2024-03-13 17:03:31', '1', '2024-03-15 10:17:57', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f777cec3473045b6b11871539232ab79', '确认', '958437067f9d45f8988a0a97065525bf', 1, '', NULL, 1, 'F', '0', '0', 'df:run:fz:record:confirm', '#', '1', '2024-03-25 13:57:46', '', '2024-03-25 13:57:46', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f90eb9f2c7c44413872499de126aa99d', '任务详情', '00ac3d79c1ee4993a415e6f793df1593', 1, 'supervisionTasksDetails', 'sluice/runManage/supervisionInspetion/tasksManage/tasksDetails', 1, 'C', '1', '0', '', '#', '1', '2024-03-11 11:29:20', '1', '2024-03-15 10:18:03', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('f96dbc80be5e446397a3c940b1c963b4', '任务管理', 'ae58fd1b4e57475eb740598f0c7c44c2', 1, 'tasksManage', 'dike/runManage/supervisionInspetion/tasksManage/index', 1, 'C', '0', '0', '', 'log', '1', '2024-02-28 15:08:21', '1', '2024-03-18 09:42:19', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('fc2598ec4cd24788a33385bb342271f4', '巡查路线设置', 'bc79940eb32443fea3ac016fd224de0a', 0, 'patrolRouteSettings', 'sluice/runManage/enginerring/patrolRouteSettings/index', 1, 'C', '1', '0', '', 'guide', '1', '2024-01-16 10:06:14', '1', '2024-01-16 18:34:18', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('fe97025934b64dd5b45e35d92bfac1f2', '巡查记录', 'd829361aed664acdbaab128c89a6ec7c', 2, 'inspectionRecords', 'dike/runManage/enginerring/inspectionRecords/index', 1, 'C', '0', '0', '', 'excel', '1', '2024-01-16 09:51:56', '1', '2024-05-28 15:50:28', '', NULL); +INSERT IGNORE INTO sys_menu +(id, menu_name, parent_id, order_num, `path`, component, is_frame, menu_type, visible, status, perms, icon, create_uid, create_time, update_uid, update_time, remark, parent_name) +VALUES('ff98c8675e57413d965d5408fe5ee5c1', '统计分析', '9643924e57ad464abdfb233614b9a7b5', 3, 'inspectStatistics', 'sluice/runManage/dangerWeakProject/inspectStatistics/index', 1, 'C', '0', '0', '', 'chart', '1', '2024-03-21 14:01:01', '1', '2024-03-21 14:13:20', '', NULL); diff --git a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql index 80922e99..3d7b86a7 100644 --- a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql +++ b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql @@ -1,8 +1,4 @@ SET NAMES utf8mb4; -ALTER TABLE `bs_sgc_df_xsjh` MODIFY COLUMN XC_ID int NULL COMMENT '巡查ID'; - -ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称'; -ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_TYPE` int COMMENT '堤防类型'; CREATE TABLE `bs_sgc_df_xslx` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查路线查编号', @@ -21,10 +17,15 @@ CREATE TABLE `bs_sgc_df_xslx` ( PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查路线表'; +ALTER TABLE `bs_sgc_df_xsjh` MODIFY COLUMN XC_ID int NULL COMMENT '巡查ID'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `DIKE_TYPE` int COMMENT '堤防类型'; ALTER TABLE `bs_sgc_df_xsjh` ADD `STATUS` int NOT NULL COMMENT '状态'; ALTER TABLE `bs_sgc_df_xsjh` ADD `START_DATE` datetime DEFAULT NULL COMMENT '计划开始时间'; ALTER TABLE `bs_sgc_df_xsjh` ADD `END_DATE` datetime DEFAULT NULL COMMENT '计划结束时间'; +ALTER TABLE `bs_sgc_df_xsjhzx` ADD `SUB_PLAN_ID` int NOT NULL COMMENT '巡查子计划ID'; + ALTER TABLE `bs_sgc_df_xsjhjl` ADD `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '计划名称'; ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SUB_PLAN_ID` int COMMENT '子计划ID'; ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SUB_PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '子计划名称'; @@ -45,7 +46,6 @@ ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_TIME` datetime DEFAULT NULL COMMENT ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片'; ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `HANDLE_CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '处置描述'; -ALTER TABLE `bs_sgc_df_xsjhzx` ADD `SUB_PLAN_ID` int NOT NULL COMMENT '巡查子计划ID'; CREATE TABLE `bs_sgc_df_xsjhxq` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡查计划内容编号', From 35f1ff42d0861dba8bca27a8bdbaa104b986eb04 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 18 Jun 2024 19:31:40 +0800 Subject: [PATCH 42/43] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/sy/v1.3.0/全量脚本/dict.sql | 16 +++++++++++++++- sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sql/sy/v1.3.0/全量脚本/dict.sql b/sql/sy/v1.3.0/全量脚本/dict.sql index d83eab57..5f5db6d8 100644 --- a/sql/sy/v1.3.0/全量脚本/dict.sql +++ b/sql/sy/v1.3.0/全量脚本/dict.sql @@ -462,4 +462,18 @@ INSERT INTO sys_dict_data VALUES('f9211c12968d44e19b879f2f6e3d6d76', 0, '监控显示器', 'sz_xs_c_1_1_6', 'sz_xs_c_1_1', NULL, NULL, 'N', '0', '1', '2024-03-18 20:46:04', '1', '2024-03-18 20:46:04', NULL); INSERT INTO sys_dict_data (id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) -VALUES('ffef3d1a2ddb452c9010ffa7e9595ddd', 0, '设备接地', 'sz_xs_c_0_0_4', 'sz_xs_c_0_0', NULL, NULL, 'N', '0', '1', '2024-03-18 18:07:08', '1', '2024-03-18 18:07:08', NULL); \ No newline at end of file +VALUES('ffef3d1a2ddb452c9010ffa7e9595ddd', 0, '设备接地', 'sz_xs_c_0_0_4', 'sz_xs_c_0_0', NULL, NULL, 'N', '0', '1', '2024-03-18 18:07:08', '1', '2024-03-18 18:07:08', NULL); + +INSERT INTO sys_dict_type +(id, dict_name, dict_type, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('b9e7401112fd4702b50a41952d55e9e7', '巡查记录隐患状态', 'xs_record_dag_status', '0', '1', '2024-06-18 16:10:01', '1', '2024-06-18 16:10:01', NULL); + +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('ced062fe6ec042dabc6c409000113e4f', 0, '已处置', '2', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:48', '1', '2024-06-18 16:10:48', NULL); +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('21f6215fbf514f1eba9b80ff2b17f704', 0, '未处置', '1', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:34', '1', '2024-06-18 16:10:34', NULL); +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('3fa63a6a55df49f8ad60b18362767d42', 0, '无异常', '0', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:22', '1', '2024-06-18 16:10:22', NULL); \ No newline at end of file diff --git a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql index 3d7b86a7..fc7f09ee 100644 --- a/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql +++ b/sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql @@ -87,3 +87,16 @@ ALTER TABLE `MS_DSM_ENV` MODIFY COLUMN MPCD varchar(20) CHARACTER SET utf8mb4 C ALTER TABLE `MS_DSM_GSTMONREC` MODIFY COLUMN MPCD varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '测点编号'; ALTER TABLE `MS_DSM_OSSMONREC` MODIFY COLUMN MPCD varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '测点编号'; +INSERT INTO sys_dict_type +(id, dict_name, dict_type, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('b9e7401112fd4702b50a41952d55e9e7', '巡查记录隐患状态', 'xs_record_dag_status', '0', '1', '2024-06-18 16:10:01', '1', '2024-06-18 16:10:01', NULL); + +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('ced062fe6ec042dabc6c409000113e4f', 0, '已处置', '2', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:48', '1', '2024-06-18 16:10:48', NULL); +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('21f6215fbf514f1eba9b80ff2b17f704', 0, '未处置', '1', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:34', '1', '2024-06-18 16:10:34', NULL); +INSERT INTO sys_dict_data +(id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_uid, create_time, update_uid, update_time, remark) +VALUES('3fa63a6a55df49f8ad60b18362767d42', 0, '无异常', '0', 'xs_record_dag_status', NULL, NULL, 'N', '0', '1', '2024-06-18 16:10:22', '1', '2024-06-18 16:10:22', NULL); \ No newline at end of file From 8b4b2bf9921c1a89e6ada8f608aaff3dac7abf84 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 19 Jun 2024 14:54:45 +0800 Subject: [PATCH 43/43] =?UTF-8?q?feat:=20=E8=AE=A1=E5=88=92=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=A1=A5=E5=85=85=E8=B7=AF=E7=BA=BF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuili/common/core/redis/RedisCache.java | 440 +++++++++--------- .../common/core/service/BaseService.java | 66 +-- .../yxgh/df/dto/DfCheckingPlanContentDto.java | 3 + .../com/kms/yxgh/df/dto/DfPlanSearchDto.java | 3 + .../com/kms/yxgh/df/dto/DfPlanSimpleDto.java | 6 + .../com/kms/yxgh/df/mapper/DfPlanMapper.java | 14 +- .../kms/yxgh/df/service/DfPlanService.java | 13 +- 7 files changed, 293 insertions(+), 252 deletions(-) diff --git a/shuili-framework/src/main/java/com/shuili/common/core/redis/RedisCache.java b/shuili-framework/src/main/java/com/shuili/common/core/redis/RedisCache.java index 8012ae4d..0537ec89 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/redis/RedisCache.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/redis/RedisCache.java @@ -18,227 +18,229 @@ import java.util.concurrent.TimeUnit; * * @author shuili **/ -@SuppressWarnings(value = { "unchecked", "rawtypes" }) +@SuppressWarnings(value = {"unchecked", "rawtypes"}) @Component public class RedisCache { - @Autowired - public RedisTemplate redisTemplate; - - @Value("${shuili.nameKey}") - private String REDIS_PREFIX; - - - /** - * 缓存基本的对象，Integer、String、实体类等 - * - * @param key 缓存的键值 - * @param value 缓存的值 - */ - public void setCacheObject(final String key, final T value) { - redisTemplate.opsForValue().set(REDIS_PREFIX+"_"+key, value); - } - - /** - * 缓存基本的对象，Integer、String、实体类等 - * - * @param key 缓存的键值 - * @param value 缓存的值 - * @param timeout 时间 - * @param timeUnit 时间颗粒度 - */ - public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) { - redisTemplate.opsForValue().set(REDIS_PREFIX+"_"+key, value, timeout, timeUnit); - } - - public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) { - redisTemplate.opsForValue().set(REDIS_PREFIX+"_"+key, value, timeout, timeUnit); - } - - /** - * 设置有效时间 - * - * @param key Redis键 - * @param timeout 超时时间 - * @return true=设置成功；false=设置失败 - */ - public boolean expire(final String key, final long timeout) { - return expire(REDIS_PREFIX+"_"+key, timeout, TimeUnit.SECONDS); - } - - /** - * 获取有效时间 - * - * @param key - * @return - */ - public long getExpire(final String key) { - return redisTemplate.getExpire(REDIS_PREFIX+"_"+key); - } - - /** - * 设置有效时间 - * - * @param key Redis键 - * @param timeout 超时时间 - * @param unit 时间单位 - * @return true=设置成功；false=设置失败 - */ - public boolean expire(final String key, final long timeout, final TimeUnit unit) { - return redisTemplate.expire(REDIS_PREFIX+"_"+key, timeout, unit); - } - - /** - * 获得缓存的基本对象。 - * - * @param key 缓存键值 - * @return 缓存键值对应的数据 - */ - public T getCacheObject(final String key) { - ValueOperations operation = redisTemplate.opsForValue(); - return operation.get(REDIS_PREFIX+"_"+key); - } - public T getCacheObject(final String key,Class c) { - ValueOperations operation = redisTemplate.opsForValue(); - return operation.get(REDIS_PREFIX+"_"+key); - } - - /** - * 删除单个对象 - * - * @param key - */ - public boolean deleteObject(final String key) { - return redisTemplate.delete(REDIS_PREFIX+"_"+key); - } - - /** - * 删除集合对象 - * - * @param collection 多个对象 - * @return - */ - public long deleteObject(final Collection collection) { - return redisTemplate.delete(collection); - } - - /** - * 缓存List数据 - * - * @param key 缓存的键值 - * @param dataList 待缓存的List数据 - * @return 缓存的对象 - */ - public long setCacheList(final String key, final List dataList) { - Long count = redisTemplate.opsForList().rightPushAll(REDIS_PREFIX+"_"+key, dataList); - return count == null ? 0 : count; - } - - /** - * 获得缓存的list对象 - * - * @param key 缓存的键值 - * @return 缓存键值对应的数据 - */ - public List getCacheList(final String key) { - return redisTemplate.opsForList().range(REDIS_PREFIX+"_"+key, 0, -1); - } - - /** - * 缓存Set - * - * @param key 缓存键值 - * @param dataSet 缓存的数据 - * @return 缓存数据的对象 - */ - public long setCacheSet(final String key, final Set dataSet) { + @Autowired + public RedisTemplate redisTemplate; + + @Value("${shuili.nameKey}") + private String REDIS_PREFIX; + + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + */ + public void setCacheObject(final String key, final T value) { + redisTemplate.opsForValue().set(REDIS_PREFIX + "_" + key, value); + } + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + * @param timeout 时间 + * @param timeUnit 时间颗粒度 + */ + public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) { + redisTemplate.opsForValue().set(REDIS_PREFIX + "_" + key, value, timeout, timeUnit); + } + + public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) { + redisTemplate.opsForValue().set(REDIS_PREFIX + "_" + key, value, timeout, timeUnit); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @return true=设置成功；false=设置失败 + */ + public boolean expire(final String key, final long timeout) { + return expire(REDIS_PREFIX + "_" + key, timeout, TimeUnit.SECONDS); + } + + /** + * 获取有效时间 + * + * @param key + * @return + */ + public long getExpire(final String key) { + return redisTemplate.getExpire(REDIS_PREFIX + "_" + key); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @param unit 时间单位 + * @return true=设置成功；false=设置失败 + */ + public boolean expire(final String key, final long timeout, final TimeUnit unit) { + return Boolean.TRUE.equals(redisTemplate.expire(REDIS_PREFIX + "_" + key, timeout, unit)); + } + + /** + * 获得缓存的基本对象。 + * + * @param key 缓存键值 + * @return 缓存键值对应的数据 + */ + public T getCacheObject(final String key) { + ValueOperations operation = redisTemplate.opsForValue(); + return operation.get(REDIS_PREFIX + "_" + key); + } + + public T getCacheObject(final String key, Class c) { + ValueOperations operation = redisTemplate.opsForValue(); + return operation.get(REDIS_PREFIX + "_" + key); + } + + /** + * 删除单个对象 + * + * @param key + */ + public boolean deleteObject(final String key) { + return Boolean.TRUE.equals(redisTemplate.delete(REDIS_PREFIX + "_" + key)); + } + + /** + * 删除集合对象 + * + * @param collection 多个对象 + * @return + */ + public long deleteObject(final Collection collection) { + return redisTemplate.delete(collection); + } + + /** + * 缓存List数据 + * + * @param key 缓存的键值 + * @param dataList 待缓存的List数据 + * @return 缓存的对象 + */ + public long setCacheList(final String key, final List dataList) { + Long count = redisTemplate.opsForList().rightPushAll(REDIS_PREFIX + "_" + key, dataList); + return count == null ? 0 : count; + } + + /** + * 获得缓存的list对象 + * + * @param key 缓存的键值 + * @return 缓存键值对应的数据 + */ + public List getCacheList(final String key) { + return redisTemplate.opsForList().range(REDIS_PREFIX + "_" + key, 0, -1); + } + + /** + * 缓存Set + * + * @param key 缓存键值 + * @param dataSet 缓存的数据 + * @return 缓存数据的对象 + */ + public long setCacheSet(final String key, final Set dataSet) { // redisTemplate.opsForSet() - Long count = redisTemplate.opsForSet().add(REDIS_PREFIX+"_"+key, dataSet); - return count == null ? 0 : count; - } - public long setCacheSet(final String key, final Set dataSet,int time,TimeUnit t) { - - Long count = redisTemplate.opsForSet().add(REDIS_PREFIX+"_"+key, dataSet,time,t); - return count == null ? 0 : count; - } - - /** - * 获得缓存的set - * - * @param key - * @return - */ - public Set getCacheSet(final String key) { - return redisTemplate.opsForSet().members(REDIS_PREFIX+"_"+key); - } - - /** - * 缓存Map - * - * @param key - * @param dataMap - */ - public void setCacheMap(final String key, final Map dataMap) { - if (dataMap != null) { - redisTemplate.opsForHash().putAll(REDIS_PREFIX+"_"+key, dataMap); - } - } - - /** - * 获得缓存的Map - * - * @param key - * @return - */ - public Map getCacheMap(final String key) { - return redisTemplate.opsForHash().entries(REDIS_PREFIX+"_"+key); - } - - /** - * 往Hash中存入数据 - * - * @param key Redis键 - * @param hKey Hash键 - * @param value 值 - */ - public void setCacheMapValue(final String key, final String hKey, final T value) { - redisTemplate.opsForHash().put(REDIS_PREFIX+"_"+key, hKey, value); - } - - /** - * 获取Hash中的数据 - * - * @param key Redis键 - * @param hKey Hash键 - * @return Hash中的对象 - */ - public T getCacheMapValue(final String key, final String hKey) { - HashOperations opsForHash = redisTemplate.opsForHash(); - return opsForHash.get(REDIS_PREFIX+"_"+key, hKey); - } - - /** - * 获取多个Hash中的数据 - * - * @param key Redis键 - * @param hKeys Hash键集合 - * @return Hash对象集合 - */ - public List getMultiCacheMapValue(final String key, final Collection hKeys) { - return redisTemplate.opsForHash().multiGet(REDIS_PREFIX+"_"+key, hKeys); - } - - /** - * 获得缓存的基本对象列表 - * - * @param pattern 字符串前缀 - * @return 对象列表 - */ - public Collection keys(final String pattern) { - return redisTemplate.keys(pattern); - } - - public boolean hasKey(String key) { - return redisTemplate.hasKey(REDIS_PREFIX+"_"+key); - } + Long count = redisTemplate.opsForSet().add(REDIS_PREFIX + "_" + key, dataSet); + return count == null ? 0 : count; + } + + public long setCacheSet(final String key, final Set dataSet, int time, TimeUnit t) { + + Long count = redisTemplate.opsForSet().add(REDIS_PREFIX + "_" + key, dataSet, time, t); + return count == null ? 0 : count; + } + + /** + * 获得缓存的set + * + * @param key + * @return + */ + public Set getCacheSet(final String key) { + return redisTemplate.opsForSet().members(REDIS_PREFIX + "_" + key); + } + + /** + * 缓存Map + * + * @param key + * @param dataMap + */ + public void setCacheMap(final String key, final Map dataMap) { + if (dataMap != null) { + redisTemplate.opsForHash().putAll(REDIS_PREFIX + "_" + key, dataMap); + } + } + + /** + * 获得缓存的Map + * + * @param key + * @return + */ + public Map getCacheMap(final String key) { + return redisTemplate.opsForHash().entries(REDIS_PREFIX + "_" + key); + } + + /** + * 往Hash中存入数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @param value 值 + */ + public void setCacheMapValue(final String key, final String hKey, final T value) { + redisTemplate.opsForHash().put(REDIS_PREFIX + "_" + key, hKey, value); + } + + /** + * 获取Hash中的数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @return Hash中的对象 + */ + public T getCacheMapValue(final String key, final String hKey) { + HashOperations opsForHash = redisTemplate.opsForHash(); + return opsForHash.get(REDIS_PREFIX + "_" + key, hKey); + } + + /** + * 获取多个Hash中的数据 + * + * @param key Redis键 + * @param hKeys Hash键集合 + * @return Hash对象集合 + */ + public List getMultiCacheMapValue(final String key, final Collection hKeys) { + return redisTemplate.opsForHash().multiGet(REDIS_PREFIX + "_" + key, hKeys); + } + + /** + * 获得缓存的基本对象列表 + * + * @param pattern 字符串前缀 + * @return 对象列表 + */ + public Collection keys(final String pattern) { + return redisTemplate.keys(pattern); + } + + public boolean hasKey(String key) { + return Boolean.TRUE.equals(redisTemplate.hasKey(REDIS_PREFIX + "_" + key)); + } } diff --git a/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java b/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java index d944a70d..4803f193 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java @@ -21,61 +21,69 @@ import java.util.Objects; /** * 扩展其他的通用方法 + * * @param */ -public class BaseService, T extends BaseEntity> extends ServiceImpl{ +public class BaseService, T extends BaseEntity> extends ServiceImpl { RedisCache redisCache = SpringUtils.getBean(RedisCache.class); - public IPage selectPage(SearchParam sp){ - return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()), BeanToWrapper.getWrapper(sp)); + public IPage selectPage(SearchParam sp) { + return getBaseMapper().selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); } - public AjaxResult selectPage(T t){ + public AjaxResult selectPage(T t) { QueryWrapper wrapper = BeanToWrapper.getWrapper(t); BeanToWrapper.order(wrapper, t); Page> mapPage = getBaseMapper().selectMapsPage(new Page<>(t.getPageNum(), t.getPageSize()), wrapper); AjaxResult success = AjaxResult.success(); - success.put(AjaxResult.DATA_TAG,mapPage.getRecords()); - success.put(AjaxResult.TOTAL,mapPage.getTotal()); + success.put(AjaxResult.DATA_TAG, mapPage.getRecords()); + success.put(AjaxResult.TOTAL, mapPage.getTotal()); return success; } + /** * 同步保存到缓存 + * * @param t * @return */ - public boolean saveWithRedis(T t){ + public boolean saveWithRedis(T t) { boolean save = super.save(t); - if(save){ - redisCache.setCacheObject(getRedisKey()+t.getId(),t); + if (save) { + redisCache.setCacheObject(getRedisKey() + t.getId(), t); } return true; } /** * 同步更新缓存 + * * @param t * @return */ - public boolean updateWithReids(T t){ + public boolean updateWithReids(T t) { boolean result = super.updateById(t); - if(result){ - redisCache.setCacheObject(getRedisKey()+t.getId(),t); + if (result) { + redisCache.setCacheObject(getRedisKey() + t.getId(), t); } return result; } /** * 从缓存中获取对应的数据 + * * @param id * @return */ - public T getWithRedis(Serializable id){ - T cacheObject = redisCache.getCacheObject(getRedisKey()+id.toString(),getEntityClass()); - if(Objects.isNull(cacheObject)){ + public T getWithRedis(Serializable id) { + T cacheObject = redisCache.getCacheObject(getRedisKey() + id.toString(), getEntityClass()); + if (Objects.isNull(cacheObject)) { T byId = getById(id); - redisCache.setCacheObject(getRedisKey()+id.toString(),byId); + if (Objects.isNull(byId)) { + return null; + } + redisCache.setCacheObject(getRedisKey() + id, byId); return byId; } return cacheObject; @@ -84,45 +92,49 @@ public class BaseService, T extends BaseEntity> extends /** * 同步删除redis + * * @return */ - public boolean removeByIdWithRedis(Serializable id){ + public boolean removeByIdWithRedis(Serializable id) { boolean result = super.removeById(id); - if(result){ // 同步删除redis - redisCache.deleteObject(getRedisKey()+id.toString()); + if (result) { // 同步删除redis + redisCache.deleteObject(getRedisKey() + id.toString()); } return result; } /** * 同步删除缓存 + * * @param ids * @return */ - public boolean removeWithRedis(Serializable[] ids){ + public boolean removeWithRedis(Serializable[] ids) { boolean result = removeByIds(Arrays.asList(ids)); - if(result){ + if (result) { for (Serializable id : ids) { - redisCache.deleteObject(getRedisKey()+id.toString()); + redisCache.deleteObject(getRedisKey() + id.toString()); } } return result; } - public boolean removeWithRedis(List ids){ + public boolean removeWithRedis(List ids) { boolean result = removeByIds(ids); - if(result){ + if (result) { for (Serializable id : ids) { - redisCache.deleteObject(getRedisKey()+id.toString()); + redisCache.deleteObject(getRedisKey() + id.toString()); } } return result; } + /** * 工程名+实体类+ id + * * @return */ - public String getRedisKey(){ - return getEntityClass()+"_"; + public String getRedisKey() { + return getEntityClass() + "_"; } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java index 4b125d45..b0f13768 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingPlanContentDto.java @@ -35,6 +35,9 @@ public class DfCheckingPlanContentDto { @ApiModelProperty("巡查路线ID") private String lineId; + @ApiModelProperty("巡查路线名称") + private String lineName; + /** * 计划开始时间 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java index 5914fc3c..e867db1d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java @@ -17,6 +17,9 @@ public class DfPlanSearchDto { private String name; @ApiModelProperty(value = "状态") private String status; + @ApiModelProperty(value = "记录状态") + private String recordStatus; + private String user; @ApiModelProperty(value = "巡查人员id") private List userIds; @ApiModelProperty(value = "开始时间") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java index 683bc70b..de535b0d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSimpleDto.java @@ -44,6 +44,12 @@ public class DfPlanSimpleDto { @ApiModelProperty("状态") private String status; + @ApiModelProperty("记录状态") + private String recordStatus; + + @ApiModelProperty("记录id") + private String recordId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("最近修改时间") private Date updateTime; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java index aca71a10..c9245de0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java @@ -31,7 +31,9 @@ public interface DfPlanMapper extends BaseMapper { "SELECT df.dike_name as dike_name, df.dike_code as dike_code, df.dike_type as dike_type, " + "p.id, p.name, p.type plan_type, p.update_time as update_time, p.create_time as create_time, " + "p.frequency, p.status, p.create_uid as createUid, " + - "(select count(1) from bs_sgc_df_xsjhxq su where su.plan_id = p.id) as item_count " + + "(select count(1) from bs_sgc_df_xsjhxq su where su.plan_id = p.id) as item_count ," + + "(select count(1) from bs_sgc_df_xsjhjl r where p.id = r.plan_id and r.create_uid = #{dto.user} and r.status = '1' order by r.create_time desc limit 1) as record_status, " + + "(select id from bs_sgc_df_xsjhjl r where p.id = r.plan_id and r.create_uid = #{dto.user} and r.status = '1' order by r.create_time desc limit 1) as record_id " + "FROM bs_sgc_df_xsjh p " + "Left JOIN att_dike_base df ON p.dike_code = df.dike_code and df.expr_date is null " + "WHERE 1=1 " + @@ -50,6 +52,16 @@ public interface DfPlanMapper extends BaseMapper { "" + "AND p.end_date <= #{dto.endTime} " + "" + + "" + + " and NOT EXISTS (" + + " SELECT plan_id FROM bs_sgc_df_xsjhjl od WHERE p.id = od.plan_id and od.create_uid = #{dto.user} and od.status = '1'" + + ") " + + "" + + "" + + " and EXISTS (" + + " SELECT plan_id FROM bs_sgc_df_xsjhjl od WHERE p.id = od.plan_id and od.create_uid = #{dto.user} and od.status = '1'" + + ") " + + "" + "" + "AND p.id in (select plan_id from bs_sgc_df_xsjhzx where operator_uid in " + " " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 5bb273ed..4291e4fe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.DfException; import com.kms.yxgh.common.dto.OperatorDto; -import com.kms.yxgh.df.domain.DfCheckingPlanContent; -import com.kms.yxgh.df.domain.DfPlan; -import com.kms.yxgh.df.domain.DfPlanOperator; -import com.kms.yxgh.df.domain.DfRecord; +import com.kms.yxgh.df.domain.*; import com.kms.yxgh.df.dto.DfCheckingPlanContentDto; import com.kms.yxgh.df.dto.DfPlanDetailDto; import com.kms.yxgh.df.dto.DfPlanSearchDto; @@ -21,10 +19,12 @@ import com.kms.yxgh.df.mapper.DfPlanMapper; import com.kms.yxgh.df.mapper.DfRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.StringUtils; import lombok.AllArgsConstructor; import org.apache.commons.collections4.CollectionUtils; +import org.springframework.data.util.Optionals; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,6 +47,7 @@ public class DfPlanService extends BaseService { private final DfRecordMapper dfRecordMapper; private final DfCheckingPlanContentService dfCheckingPlanContentService; + private final DfCheckingLineService dfCheckingLineService; private final DfCheckingPlanContentMapper dfCheckingPlanContentMapper; private final SysUserService userService; private final DfPlanOperatorService dfPlanOperatorService; @@ -54,7 +55,8 @@ public class DfPlanService extends BaseService { public IPage search(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); DfPlanSearchDto searchDto = sp.getData(); - + SysUser user = UserUtils.getUser(); + searchDto.setUser(Optional.ofNullable(user).map(SysUser::getId).orElse(null)); IPage result = this.getBaseMapper().search(page, searchDto); result.getRecords().forEach(item -> { item.setCreateName(userService.userName(item.getCreateUid())); @@ -235,6 +237,7 @@ public class DfPlanService extends BaseService { private DfCheckingPlanContentDto toDto(DfCheckingPlanContent entity, Map> operatorMap) { DfCheckingPlanContentDto dto = BeanCopyUtils.copy(entity, DfCheckingPlanContentDto.class); if (dto != null) { + dto.setLineName(Optional.ofNullable(dfCheckingLineService.getWithRedis(dto.getLineId())).map(DfCheckingLine::getName).orElse("")); dto.setOperator(operatorMap.getOrDefault(dto.getId(), Collections.emptyList()).stream() .map(item -> { OperatorDto operatorDto = new OperatorDto();