diff --git a/pom.xml b/pom.xml index 94fd1e34217acc864e5422c883a904609695b795..0b1aef01970aa1f670d499daa7a3260417dd8498 100644 --- a/pom.xml +++ b/pom.xml @@ -77,23 +77,12 @@ 1.2.62 - - - - - - - - - - org.postgresql postgresql - 9.4.1212.jre7 + 9.4.1212 - org.projectlombok lombok diff --git a/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..8efbd9f9b6502b81d390793eb80696cfb93f59d0 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/MYLocalDateTimeTypeHandler.java @@ -0,0 +1,54 @@ +package com.pms.ocp.common.handler; + +import org.apache.ibatis.type.LocalDateTimeTypeHandler; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.time.ZoneOffset; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 10:10 + * @Description:时间类型处理器 + */ +public class MYLocalDateTimeTypeHandler extends LocalDateTimeTypeHandler { +// @Override +// public LocalDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException { +// Timestamp timestamp = rs.getTimestamp(columnName); +// Long remindTime = timestamp.getTime(); +// return LocalDateTime.ofEpochSecond(remindTime,0, ZoneOffset.ofHours(8)); +// } + + +// @Override +// public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException { +// Object object = rs.getObject(columnName); +// System.out.println(object); +// if (object instanceof java.sql.Timestamp) {//在这里强行转换，将sql的时间转换为LocalDateTime +// //可以根据自己的需要进行转化 +// return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(0)); +// } +// return super.getResult(rs, columnName); +// } + + @Override + public LocalDateTime getResult(ResultSet rs, String columnName) throws SQLException { + Object object = rs.getObject(columnName); + if (object == null) { + return null; + } + +// System.out.println(object); + // 如有需要 在这里强行转换，将sql的时间转换为LocalDateTime + if (object instanceof java.sql.Timestamp) { + //可以根据自己的需要进行转化 + return LocalDateTime.ofInstant(((Timestamp) object).toInstant(), ZoneOffset.ofHours(8)); + } + + return super.getResult(rs, columnName); + } + + +} diff --git a/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..dab5ce2a0827d17d63cadc6d2391c55fea2c3b3d --- /dev/null +++ b/src/main/java/com/pms/ocp/common/handler/TimestampTypeHandler.java @@ -0,0 +1,66 @@ +package com.pms.ocp.common.handler; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; +import org.postgresql.util.PGTimestamp; + +import java.sql.*; +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/3/10 09:43 + * @Description: + */ +@MappedTypes({LocalDateTime.class}) +@MappedJdbcTypes({JdbcType.OTHER}) +public class TimestampTypeHandler extends BaseTypeHandler { + @Override + public void setNonNullParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { + Timestamp p = null; + if (parameter != null) { + if (parameter instanceof LocalDateTime) { + PGTimestamp.valueOf(LocalDateTime.now()); + p = PGTimestamp.valueOf((LocalDateTime) parameter); + } + ps.setObject(i, p); + } + } + + /** + * Gets the nullable result. + * + * @param rs the rs + * @param columnName Colunm name, when configuration useColumnLabel is false + * @return the nullable result + * @throws SQLException the SQL exception + */ + @Override + public Object getNullableResult(ResultSet rs, String columnName) throws SQLException { + return toFill(rs.getObject(columnName)); + } + + @Override + public Object getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + return toFill(rs.getObject(columnIndex)); + } + + @Override + public Object getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + return toFill(cs.getObject(columnIndex)); + } + + private Object toFill(Object v) { + if (v != null) { + if (v instanceof PGTimestamp) { + PGTimestamp p = (PGTimestamp) v; + return p.toLocalDateTime(); + } else if (v instanceof Timestamp) { + return ((Timestamp) v).toLocalDateTime(); + } + } + return v; + } +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 5e9f1caa2c2adf0b43bea0619b8da85857203241..d6ef10b2876b50300a0a3a8ed9ccd0f65f5072f2 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,8 +1,10 @@ package com.pms.ocp.controller; import com.pms.ocp.common.constants.CodeEnum; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelNote; +import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelGroupService; @@ -44,6 +46,9 @@ public class ModelBaseController { @Autowired private ModelNoteService modelNoteService; + @Autowired + private ModelPropertyService propertyService; + /** * 模型分类-查询 * @@ -219,8 +224,10 @@ public class ModelBaseController { */ @ApiOperation("模型属性-增加") @PostMapping("create/model/property") - public ResponseVO createModelProperty() { - return ResponseVO.ok(); + public ResponseVO createModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + Integer i = modelPropertyService.createModelProperty(modelPropertyDTO); + return ResponseVO.ok(i); } /** @@ -230,8 +237,9 @@ public class ModelBaseController { */ @ApiOperation("模型属性-查询") @GetMapping("get/model/property") - public ResponseVO getModelProperty() { - return ResponseVO.ok(modelPropertyService.getModelProperty()); + public ResponseVO getModelProperty(@RequestParam(value = "modelCode", required = false) String modelCode, + @RequestParam(value = "propCode", required = false) String propCode) { + return ResponseVO.ok(modelPropertyService.listModelProperty(modelCode, propCode)); } /** @@ -241,19 +249,20 @@ public class ModelBaseController { */ @ApiOperation("模型属性-修改") @PostMapping("/update/model/property") - public ResponseVO updateModelProperty() { - return ResponseVO.ok(); + public ResponseVO updateModelProperty(@RequestBody ModelPropertyDTO modelPropertyDTO) { + + return ResponseVO.ok(modelPropertyService.updateModelProperty(modelPropertyDTO)); } /** - * 模型属性-删除 + * 模型属性-删除/批量删除 * * @return */ - @ApiOperation("模型属性-删除") + @ApiOperation("模型属性-删除/批量删除") @PostMapping("/delete/model/property") - public ResponseVO deleteModelProperty() { - return ResponseVO.ok(); + public ResponseVO deleteModelProperty(@RequestBody List ids) { + return ResponseVO.ok(modelPropertyService.deletePatchModelProperty(ids)); } /** diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java index c082f963e44ddb3a3aa79037b8ef1d1b080e1493..c65a3a50d57239c33a6fd925d81f5ced7ddb88e0 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -51,7 +51,7 @@ public class OcpApiDetailsController { return ocpApiAuditService.sById(ocpApiAudit); } - @ApiOperation("服务大事记-查询详情") + @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.OaaById(ocpApiAudit); @@ -65,16 +65,10 @@ public class OcpApiDetailsController { @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { + public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } - @ApiOperation("服务与模型拓扑图-关联查询详情") - @PostMapping("/getoaabyid") - public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) { - return ocpApiAuditService.OaaById(ocpApiAudit); - } - @ApiOperation("服务大事记-导出") @GetMapping("/export") public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java index d7c81c9cb29019746b01573df5684896940c4d24..798c1d3d800f871c06161dcee314404896623283 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -1,7 +1,10 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpApiAuditService; +import com.pms.ocp.service.OcpTenantAuditService; import com.pms.ocp.service.OcpTenantBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,9 +23,19 @@ public class OcpTenantDetailsController { @Autowired private OcpTenantBaseService ocpTenantBaseService; + + @Autowired + private OcpTenantAuditService ocpTenantAuditService; + @ApiOperation("应用基础信息-查询") @PostMapping("/getotbList") public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ return ocpTenantBaseService.getOtbList(ocpTenantBase); } + + @ApiOperation("应用大事记-查询") + @PostMapping("/getotaList") + public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaList(ocpTenantAudit); + } } diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java index 52de9394071b5be5ee8ae7f34585616007a19d67..fcb91b2cfaf4d2acd4263d514584138712fd5eaa 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelPropertyMapper extends BaseMapper { +public interface ModelPropertyMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..30c4c13780cbec55eb8c66dead8abe0237b5f2b0 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -0,0 +1,10 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.entity.OcpTenantAudit; + +import java.util.List; + +public interface OcpTenantAuditMapper extends BaseMapper { + List getOtaList(OcpTenantAudit ocpTenantAudit); +} diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java new file mode 100644 index 0000000000000000000000000000000000000000..b01ac9d33cb9845f8f8425c368729e128cafbf58 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java @@ -0,0 +1,143 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.sql.Date; +import java.time.LocalDateTime; + +/** + * @Auther: wangjian + * @Date: 2022/2/22 16:40 + * @Description:模型属性DTO对象 + */ + +@ApiModel(value = "模型属性DTO对象") +@Data +public class ModelPropertyDTO { + + /** + * 模型属性编号 + */ + @ApiModelProperty(value = "模型属性编号") + private String objId; + + /** + * 模型编号 + */ + @ApiModelProperty(value = "模型编号") + private String modelCode; + + /** + * 属性名称 + */ + @ApiModelProperty(value = "属性名称") + private String columnName; + + /** + * 属性编码 + */ + @ApiModelProperty(value = "属性编码") + private String propCode; + + /** + * 属性描述 + */ + @ApiModelProperty(value = "属性描述") + private String columnComments; + + /** + * 数据类型 + */ + @ApiModelProperty(value = "数据类型") + private Integer dataType; + + /** + * 数据长度 + */ + @ApiModelProperty(value = "数据长度") + private Integer dataLength; + + /** + * 数据精度 + */ + @ApiModelProperty(value = "数据精度") + private Integer dataScale; + + /** + * 是否主键 0:否,1:是 + */ + @ApiModelProperty(value = "是否主键 0:否,1:是") + private Integer boolPrimaryKey; + + /** + * 是否必填 0:否,1:是 + */ + @ApiModelProperty(value = "是否必填 0:否,1:是") + private Integer boolRequired; + + /** + * 推广类型 0:统推,1：自建 + */ + @ApiModelProperty(value = "推广类型 0:统推,1：自建") + private String propPromotion; + + /** + * 显示顺序 + */ + @ApiModelProperty(value = "显示顺序") + private Integer propOrderNo; + + /** + * 提交人编号 + */ + @ApiModelProperty(value = "提交人编号") + private String propUserId; + + /** + * 提交人姓名 + */ + @ApiModelProperty(value = "提交人姓名") + private String propUserName; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "创建时间") + private Date propCtime; + + /** + * 修改时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "修改时间") + private Date propMtime; + +} + +// 字段名称 字段描述 字段类型 允许为NULL 备注 +// prop_id 主键 varchar(42) 否 +// model_id 模型id varchar(42) 否 +// column_name 属性名称 varchar(50) 否 +// column_code 属性编码 varchar(42) 否 +// column_comments 属性描述 varchar(50) 否 +// data_type 数据类型 int4 否 +// data_length 数据长度 int4 是 +// data_scale 数据精度 int4 是 +// is_pk 是否主键 int4 否 0:否,1:是 +// is_required 是否必填 int4 是 0:否,1:是 +// prop_promotion 推广类型 int4 是 0:统推,1：自建 +// company_id 省公司ID varchar(42) 是 +// company_name 省公司名称 varchar(50) 是 +// prop _dispidx 显示顺序 int4 否 +// prop_user_id 提交人id varchar(42) 否 +// prop_user_name 提交人姓名 varchar(64) 否 +// prop_ctime 创建时间 timestamp(6) 否 +// prop_mtime 修改时间 timestamp(6) 否 diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index ff930b3aaa19fbcbbc26d14abcf8570fd14740b9..afcef546c2e8e72f1426e9048592ca3b9c8c0574 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -3,9 +3,16 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; /** * @Auther: wangjian @@ -13,6 +20,7 @@ import lombok.NoArgsConstructor; * @Description:模型属性对象 */ @Data +@Accessors(chain = true) @TableName("ocp_model_prop") public class ModelProperty{ @@ -45,41 +53,39 @@ public class ModelProperty{ /** * 数据类型 */ - private String dataType; + private Integer dataType; /** * 数据长度 */ - private String dataLength; + private Integer dataLength; /** * 数据精度 */ - private String dataScale; + private Integer dataScale; /** * 是否主键 */ @TableField(value = "is_pk") - private String boolPrimaryKey; + private Integer boolPrimaryKey; /** * 是否必填 */ @TableField(value = "is_required") - private String boolRequired; + private Integer boolRequired; /** * 推广类型 */ private String propPromotion; - - /** * 显示顺序 */ - private String propOrderNo; + private Integer propOrderNo; /** * 提交人id @@ -94,14 +100,21 @@ public class ModelProperty{ /** * 创建时间 */ - @TableField(value = "prop_ctime") - private String prop_ctime; + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField() +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propCtime; /** * 修改时间 */ - @TableField(value = "prop_mtime") - private String prop_mtime; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// @TableField(typeHandler = TimestampTypeHandler.class) + private LocalDateTime propMtime; } // 字段名称 字段描述 字段类型 允许为NULL 备注 diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index 0685a195fa39a38955d336f22923744426a65077..3e4d512c54712fbd67cea5dcb45aee41bb9fa131 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -40,6 +40,51 @@ public class OcpApiSubs { @ApiModelProperty("是否删除0-否，1-是") private long isDelete; + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; + + @ApiModelProperty("推广类型0:统建；1:自建") + private long apiPromotion; + + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("服务创建时间") + private Timestamp apiCtime; + + @ApiModelProperty("服务修改时间") + private Timestamp apiMtime; + + @ApiModelProperty("创建者用户ID") + private String apiUserId; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyName; + + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private long apiZone; + + @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private long apiLayer; + + @ApiModelProperty("服务版本（最新版本）") + private long apiVersion; + public String getObjId() { return objId; } @@ -96,8 +141,131 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } + public long getIsDelete() { + return isDelete; + } + public void setIsDelete(long isDelete) { this.isDelete = isDelete; } + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index df9e737230d9fbe29f2b02a81d457ada6a36e0c5..5fede0949932fdb1f0a152d395f7caab0e242306 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -1,6 +1,8 @@ package com.pms.ocp.service; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; +import io.swagger.models.auth.In; import java.util.List; @@ -14,26 +16,34 @@ public interface ModelPropertyService { /** * 创建模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer createModelProperty(ModelProperty modelProperty); + Integer createModelProperty(ModelPropertyDTO modelPropertyDTO); /** * 删除模型属性 * - * @param modelId + * @param modelCode * @return */ - Integer deleteModelProperty(String modelId); + Integer deleteModelProperty(String modelCode, String propCode); + + /** + * 批量删除模型属性 + * + * @param ids + * @return + */ + Integer deletePatchModelProperty(List ids); /** * 更新模型属性 * - * @param modelProperty + * @param modelPropertyDTO * @return */ - Integer updateModelProperty(ModelProperty modelProperty); + Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO); /** * 获取模型属性 @@ -41,7 +51,7 @@ public interface ModelPropertyService { * @param * @return */ - List getModelPropertyList(); + List listModelProperty(String modelCode, String propCode); /** * 获取模型属性列表 @@ -49,5 +59,5 @@ public interface ModelPropertyService { * @param * @return */ - List getModelProperty(); + ModelPropertyDTO getModelProperty(); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java new file mode 100644 index 0000000000000000000000000000000000000000..9b67b168d29d4856561db4a010351b2119c12c40 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -0,0 +1,8 @@ +package com.pms.ocp.service; + +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.vo.ResponseVO; + +public interface OcpTenantAuditService { + ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); +} diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java index 1b85388bfb757bc01a88ee793c6d5397749555ee..0bcbfc46842716d81367ab4b30afaa2e91888d7e 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -1,10 +1,19 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.pms.ocp.mapper.ModelPropertyMapper; +import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.service.ModelPropertyService; +import io.swagger.models.auth.In; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Date; +import java.time.LocalDateTime; import java.util.List; /** @@ -16,26 +25,69 @@ import java.util.List; @Service public class ModelPropertyServiceImpl implements ModelPropertyService { -// @Autowired + @Autowired + private ModelPropertyMapper modelPropertyMapper; @Override - public Integer createModelProperty(ModelProperty modelProperty) { - return null; + public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropCtime(LocalDateTime.now()); + return modelPropertyMapper.insert(modelProperty); } @Override - public Integer deleteModelProperty(String modelId) { - return null; + public Integer deleteModelProperty(String modelCode, String propCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + return modelPropertyMapper.delete(queryWrapper); } @Override - public Integer updateModelProperty(ModelProperty modelProperty) { - return null; + public Integer deletePatchModelProperty(List ids) { + return modelPropertyMapper.deleteBatchIds(ids); } @Override - public List getModelPropertyList() { - return null; + public Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO) { + + ModelProperty modelProperty = new ModelProperty(); + + BeanUtils.copyProperties(modelPropertyDTO, modelProperty); + + modelProperty.setPropMtime(LocalDateTime.now()); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(ModelProperty::getObjId, modelProperty.getObjId()); + + return modelPropertyMapper.update(modelProperty, updateWrapper); + } + + @Override + public List listModelProperty(String modelCode, String propCode) { + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelProperty::getModelCode, modelCode); + } + + if (StringUtils.isNotEmpty(propCode)) { + queryWrapper.lambda().eq(ModelProperty::getPropCode, propCode); + } + + return modelPropertyMapper.selectList(queryWrapper); } /** @@ -44,7 +96,7 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { * @return */ @Override - public List getModelProperty() { + public ModelPropertyDTO getModelProperty() { QueryWrapper wrapper = new QueryWrapper<>(); return null; } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java index a070965ac532a0af51a932b284ec212bb348ddf8..522a9286cd49a4f9787ae9b80012d319d56f8af3 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -3,6 +3,7 @@ package com.pms.ocp.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.constants.AnalysisConstant; import com.pms.ocp.common.constants.ExportUtils; import com.pms.ocp.mapper.OcpApiAuditMapper; @@ -19,7 +20,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; @Service -public class OcpApiAuditServiceImpl implements OcpApiAuditService { +public class OcpApiAuditServiceImpl extends ServiceImpl implements OcpApiAuditService { @Autowired private OcpApiAuditMapper ocpApiAuditMapper; diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java index 0faa367c6e7e5dacdc56544201d15d22353a5db8..48afb597e931c76437f416c6198e0223d1b357ff 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpApiModelRelMapper; import com.pms.ocp.model.entity.OcpApiModelRel; import com.pms.ocp.model.vo.ResponseVO; @@ -10,7 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class OcpApiModelRelServiceImpl implements OcpApiModelRelService { +public class OcpApiModelRelServiceImpl extends ServiceImpl implements OcpApiModelRelService { @Autowired private OcpApiModelRelMapper ocpApiModelRelMapper; @Override diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java index 8b37950c62f7e4718e29772ee36fd2be04a7fecc..4796e1a9472ac037bf9598618cd4c96fe42a6be1 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -14,14 +14,13 @@ import org.springframework.util.CollectionUtils; import java.util.List; @Service -public class OcpApiSubsServiceImpl implements OcpApiSubsService { +public class OcpApiSubsServiceImpl extends ServiceImpl implements OcpApiSubsService { @Autowired private OcpApiSubsMapper ocpApiSubsMapper; @Override public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); - QueryWrapper qw = new QueryWrapper(); if(CollectionUtils.isEmpty(ocpApiSubsList)){ return ResponseVO.error("查询列表为空"); }else{ diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java index ac4edbdc81dea28917b153a0eca6ffce55d934a4..f79c75a5d6fef2987250a6afaecc69b7bd543e79 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpApiTenantRelMapper; import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.vo.ResponseVO; @@ -11,7 +12,7 @@ import java.util.List; @Service -public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService { +public class OcpApiTenantRelServiceImpl extends ServiceImpl implements OcpApiTenantRelService { @Autowired private OcpApiTenantRelMapper ocpApiTenantRelMapper; diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index f7ffe16c3a9e30652c2331e76f09dd9f76af7563..80810d75a31ecb48417a24a9e4cec7787325a537 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -1,11 +1,8 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pms.ocp.common.config.PageParam; import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..1fa49582a96474e87dafb3b68f89e835ae0d861e --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -0,0 +1,23 @@ +package com.pms.ocp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.mapper.OcpTenantAuditMapper; +import com.pms.ocp.model.entity.OcpTenantAudit; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantAuditService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OcpTenantAuditServiceImpl extends ServiceImpl implements OcpTenantAuditService { + @Autowired + private OcpTenantAuditMapper ocpTenantAuditMapper; + + @Override + public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { + List otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); + return ResponseVO.ok(otaList); + } +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index d9520d63ab4ca6c70f2c5d9eac0dc8d247e003bc..ad52d3a7d50ccfd906225e1fffba2e5a064bb3f4 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -1,5 +1,6 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; @@ -10,7 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service -public class OcpTenantBaseServiceImpl implements OcpTenantBaseService { +public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { @Autowired private OcpTenantBaseMapper ocpTenantBaseMapper; @Override diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7809dcba1700fa2789dccdfd1029112512af641f..9a47390d9617aabc3e54bfc2a15aa9f3adfa1936 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,13 +13,20 @@ knife4j: enable: true mybatis-plus: + global-config: + #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断" + field-strategy: 0 mapper-locations: classpath:/mapper/*.xml configuration: - # log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 是否开启自动驼峰命名规则 map-underscore-to-camel-case: true + #指定自定义 Handler 所在的包位置 + type-handlers-package: com.pms.ocp.common.handler + + logging: level: com.pms.ocp.mapper: debug diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index 2685ce3498a5b6fed1019e84ce5acf6162ea7345..abec0d961820861f2ea5265ce94c3adf7314c8fb 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -6,7 +6,7 @@ select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code - where oaa.obj_id = '1' + where oaa.obj_id = #{objId} + select * from ocp_tenant_audit + + \ No newline at end of file