From cc6c65bed67bf7fc2cf85ba371df108ebb5e689e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= Date: Wed, 23 Mar 2022 17:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8Aauthor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/pms/ocp/common/utils/FileExport.java | 2 +- src/main/java/com/pms/ocp/common/utils/FileUtil.java | 2 ++ .../pms/ocp/controller/ApiBasicManagementController.java | 7 ++++++- .../ocp/controller/TenantBasicManagementController.java | 4 +++- .../java/com/pms/ocp/mapper/ApiBasicManagementMapper.java | 4 +++- src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java | 7 ++++--- src/main/java/com/pms/ocp/model/dto/TenantDto.java | 2 +- src/main/java/com/pms/ocp/model/vo/Menu.java | 4 +++- src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java | 4 +++- .../com/pms/ocp/service/ApiBasicManagementService.java | 4 +++- .../com/pms/ocp/service/TenantBasicManagementService.java | 3 +++ src/main/resources/mapper/OcpGroup.xml | 2 +- 12 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/pms/ocp/common/utils/FileExport.java b/src/main/java/com/pms/ocp/common/utils/FileExport.java index 2d3d9f9..8a562c6 100644 --- a/src/main/java/com/pms/ocp/common/utils/FileExport.java +++ b/src/main/java/com/pms/ocp/common/utils/FileExport.java @@ -26,7 +26,7 @@ import java.util.Map; /** * 文件导出工具 - * @author abc + * @author guofanfan * @date 2019/01/08 */ public class FileExport { diff --git a/src/main/java/com/pms/ocp/common/utils/FileUtil.java b/src/main/java/com/pms/ocp/common/utils/FileUtil.java index 33758d1..5babdc3 100644 --- a/src/main/java/com/pms/ocp/common/utils/FileUtil.java +++ b/src/main/java/com/pms/ocp/common/utils/FileUtil.java @@ -9,6 +9,8 @@ import java.util.NoSuchElementException; /** * 导入工具类 + * @author guofanfan + * */ public class FileUtil { public static List importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class pojoClass) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 55c86b1..6158f5b 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -29,6 +29,9 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +/** + * @author guofanfan + */ @Slf4j @RequestMapping("/api/basic") @RestController @@ -144,6 +147,8 @@ public class ApiBasicManagementController { // log.error("xx:",ex); // } //} + + @ApiOperation("下载模块") @GetMapping("/downloadExcel") public void downloadExcel(HttpServletResponse response, HttpServletRequest request) { @@ -182,7 +187,7 @@ public class ApiBasicManagementController { return ResponseVO.error("不能为空"); } else if (apiPromotion.equals("0")) { return ResponseVO.error("统招"); - }else { + } else { return apiBasicManagementService.apiIssue(apiCodes); } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index d2da811..f7e5dad 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.List; - +/** + * @author guofanfan + */ @Slf4j @RequestMapping("/tenant/basic") @RestController diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 2c5dfa8..20f067d 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -9,7 +9,9 @@ import org.apache.ibatis.annotations.Param; import java.sql.Timestamp; import java.util.List; - +/** + * @author guofanfan + */ @Mapper public interface ApiBasicManagementMapper extends BaseMapper { List selectApiExport(List list); diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java index 4518114..93327b7 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -228,7 +228,8 @@ public class TenanBaseDto extends OcpTenantGroup { this.tenantGroupLevel = tenantGroupLevel; } - public void setClassIfy(String classIfy) { - this.classIfy = classIfy; - } +// public OcpTenantGroup setClassIfy(String classIfy) { +// this.classIfy = classIfy; +// return null; +// } } diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java index fa2658d..85123a4 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenantDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenantDto.java @@ -50,7 +50,7 @@ public class TenantDto implements Serializable { private String startCTime; @ApiModelProperty("注册结束") - private String endCTime; + private String endCTime; @ApiModelProperty("关键字") private String keyword; diff --git a/src/main/java/com/pms/ocp/model/vo/Menu.java b/src/main/java/com/pms/ocp/model/vo/Menu.java index f824261..bf77c08 100644 --- a/src/main/java/com/pms/ocp/model/vo/Menu.java +++ b/src/main/java/com/pms/ocp/model/vo/Menu.java @@ -6,7 +6,9 @@ import lombok.Data; import java.io.Serializable; import java.util.List; - +/** + * @author guofanfan + */ @Data @ApiModel(value = "菜单栏目Vo", description = "菜单栏目Vo") public class Menu implements Serializable { diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java index 3f866ba..8ddf4a8 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java +++ b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java @@ -11,7 +11,9 @@ import org.springframework.beans.factory.annotation.Value; import java.io.Serializable; import java.sql.Timestamp; import java.time.LocalDateTime; - +/** + * @author guofanfan + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 906f4fc..634d166 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -15,7 +15,9 @@ import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; import java.util.List; - +/** + * @author guofanfan + */ public interface ApiBasicManagementService extends IService { /** * 导出的查询 diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index f776a15..3a35a3a 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -15,6 +15,9 @@ import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; import java.util.List; +/** + * @author guofanfan + */ public interface TenantBasicManagementService extends IService { /** * 条件查询 diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index c16365a..0f6d413 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -9,7 +9,7 @@ - + -- 2.26.0