From 0b2a575612189834c484403596feefd10da30b28 Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 20 Aug 2024 10:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=B8=E9=98=80=E5=85=B3=E8=81=94=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=82=B9=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/xyt/controller/GateValveCctvRelController.java | 1 + .../gunshi/project/xyt/mapper/GateValveCctvRelMapper.java | 4 ++-- .../com/gunshi/project/xyt/model/GateValveCctvRel.java | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java b/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java index 2647846..a2a9981 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/GateValveCctvRelController.java @@ -64,6 +64,7 @@ public class GateValveCctvRelController { .count() > 0) { throw new IllegalArgumentException("当前编号已关联"); } + dto.setCreateTime(null); boolean result = service.updateById(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java index 011fc95..0a8f6b0 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java @@ -27,10 +27,10 @@ public interface GateValveCctvRelMapper extends BaseMapper { LEFT JOIN public.att_cctv_base acb ON t.index_code = acb.index_code - agv.valve_name LIKE concat('%',#{obj.valveName},'%') + AND agv.valve_name LIKE '%'||#{obj.valveName}||'%' - acb.name LIKE concat('%',#{obj.indexName},'%') + AND acb.name LIKE '%'||#{obj.indexName}||'%' diff --git a/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java b/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java index 607b178..06a5c63 100644 --- a/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java +++ b/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; @@ -45,7 +47,7 @@ public class GateValveCctvRel implements Serializable { */ @TableField(value="valve_code") @Schema(description="闸阀编号") - @Size(max = 20,message = "闸阀编号最大长度要小于 20") + @Size(max = 100,message = "闸阀编号最大长度要小于 100") @NotBlank(message = "闸阀编号不能为空", groups = {Insert.class,Update.class}) private String valveCode; @@ -54,7 +56,7 @@ public class GateValveCctvRel implements Serializable { */ @TableField(value="index_code") @Schema(description="视频点") - @Size(max = 150,message = "视频点最大长度要小于 150") + @Size(max = 100,message = "视频点最大长度要小于 100") @NotBlank(message = "视频点不能为空", groups = {Insert.class,Update.class}) private String indexCode; @@ -63,6 +65,7 @@ public class GateValveCctvRel implements Serializable { */ @TableField(value="create_time") @Schema(description="创建时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date createTime; } \ No newline at end of file