From 62b73e6552b54dc151d0b047db87b128a889d145 Mon Sep 17 00:00:00 2001 From: diaoruifeng <18351522362@163.com> Date: Wed, 30 Mar 2022 20:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PmsApiDetailsController.java | 5 +++-- .../com/pms/ocp/model/dto/ApiBaseDto.java | 21 ++++++++++++++++++- .../ocp/model/entity/PmsApiMangageApi.java | 10 +++++++++ .../impl/ApiBasicManagementServiceImpl.java | 18 ++++++++++------ .../impl/PmsApiManagementServiceImpl.java | 10 ++++++--- .../resources/mapper/OcpApiGroupMapper.xml | 11 ++++++---- .../mapper/PmsApiManagementMapper.xml | 9 +++++++- 7 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java index 835b7b7..f12ac88 100644 --- a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java @@ -124,8 +124,9 @@ public class PmsApiDetailsController { @ApiOperation("服务分类——删除服务") @PostMapping("/delete") - public void delete(@RequestBody PmsApiMangageApi pmsApiMangageApi) { - pmsApiManagementService.deleteApi(pmsApiMangageApi); + public ResponseVO delete(@RequestBody PmsApiMangageApi pmsApiMangageApi) { + ResponseResult responseResult = pmsApiManagementService.deleteApi(pmsApiMangageApi); + return ResponseVO.ok(responseResult.getMessage()); } @ApiOperation("服务分类——编辑服务") diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index 5b0a0b3..d27e540 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -20,7 +20,8 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("服务编码") private String apiCode; - + @ApiModelProperty("服务类型") + private String professionalKind; @ApiModelProperty("服务名称") private String apiName; @ApiModelProperty("服务分类编码") @@ -72,6 +73,8 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("分类名称") private String apiGroupName; + @ApiModelProperty("用户名称") + private String apiUserName; private List apiGroupCodeList; @@ -218,4 +221,20 @@ public class ApiBaseDto implements Serializable { public void setCurrentPage(Integer currentPage) { this.currentPage = currentPage; } + + public String getProfessionalKind() { + return professionalKind; + } + + public void setProfessionalKind(String professionalKind) { + this.professionalKind = professionalKind; + } + + public String getApiUserName() { + return apiUserName; + } + + public void setApiUserName(String apiUserName) { + this.apiUserName = apiUserName; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java index 0005b30..3d605c8 100644 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java @@ -161,6 +161,16 @@ public class PmsApiMangageApi { @ApiModelProperty("是否成功") private boolean boole; + @ApiModelProperty("是否成功") + private String[] objIds; + + public String[] getObjIds() { + return objIds; + } + + public void setObjIds(String[] objIds) { + this.objIds = objIds; + } public boolean getBoole() { return boole; diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index cecb8b5..271ff52 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -25,13 +25,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.*; -import java.util.Collections; -import java.util.List; import java.util.stream.Collectors; @Service @@ -189,8 +187,16 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl pageInfo = new PageInfo<>(ocpApiBaseVos); return ResponseVO.ok(pageInfo); } - - @Override + public static String timedate(String time) { + SimpleDateFormat sdr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @SuppressWarnings("unused") + long lcc = Long.valueOf(time); + int i = Integer.parseInt(time); + String times = sdr.format(new Date(i * 1000L)); + return times; + + } + @Override public List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode) { QueryWrapper qw = new QueryWrapper(); if (!StringUtils.isEmpty(apiGroupPcode)) { diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java index e4a591b..f0ecccf 100644 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java @@ -65,7 +65,7 @@ public class PmsApiManagementServiceImpl extends ServiceImpl and oab.api_promotion = #{apiPromotion} - + = #{startTime} + and oab.api_ctime >= #{startCTime} ]]> - + and oab.api_name like CONCAT('%', #{keyword}::text,'%') + + and oab.api_name like CONCAT('%', #{apiName}::text,'%') + = #{startMTime} diff --git a/src/main/resources/mapper/PmsApiManagementMapper.xml b/src/main/resources/mapper/PmsApiManagementMapper.xml index 8894df7..adc7646 100644 --- a/src/main/resources/mapper/PmsApiManagementMapper.xml +++ b/src/main/resources/mapper/PmsApiManagementMapper.xml @@ -86,7 +86,14 @@ - delete from ocp_api_base oab where oab.api_code = #{apiCode} + delete from ocp_api_base oab where 1=1 + + AND oab.obj_id in + + #{objId} + +