From 5ca13acd25d04eb0ef0d4240cea390d21b3d4dd1 Mon Sep 17 00:00:00 2001 From: xbx <1827135378@qq.com> Date: Sun, 19 Nov 2023 20:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RmsFurnitureController.java | 232 +++++++++-------- .../rms/controller/RmsLocationController.java | 245 +++++++++--------- .../src/main/java/rms/entity/RmsLocation.java | 61 +++-- .../rms/mapper/xml/RmsFurnitureMapper.xml | 2 +- .../rms/mapper/xml/RmsInstrumentMapper.xml | 2 +- .../java/rms/model/RmsFurnitureModel.java | 77 ++++-- .../java/rms/model/RmsInstrumentModel.java | 9 - HRBNU/src/main/java/rms/model/TreeModel.java | 22 ++ .../rms/service/IRmsFurnitureService.java | 5 +- .../java/rms/service/IRmsLocationService.java | 19 +- .../service/impl/RmsFurnitureServiceImpl.java | 48 +++- .../service/impl/RmsLocationServiceImpl.java | 147 ++++++++++- .../org/jeecg/common/aspect/DictAspect.java | 105 ++++---- .../src/main/resources/application-dev.yml | 2 +- 14 files changed, 633 insertions(+), 343 deletions(-) create mode 100644 HRBNU/src/main/java/rms/model/TreeModel.java diff --git a/HRBNU/src/main/java/rms/controller/RmsFurnitureController.java b/HRBNU/src/main/java/rms/controller/RmsFurnitureController.java index e6db363..168d626 100644 --- a/HRBNU/src/main/java/rms/controller/RmsFurnitureController.java +++ b/HRBNU/src/main/java/rms/controller/RmsFurnitureController.java @@ -1,5 +1,7 @@ package rms.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -7,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; import rms.entity.RmsFurniture; import rms.model.RmsFurnitureModel; import rms.service.IRmsFurnitureService; @@ -16,132 +19,145 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.Arrays; - /** +/** * @Description: 家具信息表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ -@Api(tags="家具信息表") +@Api(tags = "家具信息表") @RestController @RequestMapping("/rms/rmsFurniture") @Slf4j public class RmsFurnitureController extends JeecgController { - @Autowired - private IRmsFurnitureService rmsFurnitureService; - - /** - * 分页列表查询 - * - * @param rmsFurnitureModel - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "家具信息表-分页列表查询") - @ApiOperation(value="家具信息表-分页列表查询", notes="家具信息表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(RmsFurnitureModel rmsFurnitureModel, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - return rmsFurnitureService.queryAllFurniture(rmsFurnitureModel, pageNo, pageSize, req); - } - - /** - * 添加 - * - * @param rmsFurniture - * @return - */ - @AutoLog(value = "家具信息表-添加") - @ApiOperation(value="家具信息表-添加", notes="家具信息表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody RmsFurniture rmsFurniture) { - rmsFurnitureService.save(rmsFurniture); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param rmsFurniture - * @return - */ - @AutoLog(value = "家具信息表-编辑") - @ApiOperation(value="家具信息表-编辑", notes="家具信息表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody RmsFurniture rmsFurniture) { - rmsFurnitureService.updateById(rmsFurniture); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "家具信息表-通过id删除") - @ApiOperation(value="家具信息表-通过id删除", notes="家具信息表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - rmsFurnitureService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "家具信息表-批量删除") - @ApiOperation(value="家具信息表-批量删除", notes="家具信息表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.rmsFurnitureService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "家具信息表-通过id查询") - @ApiOperation(value="家具信息表-通过id查询", notes="家具信息表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - RmsFurniture rmsFurniture = rmsFurnitureService.getById(id); - if(rmsFurniture==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(rmsFurniture); - } + @Autowired + private IRmsFurnitureService rmsFurnitureService; /** - * 导出excel - * - * @param request - * @param rmsFurniture - */ + * 分页列表查询 + * + * @param rmsFurnitureModel + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "家具信息表-分页列表查询") +// @ApiOperation(value = "家具信息表-分页列表查询", notes = "家具信息表-分页列表查询") +// @GetMapping(value = "/list") +// public Result> queryPageList(RmsFurniture rmsFurniture, +// @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, +// @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, +// HttpServletRequest req) { +// return rmsFurnitureService.queryAllFurniture(rmsFurniture, pageNo, pageSize, req); +// } + @ApiOperation(value = "家具信息表-分页列表查询", notes = "家具信息表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(RmsFurniture rmsFurniture, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(rmsFurniture, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = rmsFurnitureService.page(page, queryWrapper); + + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param rmsFurniture + * @return + */ + @AutoLog(value = "家具信息表-添加") + @ApiOperation(value = "家具信息表-添加", notes = "家具信息表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody RmsFurniture rmsFurniture) { + rmsFurnitureService.save(rmsFurniture); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param rmsFurniture + * @return + */ + @AutoLog(value = "家具信息表-编辑") + @ApiOperation(value = "家具信息表-编辑", notes = "家具信息表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody RmsFurniture rmsFurniture) { + rmsFurnitureService.updateById(rmsFurniture); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "家具信息表-通过id删除") + @ApiOperation(value = "家具信息表-通过id删除", notes = "家具信息表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + rmsFurnitureService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "家具信息表-批量删除") + @ApiOperation(value = "家具信息表-批量删除", notes = "家具信息表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.rmsFurnitureService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "家具信息表-通过id查询") + @ApiOperation(value = "家具信息表-通过id查询", notes = "家具信息表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + RmsFurniture rmsFurniture = rmsFurnitureService.getById(id); + if (rmsFurniture == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(rmsFurniture); + } + + /** + * 导出excel + * + * @param request + * @param rmsFurniture + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, RmsFurniture rmsFurniture) { return super.exportXls(request, rmsFurniture, RmsFurniture.class, "家具信息表"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, RmsFurniture.class); diff --git a/HRBNU/src/main/java/rms/controller/RmsLocationController.java b/HRBNU/src/main/java/rms/controller/RmsLocationController.java index baf6211..7dbc1b8 100644 --- a/HRBNU/src/main/java/rms/controller/RmsLocationController.java +++ b/HRBNU/src/main/java/rms/controller/RmsLocationController.java @@ -1,11 +1,14 @@ package rms.controller; +import java.util.ArrayList; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import rms.entity.RmsLocation; +import rms.model.TreeModel; import rms.service.IRmsLocationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,141 +23,149 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 存放地表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ -@Api(tags="存放地表") +@Api(tags = "存放地表") @RestController @RequestMapping("/rms/rmsLocation") @Slf4j public class RmsLocationController extends JeecgController { - @Autowired - private IRmsLocationService rmsLocationService; - - /** - * 分页列表查询 - * - * @param rmsLocation - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "存放地表-分页列表查询") - @ApiOperation(value="存放地表-分页列表查询", notes="存放地表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(RmsLocation rmsLocation, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(rmsLocation, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = rmsLocationService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param rmsLocation - * @return - */ - @AutoLog(value = "存放地表-添加") - @ApiOperation(value="存放地表-添加", notes="存放地表-添加") - @RequiresPermissions("rms:rms_location:add") - @PostMapping(value = "/add") - public Result add(@RequestBody RmsLocation rmsLocation) { - rmsLocationService.save(rmsLocation); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param rmsLocation - * @return - */ - @AutoLog(value = "存放地表-编辑") - @ApiOperation(value="存放地表-编辑", notes="存放地表-编辑") - @RequiresPermissions("rms:rms_location:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody RmsLocation rmsLocation) { - rmsLocationService.updateById(rmsLocation); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "存放地表-通过id删除") - @ApiOperation(value="存放地表-通过id删除", notes="存放地表-通过id删除") - @RequiresPermissions("rms:rms_location:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - rmsLocationService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "存放地表-批量删除") - @ApiOperation(value="存放地表-批量删除", notes="存放地表-批量删除") - @RequiresPermissions("rms:rms_location:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.rmsLocationService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "存放地表-通过id查询") - @ApiOperation(value="存放地表-通过id查询", notes="存放地表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - RmsLocation rmsLocation = rmsLocationService.getById(id); - if(rmsLocation==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(rmsLocation); - } + @Autowired + private IRmsLocationService rmsLocationService; /** - * 导出excel - * - * @param request - * @param rmsLocation - */ - @RequiresPermissions("rms:rms_location:exportXls") + * 分页列表查询 + * + * @param rmsLocation + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "存放地表-分页列表查询") + @ApiOperation(value = "存放地表-分页列表查询", notes = "存放地表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(RmsLocation rmsLocation, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(rmsLocation, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = rmsLocationService.page(page, queryWrapper); + //return Result.OK(rmsLocationService.getsLocationData(page, queryWrapper)); + return Result.OK(pageList); + } + + //获取树结构 + @ApiOperation(value = "存放地表-分页列表查询", notes = "存放地表-分页列表查询") + @GetMapping(value = "/getTree") + public Result> getTreeList() { + return Result.OK(rmsLocationService.getTreeList()); + } + + //获取级联样式 + @ApiOperation(value = "存放地表-分页列表查询", notes = "存放地表-分页列表查询") + @GetMapping(value = "/getCascader") + public Result> getCascaderList(@RequestParam(name = "type", defaultValue = "0") Integer type) { + return Result.OK(rmsLocationService.getCascaderList(type)); + } + + /** + * 添加 + * + * @param rmsLocation + * @return + */ + @AutoLog(value = "存放地表-添加") + @ApiOperation(value = "存放地表-添加", notes = "存放地表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody RmsLocation rmsLocation) { + rmsLocationService.save(rmsLocation); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param rmsLocation + * @return + */ + @AutoLog(value = "存放地表-编辑") + @ApiOperation(value = "存放地表-编辑", notes = "存放地表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody RmsLocation rmsLocation) { + rmsLocationService.updateById(rmsLocation); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "存放地表-通过id删除") + @ApiOperation(value = "存放地表-通过id删除", notes = "存放地表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + rmsLocationService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "存放地表-批量删除") + @ApiOperation(value = "存放地表-批量删除", notes = "存放地表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.rmsLocationService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "存放地表-通过id查询") + @ApiOperation(value = "存放地表-通过id查询", notes = "存放地表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + RmsLocation rmsLocation = rmsLocationService.getById(id); + if (rmsLocation == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(rmsLocation); + } + + /** + * 导出excel + * + * @param request + * @param rmsLocation + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, RmsLocation rmsLocation) { return super.exportXls(request, rmsLocation, RmsLocation.class, "存放地表"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("rms:rms_location:importExcel") + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, RmsLocation.class); diff --git a/HRBNU/src/main/java/rms/entity/RmsLocation.java b/HRBNU/src/main/java/rms/entity/RmsLocation.java index 1043705..678d2d7 100644 --- a/HRBNU/src/main/java/rms/entity/RmsLocation.java +++ b/HRBNU/src/main/java/rms/entity/RmsLocation.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -21,50 +22,68 @@ import lombok.experimental.Accessors; /** * @Description: 存放地表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ @Data @TableName("rms_location") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="rms_location对象", description="存放地表") +@ApiModel(value = "rms_location对象", description = "存放地表") public class RmsLocation implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**存放地id*/ - @Excel(name = "存放地id", width = 15) - @ApiModelProperty(value = "存放地id") - private java.lang.String locationId; - /**存放地名称*/ - @Excel(name = "存放地名称", width = 15) + /** + * 存放地名称 + */ + @Excel(name = "存放地名称", width = 15) @ApiModelProperty(value = "存放地名称") private java.lang.String locationName; - /**父节点id*/ - @Excel(name = "父节点id", width = 15) + /** + * 排序号 + */ + @Excel(name = "排序号", width = 15) + @ApiModelProperty(value = "排序号") + private java.lang.Integer sortNumber; + /** + * 父节点id + */ + @Excel(name = "父节点id", width = 15) @ApiModelProperty(value = "父节点id") private java.lang.String parentLocationId; } diff --git a/HRBNU/src/main/java/rms/mapper/xml/RmsFurnitureMapper.xml b/HRBNU/src/main/java/rms/mapper/xml/RmsFurnitureMapper.xml index d523b28..cf567ff 100644 --- a/HRBNU/src/main/java/rms/mapper/xml/RmsFurnitureMapper.xml +++ b/HRBNU/src/main/java/rms/mapper/xml/RmsFurnitureMapper.xml @@ -4,6 +4,6 @@ diff --git a/HRBNU/src/main/java/rms/mapper/xml/RmsInstrumentMapper.xml b/HRBNU/src/main/java/rms/mapper/xml/RmsInstrumentMapper.xml index 867320c..badf0d7 100644 --- a/HRBNU/src/main/java/rms/mapper/xml/RmsInstrumentMapper.xml +++ b/HRBNU/src/main/java/rms/mapper/xml/RmsInstrumentMapper.xml @@ -4,6 +4,6 @@ diff --git a/HRBNU/src/main/java/rms/model/RmsFurnitureModel.java b/HRBNU/src/main/java/rms/model/RmsFurnitureModel.java index cfc01ec..192a5e1 100644 --- a/HRBNU/src/main/java/rms/model/RmsFurnitureModel.java +++ b/HRBNU/src/main/java/rms/model/RmsFurnitureModel.java @@ -2,6 +2,7 @@ package rms.model; import lombok.Data; import lombok.EqualsAndHashCode; +import org.jeecg.common.aspect.annotation.Dict; /** * 关联地址模型 @@ -10,52 +11,84 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode() public class RmsFurnitureModel { - /**主键*/ + /** + * 主键 + */ private String id; - /**领用单位号*/ + /** + * 领用单位号 + */ private String collectingUnitNumber; - /**家具编号*/ + /** + * 家具编号 + */ private java.lang.String furnitureNumber; - /**家具名称*/ + /** + * 家具名称 + */ private java.lang.String furnitureName; - /**分类号*/ + /** + * 分类号 + */ private java.lang.String categoryId; - /**型号*/ + /** + * 型号 + */ private java.lang.String model; - /**规格*/ + /** + * 规格 + */ private java.lang.String specifications; - /**数量*/ + /** + * 数量 + */ private String number; - /**单价*/ + /** + * 单价 + */ private String unitPrice; - /**金额*/ + /** + * 金额 + */ private String amount; - /**厂家*/ + /** + * 厂家 + */ private String manufactuer; - /**购置日期*/ + /** + * 购置日期 + */ private java.util.Date purchaseDate; - /**领用人*/ + /** + * 领用人 + */ private java.lang.String recipient; - /**单据号*/ + /** + * 单据号 + */ private String documentNumber; - /**存放地id*/ - private String locationId; //存放地名 private String locationName; - /**备注*/ + /** + * 备注 + */ private String note; - /**审核状态*/ + /** + * 审核状态 + */ private java.lang.String approvalStatus; - /**初审状态*/ + /** + * 初审状态 + */ private java.lang.String initialAudit; - /**使用年限*/ + /** + * 使用年限 + */ private String usageYears; - - } diff --git a/HRBNU/src/main/java/rms/model/RmsInstrumentModel.java b/HRBNU/src/main/java/rms/model/RmsInstrumentModel.java index 1be7228..aa2f1c4 100644 --- a/HRBNU/src/main/java/rms/model/RmsInstrumentModel.java +++ b/HRBNU/src/main/java/rms/model/RmsInstrumentModel.java @@ -35,12 +35,8 @@ public class RmsInstrumentModel { private java.lang.String recipient; /**入库时间*/ private java.util.Date entryDate; - - /**单据号*/ private java.lang.String documentNumber; - /**存放地id*/ - private String locationId; //存放地名 private String locationName; /**备注*/ @@ -52,9 +48,4 @@ public class RmsInstrumentModel { /**ID*/ private java.lang.String instrumentId; - - - - - } diff --git a/HRBNU/src/main/java/rms/model/TreeModel.java b/HRBNU/src/main/java/rms/model/TreeModel.java new file mode 100644 index 0000000..c37e744 --- /dev/null +++ b/HRBNU/src/main/java/rms/model/TreeModel.java @@ -0,0 +1,22 @@ +package rms.model; + +import lombok.Data; + +import java.util.ArrayList; + +/** + * 树结构模型 + * 包含以下属性 + * 1. 树key + * 2. 树title + * 3. 树children + */ +@Data +public class TreeModel { + private String key; + private String value; + private String title; + private String label; + private Integer sortNumber; + private ArrayList children; +} diff --git a/HRBNU/src/main/java/rms/service/IRmsFurnitureService.java b/HRBNU/src/main/java/rms/service/IRmsFurnitureService.java index d9ebd35..052db87 100644 --- a/HRBNU/src/main/java/rms/service/IRmsFurnitureService.java +++ b/HRBNU/src/main/java/rms/service/IRmsFurnitureService.java @@ -7,14 +7,15 @@ import com.baomidou.mybatisplus.extension.service.IService; import rms.model.RmsFurnitureModel; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; /** * @Description: 家具信息表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ public interface IRmsFurnitureService extends IService { - Result> queryAllFurniture(RmsFurnitureModel rmsFurnitureModel, Integer pageNo, Integer pageSize, HttpServletRequest req) ; + Result> queryAllFurniture(RmsFurniture rmsFurniture, Integer pageNo, Integer pageSize, HttpServletRequest req); } diff --git a/HRBNU/src/main/java/rms/service/IRmsLocationService.java b/HRBNU/src/main/java/rms/service/IRmsLocationService.java index b16aa5f..e37262c 100644 --- a/HRBNU/src/main/java/rms/service/IRmsLocationService.java +++ b/HRBNU/src/main/java/rms/service/IRmsLocationService.java @@ -1,14 +1,31 @@ package rms.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import rms.entity.RmsLocation; import com.baomidou.mybatisplus.extension.service.IService; +import rms.model.TreeModel; + +import java.util.ArrayList; /** * @Description: 存放地表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ public interface IRmsLocationService extends IService { + //获取表格数据 + ArrayList getsLocationData(Page page, QueryWrapper queryWrapper); + + //获取全部的树结构 + ArrayList getTreeList(); + + //获取某个节点的子节点ids（包括自身） + ArrayList getChildrenIds(String id); + + //获取级联样式 + ArrayList getCascaderList(Integer type); + } diff --git a/HRBNU/src/main/java/rms/service/impl/RmsFurnitureServiceImpl.java b/HRBNU/src/main/java/rms/service/impl/RmsFurnitureServiceImpl.java index 09005d4..2fdfe31 100644 --- a/HRBNU/src/main/java/rms/service/impl/RmsFurnitureServiceImpl.java +++ b/HRBNU/src/main/java/rms/service/impl/RmsFurnitureServiceImpl.java @@ -1,7 +1,11 @@ package rms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecg.common.system.query.QueryGenerator; import rms.entity.RmsFurniture; import rms.mapper.RmsFurnitureMapper; import rms.model.RmsFurnitureModel; @@ -11,24 +15,50 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; /** * @Description: 家具信息表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ @Service public class RmsFurnitureServiceImpl extends ServiceImpl implements IRmsFurnitureService { @Override - public Result> queryAllFurniture(RmsFurnitureModel rmsFurnitureModel, Integer pageNo, Integer pageSize, HttpServletRequest req) { - Page RmsFurnitureModelPage = new Page<>(pageNo, pageSize); - - List RmsFurniturelList = getBaseMapper().queryAllFurniture(RmsFurnitureModelPage); - - RmsFurnitureModelPage.setRecords(RmsFurniturelList); - - return Result.OK(RmsFurnitureModelPage); + public Result> queryAllFurniture(RmsFurniture rmsFurniture, Integer pageNo, Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(rmsFurniture, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage RmsFurnitureModel = page(page, queryWrapper); + //将RmsFurniture转换为RmsFurnitureModel + ArrayList rmsFurnitureModelList = new ArrayList<>(); + List records = RmsFurnitureModel.getRecords(); + for (RmsFurniture record : records) { + System.out.println(record); + RmsFurnitureModel rmsFurnitureModel = new RmsFurnitureModel(); + rmsFurnitureModel.setId(record.getId()); + rmsFurnitureModel.setCollectingUnitNumber(record.getCollectingUnitNumber()); + rmsFurnitureModel.setFurnitureNumber(record.getFurnitureNumber()); + rmsFurnitureModel.setFurnitureName(record.getFurnitureName()); + rmsFurnitureModel.setCategoryId(record.getCategoryId()); + rmsFurnitureModel.setModel(record.getModel()); + rmsFurnitureModel.setSpecifications(record.getSpecifications()); + rmsFurnitureModel.setNumber(record.getNumber()); + rmsFurnitureModel.setUnitPrice(record.getUnitPrice()); + rmsFurnitureModel.setAmount(record.getAmount()); + rmsFurnitureModel.setManufactuer(record.getManufactuer()); + rmsFurnitureModel.setPurchaseDate(record.getPurchaseDate()); + rmsFurnitureModel.setRecipient(record.getRecipient()); + rmsFurnitureModel.setDocumentNumber(record.getDocumentNumber()); + rmsFurnitureModel.setLocationName(null); + rmsFurnitureModel.setNote(record.getNote()); + rmsFurnitureModel.setApprovalStatus(record.getApprovalStatus()); + rmsFurnitureModel.setInitialAudit(record.getInitialAudit()); + rmsFurnitureModel.setUsageYears(record.getUsageYears()); + System.out.println(rmsFurnitureModel); + rmsFurnitureModelList.add(rmsFurnitureModel); + } + return Result.OK(rmsFurnitureModelList); } } diff --git a/HRBNU/src/main/java/rms/service/impl/RmsLocationServiceImpl.java b/HRBNU/src/main/java/rms/service/impl/RmsLocationServiceImpl.java index 0815cd6..0b2baba 100644 --- a/HRBNU/src/main/java/rms/service/impl/RmsLocationServiceImpl.java +++ b/HRBNU/src/main/java/rms/service/impl/RmsLocationServiceImpl.java @@ -1,19 +1,164 @@ package rms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jetbrains.annotations.NotNull; import rms.entity.RmsLocation; import rms.mapper.RmsLocationMapper; +import rms.model.TreeModel; import rms.service.IRmsLocationService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** * @Description: 存放地表 * @Author: jeecg-boot - * @Date: 2023-11-18 + * @Date: 2023-11-18 * @Version: V1.0 */ @Service public class RmsLocationServiceImpl extends ServiceImpl implements IRmsLocationService { + //获取分页的树数据，排序规则为父级在上，子集依据sortNumber排序 + @Override + public ArrayList getsLocationData(Page page, QueryWrapper queryWrapper) { + //此处查询器查询出来的已经是只有父节点和一层子节点的数据了 + //查询全部数据，然后先写入父节点，再写入子节点（依据sortNumber排序）最后再依据原本的分页规则进行分页 + //获取全部的树结构 + Page newPage = new Page<>(1, 100000); + IPage pageList = page(newPage, queryWrapper); + //如果list长于2（即有多个子节点）的情况下，进行排序，否则直接返回 + if (pageList.getRecords().size() > 2) { + ArrayList treeModels = (ArrayList) pageList.getRecords(); + return treeModels; + } + //如果长于2，遍历全部父节点，出现最多的即为总父节点 + HashMap parentMap = new HashMap<>(); + for (RmsLocation location : pageList.getRecords()) { + if (location.getParentLocationId() != null && !location.getParentLocationId().isEmpty()) { + if (parentMap.containsKey(location.getParentLocationId())) { + parentMap.put(location.getParentLocationId(), parentMap.get(location.getParentLocationId()) + 1); + } else { + parentMap.put(location.getParentLocationId(), 1); + } + } + } + // + return null; + } + + + //获取完整的树结构 + public ArrayList getTreeList() { + //依据排序号对list进行排序 + ArrayList treeModels = getTreeModels(); + sortTree(treeModels); + return treeModels; + } + + //递归对树结构进行排序 + private void sortTree(ArrayList treeModels) { + treeModels.sort((o1, o2) -> { + if (o1.getSortNumber() == null) { + return -1; + } + if (o2.getSortNumber() == null) { + return 1; + } + return o1.getSortNumber() - o2.getSortNumber(); + }); + for (TreeModel treeModel : treeModels) { + sortTree(treeModel.getChildren()); + } + } + + //获取级联样式（只搜索前两层） + public ArrayList getCascaderList(Integer type) { + List list = getBaseMapper().selectList(null); + ArrayList treeModels = getTreeModels(list); + ArrayList cascaderList = new ArrayList<>(); + for (TreeModel treeModel : treeModels) { + cascaderList.add(treeModel); + //如果存在子集的话 + //如果type=1，则不进行该操作 + if (type == 0 && treeModel.getChildren().size() > 0) { + for (TreeModel child : treeModel.getChildren()) { + child.setChildren(null); + } + } + } + + return cascaderList; + } + + + //获取某个节点的子节点ids（包括自身） + public ArrayList getChildrenIds(String id) { + ArrayList childrenIds = new ArrayList<>(); + childrenIds.add(id); + ArrayList treeModels = getTreeModels(); + for (TreeModel treeModel : treeModels) { + if (treeModel.getKey().equals(id)) { + getChildrenIds(treeModel, childrenIds); + break; + } + } + return childrenIds; + } + + + private void getChildrenIds(TreeModel treeModel, ArrayList childrenIds) { + for (TreeModel child : treeModel.getChildren()) { + childrenIds.add(child.getKey()); + getChildrenIds(child, childrenIds); + } + } + + + //查询树结构 + @NotNull + private ArrayList getTreeModels() { + List list = getBaseMapper().selectList(null); + return getTreeModels(list); + } + + @NotNull + private static ArrayList getTreeModels(List list) { + // 2. 将 RmsLocation 转换为 TreeModel + HashMap treeModelMap = new HashMap<>(); + for (RmsLocation location : list) { + TreeModel treeModel = new TreeModel(); + treeModel.setKey(location.getId()); + treeModel.setValue(location.getId()); + treeModel.setTitle(location.getLocationName()); + treeModel.setLabel(location.getLocationName()); + treeModel.setChildren(new ArrayList<>()); + treeModel.setSortNumber(location.getSortNumber()); + + treeModelMap.put(location.getId(), treeModel); + } + + // 3. 构建树结构 + ArrayList tree = new ArrayList<>(); + for (RmsLocation location : list) { + TreeModel current = treeModelMap.get(location.getId()); + if (location.getParentLocationId() == null || location.getParentLocationId().isEmpty()) { + // 如果没有父节点，则是树的根节点 + tree.add(current); + } else { + // 如果有父节点，找到父节点，并将当前节点添加为其子节点 + TreeModel parent = treeModelMap.get(location.getParentLocationId()); + if (parent != null) { + parent.getChildren().add(current); + } + } + } + return tree; + } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java index c5c2897..99f4e94 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java @@ -52,20 +52,21 @@ public class DictAspect { /** * 定义切点Pointcut */ - @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..)) || @annotation(org.jeecg.common.aspect.annotation.AutoDict)") + @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..)) ||execution(public * rms.controller.*Controller.*(..)) || @annotation(org.jeecg.common.aspect.annotation.AutoDict)") + public void excudeService() { } @Around("excudeService()") public Object doAround(ProceedingJoinPoint pjp) throws Throwable { - long time1=System.currentTimeMillis(); + long time1 = System.currentTimeMillis(); Object result = pjp.proceed(); - long time2=System.currentTimeMillis(); - log.debug("获取JSON数据 耗时："+(time2-time1)+"ms"); - long start=System.currentTimeMillis(); - result=this.parseDictText(result); - long end=System.currentTimeMillis(); - log.debug("注入字典到JSON数据 耗时"+(end-start)+"ms"); + long time2 = System.currentTimeMillis(); + log.debug("获取JSON数据 耗时：" + (time2 - time1) + "ms"); + long start = System.currentTimeMillis(); + result = this.parseDictText(result); + long end = System.currentTimeMillis(); + log.debug("注入字典到JSON数据 耗时" + (end - start) + "ms"); return result; } @@ -75,20 +76,21 @@ public class DictAspect { * 示例为SysUser 字段为sex 添加了注解@Dict(dicCode = "sex") 会在字典服务立马查出来对应的text 然后在请求list的时候将这个字典text，已字段名称加_dictText形式返回到前端 * 例输入当前返回值的就会多出一个sex_dictText字段 * { - * sex:1, - * sex_dictText:"男" + * sex:1, + * sex_dictText:"男" * } * 前端直接取值sext_dictText在table里面无需再进行前端的字典转换了 - * customRender:function (text) { - * if(text==1){ - * return "男"; - * }else if(text==2){ - * return "女"; - * }else{ - * return text; - * } - * } - * 目前vue是这么进行字典渲染到table上的多了就很麻烦了 这个直接在服务端渲染完成前端可以直接用 + * customRender:function (text) { + * if(text==1){ + * return "男"; + * }else if(text==2){ + * return "女"; + * }else{ + * return text; + * } + * } + * 目前vue是这么进行字典渲染到table上的多了就很麻烦了 这个直接在服务端渲染完成前端可以直接用 + * * @param result */ private Object parseDictText(Object result) { @@ -101,24 +103,24 @@ public class DictAspect { // 字典数据列表， key = 字典code，value=数据列表 Map> dataListMap = new HashMap<>(5); //取出结果集 - List records=((IPage) ((Result) result).getResult()).getRecords(); + List records = ((IPage) ((Result) result).getResult()).getRecords(); //update-begin--Author:zyf -- Date:20220606 ----for：【VUEN-1230】 判断是否含有字典注解,没有注解返回----- - Boolean hasDict= checkHasDict(records); - if(!hasDict){ + Boolean hasDict = checkHasDict(records); + if (!hasDict) { return result; } - log.debug(" __ 进入字典翻译切面 DictAspect —— " ); + log.debug(" __ 进入字典翻译切面 DictAspect —— "); //update-end--Author:zyf -- Date:20220606 ----for：【VUEN-1230】 判断是否含有字典注解,没有注解返回----- for (Object record : records) { - String json="{}"; + String json = "{}"; try { //update-begin--Author:zyf -- Date:20220531 ----for：【issues/#3629】 DictAspect Jackson序列化报错----- //解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat - json = objectMapper.writeValueAsString(record); + json = objectMapper.writeValueAsString(record); //update-end--Author:zyf -- Date:20220531 ----for：【issues/#3629】 DictAspect Jackson序列化报错----- } catch (JsonProcessingException e) { - log.error("json解析失败"+e.getMessage(),e); + log.error("json解析失败" + e.getMessage(), e); } //update-begin--Author:scott -- Date:20211223 ----for：【issues/3303】restcontroller返回json数据后key顺序错乱 ----- JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); @@ -132,7 +134,7 @@ public class DictAspect { if (oConvertUtils.isEmpty(value)) { continue; } - //update-end--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ + //update-end--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ if (field.getAnnotation(Dict.class) != null) { if (!dictFieldList.contains(field)) { dictFieldList.add(field); @@ -152,8 +154,8 @@ public class DictAspect { //date类型默认转换string格式化日期 //update-begin--Author:zyf -- Date:20220531 ----for：【issues/#3629】 DictAspect Jackson序列化报错----- //if (JAVA_UTIL_DATE.equals(field.getType().getName())&&field.getAnnotation(JsonFormat.class)==null&&item.get(field.getName())!=null){ - //SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - // item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName())))); + //SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + // item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName())))); //} //update-end--Author:zyf -- Date:20220531 ----for：【issues/#3629】 DictAspect Jackson序列化报错----- } @@ -178,7 +180,7 @@ public class DictAspect { String value = record.getString(field.getName()); if (oConvertUtils.isNotEmpty(value)) { List dictModels = translText.get(fieldDictCode); - if(dictModels==null || dictModels.size()==0){ + if (dictModels == null || dictModels.size() == 0) { continue; } @@ -217,6 +219,7 @@ public class DictAspect { * 一次性把所有的字典都翻译了 * 1. 所有的普通数据字典的所有数据只执行一次SQL * 2. 表字典相同的所有数据只执行一次SQL + * * @param dataListMap * @return */ @@ -352,7 +355,8 @@ public class DictAspect { } /** - * 翻译字典文本 + * 翻译字典文本 + * * @param code * @param text * @param table @@ -361,39 +365,39 @@ public class DictAspect { */ @Deprecated private String translateDictValue(String code, String text, String table, String key) { - if(oConvertUtils.isEmpty(key)) { - return null; - } - StringBuffer textValue=new StringBuffer(); + if (oConvertUtils.isEmpty(key)) { + return null; + } + StringBuffer textValue = new StringBuffer(); String[] keys = key.split(","); for (String k : keys) { String tmpValue = null; - log.debug(" 字典 key : "+ k); + log.debug(" 字典 key : " + k); if (k.trim().length() == 0) { continue; //跳过循环 } //update-begin--Author:scott -- Date:20210531 ----for： !56 优化微服务应用下存在表字段需要字典翻译时加载缓慢问题----- - if (!StringUtils.isEmpty(table)){ - log.debug("--DictAspect------dicTable="+ table+" ,dicText= "+text+" ,dicCode="+code); - String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]",table,text,code,k.trim()); - if (redisTemplate.hasKey(keyString)){ + if (!StringUtils.isEmpty(table)) { + log.debug("--DictAspect------dicTable=" + table + " ,dicText= " + text + " ,dicCode=" + code); + String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]", table, text, code, k.trim()); + if (redisTemplate.hasKey(keyString)) { try { tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); } catch (Exception e) { log.warn(e.getMessage()); } - }else { - tmpValue= commonApi.translateDictFromTable(table,text,code,k.trim()); + } else { + tmpValue = commonApi.translateDictFromTable(table, text, code, k.trim()); } - }else { - String keyString = String.format("sys:cache:dict::%s:%s",code,k.trim()); - if (redisTemplate.hasKey(keyString)){ + } else { + String keyString = String.format("sys:cache:dict::%s:%s", code, k.trim()); + if (redisTemplate.hasKey(keyString)) { try { tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); } catch (Exception e) { - log.warn(e.getMessage()); + log.warn(e.getMessage()); } - }else { + } else { tmpValue = commonApi.translateDict(code, k.trim()); } } @@ -412,11 +416,12 @@ public class DictAspect { /** * 检测返回结果集中是否包含Dict注解 + * * @param records * @return */ - private Boolean checkHasDict(List records){ - if(oConvertUtils.isNotEmpty(records) && records.size()>0){ + private Boolean checkHasDict(List records) { + if (oConvertUtils.isNotEmpty(records) && records.size() > 0) { for (Field field : oConvertUtils.getAllFields(records.get(0))) { if (oConvertUtils.isNotEmpty(field.getAnnotation(Dict.class))) { return true; diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 81e89f1..35c2192 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -149,7 +149,7 @@ spring: password: aB3cDeF9 #mybatis plus 设置 mybatis-plus: - mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml + mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml, classpath*:rms/**/xml/*Mapper.xml global-config: # 关闭MP3.0自带的banner banner: false