From 63ddca0d944f82c9bbd4c9702c5764bc514e440a Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Tue, 19 Dec 2023 11:52:34 +0800 Subject: [PATCH 01/30] first --- .../controller/common/CommonController.class | Bin 6567 -> 6575 bytes .../shuili/common/utils/file/FileUtils.class | Bin 4079 -> 4079 bytes .../shuili/common/utils/http/HttpHelper.class | Bin 2520 -> 2520 bytes .../shuili/common/utils/http/HttpUtils.class | Bin 8444 -> 8444 bytes .../framework/aspectj/DataSourceAspect.class | Bin 2769 -> 2773 bytes .../shuili/common/utils/FileBasicUtils.class | Bin 2167 -> 2167 bytes .../shuili/common/utils/poi/ExcelUtil.class | Bin 31680 -> 31680 bytes .../kms/system/base/analysis/FileUtils.class | Bin 37280 -> 37284 bytes .../kms/system/service/upload/FileUtils.class | Bin 37158 -> 37162 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/shuili-admin/target/classes/com/kms/web/controller/common/CommonController.class b/shuili-admin/target/classes/com/kms/web/controller/common/CommonController.class index e90bfb2ed5eb965352b1f78529bc01365cdfab46..b7623ff04b36ef99b7727ecf7da39a91b3ff453a 100644 GIT binary patch delta 66 zcmV-I0KNaGGp{qSL=ge~vqceC0Rxf%B$J;KeFFgiW3w9*X9Nk$00aOC0001wlRg$8 YldBh?16BYPlTH{-1B(FPvzizU0f6ZeO#lD@ delta 46 zcmZ2)yxe$$iy-6A&8~vsjLdxu%9G~{)oxZ0PGey_KDk}|1alCB$mAdi-_469co+e5 CT@KLz diff --git a/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class b/shuili-common/target/classes/com/shuili/common/utils/file/FileUtils.class index e80a12c1ce2a6f02fb2303139ddeb93f4d6e390b..3aa1b21b19aca5fa16bd846d0ffccbccf7c74f11 100644 GIT binary patch delta 14 VcmaDa|6YDWB{yT><|^(|763081yle4 delta 14 VcmaDa|6YDWB{!r0<|^(|762~{1yTS2 diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpHelper.class index 0ac7373893c80a07dbb9f5d6cd6d058fc2670f58..1e9b3fa79241d8b6e14f1421046845430fc2e277 100644 GIT binary patch delta 14 Vcmca1d_#D{91cda&2u@d838OW1oi*` delta 14 Vcmca1d_#D{91cd4&2u@d838OK1oQv^ diff --git a/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils.class b/shuili-common/target/classes/com/shuili/common/utils/http/HttpUtils.class index 1bc306e31bb7938aa827ccd96dd3e1d192f3dd54..90ab2713329cabb08f9aeea183c4d2867e810210 100644 GIT binary patch delta 21 dcmez4_{VWWohW0*=6X>nHpY#cXGtfq0sv+&2oC@N delta 21 dcmez4_{VWWohW1a=6X>nHpUH`XGtfq0sv+l2n_%L diff --git a/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class b/shuili-framework/target/classes/com/kms/framework/aspectj/DataSourceAspect.class index 2d8bd8c4843340f81c64e7c0da0c670a5537e3b3..34d924bfdf58c0248490e190b2932e09a9c34dfd 100644 GIT binary patch delta 30 mcmca8dR26TD<|X1$!?r}%t{O#lc#gaGHWrIZ{Ex)#|QwBYX}$s delta 26 icmcaAdQo(PD<|X9$!?r}%yJCulc#gaZr;Hu%Lo8;wg;~O diff --git a/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class b/shuili-framework/target/classes/com/shuili/common/utils/FileBasicUtils.class index fca73b46c39564b1bbb5e08139099cf0e305dc26..ec368fcd7801818b470b29a7912e70e9c9f5c186 100644 GIT binary patch delta 20 ccmew^@LgcT6IMo*%}-fpF*4dsZeafo09_FXRR910 delta 20 ccmew^@LgcT6IMp0%}-fpF*4drZeafo09@|~Q2+n{ diff --git a/shuili-framework/target/classes/com/shuili/common/utils/poi/ExcelUtil.class b/shuili-framework/target/classes/com/shuili/common/utils/poi/ExcelUtil.class index 263770bb78a101fb867172b3c17d890e3e2ebb1c..52a74108cd2709c4d5be093d380f5cb044a0105c 100644 GIT binary patch delta 23 fcmX@`o$s0h_bwMZ6*bpR=ZD-v|LKvxaeo4*@N+4S`((17ZMJvu%S} U0RyfDSF^>0i3s0hzPuMZ6*bowKHB-v|LJvxaeo4*@B&4S`((16}}Evu%S} Q0kg`4hzkKCvr~{!0nua@lK=n! diff --git a/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class b/shuili-system/target/classes/com/kms/system/service/upload/FileUtils.class index 4bc3e1362d4226758e48273e8693fb3acbbb14cf..ec1d22173afab1b8f9441da897448296fb04ebe6 100644 GIT binary patch delta 62 zcmV-E0KxyJq5`U-0EKL;wH) From 3fee28fb8387617aca8847a5254332444539c256 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Mon, 25 Dec 2023 17:31:13 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/cms/service/CmsContentService.java | 2 + .../df/controller/BsSgcDfBzbpController.java | 114 +++++++++ .../df/controller/BsSgcDfGcglController.java | 118 +++++++++ .../df/controller/BsSgcDfJbxxController.java | 117 +++++++++ .../com/kms/yg/df/domain/BsSgcDfBzbp.java | 91 +++++++ .../com/kms/yg/df/domain/BsSgcDfGcgl.java | 208 +++++++++++++++ .../com/kms/yg/df/domain/BsSgcDfJbxx.java | 212 ++++++++++++++++ .../kms/yg/df/mapper/BsSgcDfBzbpMapper.java | 16 ++ .../kms/yg/df/mapper/BsSgcDfGcglMapper.java | 17 ++ .../kms/yg/df/mapper/BsSgcDfJbxxMapper.java | 17 ++ .../kms/yg/df/service/BsSgcDfBzbpService.java | 17 ++ .../kms/yg/df/service/BsSgcDfGcglService.java | 18 ++ .../kms/yg/df/service/BsSgcDfJbxxService.java | 18 ++ .../sz/controller/BsSgcSzBzbpController.java | 114 +++++++++ .../sz/controller/BsSgcSzGcdaController.java | 117 +++++++++ .../sz/controller/BsSgcSzGcglController.java | 117 +++++++++ .../com/kms/yg/sz/domain/BsSgcSzBzbp.java | 86 +++++++ .../com/kms/yg/sz/domain/BsSgcSzGcda.java | 238 ++++++++++++++++++ .../com/kms/yg/sz/domain/BsSgcSzGcgl.java | 208 +++++++++++++++ .../kms/yg/sz/mapper/BsSgcSzBzbpMapper.java | 16 ++ .../kms/yg/sz/mapper/BsSgcSzGcdaMapper.java | 17 ++ .../kms/yg/sz/mapper/BsSgcSzGcglMapper.java | 17 ++ .../kms/yg/sz/service/BsSgcSzBzbpService.java | 17 ++ .../kms/yg/sz/service/BsSgcSzGcdaService.java | 18 ++ .../kms/yg/sz/service/BsSgcSzGcglService.java | 29 +++ .../CreateAndUpdateMetaObjectHandler.java | 1 + 26 files changed, 1960 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java 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 389d1f77..67bed2d3 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,8 +1,10 @@ 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 org.springframework.stereotype.Service; /** 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 new file mode 100644 index 00000000..8ca1aee8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfBzbpController.java @@ -0,0 +1,114 @@ +package com.kms.yg.df.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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 com.kms.yg.df.domain.BsSgcDfBzbp; +import com.kms.yg.df.service.BsSgcDfBzbpService; + + +/** + * 堤防标识标牌Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/df/dikeMark") +@Api(tags = "堤防标识标牌") +public class BsSgcDfBzbpController extends BaseController +{ + @Autowired + private BsSgcDfBzbpService bsSgcDfBzbpService; + + /** + * 查询堤防标识标牌列表 + */ + @PostMapping("/list") + @ApiOperation("堤防标识标牌列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcDfBzbpService.selectPage(sp); + } + + /** + * 导出堤防标识标牌列表 + */ + @Log(title = "堤防标识标牌导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤防标识标牌导出") + public AjaxResult export(@RequestBody BsSgcDfBzbp bsSgcDfBzbp) + { + List list = bsSgcDfBzbpService.listByIds(bsSgcDfBzbp.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcDfBzbp.class); + return util.exportExcel(list, "dikeMark"); + } + + /** + * 获取堤防标识标牌详细信息 + */ + @ApiOperation(" 堤防标识标牌详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcDfBzbpService.getById(id)); + } + + /** + * 新增堤防标识标牌 + */ + @Log(title = "堤防标识标牌新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防标识标牌新增") + public AjaxResult add(@RequestBody BsSgcDfBzbp bsSgcDfBzbp) + { + BaseEntityUtils.preInsert(bsSgcDfBzbp); + return toAjax(bsSgcDfBzbpService.save(bsSgcDfBzbp)); + } + + /** + * 修改堤防标识标牌 + */ + @ApiOperation("堤防标识标牌修改") + @Log(title = "堤防标识标牌修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcDfBzbp bsSgcDfBzbp) + { + return toAjax(bsSgcDfBzbpService.updateById(bsSgcDfBzbp)); + } + + /** + * 删除堤防标识标牌 + */ + @ApiOperation("堤防标识标牌删除") + @Log(title = "堤防标识标牌删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcDfBzbpService.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 new file mode 100644 index 00000000..e2d08917 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcglController.java @@ -0,0 +1,118 @@ +package com.kms.yg.df.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import com.kms.yg.df.domain.BsSgcDfGcgl; +import com.kms.yg.df.service.BsSgcDfGcglService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + + + +/** + * 水闸工程管理信息Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/yg/engineerManageInfo") +@Api(tags = "水闸工程管理信息") +public class BsSgcDfGcglController extends BaseController +{ + @Autowired + private BsSgcDfGcglService bsSgcDfGcglService; + + /** + * 查询水闸工程管理信息列表 + */ + @PostMapping("/list") + @ApiOperation("水闸工程管理信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcDfGcglService.selectPage(sp); + } + + /** + * 导出水闸工程管理信息列表 + */ + @Log(title = "水闸工程管理信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸工程管理信息导出") + public AjaxResult export(@RequestBody BsSgcDfGcgl bsSgcDfGcgl) + { + List list = bsSgcDfGcglService.listByIds(bsSgcDfGcgl.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcDfGcgl.class); + return util.exportExcel(list, "engineerManageInfo"); + } + + /** + * 获取水闸工程管理信息详细信息 + */ + @ApiOperation(" 水闸工程管理信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcDfGcglService.getById(id)); + } + + /** + * 新增水闸工程管理信息 + */ + @Log(title = "水闸工程管理信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸工程管理信息新增") + public AjaxResult add(@RequestBody BsSgcDfGcgl bsSgcDfGcgl) + { + BaseEntityUtils.preInsert(bsSgcDfGcgl); + bsSgcDfGcgl.setRecordTakeEffectTime(new Date()); + return toAjax(bsSgcDfGcglService.save(bsSgcDfGcgl)); + } + + /** + * 修改水闸工程管理信息 + */ + @ApiOperation("水闸工程管理信息修改") + @Log(title = "水闸工程管理信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcDfGcgl bsSgcDfGcgl) + { + return toAjax(bsSgcDfGcglService.updateById(bsSgcDfGcgl)); + } + + /** + * 删除水闸工程管理信息 + */ + @ApiOperation("水闸工程管理信息删除") + @Log(title = "水闸工程管理信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcDfGcglService.removeByIds(Arrays.asList(ids))); + } +} 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 new file mode 100644 index 00000000..b1a1b9dd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java @@ -0,0 +1,117 @@ +package com.kms.yg.df.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import com.kms.yg.df.domain.BsSgcDfJbxx; +import com.kms.yg.df.service.BsSgcDfJbxxService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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; + + + +/** + * 堤防基本信息Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/yg/dikeInfo") +@Api(tags = "堤防基本信息") +public class BsSgcDfJbxxController extends BaseController +{ + @Autowired + private BsSgcDfJbxxService bsSgcDfJbxxService; + + /** + * 查询堤防基本信息列表 + */ + @PostMapping("/list") + @ApiOperation("堤防基本信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcDfJbxxService.selectPage(sp); + } + + /** + * 导出堤防基本信息列表 + */ + @Log(title = "堤防基本信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤防基本信息导出") + public AjaxResult export(@RequestBody BsSgcDfJbxx bsSgcDfJbxx) + { + List list = bsSgcDfJbxxService.listByIds(bsSgcDfJbxx.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcDfJbxx.class); + return util.exportExcel(list, "dikeInfo"); + } + + /** + * 获取堤防基本信息详细信息 + */ + @ApiOperation(" 堤防基本信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcDfJbxxService.getById(id)); + } + + /** + * 新增堤防基本信息 + */ + @Log(title = "堤防基本信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防基本信息新增") + public AjaxResult add(@RequestBody BsSgcDfJbxx bsSgcDfJbxx) + { + BaseEntityUtils.preInsert(bsSgcDfJbxx); + bsSgcDfJbxx.setRecordTakeEffectTime(new Date()); + return toAjax(bsSgcDfJbxxService.save(bsSgcDfJbxx)); + } + + /** + * 修改堤防基本信息 + */ + @ApiOperation("堤防基本信息修改") + @Log(title = "堤防基本信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcDfJbxx bsSgcDfJbxx) + { + return toAjax(bsSgcDfJbxxService.updateById(bsSgcDfJbxx)); + } + + /** + * 删除堤防基本信息 + */ + @ApiOperation("堤防基本信息删除") + @Log(title = "堤防基本信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcDfJbxxService.removeByIds(Arrays.asList(ids))); + } +} 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 new file mode 100644 index 00000000..dd5c8d96 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java @@ -0,0 +1,91 @@ +package com.kms.yg.df.domain; + +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; + + + +/** + * 堤防标识标牌对象 bs_sgc_df_bzbp + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_df_bzbp") +@Data +@ApiModel("堤防标识标牌") +public class BsSgcDfBzbp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标志名称 */ + @Excel(name = "标志名称") + @ApiModelProperty("标志名称") + private String markName; + + /** 堤防id */ + @Excel(name = "堤防id") + @ApiModelProperty("堤防id") + private String embankmentId; + + /** 标识位置 */ + @Excel(name = "标识位置") + @ApiModelProperty("标识位置") + private String markLocation; + + /** 标牌类型 */ + @Excel(name = "标牌类型") + @ApiModelProperty("标牌类型") + private String type; + + /** 标识类型 */ + @Excel(name = "标识类型") + @ApiModelProperty("标识类型") + private String markType; + + /** 上传图片 */ + @Excel(name = "上传图片") + @ApiModelProperty("上传图片") + private String photo; + + /** 标牌编号 */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String markCode; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String relation; + +} 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 new file mode 100644 index 00000000..ce98f35b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcgl.java @@ -0,0 +1,208 @@ +package com.kms.yg.df.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + + + +/** + * 水闸工程管理信息对象 bs_sgc_df_gcgl + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_df_gcgl") +@Data +@ApiModel("水闸工程管理信息") +public class BsSgcDfGcgl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 工程管理单位 */ + @Excel(name = "工程管理单位") + @ApiModelProperty("工程管理单位") + private String engineeringManagementUnit; + + /** 工程管理单位性质 */ + @Excel(name = "工程管理单位性质") + @ApiModelProperty("工程管理单位性质") + private String managementUnitNature; + + /** 工程管理单位权属 */ + @Excel(name = "工程管理单位权属") + @ApiModelProperty("工程管理单位权属") + private String engineeringManagementOwnership; + + /** 工程管理单位责任人 */ + @Excel(name = "工程管理单位责任人") + @ApiModelProperty("工程管理单位责任人") + private String engineeringManagementPerson; + + /** 工程管理单位责任人职务 */ + @Excel(name = "工程管理单位责任人职务") + @ApiModelProperty("工程管理单位责任人职务") + private String engineeringManagementPosition; + + /** 工程管理单位责任人手机号码 */ + @Excel(name = "工程管理单位责任人手机号码") + @ApiModelProperty("工程管理单位责任人手机号码") + private String engineeringManagementPhone; + + /** 水行政主管部门 */ + @Excel(name = "水行政主管部门") + @ApiModelProperty("水行政主管部门") + private String waterAdministrativeDepartment; + + /** 水行政主管部门性质 */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentNature; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPerson; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPosition; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPhone; + + /** 行业归口管理部门 */ + @Excel(name = "行业归口管理部门") + @ApiModelProperty("行业归口管理部门") + private String centralizedManagementDepartment; + + /** 管理范围划界 */ + @Excel(name = "管理范围划界") + @ApiModelProperty("管理范围划界") + private String managementDelimitation; + + /** 完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("完成时间") + private Date delimitationTime; + + /** 证明材料 */ + @Excel(name = "证明材料") + @ApiModelProperty("证明材料") + private String delimitationEvidence; + + /** 管理范围确权 */ + @Excel(name = "管理范围确权") + @ApiModelProperty("管理范围确权") + private String managementConfirmation; + + /** $column.columnComment */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "管理范围确权", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("管理范围确权") + private Date confirmationTime; + + /** $column.columnComment */ + @Excel(name = "管理范围确权") + @ApiModelProperty("管理范围确权") + private String confirmationEvidence; + + /** 保护范围划界 */ + @Excel(name = "保护范围划界") + @ApiModelProperty("保护范围划界") + private String protectionDelimitation; + + /** $column.columnComment */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "保护范围划界", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("保护范围划界") + private Date protectionTime; + + /** $column.columnComment */ + @Excel(name = "保护范围划界") + @ApiModelProperty("保护范围划界") + private String protectionEvidence; + + /** 闸门操作规程 */ + @Excel(name = "闸门操作规程") + @ApiModelProperty("闸门操作规程") + private String gateOperatingProcedures; + + /** 水闸控制运用计划(方案)批复文件 */ + @Excel(name = "水闸控制运用计划(方案)批复文件") + @ApiModelProperty("水闸控制运用计划(方案)批复文件") + private String waterGateControlOperation; + + /** 工程竣工验收鉴定书 */ + @Excel(name = "工程竣工验收鉴定书") + @ApiModelProperty("工程竣工验收鉴定书") + private String engineeringCompletionAcceptance; + + /** 工程图表 */ + @Excel(name = "工程图表") + @ApiModelProperty("工程图表") + private String engineeringChart; + + /** 工程全景照片 */ + @Excel(name = "工程全景照片") + @ApiModelProperty("工程全景照片") + private String engineeringPanoramicPhotos; + + /** 降等批复文件 */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String approvalDocumentsDowngrade; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private Long proNo; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String remarks; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String relations; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordTakeEffectTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordLoseEfficacyTime; + +} 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 new file mode 100644 index 00000000..e6a594a3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java @@ -0,0 +1,212 @@ +package com.kms.yg.df.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + + + +/** + * 堤防基本信息对象 bs_sgc_df_jbxx + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_df_jbxx") +@Data +@ApiModel("堤防基本信息") +public class BsSgcDfJbxx extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 堤防名称 */ + @Excel(name = "堤防名称") + @ApiModelProperty("堤防名称") + private String embankmentName; + + /** 起点行政区划 */ + @Excel(name = "起点行政区划") + @ApiModelProperty("起点行政区划") + private String adcdStart; + + /** 堤防编码 */ + @Excel(name = "堤防编码") + @ApiModelProperty("堤防编码") + private String embankmentCode; + + /** 标绘堤防 */ + @Excel(name = "标绘堤防") + @ApiModelProperty("标绘堤防") + private String plotEmbankments; + + /** 终点行政区划 */ + @Excel(name = "终点行政区划") + @ApiModelProperty("终点行政区划") + private String adcdEnd; + + /** 起点桩号 */ + @Excel(name = "起点桩号") + @ApiModelProperty("起点桩号") + private String startingStationNumber; + + /** 终点桩号 */ + @Excel(name = "终点桩号") + @ApiModelProperty("终点桩号") + private String endStationNumber; + + /** 堤防类型 */ + @Excel(name = "堤防类型") + @ApiModelProperty("堤防类型") + private String embankmentType; + + /** 是否为蓄滞洪区堤防 */ + @Excel(name = "是否为蓄滞洪区堤防") + @ApiModelProperty("是否为蓄滞洪区堤防") + private String isFloodStorageDetention; + + /** 所在蓄滞洪区名称 */ + @Excel(name = "所在蓄滞洪区名称") + @ApiModelProperty("所在蓄滞洪区名称") + private String storageDetentionAreaName; + + /** $column.columnComment */ + @Excel(name = "所在蓄滞洪区名称") + @ApiModelProperty("所在蓄滞洪区名称") + private String areaStartingStationNumber; + + /** $column.columnComment */ + @Excel(name = "所在蓄滞洪区名称") + @ApiModelProperty("所在蓄滞洪区名称") + private String areaEndStationNumber; + + /** 堤防蓄滞洪区段总长度(m) */ + @Excel(name = "堤防蓄滞洪区段总长度(m)") + @ApiModelProperty("堤防蓄滞洪区段总长度(m)") + private String totalLengthFloodStorage; + + /** 蓄滞洪区特殊情况说明 */ + @Excel(name = "蓄滞洪区特殊情况说明") + @ApiModelProperty("蓄滞洪区特殊情况说明") + private String floodStorageDetentionAreasExplanation; + + /** 堤防跨界情况 */ + @Excel(name = "堤防跨界情况") + @ApiModelProperty("堤防跨界情况") + private String crossBorderSituation; + + /** 堤防型式 */ + @Excel(name = "堤防型式") + @ApiModelProperty("堤防型式") + private String embankmentTyper; + + /** 建成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("建成时间") + private Date completionTime; + + /** 最近达标加固完工状态 */ + @Excel(name = "最近达标加固完工状态") + @ApiModelProperty("最近达标加固完工状态") + private String recentComplianceReinforcementStatus; + + /** 最近达标加固完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近达标加固完成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近达标加固完成时间") + private Date recentComplianceReinforcementTime; + + /** 工程任务 */ + @Excel(name = "工程任务") + @ApiModelProperty("工程任务") + private String engineeringTasks; + + /** 堤防级别 */ + @Excel(name = "堤防级别") + @ApiModelProperty("堤防级别") + private String embankmentLevel; + + /** 设计防洪（潮）标准[重现期（年）] */ + @Excel(name = "设计防洪", readConverterExp = "潮=") + @ApiModelProperty("设计防洪") + private String designFloodControl; + + /** 堤防长度(m) */ + @Excel(name = "堤防长度(m)") + @ApiModelProperty("堤防长度(m)") + private String embankmentLength; + + /** 规划防洪（潮）标准[重现期（年）] */ + @Excel(name = "规划防洪", readConverterExp = "潮=") + @ApiModelProperty("规划防洪") + private String planningFloodControl; + + /** 达到规划标准的堤防长度(m) */ + @Excel(name = "达到规划标准的堤防长度(m)") + @ApiModelProperty("达到规划标准的堤防长度(m)") + private String embankmentLengthPlanningStandards; + + /** 保护人口（单位：万人） */ + @Excel(name = "保护人口", readConverterExp = "单=位：万人") + @ApiModelProperty("保护人口") + private String populationProtection; + + /** 保护农田（单位：万亩） */ + @Excel(name = "保护农田", readConverterExp = "单=位：万亩") + @ApiModelProperty("保护农田") + private String protectingFarmland; + + /** 重要基础设施 */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String criticalInfrastructure; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "重要基础设施") + @ApiModelProperty("重要基础设施") + private String remarks; + + /** 关联字段1 */ + @Excel(name = "关联字段1") + @ApiModelProperty("关联字段1") + private String relations; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordTakeEffectTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordLoseEfficacyTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java new file mode 100644 index 00000000..45a45e2e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzbpMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.df.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.df.domain.BsSgcDfBzbp; + +/** + * 堤防标识标牌Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcDfBzbpMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java new file mode 100644 index 00000000..ff5c5b3a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfGcglMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.df.mapper; + +import com.kms.yg.df.domain.BsSgcDfGcgl; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 水闸工程管理信息Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcDfGcglMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java new file mode 100644 index 00000000..62b8f838 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.df.mapper; + +import com.kms.yg.df.domain.BsSgcDfJbxx; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 堤防基本信息Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcDfJbxxMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..b188ca4f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -0,0 +1,17 @@ +package com.kms.yg.df.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yg.df.mapper.BsSgcDfBzbpMapper; +import com.kms.yg.df.domain.BsSgcDfBzbp; +import org.springframework.stereotype.Service; + +/** + * 堤防标识标牌Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcDfBzbpService extends BaseService{ + +} 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 new file mode 100644 index 00000000..79bc13f3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfGcglService.java @@ -0,0 +1,18 @@ +package com.kms.yg.df.service; + +import com.kms.yg.df.domain.BsSgcDfGcgl; +import com.kms.yg.df.mapper.BsSgcDfGcglMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + + +/** + * 水闸工程管理信息Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcDfGcglService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java new file mode 100644 index 00000000..cc9cfec1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java @@ -0,0 +1,18 @@ +package com.kms.yg.df.service; + +import com.kms.yg.df.domain.BsSgcDfJbxx; +import com.kms.yg.df.mapper.BsSgcDfJbxxMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + + +/** + * 堤防基本信息Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcDfJbxxService extends BaseService{ + +} 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 new file mode 100644 index 00000000..ba5d0a49 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzBzbpController.java @@ -0,0 +1,114 @@ +package com.kms.yg.sz.controller; + +import java.util.Arrays; +import java.util.List; + +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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 com.kms.yg.sz.domain.BsSgcSzBzbp; +import com.kms.yg.sz.service.BsSgcSzBzbpService; + + +/** + * 水闸标识标牌Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/sz/sluiceMark") +@Api(tags = "水闸标识标牌") +public class BsSgcSzBzbpController extends BaseController +{ + @Autowired + private BsSgcSzBzbpService bsSgcSzBzbpService; + + /** + * 查询水闸标识标牌列表 + */ + @PostMapping("/list") + @ApiOperation("水闸标识标牌列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzBzbpService.selectPage(sp); + } + + /** + * 导出水闸标识标牌列表 + */ + @Log(title = "水闸标识标牌导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸标识标牌导出") + public AjaxResult export(@RequestBody BsSgcSzBzbp bsSgcSzBzbp) + { + List list = bsSgcSzBzbpService.listByIds(bsSgcSzBzbp.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcSzBzbp.class); + return util.exportExcel(list, "sluiceMark"); + } + + /** + * 获取水闸标识标牌详细信息 + */ + @ApiOperation(" 水闸标识标牌详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzBzbpService.getById(id)); + } + + /** + * 新增水闸标识标牌 + */ + @Log(title = "水闸标识标牌新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸标识标牌新增") + public AjaxResult add(@RequestBody BsSgcSzBzbp bsSgcSzBzbp) + { + BaseEntityUtils.preInsert(bsSgcSzBzbp); + return toAjax(bsSgcSzBzbpService.save(bsSgcSzBzbp)); + } + + /** + * 修改水闸标识标牌 + */ + @ApiOperation("水闸标识标牌修改") + @Log(title = "水闸标识标牌修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcSzBzbp bsSgcSzBzbp) + { + return toAjax(bsSgcSzBzbpService.updateById(bsSgcSzBzbp)); + } + + /** + * 删除水闸标识标牌 + */ + @ApiOperation("水闸标识标牌删除") + @Log(title = "水闸标识标牌删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzBzbpService.removeByIds(Arrays.asList(ids))); + } +} 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 new file mode 100644 index 00000000..43d920de --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java @@ -0,0 +1,117 @@ +package com.kms.yg.sz.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import com.kms.yg.sz.domain.BsSgcSzGcda; +import com.kms.yg.sz.service.BsSgcSzGcdaService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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; + + + +/** + * 水闸工程基础信息Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/yg/sluiceInfo") +@Api(tags = "水闸工程基础信息") +public class BsSgcSzGcdaController extends BaseController +{ + @Autowired + private BsSgcSzGcdaService bsSgcSzGcdaService; + + /** + * 查询水闸工程基础信息列表 + */ + @PostMapping("/list") + @ApiOperation("水闸工程基础信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzGcdaService.selectPage(sp); + } + + /** + * 导出水闸工程基础信息列表 + */ + @Log(title = "水闸工程基础信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸工程基础信息导出") + public AjaxResult export(@RequestBody BsSgcSzGcda bsSgcSzGcda) + { + List list = bsSgcSzGcdaService.listByIds(bsSgcSzGcda.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcSzGcda.class); + return util.exportExcel(list, "sluiceInfo"); + } + + /** + * 获取水闸工程基础信息详细信息 + */ + @ApiOperation(" 水闸工程基础信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzGcdaService.getById(id)); + } + + /** + * 新增水闸工程基础信息 + */ + @Log(title = "水闸工程基础信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸工程基础信息新增") + public AjaxResult add(@RequestBody BsSgcSzGcda bsSgcSzGcda) + { + BaseEntityUtils.preInsert(bsSgcSzGcda); + bsSgcSzGcda.setRecordTakeEffectTime(new Date()); + return toAjax(bsSgcSzGcdaService.save(bsSgcSzGcda)); + } + + /** + * 修改水闸工程基础信息 + */ + @ApiOperation("水闸工程基础信息修改") + @Log(title = "水闸工程基础信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcSzGcda bsSgcSzGcda) + { + return toAjax(bsSgcSzGcdaService.updateById(bsSgcSzGcda)); + } + + /** + * 删除水闸工程基础信息 + */ + @ApiOperation("水闸工程基础信息删除") + @Log(title = "水闸工程基础信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzGcdaService.removeByIds(Arrays.asList(ids))); + } +} 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 new file mode 100644 index 00000000..6a44063e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcglController.java @@ -0,0 +1,117 @@ +package com.kms.yg.sz.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import com.kms.yg.sz.domain.BsSgcSzGcgl; +import com.kms.yg.sz.service.BsSgcSzGcglService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +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; + + + +/** + * 水闸工程管理信息Controller + * + * @author kms + * @date 2023-12-25 + */ +@RestController +@RequestMapping("/yg/sluiceEngineerMangeInfo") +@Api(tags = "水闸工程管理信息") +public class BsSgcSzGcglController extends BaseController +{ + @Autowired + private BsSgcSzGcglService bsSgcSzGcglService; + + /** + * 查询水闸工程管理信息列表 + */ + @PostMapping("/list") + @ApiOperation("水闸工程管理信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcSzGcglService.selectPage(sp); + } + + /** + * 导出水闸工程管理信息列表 + */ + @Log(title = "水闸工程管理信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("水闸工程管理信息导出") + public AjaxResult export(@RequestBody BsSgcSzGcgl bsSgcSzGcgl) + { + List list = bsSgcSzGcglService.listByIds(bsSgcSzGcgl.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcSzGcgl.class); + return util.exportExcel(list, "sluiceEngineerMangeInfo"); + } + + /** + * 获取水闸工程管理信息详细信息 + */ + @ApiOperation(" 水闸工程管理信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcSzGcglService.getById(id)); + } + + /** + * 新增水闸工程管理信息 + */ + @Log(title = "水闸工程管理信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸工程管理信息新增") + public AjaxResult add(@RequestBody BsSgcSzGcgl bsSgcSzGcgl) + { + BaseEntityUtils.preInsert(bsSgcSzGcgl); + bsSgcSzGcgl.setRecordTakeEffectTime(new Date()); + return toAjax(bsSgcSzGcglService.save(bsSgcSzGcgl)); + } + + /** + * 修改水闸工程管理信息 + */ + @ApiOperation("水闸工程管理信息修改") + @Log(title = "水闸工程管理信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcSzGcgl bsSgcSzGcgl) + { + return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl)); + } + + /** + * 删除水闸工程管理信息 + */ + @ApiOperation("水闸工程管理信息删除") + @Log(title = "水闸工程管理信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcSzGcglService.removeByIds(Arrays.asList(ids))); + } +} 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 new file mode 100644 index 00000000..68d2dce1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzBzbp.java @@ -0,0 +1,86 @@ +package com.kms.yg.sz.domain; + +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; + + + +/** + * 水闸标识标牌对象 bs_sgc_sz_bzbp + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_sz_bzbp") +@Data +@ApiModel("水闸标识标牌") +public class BsSgcSzBzbp extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 标志名称 */ + @Excel(name = "标志名称") + @ApiModelProperty("标志名称") + private String markName; + + /** 水闸id */ + @Excel(name = "水闸id") + @ApiModelProperty("水闸id") + private String suliceId; + + /** 标识位置 */ + @Excel(name = "标识位置") + @ApiModelProperty("标识位置") + private String markLocation; + + /** 标牌类型 */ + @Excel(name = "标牌类型") + @ApiModelProperty("标牌类型") + private String type; + + /** 标识类型 */ + @Excel(name = "标识类型") + @ApiModelProperty("标识类型") + private String markType; + + /** 上传图片 */ + @Excel(name = "上传图片") + @ApiModelProperty("上传图片") + private String photo; + + /** 标牌编号 */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String markCode; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "标牌编号") + @ApiModelProperty("标牌编号") + private String owerDept; + +} 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 new file mode 100644 index 00000000..efadda27 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java @@ -0,0 +1,238 @@ +package com.kms.yg.sz.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + + + +/** + * 水闸工程基础信息对象 bs_sgc_sz_gcda + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_sz_jbxx") +@Data +@ApiModel("水闸工程基础信息") +public class BsSgcSzGcda extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 水闸名称 */ + @Excel(name = "水闸名称") + @ApiModelProperty("水闸名称") + private String sluiceName; + + /** 行政区划 */ + @Excel(name = "行政区划") + @ApiModelProperty("行政区划") + private String adcd; + + /** 水闸编码 */ + @Excel(name = "水闸编码") + @ApiModelProperty("水闸编码") + private String sluiceCode; + + /** 所在位置 */ + @Excel(name = "所在位置") + @ApiModelProperty("所在位置") + private String location; + + /** 标绘水闸 */ + @Excel(name = "标绘水闸") + @ApiModelProperty("标绘水闸") + private String plottingSluice; + + /** 验收情况 */ + @Excel(name = "验收情况") + @ApiModelProperty("验收情况") + private String acceptanceStatus; + + /** 除险加固情况 */ + @Excel(name = "除险加固情况") + @ApiModelProperty("除险加固情况") + private String riskEliminationStatus; + + /** 是否为枢纽工程 */ + @Excel(name = "是否为枢纽工程") + @ApiModelProperty("是否为枢纽工程") + private String isHubProject; + + /** 是否为闸站工程 */ + @Excel(name = "是否为闸站工程") + @ApiModelProperty("是否为闸站工程") + private String isGateStation; + + /** 是否为套闸工程 */ + @Excel(name = "是否为套闸工程") + @ApiModelProperty("是否为套闸工程") + private String isSetGateProject; + + /** 水闸类型 */ + @Excel(name = "水闸类型") + @ApiModelProperty("水闸类型") + private String sluiceType; + + /** 设计过闸流量（m³/s） */ + @Excel(name = "设计过闸流量", readConverterExp = "m=³/s") + @ApiModelProperty("设计过闸流量") + private String designGateFlow; + + /** 校核过闸流量（m³/s） */ + @Excel(name = "校核过闸流量", readConverterExp = "m=³/s") + @ApiModelProperty("校核过闸流量") + private String verifiedGateFlow; + + /** 工程规模 */ + @Excel(name = "工程规模") + @ApiModelProperty("工程规模") + private String projectScale; + + /** 建筑物级别 */ + @Excel(name = "建筑物级别") + @ApiModelProperty("建筑物级别") + private String buildingLevel; + + /** 设计标准[重现期（年）] */ + @Excel(name = "设计标准[重现期", readConverterExp = "年=") + @ApiModelProperty("设计标准[重现期") + private String designStandards; + + /** 校核标准[重现期（年）] */ + @Excel(name = "校核标准[重现期", readConverterExp = "年=") + @ApiModelProperty("校核标准[重现期") + private String verificationStandards; + + /** 历史最大过闸流量(m³/s) */ + @Excel(name = "历史最大过闸流量(m³/s)") + @ApiModelProperty("历史最大过闸流量(m³/s)") + private String historicalMaximumGate; + + /** 历史最大过闸流量日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "历史最大过闸流量日期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("历史最大过闸流量日期") + private Date historicalMaximumDate; + + /** 设计地震烈度 */ + @Excel(name = "设计地震烈度") + @ApiModelProperty("设计地震烈度") + private String designSeismicIntensity; + + /** 闸孔数量 */ + @Excel(name = "闸孔数量") + @ApiModelProperty("闸孔数量") + private String gateHolesNumber; + + /** 闸孔总净宽(m) */ + @Excel(name = "闸孔总净宽(m)") + @ApiModelProperty("闸孔总净宽(m)") + private String gateHoleWidth; + + /** 闸门型式 */ + @Excel(name = "闸门型式") + @ApiModelProperty("闸门型式") + private String gateType; + + /** 启闭机数量 */ + @Excel(name = "启闭机数量") + @ApiModelProperty("启闭机数量") + private String hoistsNumber; + + /** 观测项目 */ + @Excel(name = "观测项目") + @ApiModelProperty("观测项目") + private String observationProject; + + /** 闸室结构 */ + @Excel(name = "闸室结构") + @ApiModelProperty("闸室结构") + private String lockChamberStructure; + + /** 启闭机形式 */ + @Excel(name = "启闭机形式") + @ApiModelProperty("启闭机形式") + private String machineForm; + + /** 消能方式 */ + @Excel(name = "消能方式") + @ApiModelProperty("消能方式") + private String energyDissipationMethod; + + /** 自动化控制 */ + @Excel(name = "自动化控制") + @ApiModelProperty("自动化控制") + private String automationControl; + + /** $column.columnComment */ + @Excel(name = "自动化控制") + @ApiModelProperty("自动化控制") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "自动化控制") + @ApiModelProperty("自动化控制") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "自动化控制") + @ApiModelProperty("自动化控制") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "自动化控制") + @ApiModelProperty("自动化控制") + private String proCode; + + /** 关联字段1 */ + @Excel(name = "关联字段1") + @ApiModelProperty("关联字段1") + private String relation; + + /** 建成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("建成时间") + private Date completionTime; + + /** 竣工验收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "竣工验收时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("竣工验收时间") + private Date completionAcceptanceTime; + + /** 最近除险加固完工时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近除险加固完工时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近除险加固完工时间") + private Date recentCompletionTime; + + /** 枢纽建筑物 */ + @Excel(name = "枢纽建筑物") + @ApiModelProperty("枢纽建筑物") + private String hubBuildings; + + /** 副闸闸孔数量 */ + @Excel(name = "副闸闸孔数量") + @ApiModelProperty("副闸闸孔数量") + private String auxiliaryGateHoles; + + /** 副闸闸孔总净宽 */ + @Excel(name = "副闸闸孔总净宽") + @ApiModelProperty("副闸闸孔总净宽") + private String auxiliaryGateHolesWidth; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordTakeEffectTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordLoseEfficacyTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java new file mode 100644 index 00000000..3ffb81b5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java @@ -0,0 +1,208 @@ +package com.kms.yg.sz.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + + + +/** + * 水闸工程管理信息对象 bs_sgc_sz_gcgl + * + * @author kms + * @date 2023-12-25 + */ +@TableName("bs_sgc_sz_gcgl") +@Data +@ApiModel("水闸工程管理信息") +public class BsSgcSzGcgl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 工程管理单位 */ + @Excel(name = "工程管理单位") + @ApiModelProperty("工程管理单位") + private String engineeringManagementUnit; + + /** 工程管理单位性质 */ + @Excel(name = "工程管理单位性质") + @ApiModelProperty("工程管理单位性质") + private String managementUnitNature; + + /** 工程管理单位权属 */ + @Excel(name = "工程管理单位权属") + @ApiModelProperty("工程管理单位权属") + private String engineeringManagementOwnership; + + /** 工程管理单位责任人 */ + @Excel(name = "工程管理单位责任人") + @ApiModelProperty("工程管理单位责任人") + private String engineeringManagementPerson; + + /** 工程管理单位责任人职务 */ + @Excel(name = "工程管理单位责任人职务") + @ApiModelProperty("工程管理单位责任人职务") + private String engineeringManagementPosition; + + /** 工程管理单位责任人手机号码 */ + @Excel(name = "工程管理单位责任人手机号码") + @ApiModelProperty("工程管理单位责任人手机号码") + private String engineeringManagementPhone; + + /** 水行政主管部门 */ + @Excel(name = "水行政主管部门") + @ApiModelProperty("水行政主管部门") + private String waterAdministrativeDepartment; + + /** 水行政主管部门性质 */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentNature; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPerson; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPosition; + + /** $column.columnComment */ + @Excel(name = "水行政主管部门性质") + @ApiModelProperty("水行政主管部门性质") + private String administrationDepartmentPhone; + + /** 行业归口管理部门 */ + @Excel(name = "行业归口管理部门") + @ApiModelProperty("行业归口管理部门") + private String centralizedManagementDepartment; + + /** 管理范围划界 */ + @Excel(name = "管理范围划界") + @ApiModelProperty("管理范围划界") + private String managementDelimitation; + + /** 完成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("完成时间") + private Date delimitationTime; + + /** 证明材料 */ + @Excel(name = "证明材料") + @ApiModelProperty("证明材料") + private String delimitationEvidence; + + /** 管理范围确权 */ + @Excel(name = "管理范围确权") + @ApiModelProperty("管理范围确权") + private String managementConfirmation; + + /** $column.columnComment */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "管理范围确权", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("管理范围确权") + private Date confirmationTime; + + /** $column.columnComment */ + @Excel(name = "管理范围确权") + @ApiModelProperty("管理范围确权") + private String confirmationEvidence; + + /** 保护范围划界 */ + @Excel(name = "保护范围划界") + @ApiModelProperty("保护范围划界") + private String protectionDelimitation; + + /** $column.columnComment */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "保护范围划界", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("保护范围划界") + private Date protectionTime; + + /** $column.columnComment */ + @Excel(name = "保护范围划界") + @ApiModelProperty("保护范围划界") + private String protectionEvidence; + + /** 闸门操作规程 */ + @Excel(name = "闸门操作规程") + @ApiModelProperty("闸门操作规程") + private String gateOperatingProcedures; + + /** 水闸控制运用计划(方案)批复文件 */ + @Excel(name = "水闸控制运用计划(方案)批复文件") + @ApiModelProperty("水闸控制运用计划(方案)批复文件") + private String waterGateControlOperation; + + /** 工程竣工验收鉴定书 */ + @Excel(name = "工程竣工验收鉴定书") + @ApiModelProperty("工程竣工验收鉴定书") + private String engineeringCompletionAcceptance; + + /** 工程图表 */ + @Excel(name = "工程图表") + @ApiModelProperty("工程图表") + private String engineeringChart; + + /** 工程全景照片 */ + @Excel(name = "工程全景照片") + @ApiModelProperty("工程全景照片") + private String engineeringPanoramicPhotos; + + /** 降等批复文件 */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String approvalDocumentsDowngrade; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private Long proNo; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String remarks; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "降等批复文件") + @ApiModelProperty("降等批复文件") + private String relations; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordTakeEffectTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date recordLoseEfficacyTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java new file mode 100644 index 00000000..79c4a283 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzbpMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.sz.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sz.domain.BsSgcSzBzbp; + +/** + * 水闸标识标牌Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcSzBzbpMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java new file mode 100644 index 00000000..ce06cc10 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sz.mapper; + +import com.kms.yg.sz.domain.BsSgcSzGcda; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 水闸工程基础信息Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcSzGcdaMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..1e9fc36d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcglMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sz.mapper; + +import com.kms.yg.sz.domain.BsSgcSzGcgl; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 水闸工程管理信息Mapper接口 + * + * @author kms + * @date 2023-12-25 + */ +@Repository +public interface BsSgcSzGcglMapper extends BaseMapper { + +} 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 new file mode 100644 index 00000000..cbba3612 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzbpService.java @@ -0,0 +1,17 @@ +package com.kms.yg.sz.service; + +import com.shuili.common.core.service.BaseService; +import com.kms.yg.sz.mapper.BsSgcSzBzbpMapper; +import com.kms.yg.sz.domain.BsSgcSzBzbp; +import org.springframework.stereotype.Service; + +/** + * 水闸标识标牌Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcSzBzbpService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java new file mode 100644 index 00000000..b56cba08 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java @@ -0,0 +1,18 @@ +package com.kms.yg.sz.service; + +import com.kms.yg.sz.domain.BsSgcSzGcda; +import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + + +/** + * 水闸工程基础信息Service接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcSzGcdaService extends BaseService{ + +} 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 new file mode 100644 index 00000000..ec38c038 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcglService.java @@ -0,0 +1,29 @@ +package com.kms.yg.sz.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.sz.domain.BsSgcSzGcgl; +import com.kms.yg.sz.mapper.BsSgcSzGcglMapper; +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接口 + * + * @author kms + * @date 2023-12-25 + */ +@Service +public class BsSgcSzGcglService extends BaseService{ + + @Autowired + private BsSgcSzGcglMapper bsSgcSzGcglMapper; + + /* public IPage selectPage(SearchParam sp) { + + + return null; + }*/ +} 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 696c915b..e9896956 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,6 +3,7 @@ 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; From 8fca105fbc5dfb0e7d4fb2843cfcb2d34ac809fd Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Tue, 26 Dec 2023 10:37:49 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfGcglController.java | 18 ++++++++++- .../df/controller/BsSgcDfJbxxController.java | 32 ++++++++++++++++++- .../com/kms/yg/df/domain/BsSgcDfBzbp.java | 6 ++-- .../com/kms/yg/df/domain/BsSgcDfGcgl.java | 3 ++ .../sz/controller/BsSgcSzGcdaController.java | 27 +++++++++++++++- .../sz/controller/BsSgcSzGcglController.java | 18 ++++++++++- .../com/kms/yg/sz/domain/BsSgcSzBzbp.java | 6 ++-- .../com/kms/yg/sz/domain/BsSgcSzGcgl.java | 2 ++ 8 files changed, 102 insertions(+), 10 deletions(-) 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 e2d08917..d615eb20 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 @@ -8,6 +8,7 @@ import com.kms.yg.df.domain.BsSgcDfGcgl; import com.kms.yg.df.service.BsSgcDfGcglService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.BeanUtils; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -102,7 +103,22 @@ public class BsSgcDfGcglController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcDfGcgl bsSgcDfGcgl) { - return toAjax(bsSgcDfGcglService.updateById(bsSgcDfGcgl)); + String id = bsSgcDfGcgl.getId(); + BsSgcDfGcgl byId = bsSgcDfGcglService.getById(id); + byId.setRecordLoseEfficacyTime(new Date()); + bsSgcDfGcglService.updateById(byId); + + bsSgcDfGcgl.setRecordTakeEffectTime(new Date()); + bsSgcDfGcgl.setRecordLoseEfficacyTime(null); + bsSgcDfGcgl.setId(""); + + BsSgcDfGcgl gcgl = new BsSgcDfGcgl(); + + BeanUtils.copyProperties(bsSgcDfGcgl,gcgl); + BaseEntityUtils.preInsert(gcgl); + + + return toAjax(bsSgcDfGcglService.save(gcgl)); } /** 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 b1a1b9dd..1b4526c7 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 @@ -4,10 +4,12 @@ import java.util.Arrays; import java.util.Date; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.df.service.BsSgcDfJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.BeanUtils; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -88,6 +90,18 @@ public class BsSgcDfJbxxController extends BaseController @ApiOperation("堤防基本信息新增") public AjaxResult add(@RequestBody BsSgcDfJbxx bsSgcDfJbxx) { + String embankmentCode = bsSgcDfJbxx.getEmbankmentCode(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("EBANKMENT_CODE", embankmentCode); + + BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper); + if (one != null) { + return AjaxResult.error("该堤防编码已存在"); + } + + BaseEntityUtils.preInsert(bsSgcDfJbxx); bsSgcDfJbxx.setRecordTakeEffectTime(new Date()); return toAjax(bsSgcDfJbxxService.save(bsSgcDfJbxx)); @@ -101,7 +115,23 @@ public class BsSgcDfJbxxController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcDfJbxx bsSgcDfJbxx) { - return toAjax(bsSgcDfJbxxService.updateById(bsSgcDfJbxx)); + String id = bsSgcDfJbxx.getId(); + BsSgcDfJbxx byId = bsSgcDfJbxxService.getById(id); + byId.setRecordLoseEfficacyTime(new Date()); + bsSgcDfJbxxService.updateById(byId); + + + bsSgcDfJbxx.setRecordTakeEffectTime(new Date()); + bsSgcDfJbxx.setRecordLoseEfficacyTime(null); + bsSgcDfJbxx.setId(""); + + BsSgcDfJbxx jbxx = new BsSgcDfJbxx(); + + BeanUtils.copyProperties(bsSgcDfJbxx, jbxx); + BaseEntityUtils.preInsert(jbxx); + + + return toAjax(bsSgcDfJbxxService.save(jbxx)); } /** 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 dd5c8d96..e10d5f64 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 @@ -29,9 +29,9 @@ public class BsSgcDfBzbp extends BaseEntity private String markName; /** 堤防id */ - @Excel(name = "堤防id") - @ApiModelProperty("堤防id") - private String embankmentId; + @Excel(name = "堤防编码") + @ApiModelProperty("堤防编码") + private String embankmentCode; /** 标识位置 */ @Excel(name = "标识位置") 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 ce98f35b..5881cacc 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 @@ -205,4 +205,7 @@ public class BsSgcDfGcgl extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date recordLoseEfficacyTime; + + private String embankmentCode; + } 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 43d920de..cffa6f7d 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 @@ -4,10 +4,12 @@ import java.util.Arrays; import java.util.Date; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.service.BsSgcSzGcdaService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.BeanUtils; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -88,6 +90,16 @@ public class BsSgcSzGcdaController extends BaseController @ApiOperation("水闸工程基础信息新增") public AjaxResult add(@RequestBody BsSgcSzGcda bsSgcSzGcda) { + String sluiceCode = bsSgcSzGcda.getSluiceCode(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sluice_code", sluiceCode); + + BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper); + if (one != null){ + return AjaxResult.error("水闸编码已存在"); + } + BaseEntityUtils.preInsert(bsSgcSzGcda); bsSgcSzGcda.setRecordTakeEffectTime(new Date()); return toAjax(bsSgcSzGcdaService.save(bsSgcSzGcda)); @@ -101,7 +113,20 @@ public class BsSgcSzGcdaController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcSzGcda bsSgcSzGcda) { - return toAjax(bsSgcSzGcdaService.updateById(bsSgcSzGcda)); + String id = bsSgcSzGcda.getId(); + BsSgcSzGcda byId = bsSgcSzGcdaService.getById(id); + byId.setRecordLoseEfficacyTime(new Date()); + bsSgcSzGcdaService.updateById(byId); + + bsSgcSzGcda.setRecordTakeEffectTime(new Date()); + bsSgcSzGcda.setRecordLoseEfficacyTime(null); + bsSgcSzGcda.setId(""); + + BsSgcSzGcda gcda = new BsSgcSzGcda(); + BeanUtils.copyProperties(bsSgcSzGcda,gcda); + + BaseEntityUtils.preInsert(gcda); + return toAjax(bsSgcSzGcdaService.save(gcda)); } /** 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 6a44063e..557ae331 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 @@ -8,6 +8,7 @@ import com.kms.yg.sz.domain.BsSgcSzGcgl; import com.kms.yg.sz.service.BsSgcSzGcglService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.BeanUtils; import com.shuili.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; @@ -101,7 +102,22 @@ public class BsSgcSzGcglController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcSzGcgl bsSgcSzGcgl) { - return toAjax(bsSgcSzGcglService.updateById(bsSgcSzGcgl)); + + String id = bsSgcSzGcgl.getId(); + BsSgcSzGcgl byId = bsSgcSzGcglService.getById(id); + byId.setRecordLoseEfficacyTime(new Date()); + bsSgcSzGcglService.updateById(byId); + + bsSgcSzGcgl.setRecordTakeEffectTime(new Date()); + bsSgcSzGcgl.setRecordLoseEfficacyTime(null); + bsSgcSzGcgl.setId(""); + + BsSgcSzGcgl gcgl = new BsSgcSzGcgl(); + + BeanUtils.copyProperties(bsSgcSzGcgl,gcgl); + BaseEntityUtils.preInsert(gcgl); + + return toAjax(bsSgcSzGcglService.save(gcgl)); } /** 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 68d2dce1..0332fdc9 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 @@ -29,9 +29,9 @@ public class BsSgcSzBzbp extends BaseEntity private String markName; /** 水闸id */ - @Excel(name = "水闸id") - @ApiModelProperty("水闸id") - private String suliceId; + @Excel(name = "水闸编码") + @ApiModelProperty("水闸编码") + private String sluiceCode; /** 标识位置 */ @Excel(name = "标识位置") diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java index 3ffb81b5..4dccb258 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcgl.java @@ -205,4 +205,6 @@ public class BsSgcSzGcgl extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date recordLoseEfficacyTime; + private String sluiceCode; + } From 39018eb68565edd36643786cdb730bb757c9a367 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Tue, 26 Dec 2023 11:18:37 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index.vue.vm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/shuili-generator/src/main/resources/vm/vue/index.vue.vm b/shuili-generator/src/main/resources/vm/vue/index.vue.vm index 2db48d3a..5b909ad9 100644 --- a/shuili-generator/src/main/resources/vm/vue/index.vue.vm +++ b/shuili-generator/src/main/resources/vm/vue/index.vue.vm @@ -152,7 +152,7 @@ /> - + #foreach($column in $columns) #set($field=$column.javaField) @@ -296,7 +296,14 @@ export default { #end #end - } + }, + // 排序方式 + params: { + // 按哪个字段排序 + orderBy: "create_time", + // desc降序，升序asc + sort: "desc", + }, }, // 表单参数 From b554923452f3424646d07234a73146fb1c1e67a1 Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Tue, 26 Dec 2023 13:54:15 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index.vue.vm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shuili-generator/src/main/resources/vm/vue/index.vue.vm b/shuili-generator/src/main/resources/vm/vue/index.vue.vm index 5b909ad9..afeca5c1 100644 --- a/shuili-generator/src/main/resources/vm/vue/index.vue.vm +++ b/shuili-generator/src/main/resources/vm/vue/index.vue.vm @@ -99,8 +99,8 @@ - - + + #foreach($column in $columns) #set($javaField=$column.javaField) #set($parentheseIndex=$column.columnComment.indexOf("（")) @@ -112,18 +112,18 @@ #if($column.pk) #elseif($column.list && $column.htmlType == "datetime") - + #elseif($column.list && "" != $column.dictType) - + #elseif($column.list && "" != $javaField) - + #end #end - +