监测断面信息新增修改,视频点目录新增修改,系统字典新增修改

master
徐杰盟 2024-08-19 11:25:25 +08:00
parent f873c2ce5c
commit 1d63b94dcc
7 changed files with 20 additions and 0 deletions

View File

@ -1,6 +1,7 @@
package com.gunshi.project.xyt.controller; package com.gunshi.project.xyt.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -45,6 +46,8 @@ public class AttDamProfileController extends AbstractCommonFileController{
public R<AttDamProfile> insert(@Validated(Insert.class) @RequestBody AttDamProfile dto) { public R<AttDamProfile> insert(@Validated(Insert.class) @RequestBody AttDamProfile dto) {
if (Objects.nonNull(service.getById(dto.getProfileCode()))) { if (Objects.nonNull(service.getById(dto.getProfileCode()))) {
throw new IllegalArgumentException("当前编号已存在"); throw new IllegalArgumentException("当前编号已存在");
}else{
dto.setProfileCode(String.valueOf(IdWorker.getId()));
} }
if (StringUtils.isNotBlank(dto.getProfileName())){ if (StringUtils.isNotBlank(dto.getProfileName())){
if (service.lambdaQuery().eq(AttDamProfile::getProfileName,dto.getProfileName()).count() > 0) { if (service.lambdaQuery().eq(AttDamProfile::getProfileName,dto.getProfileName()).count() > 0) {

View File

@ -1,5 +1,6 @@
package com.gunshi.project.xyt.controller; package com.gunshi.project.xyt.controller;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.gunshi.core.result.R; import com.gunshi.core.result.R;
import com.gunshi.project.xyt.model.CctvBMenu; import com.gunshi.project.xyt.model.CctvBMenu;
import com.gunshi.project.xyt.service.CctvBMenuService; import com.gunshi.project.xyt.service.CctvBMenuService;
@ -31,6 +32,7 @@ public class CctvBMenuController {
@Operation(summary = "新增") @Operation(summary = "新增")
@PostMapping("/insert") @PostMapping("/insert")
public R<CctvBMenu> insert(@Validated(Insert.class) @RequestBody CctvBMenu dto) { public R<CctvBMenu> insert(@Validated(Insert.class) @RequestBody CctvBMenu dto) {
dto.setId(IdWorker.getId());
boolean result = service.save(dto); boolean result = service.save(dto);
return R.ok(result ? dto : null); return R.ok(result ? dto : null);
} }

View File

@ -1,5 +1,6 @@
package com.gunshi.project.xyt.controller; 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.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gunshi.core.result.R; import com.gunshi.core.result.R;
@ -52,6 +53,8 @@ public class SysDictBController {
} }
} }
dto.setCreateTm(new Date()); dto.setCreateTm(new Date());
dto.setId(IdWorker.getId());
boolean result = service.save(dto); boolean result = service.save(dto);
return R.ok(result ? dto : null); return R.ok(result ? dto : null);
} }

View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; 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.core.dateformat.DateFormatString;
import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Insert;
import com.gunshi.project.xyt.validate.markers.Update; import com.gunshi.project.xyt.validate.markers.Update;
@ -37,6 +39,7 @@ public class AttCctvBase implements Serializable {
@TableId(value="id", type= IdType.AUTO) @TableId(value="id", type= IdType.AUTO)
@Schema(description="id") @Schema(description="id")
@NotNull(message = "id不能为空",groups = { Update.class}) @NotNull(message = "id不能为空",groups = { Update.class})
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**

View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -33,6 +35,7 @@ public class CctvBMenu implements Serializable {
@TableId(value="id", type= IdType.AUTO) @TableId(value="id", type= IdType.AUTO)
@Schema(description="id") @Schema(description="id")
@NotNull(message = "id不能为空") @NotNull(message = "id不能为空")
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**

View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.Insert;
import com.gunshi.project.xyt.validate.markers.Update; import com.gunshi.project.xyt.validate.markers.Update;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
@ -35,6 +37,7 @@ public class GateValveCctvRel implements Serializable {
@TableId(value="id", type= IdType.AUTO) @TableId(value="id", type= IdType.AUTO)
@Schema(description="id") @Schema(description="id")
@NotNull(message = "id不能为空", groups = {Update.class}) @NotNull(message = "id不能为空", groups = {Update.class})
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**

View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; 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.core.dateformat.DateFormatString;
import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Insert;
import com.gunshi.project.xyt.validate.markers.Update; import com.gunshi.project.xyt.validate.markers.Update;
@ -39,6 +41,7 @@ public class SysDictB implements Serializable {
@Schema(description="ID") @Schema(description="ID")
// @Size(max = 0,message = "ID最大长度要小于 0") // @Size(max = 0,message = "ID最大长度要小于 0")
@NotBlank(message = "ID不能为空",groups = {Insert.class, Update.class}) @NotBlank(message = "ID不能为空",groups = {Insert.class, Update.class})
@JsonSerialize(using = ToStringSerializer.class)
private Long id; private Long id;
/** /**