From 69c67fbcad99a8b0718c3d38ece84164a09f440c Mon Sep 17 00:00:00 2001 From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com> Date: Thu, 28 Mar 2024 14:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysTroubleController.java | 4 +- .../com/couplet/trouble/domain/Trouble.java | 90 ++++++++++--------- .../trouble/mapper/SysTroubleMapper.java | 3 + .../trouble/service/SysTroubleService.java | 3 +- .../service/impl/SysTroubleServiceImpl.java | 5 ++ .../mapper/trouble/SysTroubleMapper.xml | 7 +- 6 files changed, 64 insertions(+), 48 deletions(-) diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java index 3c5d21f..27fa434 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java @@ -61,8 +61,8 @@ public class SysTroubleController extends BaseController { */ @Log(title = "删除故障码",businessType = BusinessType.DELETE) @GetMapping("/removeId/{troubleId}") - public Result remove(@PathVariable Long troubleId) { - troubleService.removeById(troubleId); + public Result remove(@PathVariable Integer troubleId) { + troubleService.delByTroubleId(troubleId); return success(); } } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java index 34f71f8..23838a1 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/Trouble.java @@ -1,5 +1,8 @@ package com.couplet.trouble.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.couplet.common.core.annotation.Excel; import com.couplet.common.core.web.domain.BaseEntity; import lombok.*; @@ -13,14 +16,15 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024/3/26 21:49 * @description */ -@Getter +//@Getter @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@EqualsAndHashCode(callSuper = true) +//@EqualsAndHashCode(callSuper = true) +@TableName("trouble") public class Trouble extends BaseEntity { - private static final long serialVersionUID = 1L; +// private static final long serialVersionUID = 1L; /** * 主键id @@ -62,44 +66,44 @@ public class Trouble extends BaseEntity { */ private Integer troubleGradeId; - public void setTroubleId (Integer troubleId) { - this.troubleId = troubleId; - } - - public void setTroubleCode (String troubleCode) { - this.troubleCode = troubleCode; - } - - public void setTroublePosition (String troublePosition) { - this.troublePosition = troublePosition; - } - - public void setTroubleValue (String troubleValue) { - this.troubleValue = troubleValue; - } - - public void setTroubleTag (String troubleTag) { - this.troubleTag = troubleTag; - } - - public void setTroubleTypeId (Integer troubleTypeId) { - this.troubleTypeId = troubleTypeId; - } - - public void setTroubleGradeId (Integer troubleGradeId) { - this.troubleGradeId = troubleGradeId; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("troubleId", getTroubleId()) - .append("troubleCode", getTroubleCode()) - .append("troublePosition", getTroublePosition()) - .append("troubleValue", getTroubleValue()) - .append("troubleTag", getTroubleTag()) - .append("troubleTypeId", getTroubleTypeId()) - .append("troubleGradeId", getTroubleGradeId()) - .toString(); - } +// public void setTroubleId (Integer troubleId) { +// this.troubleId = troubleId; +// } +// +// public void setTroubleCode (String troubleCode) { +// this.troubleCode = troubleCode; +// } +// +// public void setTroublePosition (String troublePosition) { +// this.troublePosition = troublePosition; +// } +// +// public void setTroubleValue (String troubleValue) { +// this.troubleValue = troubleValue; +// } +// +// public void setTroubleTag (String troubleTag) { +// this.troubleTag = troubleTag; +// } +// +// public void setTroubleTypeId (Integer troubleTypeId) { +// this.troubleTypeId = troubleTypeId; +// } +// +// public void setTroubleGradeId (Integer troubleGradeId) { +// this.troubleGradeId = troubleGradeId; +// } +// +// @Override +// public String toString() { +// return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) +// .append("troubleId", getTroubleId()) +// .append("troubleCode", getTroubleCode()) +// .append("troublePosition", getTroublePosition()) +// .append("troubleValue", getTroubleValue()) +// .append("troubleTag", getTroubleTag()) +// .append("troubleTypeId", getTroubleTypeId()) +// .append("troubleGradeId", getTroubleGradeId()) +// .toString(); +// } } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java index d756f68..7daae25 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java @@ -5,6 +5,7 @@ import com.couplet.trouble.domain.Trouble; import com.couplet.trouble.domain.req.TroubleAddReq; import com.couplet.trouble.domain.req.TroubleUpdReq; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +22,6 @@ public interface SysTroubleMapper extends BaseMapper { int addTrouble(TroubleAddReq troubleAddReq); int updateTrouble(TroubleUpdReq troubleUpdReq); + + int delByTroubleId(@Param("troubleId") Integer troubleId); } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java index aa92d02..356752f 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.couplet.trouble.domain.Trouble; import com.couplet.trouble.domain.req.TroubleAddReq; import com.couplet.trouble.domain.req.TroubleUpdReq; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,5 +21,5 @@ public interface SysTroubleService extends IService { int updateTrouble(TroubleUpdReq troubleUpdReq); - + int delByTroubleId(Integer troubleId); } diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java index 96113e5..71d6137 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java +++ b/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java @@ -53,5 +53,10 @@ public class SysTroubleServiceImpl extends ServiceImpl + + delete from dxd_trouble_code + where trouble_id =#{troubleId} + - - +