From 0e7a4f33ee7169eb25f7b8f40445d2db5ec82f3a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 2 Apr 2024 11:54:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20swagger=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot-module-system/pom.xml | 17 +- .../controller/KhDeviceController.java | 287 +++++++++--------- .../jero/modules/entity/KhSystemSetting.java | 3 - .../com/jero/modules/entity/KhWellhead.java | 3 - .../modules/mapper/xml/KhDeviceMapper.xml | 6 +- .../modules/mapper/xml/KhWellheadMapper.xml | 4 +- jero-boot-single-startup/pom.xml | 31 ++ 7 files changed, 185 insertions(+), 166 deletions(-) diff --git a/jero-boot-module-system/pom.xml b/jero-boot-module-system/pom.xml index 2ca20542..df192bf2 100644 --- a/jero-boot-module-system/pom.xml +++ b/jero-boot-module-system/pom.xml @@ -12,20 +12,9 @@ - aliyun - aliyun Repository - https://maven.aliyun.com/repository/public - - false - - - - jeecg - jeecg Repository - https://maven.jeecg.org/nexus/content/repositories/jeecg - - false - + com.e-iceblue + e-iceblue + https://repo.e-iceblue.cn/repository/maven-public/ diff --git a/jero-boot-modules/src/main/java/com/jero/modules/controller/KhDeviceController.java b/jero-boot-modules/src/main/java/com/jero/modules/controller/KhDeviceController.java index 6818a5dc..9873b494 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/controller/KhDeviceController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/controller/KhDeviceController.java @@ -1,4 +1,4 @@ -package com.jero.modules.controller.controller; +package com.jero.modules.controller; import java.util.Arrays; import java.util.List; @@ -13,6 +13,7 @@ import com.jero.modules.vo.DeviceStatisticsVO; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -23,167 +24,171 @@ import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; - /** +/** * @Description: 设备 * @Author: jero-boot - * @Date: 2024-04-01 + * @Date: 2024-04-01 * @Version: V1.0 */ -@Api(tags="设备") -@RestController -@RequestMapping("/device") + @Slf4j +@Transactional(rollbackFor = Exception.class) +@RestController +@Api(tags = "设备管理") +@RequestMapping("/device") public class KhDeviceController extends JeroController { - @Autowired - private IKhDeviceService khDeviceService; - - /** - * 分页列表查询 - * - * @param khDevice - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "设备-分页列表查询") - @ApiOperation(value="设备-分页列表查询", notes="设备-分页列表查询") - @GetMapping(value = "/page") - public Results> queryPageList(KhDevice khDevice, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - IPage pageList = khDeviceService.queryPage(khDevice, pageNo, pageSize, req); - return Results.OK(pageList); - } - - /** - * 系统设备概况 - * - * @return - */ - @AutoLog(value = "设备-系统设备概况") - @ApiOperation(value="设备-系统设备概况", notes="设备-系统设备概况") - @GetMapping(value = "/statistics") - public Results statistics() { - return Results.OK(khDeviceService.statistics()); - } + @Autowired + private IKhDeviceService khDeviceService; /** - * 列表查询 - * - * @param khDevice - * @param req - * @return - */ - @AutoLog(value = "设备-列表查询") - @ApiOperation(value="设备-列表查询", notes="设备-列表查询") - @GetMapping(value = "/list") - public Results> queryList(KhDevice khDevice, HttpServletRequest req) { + * 分页列表查询 + * + * @param khDevice + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "设备-分页列表查询") + @ApiOperation(value = "设备-分页列表查询", notes = "设备-分页列表查询") + @GetMapping(value = "/page") + public Results> queryPageList(KhDevice khDevice, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = khDeviceService.queryPage(khDevice, pageNo, pageSize, req); + return Results.OK(pageList); + } + + /** + * 系统设备概况 + * + * @return + */ + @AutoLog(value = "设备-系统设备概况") + @ApiOperation(value = "设备-系统设备概况", notes = "设备-系统设备概况") + @GetMapping(value = "/statistics") + public Results statistics() { + return Results.OK(khDeviceService.statistics()); + } + + /** + * 列表查询 + * + * @param khDevice + * @param req + * @return + */ + @AutoLog(value = "设备-列表查询") + @ApiOperation(value = "设备-列表查询", notes = "设备-列表查询") + @GetMapping(value = "/list") + public Results> queryList(KhDevice khDevice, HttpServletRequest req) { List list = khDeviceService.queryList(khDevice, req); return Results.OK(list); - } - - /** - * 添加 - * - * @param khDevice - * @return - */ - @AutoLog(value = "设备-添加") - @ApiOperation(value="设备-添加", notes="设备-添加") - @PostMapping(value = "/add") - public Results add(@Validated @RequestBody KhDevice khDevice) { - khDeviceService.add(khDevice); - return Results.OK("操作成功!"); - } - - /** - * 编辑 - * - * @param khDevice - * @return - */ - @AutoLog(value = "设备-编辑") - @ApiOperation(value="设备-编辑", notes="设备-编辑") - @PostMapping(value = "/edit") - public Results edit(@Validated @RequestBody KhDevice khDevice) { - khDeviceService.editById(khDevice); - return Results.OK("操作成功!"); - } - - /** - * 通过id删除 - * - * @param map - * @return - */ - @AutoLog(value = "设备-通过id删除") - @ApiOperation(value="设备-通过id删除", notes="设备-通过id删除") - @PostMapping(value = "/delete") - public Results delete(@RequestBody Map map) { - if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){ - return Results.error("请选择数据!"); - } - khDeviceService.deleteById(map.get("id")); - return Results.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "设备-批量删除") - @ApiOperation(value="设备-批量删除", notes="设备-批量删除") - @PostMapping(value = "/deleteBatch") - public Results deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - return Results.error("请选择数据!"); - } - this.khDeviceService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Results.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "设备-通过id查询") - @ApiOperation(value="设备-通过id查询", notes="设备-通过id查询") - @GetMapping(value = "/queryById") - public Results queryById(@RequestParam(name="id",required=true) String id) { - KhDevice khDevice = khDeviceService.queryById(id); - if(khDevice==null) { - return Results.error("未找到对应数据"); - } - return Results.OK(khDevice); - } + } /** - * 导出excel - * - * @param request - * @param khDevice - */ + * 添加 + * + * @param khDevice + * @return + */ + @AutoLog(value = "设备-添加") + @ApiOperation(value = "设备-添加", notes = "设备-添加") + @PostMapping(value = "/add") + public Results add(@Validated @RequestBody KhDevice khDevice) { + khDeviceService.add(khDevice); + return Results.OK("操作成功!"); + } + + /** + * 编辑 + * + * @param khDevice + * @return + */ + @AutoLog(value = "设备-编辑") + @ApiOperation(value = "设备-编辑", notes = "设备-编辑") + @PostMapping(value = "/edit") + public Results edit(@Validated @RequestBody KhDevice khDevice) { + khDeviceService.editById(khDevice); + return Results.OK("操作成功!"); + } + + /** + * 通过id删除 + * + * @param map + * @return + */ + @AutoLog(value = "设备-通过id删除") + @ApiOperation(value = "设备-通过id删除", notes = "设备-通过id删除") + @PostMapping(value = "/delete") + public Results delete(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + return Results.error("请选择数据!"); + } + khDeviceService.deleteById(map.get("id")); + return Results.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param map + * @return + */ + @AutoLog(value = "设备-批量删除") + @ApiOperation(value = "设备-批量删除", notes = "设备-批量删除") + @PostMapping(value = "/deleteBatch") + public Results deleteBatch(@RequestBody Map map) { + if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { + return Results.error("请选择数据!"); + } + this.khDeviceService.deleteByIds(Arrays.asList(map.get("ids").split(","))); + return Results.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "设备-通过id查询") + @ApiOperation(value = "设备-通过id查询", notes = "设备-通过id查询") + @GetMapping(value = "/queryById") + public Results queryById(@RequestParam(name = "id", required = true) String id) { + KhDevice khDevice = khDeviceService.queryById(id); + if (khDevice == null) { + return Results.error("未找到对应数据"); + } + return Results.OK(khDevice); + } + + /** + * 导出excel + * + * @param request + * @param khDevice + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, KhDevice khDevice) { return super.exportXls(request, khDevice, KhDevice.class, "设备"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Results importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, KhDevice.class); } } + + diff --git a/jero-boot-modules/src/main/java/com/jero/modules/entity/KhSystemSetting.java b/jero-boot-modules/src/main/java/com/jero/modules/entity/KhSystemSetting.java index 831e704a..92b659a0 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/entity/KhSystemSetting.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/entity/KhSystemSetting.java @@ -1,9 +1,7 @@ package com.jero.modules.entity; 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; @@ -16,7 +14,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** diff --git a/jero-boot-modules/src/main/java/com/jero/modules/entity/KhWellhead.java b/jero-boot-modules/src/main/java/com/jero/modules/entity/KhWellhead.java index 2bc55de2..b45bf46b 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/entity/KhWellhead.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/entity/KhWellhead.java @@ -1,9 +1,7 @@ package com.jero.modules.entity; 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; @@ -16,7 +14,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** diff --git a/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhDeviceMapper.xml b/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhDeviceMapper.xml index a2505103..4ee15145 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhDeviceMapper.xml +++ b/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhDeviceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhWellheadMapper.xml b/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhWellheadMapper.xml index 46db8913..026699fc 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhWellheadMapper.xml +++ b/jero-boot-modules/src/main/java/com/jero/modules/mapper/xml/KhWellheadMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-single-startup/pom.xml b/jero-boot-single-startup/pom.xml index b12b495d..1db0d68d 100644 --- a/jero-boot-single-startup/pom.xml +++ b/jero-boot-single-startup/pom.xml @@ -27,6 +27,37 @@ jero-boot-base-generater ${jero.version} + + com.jero.boot + jero-boot-modules + ${jero.version} + + + activation + javax.activation + + + commons-io + commons-io + + + commons-logging + commons-logging + + + swagger-models + io.swagger + + + xml-apis + xml-apis + + + swagger-annotations + io.swagger + + +