From 12d9232c5f62d4c1f26e19769fc7b2bc5747de56 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 13 Oct 2023 13:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/pojo/param/CsDevModelRelationAddParm.java | 3 ++- .../java/com/njcn/csdevice/pojo/param/CsLedgerParam.java | 3 ++- .../njcn/csdevice/service/impl/CsLedgerServiceImpl.java | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java index c4d68a2..7ac67ee 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java @@ -1,5 +1,6 @@ package com.njcn.csdevice.pojo.param; +import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +18,7 @@ import javax.validation.constraints.NotNull; */ @ApiModel(value="装置与模板表新增Model") @Data -public class CsDevModelRelationAddParm { +public class CsDevModelRelationAddParm extends BaseEntity { @ApiModelProperty(value="装置 id") diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java index 60c6137..53c5f81 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java @@ -1,6 +1,7 @@ package com.njcn.csdevice.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ import javax.validation.constraints.Pattern; * @createTime 2023/5/31 14:54 */ @Data -public class CsLedgerParam { +public class CsLedgerParam extends BaseEntity { @ApiModelProperty("Id") private String id; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 8abff62..cb10dbc 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.enums.LineBaseEnum; import com.njcn.csdevice.mapper.AppProjectMapper; import com.njcn.csdevice.mapper.AppTopologyDiagramMapper; @@ -14,7 +12,10 @@ import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csdevice.pojo.param.CsLedgerParam; -import com.njcn.csdevice.pojo.po.*; +import com.njcn.csdevice.pojo.po.AppProjectPO; +import com.njcn.csdevice.pojo.po.AppTopologyDiagramPO; +import com.njcn.csdevice.pojo.po.CsEngineeringPO; +import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.vo.CsLedgerVO; import com.njcn.csdevice.service.CsLinePOService; import com.njcn.csdevice.service.ICsEngineeringUserService;