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 2d3d9f9d210abf6525bfdcada833b6590fdf5aff..8a562c6da626d36debd12c6b10db459d6488ac51 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 33758d11ff3678d0038ab7d45d60f0600e341ad8..5babdc3ef029ea403540837a9c768bf9ec56149f 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 55c86b1105841868e6efc0de2570e3e6afc28ac6..6158f5b1fa6eb19eafe0a0a8a8993eb205f75d9c 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 d2da8117bdb0818292d2c57a22b80732ab6bd3bb..f7e5dadc95d81e49c949b7265c642ed9f910333e 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 2c5dfa8626105e6e49118e99d3193906ea9ec978..20f067d1cdf4fca66b2051026113b70d50ff3dcb 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 451811466a08054e532a444e89fc86eb94f140b3..93327b7214e3d8fce077fc9a6c2b4dfd4214d122 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 fa2658d0eef54473e6ef80e3a890643f3df1b0b2..85123a461552bbe3b77877bd064780d04e8f92c0 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 f82426155fa20d790acca642230b83dd88bdb09e..bf77c085c054625d826073fd82947c817feddd00 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 3f866ba6219827282bf6e30845626fe048ce9030..8ddf4a84aa4edb2814a14e029040514464949479 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 906f4fcb1f966089d2e8ae6ee970a57be4acf07d..634d166088f020f52789cdb3baeacc52dfe0bbcb 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 f776a15304482bd059e490931b22d92e5aab6db4..3a35a3ab4b9b32cc3ba92f3966b5d4a3b187c668 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 c16365a01596bb586b7c11c94b0469ab867e623f..0f6d413ccd11baebe9627bcb89be83e3cdad6c1b 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -9,7 +9,7 @@ - +