From 1d63b94dcc9d650297b42c9f89e3fec8d5fec4be Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 19 Aug 2024 11:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=96=AD=E9=9D=A2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9,=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=82=B9=E7=9B=AE=E5=BD=95=E6=96=B0=E5=A2=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/controller/AttDamProfileController.java | 3 +++ .../com/gunshi/project/xyt/controller/CctvBMenuController.java | 2 ++ .../com/gunshi/project/xyt/controller/SysDictBController.java | 3 +++ src/main/java/com/gunshi/project/xyt/model/AttCctvBase.java | 3 +++ src/main/java/com/gunshi/project/xyt/model/CctvBMenu.java | 3 +++ .../java/com/gunshi/project/xyt/model/GateValveCctvRel.java | 3 +++ src/main/java/com/gunshi/project/xyt/model/SysDictB.java | 3 +++ 7 files changed, 20 insertions(+) diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java b/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java index b445d1c..d56b9fd 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -45,6 +46,8 @@ public class AttDamProfileController extends AbstractCommonFileController{ public R insert(@Validated(Insert.class) @RequestBody AttDamProfile dto) { if (Objects.nonNull(service.getById(dto.getProfileCode()))) { throw new IllegalArgumentException("当前编号已存在"); + }else{ + dto.setProfileCode(String.valueOf(IdWorker.getId())); } if (StringUtils.isNotBlank(dto.getProfileName())){ if (service.lambdaQuery().eq(AttDamProfile::getProfileName,dto.getProfileName()).count() > 0) { diff --git a/src/main/java/com/gunshi/project/xyt/controller/CctvBMenuController.java b/src/main/java/com/gunshi/project/xyt/controller/CctvBMenuController.java index a478136..76a5a2b 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/CctvBMenuController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/CctvBMenuController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.gunshi.core.result.R; import com.gunshi.project.xyt.model.CctvBMenu; import com.gunshi.project.xyt.service.CctvBMenuService; @@ -31,6 +32,7 @@ public class CctvBMenuController { @Operation(summary = "新增") @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody CctvBMenu dto) { + dto.setId(IdWorker.getId()); boolean result = service.save(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java index a90934f..7a4e867 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; @@ -52,6 +53,8 @@ public class SysDictBController { } } dto.setCreateTm(new Date()); + dto.setId(IdWorker.getId()); + boolean result = service.save(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/model/AttCctvBase.java b/src/main/java/com/gunshi/project/xyt/model/AttCctvBase.java index d716bb5..c8754c2 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttCctvBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttCctvBase.java @@ -6,6 +6,8 @@ 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; @@ -37,6 +39,7 @@ public class AttCctvBase implements Serializable { @TableId(value="id", type= IdType.AUTO) @Schema(description="id") @NotNull(message = "id不能为空",groups = { Update.class}) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/CctvBMenu.java b/src/main/java/com/gunshi/project/xyt/model/CctvBMenu.java index 682c8d1..1f5d082 100644 --- a/src/main/java/com/gunshi/project/xyt/model/CctvBMenu.java +++ b/src/main/java/com/gunshi/project/xyt/model/CctvBMenu.java @@ -5,6 +5,8 @@ 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.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -33,6 +35,7 @@ public class CctvBMenu implements Serializable { @TableId(value="id", type= IdType.AUTO) @Schema(description="id") @NotNull(message = "id不能为空") + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 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 1e4daab..607b178 100644 --- a/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java +++ b/src/main/java/com/gunshi/project/xyt/model/GateValveCctvRel.java @@ -5,6 +5,8 @@ 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.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; @@ -35,6 +37,7 @@ public class GateValveCctvRel implements Serializable { @TableId(value="id", type= IdType.AUTO) @Schema(description="id") @NotNull(message = "id不能为空", groups = {Update.class}) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java index 941ed84..304b638 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java +++ b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java @@ -6,6 +6,8 @@ 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; @@ -39,6 +41,7 @@ public class SysDictB implements Serializable { @Schema(description="ID") // @Size(max = 0,message = "ID最大长度要小于 0") @NotBlank(message = "ID不能为空",groups = {Insert.class, Update.class}) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /**