From 4b528ea63b8b5017626412c220ded3cc5e12c903 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Sat, 22 Mar 2025 09:14:59 +0800 Subject: [PATCH] bugfix --- .../BuildingInformationController.java | 3 +- .../ruoyi/gysl/controller/MxController.java | 13 +- .../ruoyi/gysl/controller/PjpzController.java | 13 +- .../controller/PlanInformationController.java | 3 +- .../controller/ProjectLegendController.java | 11 +- .../ProjectMonthInfoController.java | 3 +- .../ProjectOtherInfoController.java | 3 +- .../controller/ProjectRemarkController.java | 3 +- .../WysmxInformationController.java | 45 +-- .../ruoyi/gysl/controller/XmxlController.java | 23 +- .../gysl/controller/XmzskController.java | 15 +- .../gysl/entity/BaseModel/BaseModel.java | 40 +++ .../ruoyi/gysl/entity/BasicInformation.java | 36 +-- .../gysl/entity/BuildingInformation.java | 2 +- .../main/java/com/ruoyi/gysl/entity/Mx.java | 52 +--- .../main/java/com/ruoyi/gysl/entity/Pjpz.java | 46 +--- .../com/ruoyi/gysl/entity/ProjectLegend.java | 9 +- .../ruoyi/gysl/entity/ProjectMonthInfo.java | 5 +- .../ruoyi/gysl/entity/ProjectOtherInfo.java | 12 +- .../com/ruoyi/gysl/entity/ProjectRemark.java | 7 +- .../ruoyi/gysl/entity/WysmxInformation.java | 118 +------- .../main/java/com/ruoyi/gysl/entity/Xmxl.java | 43 ++- .../java/com/ruoyi/gysl/entity/Xmzsk.java | 58 +--- .../gysl/entity/request/PjpzRequest.java | 20 ++ .../gysl/entity/request/XmzskPageReq.java | 26 ++ .../gysl/entity/request/ZwIdPageReq.java | 4 + .../response/ImgResponse/ImgResponse.java | 18 ++ .../response/ProjectLegendResponse.java | 24 ++ .../mapper/BuildingInformationMapper.java | 3 +- .../com/ruoyi/gysl/mapper/PjpzMapper.java | 11 + .../gysl/mapper/ProjectLegendMapper.java | 6 +- .../gysl/mapper/WysmxInformationMapper.java | 12 + .../com/ruoyi/gysl/mapper/XmxlMapper.java | 5 +- .../java/com/ruoyi/gysl/mapper/XmzskDao.java | 15 - .../com/ruoyi/gysl/mapper/XmzskMapper.java | 26 ++ .../com/ruoyi/gysl/service/MxService.java | 7 + .../com/ruoyi/gysl/service/PjpzService.java | 10 + .../gysl/service/ProjectLegendService.java | 9 +- .../gysl/service/WysmxInformationService.java | 10 + .../com/ruoyi/gysl/service/XmxlService.java | 14 +- .../com/ruoyi/gysl/service/XmzskService.java | 9 + .../gysl/service/impl/MxServiceImpl.java | 10 + .../gysl/service/impl/PjpzServiceImpl.java | 13 + .../impl/ProjectLegendServiceImpl.java | 34 ++- .../impl/WysmxInformationServiceImpl.java | 13 + .../gysl/service/impl/XmxlServiceImpl.java | 17 +- .../gysl/service/impl/XmzskServiceImpl.java | 17 +- .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/PjpzMapper.xml | 14 + .../mapper/WysmxInfomationMapper.xml | 14 + .../src/main/resources/mapper/XmxlMapper.xml | 2 +- .../src/main/resources/mapper/XmzskMapper.xml | 17 ++ .../ruoyi/common/core/domain/BaseEntity.java | 4 + .../ruoyi/framework/config/MyBatisConfig.java | 260 +++++++++--------- .../framework/config/MyMetaObjectHandler.java | 7 +- .../framework/config/MybatisPlusConfig.java | 126 ++++----- 57 files changed, 730 insertions(+), 614 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java create mode 100644 ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index ef5db2c..f81ebc4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -46,7 +47,7 @@ public class BuildingInformationController extends BaseController { */ @GetMapping("/page") @ApiOperation(value = "查询所有数据",response = BuildingInformation.class ) - public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(buildingInformationService.selectAll(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index e9ffe08..6644b1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -24,6 +24,8 @@ import java.util.List; @RestController @RequestMapping("/gysl/mx") public class MxController extends BaseController { + + /** * 服务对象 */ @@ -31,15 +33,14 @@ public class MxController extends BaseController { private MxService mxService; /** - * 分页查询所有数据 + * 查询所有模型数据 * - * @param page 分页对象 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page) { - return success(mxService.page(page)); + @ApiOperation("查询所有模型数据") + public AjaxResult selectAll() { + return success(mxService.list()); } /** @@ -63,7 +64,7 @@ public class MxController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Mx mx) { - return success(mxService.save(mx)); + return success(mxService.add(mx)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java index 5831190..3f8eb42 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PjpzController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; import com.ruoyi.gysl.service.PjpzService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,8 +41,8 @@ public class PjpzController extends BaseController { */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Pjpz pjpz) { - return success(this.pjpzService.page(page, new QueryWrapper<>(pjpz))); + public AjaxResult selectAll(Page page, PjpzRequest pjpz) { + return success(pjpzService.page(page, pjpz)); } /** @@ -53,7 +54,7 @@ public class PjpzController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.pjpzService.getById(id)); + return success(pjpzService.getById(id)); } /** @@ -65,7 +66,7 @@ public class PjpzController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Pjpz pjpz) { - return success(this.pjpzService.save(pjpz)); + return success(pjpzService.save(pjpz)); } /** @@ -77,7 +78,7 @@ public class PjpzController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Pjpz pjpz) { - return success(this.pjpzService.updateById(pjpz)); + return success(pjpzService.updateById(pjpz)); } /** @@ -89,7 +90,7 @@ public class PjpzController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.pjpzService.removeByIds(idList)); + return success(pjpzService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index cc28b74..f381f67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -40,7 +41,7 @@ public class PlanInformationController extends BaseController { */ @GetMapping("/selectAll") @ApiOperation("根据项目id查询规划信息") - public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(planInformationService.selectAll(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java index 5da248d..e39ed49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.ProjectLegend; @@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -32,16 +32,15 @@ public class ProjectLegendController extends BaseController { private ProjectLegendService projectLegendService; /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - @ApiOperation("分页查询所有数据") + @ApiOperation("根据项目id查询所有数据") @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq projectLegend) { - return success(projectLegendService.page(page, projectLegend)); + public AjaxResult selectAll(@Valid ZwIdPageReq projectLegend) { + return success(projectLegendService.page(projectLegend)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java index 3c3df4a..67c95be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -42,7 +43,7 @@ public class ProjectMonthInfoController extends BaseController { */ @ApiOperation("分页查询所有数据") @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(Page page,@Valid ZwIdPageReq zwIdPageReq) { return success(projectMonthInfoService.page(page, zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java index e59bc20..caf0117 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.List; /** @@ -37,7 +38,7 @@ public class ProjectOtherInfoController extends BaseController { */ @ApiOperation("根据项目id查询项目其他信息") @GetMapping("/searchId") - public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { return success(projectOtherInfoService.searchId(zwIdPageReq)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java index 6f78158..d6d48e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -40,7 +41,7 @@ public class ProjectRemarkController extends BaseController { */ @ApiOperation("查询所有数据") @GetMapping("/page") - public AjaxResult selectAll( RemarkPageReq projectRemark) { + public AjaxResult selectAll(@Valid RemarkPageReq projectRemark) { return success(projectRemarkService.list(projectRemark)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java index 9450e3e..734940f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/WysmxInformationController.java @@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.WysmxInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -21,7 +23,7 @@ import java.util.List; * @author makejava * @since 2025-02-24 14:29:58 */ -@Api(tags ="五要素模型信息" ) +@Api(tags ="五要素模型信息。" ) @RestController @RequestMapping("/gysl/wysmxInformation") public class WysmxInformationController extends BaseController { @@ -32,28 +34,15 @@ public class WysmxInformationController extends BaseController { private WysmxInformationService wysmxInformationService; /** - * 分页查询所有数据 + * 根据项目id查询该项目的五要素模型信息 * - * @param page 分页对象 - * @param wysmxInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.page(page, new QueryWrapper<>(wysmxInformation))); - } - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @ApiOperation("通过主键查询单条数据") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.wysmxInformationService.getById(id)); + @GetMapping("/selectOne") + @ApiOperation("根据项目id查询该项目的五要素模型信息") + public AjaxResult selectOne(@Valid ZwIdPageReq zwIdPageReq) { + return success(wysmxInformationService.selectOne(zwIdPageReq)); } /** @@ -65,7 +54,7 @@ public class WysmxInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.save(wysmxInformation)); + return success(wysmxInformationService.save(wysmxInformation)); } /** @@ -77,19 +66,7 @@ public class WysmxInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody WysmxInformation wysmxInformation) { - return success(this.wysmxInformationService.updateById(wysmxInformation)); - } - - /** - * 删除数据 - * - * @param idList 主键结合 - * @return 删除结果 - */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.wysmxInformationService.removeByIds(idList)); + return success(wysmxInformationService.updateById(wysmxInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java index 20faf9b..ee6b9cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Xmxl; @@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; @@ -19,9 +19,9 @@ import java.util.List; * 项目巡礼(Xmxl)表控制层 * * @author makejava - * @since 2025-03-19 14:19:21 + * @since 2025-03-21 14:15:34 */ -@Api(tags = "项目巡礼") +@Api(tags ="项目巡礼" ) @RestController @RequestMapping("/gysl/xmxl") public class XmxlController extends BaseController { @@ -32,16 +32,15 @@ public class XmxlController extends BaseController { private XmxlService xmxlService; /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @ApiOperation("分页查询所有数据") - @GetMapping("/page") - public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { - return success(xmxlService.page(page, zwIdPageReq)); + @GetMapping("/list") + @ApiOperation("根据项目id查询所有数据") + public AjaxResult selectAll(@Valid ZwIdPageReq zwIdPageReq) { + return success(xmxlService.list(zwIdPageReq)); } /** @@ -50,8 +49,8 @@ public class XmxlController extends BaseController { * @param id 主键 * @return 单条数据 */ - @ApiOperation("通过主键查询单条数据") @GetMapping("/{id}") + @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { return success(xmxlService.getById(id)); } @@ -62,8 +61,8 @@ public class XmxlController extends BaseController { * @param xmxl 实体对象 * @return 新增结果 */ - @ApiOperation("新增数据") @PostMapping("/add") + @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Xmxl xmxl) { return success(xmxlService.save(xmxl)); } @@ -74,8 +73,8 @@ public class XmxlController extends BaseController { * @param xmxl 实体对象 * @return 修改结果 */ + @PostMapping("/edit") @ApiOperation("修改数据") - @PutMapping("/edit") public AjaxResult update(@RequestBody Xmxl xmxl) { return success(xmxlService.updateById(xmxl)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java index 8fd6fa3..bfe0123 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java @@ -1,11 +1,11 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; import com.ruoyi.gysl.service.XmzskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,13 +35,12 @@ public class XmzskController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param xmzsk 查询实体 * @return 所有数据 */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Xmzsk xmzsk) { - return success(this.xmzskService.page(page, new QueryWrapper<>(xmzsk))); + public AjaxResult selectAll(Page page,XmzskPageReq req) { + return success(xmzskService.page(page,req)); } /** @@ -53,7 +52,7 @@ public class XmzskController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.xmzskService.getById(id)); + return success(xmzskService.getById(id)); } /** @@ -65,7 +64,7 @@ public class XmzskController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Xmzsk xmzsk) { - return success(this.xmzskService.save(xmzsk)); + return success(xmzskService.save(xmzsk)); } /** @@ -77,7 +76,7 @@ public class XmzskController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Xmzsk xmzsk) { - return success(this.xmzskService.updateById(xmzsk)); + return success(xmzskService.updateById(xmzsk)); } /** @@ -89,7 +88,7 @@ public class XmzskController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.xmzskService.removeByIds(idList)); + return success(xmzskService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java new file mode 100644 index 0000000..fa3d93d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BaseModel/BaseModel.java @@ -0,0 +1,40 @@ +package com.ruoyi.gysl.entity.BaseModel; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 公共实体类 + * @author du + * @since 2025/3/21 13:48 + */ +@Data +public class BaseModel { + @TableField(fill = FieldFill.INSERT) + private String createBy; + + @TableField(fill = FieldFill.INSERT) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @TableField(fill = FieldFill.INSERT) + private Long createId; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateId; + + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index 4a16301..8b21fbc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,7 +27,7 @@ import java.util.Date; @Data @ApiModel("基本信息") @TableName(value = "basic_information") -public class BasicInformation extends Model { +public class BasicInformation extends BaseModel { @ApiModelProperty("主键id") @TableId(value = "id", type = IdType.AUTO) @@ -148,36 +149,11 @@ public class BasicInformation extends Model { @ApiModelProperty("附件") private String fj; + @ApiModelProperty("经度") + private String longitude; - //创建者id - @ApiModelProperty("创建者id") - private Integer createId; - - //创建时间 - @ApiModelProperty("创建时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - - //创建者 - @ApiModelProperty("创建者") - private String createBy; - - //更新者ID - @ApiModelProperty("更新者ID") - private Long updateId; - - //更新者 - @ApiModelProperty("更新者") - private String updateBy; - - //更新时间 - @ApiModelProperty("更新时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - + @ApiModelProperty("纬度") + private String latitude; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java index 4c79c74..6e21a20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java @@ -149,7 +149,7 @@ public class BuildingInformation implements Serializable { * 是否为重要楼栋 */ @Excel(name = "是否为重要楼栋",readConverterExp="1=是,2=否") - @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") + @ApiModelProperty(value = "是否为重要楼栋 , 1是2否") @TableField("sfwzyld") private Integer sfwzyld; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index baabdf3..b1b839d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -4,9 +4,12 @@ import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; +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 com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("mx") @ApiModel(value = "Mx", description = "模型管理") -public class Mx implements Serializable { +public class Mx extends BaseModel implements Serializable { private static final long serialVersionUID = -78397958900753109L; /** @@ -31,7 +34,8 @@ public class Mx implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") - private Integer id; + @TableId(type = IdType.AUTO) + private Long id; /** * 1:关键要素；2：重要要素 @@ -60,48 +64,4 @@ public class Mx implements Serializable { @ApiModelProperty(value = "详细要求") @TableField("xxyq") private String xxyq; - - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private Date createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java index 657ee7e..426260f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Pjpz.java @@ -3,8 +3,11 @@ package com.ruoyi.gysl.entity; import java.util.Date; import java.io.Serializable; +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 com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,7 +23,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = false) @TableName("pjpz") @ApiModel(value = "Pjpz", description = "项目评价配置") -public class Pjpz implements Serializable { +public class Pjpz extends BaseModel implements Serializable { private static final long serialVersionUID = -25318153790915105L; /** @@ -28,6 +31,7 @@ public class Pjpz implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -44,45 +48,5 @@ public class Pjpz implements Serializable { @TableField("pfgz") private String pfgz; - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private Date createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - private Date updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java index 9edb3f0..756203e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java @@ -4,9 +4,12 @@ package com.ruoyi.gysl.entity; 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 com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -16,8 +19,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:12:35 */ +@EqualsAndHashCode(callSuper = true) @Data -public class ProjectLegend extends BaseEntity implements Serializable { +@TableName(value = "project_legend") +public class ProjectLegend extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) @@ -26,7 +31,7 @@ public class ProjectLegend extends BaseEntity implements Serializable { @ApiModelProperty("项目id") private Long xmId; - @ApiModelProperty("图片类型") + @ApiModelProperty("图片类型 1外部 2内部") private Integer imgType; @ApiModelProperty("图片") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java index f3ff4fa..4cccfa8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java @@ -4,7 +4,9 @@ package com.ruoyi.gysl.entity; 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 com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +18,9 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:03 */ +@TableName("project_month_info") @Data -public class ProjectMonthInfo extends BaseEntity implements Serializable { +public class ProjectMonthInfo extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java index 517d921..c588ff8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java @@ -4,7 +4,9 @@ package com.ruoyi.gysl.entity; 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 com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,8 +18,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:22 */ + +@TableName("project_other_info") @Data -public class ProjectOtherInfo extends BaseEntity implements Serializable { +public class ProjectOtherInfo extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) @@ -26,8 +30,10 @@ public class ProjectOtherInfo extends BaseEntity implements Serializable { @ApiModelProperty("项目id") private Long xmId; + @ApiModelProperty("键") + private String zdname; - @ApiModelProperty("其他信息JSON") - private String otherJson; + @ApiModelProperty("值") + private String zdinfor; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java index c64474d..e9742ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java @@ -4,9 +4,12 @@ package com.ruoyi.gysl.entity; 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 com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -16,8 +19,10 @@ import java.io.Serializable; * @author makejava * @since 2025-03-19 10:49:35 */ +@EqualsAndHashCode(callSuper = true) @Data -public class ProjectRemark extends BaseEntity implements Serializable { +@TableName("project_remark") +public class ProjectRemark extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java index 7fc6886..f8198bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/WysmxInformation.java @@ -1,18 +1,16 @@ package com.ruoyi.gysl.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; -import java.io.Serializable; - +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 com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * 五要素模型信息(WysmxInformation)实体类 @@ -24,11 +22,12 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("wysmx_information") @ApiModel(value = "WysmxInformation", description = "五要素模型信息") -public class WysmxInformation implements Serializable { +public class WysmxInformation extends BaseModel implements Serializable { private static final long serialVersionUID = 285216252862855830L; @ApiModelProperty(value = "${column.comment}") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -38,105 +37,10 @@ public class WysmxInformation implements Serializable { @TableField("xm_id") private Integer xmId; - /** - * 环境保护 - */ - @ApiModelProperty(value = "环境保护") - @TableField("hjbh") - private String hjbh; - - /** - * 设备载重 - */ - @ApiModelProperty(value = "设备载重") - @TableField("sbzz") - private BigDecimal sbzz; - - /** - * 货梯要求 - */ - @ApiModelProperty(value = "货梯要求") - @TableField("htyq") - private String htyq; - - /** - * 员工密度 - */ - @ApiModelProperty(value = "员工密度") - @TableField("ygmd") - private BigDecimal ygmd; + @ApiModelProperty("键") + private String zdname; - /** - * 加工精度 - */ - @ApiModelProperty(value = "加工精度") - @TableField("jgjd") - private BigDecimal jgjd; + @ApiModelProperty("值") + private String zdinfor; - /** - * 减振措施 - */ - @ApiModelProperty(value = "减振措施") - @TableField("jzcs") - private String jzcs; - - /** - * 生产类型 - */ - @ApiModelProperty(value = "生产类型") - @TableField("sclx") - private String sclx; - - /** - * 层高要求 - */ - @ApiModelProperty(value = "层高要求") - @TableField("cgyq") - private String cgyq; - - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java index 23c7785..0ae6c14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -4,10 +4,12 @@ package com.ruoyi.gysl.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -17,26 +19,49 @@ import java.time.LocalDate; * 项目巡礼(Xmxl)表实体类 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:38 */ +@EqualsAndHashCode(callSuper = true) @Data -public class Xmxl extends BaseEntity implements Serializable { +@TableName("xmxl") +public class Xmxl extends BaseModel implements Serializable { @TableField("id") @TableId(type = IdType.AUTO) private Long id; - @ApiModelProperty("监控名称") - private String jkmc; + @ApiModelProperty("项目id") + private Long xmId; - @ApiModelProperty(value = "时间 yyyy-MM-dd") + @ApiModelProperty("项目名称") + private String xmmc; + + @ApiModelProperty("年度") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy") + private LocalDate year; + + @ApiModelProperty("网页地址") + private String webUrl; + + @ApiModelProperty("时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate sj; - @ApiModelProperty(value = "当前状态") - private Integer status; + @ApiModelProperty("图片上传") + private String img; + + @ApiModelProperty("说明") + private String content; - @ApiModelProperty(value = "附件") + @ApiModelProperty("大事记") + private String bigEvent; + + @ApiModelProperty("新闻事件") + private String newsEvent; + + @ApiModelProperty("附件上传") private String fj; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java index 43c8044..4cb7368 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmzsk.java @@ -4,9 +4,12 @@ import java.time.LocalDateTime; import java.util.Date; import java.io.Serializable; +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 com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.gysl.entity.BaseModel.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,7 +26,7 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("xmzsk") @ApiModel(value = "Xmzsk", description = "$tableInfo.comment") -public class Xmzsk implements Serializable { +public class Xmzsk extends BaseModel implements Serializable { private static final long serialVersionUID = 442554812871200496L; /** @@ -31,6 +34,7 @@ public class Xmzsk implements Serializable { */ @ApiModelProperty(value = "主键id") @TableField("id") + @TableId(type = IdType.AUTO) private Integer id; /** @@ -47,6 +51,13 @@ public class Xmzsk implements Serializable { @TableField("lx") private String lx; + /** + * 网址 + */ + @ApiModelProperty(value = "类型") + @TableField("wz") + private String wz; + /** * 附件 */ @@ -68,49 +79,4 @@ public class Xmzsk implements Serializable { @TableField("scsj") private Date scsj; - /** - * 创建者id - */ - @ApiModelProperty(value = "创建者id") - @TableField("create_id") - private Integer createId; - - /** - * 创建时间 - */ - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - @TableField("create_by") - private String createBy; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - @TableField("update_id") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - @TableField("update_by") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java new file mode 100644 index 0000000..cd50cdb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/PjpzRequest.java @@ -0,0 +1,20 @@ +package com.ruoyi.gysl.entity.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目评价配置请求参数 + * @author du + * @since 2025/3/21 17:13 + */ +@Data +public class PjpzRequest { + + /** + * 评价要素 + */ + @ApiModelProperty(value = "评价要素") + private String pjys; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java new file mode 100644 index 0000000..0210313 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/XmzskPageReq.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.entity.request; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目知识库分页请求类 + * @author du + * @since 2025/3/21 14:37 + */ +@Data +public class XmzskPageReq { + + /** + * 文件名称 + */ + @ApiModelProperty(value = "文件名称") + private String name; + + /** + * 类型 + */ + @ApiModelProperty(value = "类型") + private String lx; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java index 714e43b..3f8ae01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java @@ -3,6 +3,8 @@ package com.ruoyi.gysl.entity.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 分页请求类 * @author du @@ -10,6 +12,8 @@ import lombok.Data; */ @Data public class ZwIdPageReq { + + @NotNull @ApiModelProperty("项目id") private Long xmId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java new file mode 100644 index 0000000..af9907e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ImgResponse/ImgResponse.java @@ -0,0 +1,18 @@ +package com.ruoyi.gysl.entity.response.ImgResponse; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 项目图例组装实体类 + * @author du + * @since 2025/3/21 16:03 + */ +@Data +public class ImgResponse { + + @ApiModelProperty("图片") + private String[] images; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java new file mode 100644 index 0000000..185c2bc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/response/ProjectLegendResponse.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.entity.response; + +import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 项目图例分页返回类 + * @author du + * @since 2025/3/21 15:52 + */ +@Data +public class ProjectLegendResponse { + + @ApiModelProperty("id") + private Long id; + + @ApiModelProperty("图片类型1") + private ImgResponse type1; + + @ApiModelProperty("图片类型2") + private ImgResponse type2; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java index 245d5eb..b8193a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.BuildingInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +21,6 @@ public interface BuildingInformationMapper extends BaseMapper selectAll(ZwIdPageReq zwIdPageReq); + List selectAll(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java index a2b0bd5..ee0542a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; +import org.apache.ibatis.annotations.Param; /** * 项目评价配置(Pjpz)表数据库访问层 @@ -11,5 +14,13 @@ import com.ruoyi.gysl.entity.Pjpz; */ public interface PjpzMapper extends BaseMapper { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") PjpzRequest pjpz); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java index 3feae45..685e9e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目图例(ProjectLegend)表数据库访问层 * @@ -18,10 +21,9 @@ public interface ProjectLegendMapper extends BaseMapper { /** * 分页查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") ZwIdPageReq projectLegend); + List page(@Param("req") ZwIdPageReq projectLegend); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java index 5f8114b..c113ac7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java @@ -2,6 +2,10 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 五要素模型信息(WysmxInformation)表数据库访问层 @@ -11,5 +15,13 @@ import com.ruoyi.gysl.entity.WysmxInformation; */ public interface WysmxInformationMapper extends BaseMapper { + + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectOne(@Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java index 78b315d..a96f5b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java @@ -6,6 +6,8 @@ import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 项目巡礼(Xmxl)表数据库访问层 * @@ -18,10 +20,9 @@ public interface XmxlMapper extends BaseMapper { /** * 分页查询所有数据 * - * @param page 分页对象 * @param zwIdPageReq 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); + List list( @Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java deleted file mode 100644 index 4bd4080..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.Xmzsk; - -/** - * (Xmzsk)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 14:31:17 - */ -public interface XmzskDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java new file mode 100644 index 0000000..bb0be24 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmzskMapper.java @@ -0,0 +1,26 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * (Xmzsk)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 14:31:17 + */ +public interface XmzskMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page,@Param("req") XmzskPageReq req); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java index fbc9a12..42e8344 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/MxService.java @@ -12,5 +12,12 @@ import com.ruoyi.gysl.entity.Mx; */ public interface MxService extends IService { + /** + * 新增数据 + * + * @param mx 实体对象 + * @return 新增结果 + */ + int add(Mx mx); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java index 9977b19..ba4154a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PjpzService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Pjpz; +import com.ruoyi.gysl.entity.request.PjpzRequest; /** * 项目评价配置(Pjpz)表服务接口 @@ -11,5 +13,13 @@ import com.ruoyi.gysl.entity.Pjpz; */ public interface PjpzService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + Page page (Page page, PjpzRequest pjpz); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java index 9f638d7..e5ade5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java @@ -1,9 +1,11 @@ package com.ruoyi.gysl.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; + +import java.util.List; /** * 项目图例(ProjectLegend)表服务接口 @@ -14,12 +16,11 @@ import com.ruoyi.gysl.entity.request.ZwIdPageReq; public interface ProjectLegendService extends IService { /** - * 分页查询所有数据 + * 根据项目id查询所有数据 * - * @param page 分页对象 * @param projectLegend 查询实体 * @return 所有数据 */ - Page page(Page page, ZwIdPageReq projectLegend); + List page( ZwIdPageReq projectLegend); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index e200ffe..ab0c183 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; /** * 五要素模型信息(WysmxInformation)表服务接口 @@ -11,5 +14,12 @@ import com.ruoyi.gysl.entity.WysmxInformation; */ public interface WysmxInformationService extends IService { + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectOne(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java index 2f2e2fd..71eaaa4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java @@ -1,25 +1,23 @@ package com.ruoyi.gysl.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import java.util.List; + /** * 项目巡礼(Xmxl)表服务接口 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:40 */ public interface XmxlService extends IService { + /** - * 分页查询所有数据 - * - * @param page 分页对象 - * @param zwIdPageReq 查询实体 - * @return 所有数据 + * 查询所有数据 */ - Page page(Page page , ZwIdPageReq zwIdPageReq); + List list(ZwIdPageReq projectRemark); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java index 9171059..05112b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmzskService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.Xmzsk; +import com.ruoyi.gysl.entity.request.XmzskPageReq; /** * (Xmzsk)表服务接口 @@ -11,5 +13,12 @@ import com.ruoyi.gysl.entity.Xmzsk; */ public interface XmzskService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + Page page(Page page, XmzskPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index aafd2e0..3bfaaf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; import com.ruoyi.gysl.mapper.MxMapper; import com.ruoyi.gysl.service.MxService; +import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * 模型管理(Mx)表服务实现类 * @@ -15,6 +18,13 @@ import org.springframework.stereotype.Service; @Service("mxService") public class MxServiceImpl extends ServiceImpl implements MxService { + @Resource + private WysmxInformationService wysmxInformationService; + @Override + public int add(Mx mx) { + //新增一条模型信息,就要修改一次 + return 0; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java index 648c191..92055df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.PjpzRequest; import com.ruoyi.gysl.mapper.PjpzMapper; import com.ruoyi.gysl.entity.Pjpz; import com.ruoyi.gysl.service.PjpzService; @@ -15,5 +17,16 @@ import org.springframework.stereotype.Service; @Service("pjpzService") public class PjpzServiceImpl extends ServiceImpl implements PjpzService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param pjpz 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, PjpzRequest pjpz) { + return baseMapper.page(page,pjpz); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java index 8f7c37e..9aaf848 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java @@ -1,13 +1,17 @@ package com.ruoyi.gysl.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.entity.response.ImgResponse.ImgResponse; +import com.ruoyi.gysl.entity.response.ProjectLegendResponse; import com.ruoyi.gysl.mapper.ProjectLegendMapper; -import com.ruoyi.gysl.entity.ProjectLegend; import com.ruoyi.gysl.service.ProjectLegendService; import org.springframework.stereotype.Service; +import java.util.*; +import java.util.stream.Collectors; + /** * 项目图例(ProjectLegend)表服务实现类 * @@ -20,13 +24,33 @@ public class ProjectLegendServiceImpl extends ServiceImpl page(Page page, ZwIdPageReq projectLegend) { - return baseMapper.page(page,projectLegend); + public List page(ZwIdPageReq projectLegend) { + List a1 = new ArrayList<>(); + List page = baseMapper.page(projectLegend); + // 按 id 分组 + Map> grouped = page.stream() + .collect(Collectors.groupingBy(ProjectLegend::getXmId)); + for (Long id : grouped.keySet()) { + List legends = grouped.get(id); + ProjectLegendResponse ps = new ProjectLegendResponse(); + + legends.forEach(x -> { + ImgResponse imgResponse = new ImgResponse(); + imgResponse.setImages(x.getImg().split(",")); + if(x.getImgType() == 1){ + ps.setType1(imgResponse); + }else { + ps.setType2(imgResponse); + } + }); + ps.setId(id); + a1.add(ps); + } + return a1; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index 9341504..e386556 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -3,10 +3,13 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.WysmxInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.mapper.WysmxInformationMapper; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 五要素模型信息(WysmxInformation)表服务实现类 * @@ -16,5 +19,15 @@ import org.springframework.stereotype.Service; @Service("wysmxInformationService") public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { + /** + * 根据项目id查询该项目的五要素模型信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public List selectOne(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectOne(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java index c60784e..76aa7cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java @@ -1,32 +1,29 @@ package com.ruoyi.gysl.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.mapper.XmxlMapper; -import com.ruoyi.gysl.entity.Xmxl; import com.ruoyi.gysl.service.XmxlService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 项目巡礼(Xmxl)表服务实现类 * * @author makejava - * @since 2025-03-19 14:19:22 + * @since 2025-03-21 14:15:41 */ @Service("xmxlService") public class XmxlServiceImpl extends ServiceImpl implements XmxlService { /** - * 分页查询所有数据 - * - * @param page 分页对象 - * @param zwIdPageReq 查询实体 - * @return 所有数据 + * 查询所有数据 */ @Override - public Page page(Page page, ZwIdPageReq zwIdPageReq) { - return baseMapper.page(page,zwIdPageReq); + public List list(ZwIdPageReq projectRemark) { + return baseMapper.list(projectRemark); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java index b13942d..6f13620 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmzskServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.XmzskDao; +import com.ruoyi.gysl.entity.request.XmzskPageReq; +import com.ruoyi.gysl.mapper.XmzskMapper; import com.ruoyi.gysl.entity.Xmzsk; import com.ruoyi.gysl.service.XmzskService; import org.springframework.stereotype.Service; @@ -13,7 +15,18 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:31:18 */ @Service("xmzskService") -public class XmzskServiceImpl extends ServiceImpl implements XmzskService { +public class XmzskServiceImpl extends ServiceImpl implements XmzskService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @return 所有数据 + */ + @Override + public Page page(Page page, XmzskPageReq req) { + return baseMapper.page(page,req); + } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ae66616..09b29ed 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: adminadmin + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index dba8e64..019a6eb 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -64,7 +64,7 @@ spring: devtools: restart: # 热部署开关 - enabled: true + enabled: false # redis 配置 redis: # 地址 diff --git a/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml new file mode 100644 index 0000000..6d1e3d9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/PjpzMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml new file mode 100644 index 0000000..5f85807 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/WysmxInfomationMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml index 51beeb8..4792008 100644 --- a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml @@ -1,7 +1,7 @@ - select * from xmxl diff --git a/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml new file mode 100644 index 0000000..3121d36 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XmzskMapper.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 15bf66b..c3ade7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -36,10 +38,12 @@ public class BaseEntity implements Serializable private Date updateTime; /** 备注 */ + @TableField(exist = false) private String remark; /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) private Map params; public String getSearchValue() diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index bc6618a..e6f9de2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -1,132 +1,128 @@ -//package com.ruoyi.framework.config; -// -//import java.io.IOException; -//import java.util.ArrayList; -//import java.util.Arrays; -//import java.util.HashSet; -//import java.util.List; -//import javax.sql.DataSource; -//import org.apache.ibatis.io.VFS; -//import org.apache.ibatis.session.SqlSessionFactory; -//import org.mybatis.spring.SqlSessionFactoryBean; -//import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.core.env.Environment; -//import org.springframework.core.io.DefaultResourceLoader; -//import org.springframework.core.io.Resource; -//import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -//import org.springframework.core.io.support.ResourcePatternResolver; -//import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -//import org.springframework.core.type.classreading.MetadataReader; -//import org.springframework.core.type.classreading.MetadataReaderFactory; -//import org.springframework.util.ClassUtils; -//import com.ruoyi.common.utils.StringUtils; -// -///** -// * Mybatis支持*匹配扫描包 -// * -// * @author ruoyi -// */ -//@Configuration -//public class MyBatisConfig -//{ -// @Autowired -// private Environment env; -// -// static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; -// -// public static String setTypeAliasesPackage(String typeAliasesPackage) -// { -// ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); -// MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); -// List allResult = new ArrayList(); -// try -// { -// for (String aliasesPackage : typeAliasesPackage.split(",")) -// { -// List result = new ArrayList(); -// aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX -// + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; -// Resource[] resources = resolver.getResources(aliasesPackage); -// if (resources != null && resources.length > 0) -// { -// MetadataReader metadataReader = null; -// for (Resource resource : resources) -// { -// if (resource.isReadable()) -// { -// metadataReader = metadataReaderFactory.getMetadataReader(resource); -// try -// { -// result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); -// } -// catch (ClassNotFoundException e) -// { -// e.printStackTrace(); -// } -// } -// } -// } -// if (result.size() > 0) -// { -// HashSet hashResult = new HashSet(result); -// allResult.addAll(hashResult); -// } -// } -// if (allResult.size() > 0) -// { -// typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); -// } -// else -// { -// throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); -// } -// } -// catch (IOException e) -// { -// e.printStackTrace(); -// } -// return typeAliasesPackage; -// } -// -// public Resource[] resolveMapperLocations(String[] mapperLocations) -// { -// ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); -// List resources = new ArrayList(); -// if (mapperLocations != null) -// { -// for (String mapperLocation : mapperLocations) -// { -// try -// { -// Resource[] mappers = resourceResolver.getResources(mapperLocation); -// resources.addAll(Arrays.asList(mappers)); -// } -// catch (IOException e) -// { -// // ignore -// } -// } -// } -// return resources.toArray(new Resource[resources.size()]); -// } -// -// @Bean -// public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception -// { -// String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); -// String mapperLocations = env.getProperty("mybatis.mapperLocations"); -// String configLocation = env.getProperty("mybatis.configLocation"); -// typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); -// VFS.addImplClass(SpringBootVFS.class); -// -// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); -// sessionFactory.setDataSource(dataSource); -// sessionFactory.setTypeAliasesPackage(typeAliasesPackage); -// sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); -// sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); -// return sessionFactory.getObject(); -// } -//} \ No newline at end of file +package com.ruoyi.framework.config; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import javax.sql.DataSource; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.apache.ibatis.io.VFS; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.core.type.classreading.CachingMetadataReaderFactory; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.util.ClassUtils; +import com.ruoyi.common.utils.StringUtils; + +/** + * Mybatis支持*匹配扫描包 + * + * @author ruoyi + */ +@Configuration +public class MyBatisConfig +{ + @Autowired + private Environment env; + + static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; + + public static String setTypeAliasesPackage(String typeAliasesPackage) + { + ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); + MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); + List allResult = new ArrayList(); + try + { + for (String aliasesPackage : typeAliasesPackage.split(",")) + { + List result = new ArrayList(); + aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; + Resource[] resources = resolver.getResources(aliasesPackage); + if (resources != null && resources.length > 0) + { + MetadataReader metadataReader = null; + for (Resource resource : resources) + { + if (resource.isReadable()) + { + metadataReader = metadataReaderFactory.getMetadataReader(resource); + try + { + result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); + } + catch (ClassNotFoundException e) + { + e.printStackTrace(); + } + } + } + } + if (result.size() > 0) + { + HashSet hashResult = new HashSet(result); + allResult.addAll(hashResult); + } + } + if (allResult.size() > 0) + { + typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); + } + else + { + throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); + } + } + catch (IOException e) + { + e.printStackTrace(); + } + return typeAliasesPackage; + } + + public Resource[] resolveMapperLocations(String[] mapperLocations) + { + ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); + List resources = new ArrayList(); + if (mapperLocations != null) + { + for (String mapperLocation : mapperLocations) + { + try + { + Resource[] mappers = resourceResolver.getResources(mapperLocation); + resources.addAll(Arrays.asList(mappers)); + } + catch (IOException e) + { + // ignore + } + } + } + return resources.toArray(new Resource[resources.size()]); + } + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + return interceptor; + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java index 9305725..7f44f8b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java @@ -7,6 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; +import java.time.LocalDateTime; import java.util.Date; import java.util.Objects; @@ -39,8 +40,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "createId", Long.class, userId); this.strictInsertFill(metaObject, "updateId", Long.class, userId); } - this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); - this.strictInsertFill(metaObject, "updateTime", Date.class, new Date()); + this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now()); + this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); } @Override @@ -60,6 +61,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler { if (!Objects.equals(userName, "")) { this.strictUpdateFill(metaObject, "updateBy", String.class, userName); } - this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java index 794da73..3623b71 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java @@ -1,63 +1,63 @@ -package com.ruoyi.framework.config; - - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -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.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * Mybatis Plus 配置 - * - * @author ruoyi - */ -@EnableTransactionManagement(proxyTargetClass = true) -@Configuration -public class MybatisPlusConfig -{ - @Bean - public MybatisPlusInterceptor mybatisPlusInterceptor() - { - MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 分页插件 - interceptor.addInnerInterceptor(paginationInnerInterceptor()); - // 乐观锁插件 - interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); - // 阻断插件 - interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); - return interceptor; - } - - /** - * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html - */ - public PaginationInnerInterceptor paginationInnerInterceptor() - { - PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); - // 设置数据库类型为mysql - paginationInnerInterceptor.setDbType(DbType.MYSQL); - // 设置最大单页限制数量，默认 500 条，-1 不受限制 - paginationInnerInterceptor.setMaxLimit(-1L); - return paginationInnerInterceptor; - } - - /** - * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html - */ - public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() - { - return new OptimisticLockerInnerInterceptor(); - } - - /** - * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html - */ - public BlockAttackInnerInterceptor blockAttackInnerInterceptor() - { - return new BlockAttackInnerInterceptor(); - } -} \ No newline at end of file +//package com.ruoyi.framework.config; +// +// +//import com.baomidou.mybatisplus.annotation.DbType; +//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +//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.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.transaction.annotation.EnableTransactionManagement; +// +///** +// * Mybatis Plus 配置 +// * +// * @author ruoyi +// */ +//@EnableTransactionManagement(proxyTargetClass = true) +//@Configuration +//public class MybatisPlusConfig +//{ +// @Bean +// public MybatisPlusInterceptor mybatisPlusInterceptor() +// { +// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); +// // 分页插件 +// interceptor.addInnerInterceptor(paginationInnerInterceptor()); +// // 乐观锁插件 +// interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); +// // 阻断插件 +// interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); +// return interceptor; +// } +// +// /** +// * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html +// */ +// public PaginationInnerInterceptor paginationInnerInterceptor() +// { +// PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); +// // 设置数据库类型为mysql +// paginationInnerInterceptor.setDbType(DbType.MYSQL); +// // 设置最大单页限制数量，默认 500 条，-1 不受限制 +// paginationInnerInterceptor.setMaxLimit(-1L); +// return paginationInnerInterceptor; +// } +// +// /** +// * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html +// */ +// public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() +// { +// return new OptimisticLockerInnerInterceptor(); +// } +// +// /** +// * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html +// */ +// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() +// { +// return new BlockAttackInnerInterceptor(); +// } +//} \ No newline at end of file