diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java index fb4e1bb..188bf82 100644 --- a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/api/BridgeApi.java @@ -3,48 +3,41 @@ package com.wanji.software.tocc.infra.maint.api; import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.constants.ApiConstants; import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeModel; import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; -import com.wanji.software.tocc.infra.maint.model.dto.BridgePageReq; -import com.wanji.software.tocc.infra.maint.model.dto.BridgeResp; -import com.wanji.software.tocc.infra.maint.model.dto.BridgeSaveReq; import com.wanji.software.tocc.maint.support.PageResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; /** * 桥梁信息表 */ @FeignClient(name = ApiConstants.NAME, contextId = "BridgeApi", url = "${maint.infra.url:http://127.0.0.1:7424}") -@Tag(name = "RPC 服务 - 桥梁信息表") +@Tag(name = "RPC 服务 - 桥梁") public interface BridgeApi { String PREFIX = ApiConstants.PREFIX + "/bridge"; - @PostMapping(PREFIX + "/create") - @Operation(summary = "新增桥梁信息表") - Result create(@RequestBody BridgeSaveReq req); - - @GetMapping(PREFIX + "/get-by-id") - @Operation(summary = "按主键查询桥梁信息表") - Result getById(@Parameter(description = "主键") @RequestParam("id") String id); - - @PutMapping(PREFIX + "/update") - @Operation(summary = "修改桥梁信息表") - Result update(@RequestBody BridgeSaveReq req); - - @DeleteMapping(PREFIX + "/delete") - @Operation(summary = "删除桥梁信息表") - Result delete(@Parameter(description = "主键") @RequestParam("id") String id); - @PostMapping(PREFIX + "/page") @Operation(summary = "分页查询桥梁") Result> page(@RequestBody BridgeSearchModel searchModel); + + @PostMapping(PREFIX + "/create") + @Operation(summary = "新增桥梁") + Result create(@RequestBody BridgeModel model); + + @PostMapping(PREFIX + "/update") + @Operation(summary = "修改桥梁") + Result update(@RequestBody BridgeModel model); + + @PostMapping(PREFIX + "/delete") + @Operation(summary = "删除桥梁") + Result delete(@Parameter(description = "主键") @RequestParam("ids") String ids); + + @GetMapping(PREFIX + "/get-by-id") + @Operation(summary = "按主键查询桥梁") + Result getById(@Parameter(description = "主键") @RequestParam("id") String id); } diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java index 2cb0103..d2e4bdb 100644 --- a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeListModel.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; @Schema(description = "桥梁列表") public class BridgeListModel { - @Schema(description = "ID") + @Schema(description = "主键") private String id; @Schema(description = "管养单位-名称") diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeModel.java new file mode 100644 index 0000000..9278c16 --- /dev/null +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/BridgeModel.java @@ -0,0 +1,77 @@ +package com.wanji.software.tocc.infra.maint.model; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@Schema(description = "桥梁") +public class BridgeModel { + + @Schema(description = "主键") + private String id; + + @Schema(description = "管养单位-ID") + private String deptId; + + @Schema(description = "道路-ID") + private String roadId; + + @Schema(description = "路段-ID") + private String roadSectionId; + + @Schema(description = "桥梁编码") + private String bridgeCode; + + @Schema(description = "桥梁名称") + private String bridgeName; + + @Schema(description = "起点桩号") + private String chainageStart; + + @Schema(description = "终点桩号") + private String chainageEnd; + + @Schema(description = "桥梁类型") + private Integer bridgeType; + + @Schema(description = "桥梁全长(m)") + private BigDecimal bridgeLen; + + @Schema(description = "跨径总长(m)") + private BigDecimal totalSpanLen; + + @Schema(description = "桥面净宽(m)") + private BigDecimal deckClearWidth; + + @Schema(description = "建设单位") + private String owner; + + @Schema(description = "设计单位") + private String designer; + + @Schema(description = "施工单位") + private String contractor; + + @Schema(description = "监理单位") + private String supervisor; + + @Schema(description = "行政区划-ID") + private String regionId; + + @Schema(description = "经度") + private BigDecimal longitude; + + @Schema(description = "纬度") + private BigDecimal latitude; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "技术状态") + private Integer techStatus; + + @Schema(description = "附件") + private String attacmentIds; +} diff --git a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java index bddb9b5..fce68fd 100644 --- a/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java +++ b/tocc-infra-maint/tocc-infra-maint-api/src/main/java/com/wanji/software/tocc/infra/maint/model/RoadListModel.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; @Schema(description = "道路列表") public class RoadListModel { - @Schema(description = "ID") + @Schema(description = "主键") private String id; @Schema(description = "管养单位-名称") diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java index c7d2966..1335e8e 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/api/impl/BridgeApiImpl.java @@ -5,19 +5,23 @@ import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.api.BridgeApi; import com.wanji.software.tocc.infra.maint.mapper.BridgeMapper; import com.wanji.software.tocc.infra.maint.model.BridgeListModel; +import com.wanji.software.tocc.infra.maint.model.BridgeModel; import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; -import com.wanji.software.tocc.infra.maint.model.dto.BridgePageReq; -import com.wanji.software.tocc.infra.maint.model.dto.BridgeResp; -import com.wanji.software.tocc.infra.maint.model.dto.BridgeSaveReq; import com.wanji.software.tocc.infra.maint.model.po.Bridge; -import com.wanji.software.tocc.infra.maint.support.MaintRecords; +import com.wanji.software.tocc.maint.support.CurrentUser; +import com.wanji.software.tocc.maint.support.CurrentUserHolder; import com.wanji.software.tocc.maint.support.PageResult; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.UUID; @RestController @Validated @@ -26,25 +30,8 @@ public class BridgeApiImpl implements BridgeApi { @Resource private BridgeMapper bridgeMapper; - @Override - public Result create(BridgeSaveReq req) { - return MaintRecords.create(bridgeMapper, req, Bridge.class, BridgeResp.class); - } - - @Override - public Result getById(String id) { - return MaintRecords.get(bridgeMapper, id, BridgeResp.class); - } - - @Override - public Result update(BridgeSaveReq req) { - return MaintRecords.update(bridgeMapper, req); - } - - @Override - public Result delete(String id) { - return MaintRecords.delete(bridgeMapper, id); - } + @Resource + private JdbcTemplate jdbcTemplate; @Override public Result> page(BridgeSearchModel searchModel) { @@ -61,4 +48,111 @@ public class BridgeApiImpl implements BridgeApi { return Result.ok(pageResult); } + + @Override + @Transactional + public Result create(BridgeModel model) { + String sql = "SELECT count(1) FROM maint_bridge WHERE bridge_code = ?"; + Long total = jdbcTemplate.queryForObject(sql, Long.class, model.getBridgeCode()); + if (total > 0) { + return Result.fail("桥梁编码重复"); + } + + sql = "SELECT count(1) FROM maint_bridge WHERE bridge_name = ?"; + total = jdbcTemplate.queryForObject(sql, Long.class, model.getBridgeName()); + if (total > 0) { + return Result.fail("桥梁名称重复"); + } + + Bridge bridge = new Bridge(); + BeanUtils.copyProperties(model, bridge, "id"); + CurrentUser user = CurrentUserHolder.get(); + LocalDateTime now = LocalDateTime.now(); + bridge.setCreateBy(user.getUserId()); + bridge.setCreateTime(now); + bridge.setUpdateBy(user.getUserId()); + bridge.setUpdateTime(now); + bridgeMapper.insert(bridge); + + return Result.ok(true); + } + + @Override + @Transactional + public Result update(BridgeModel model) { + if (StringUtils.isBlank(model.getId())) { + return Result.fail("主键不能为空"); + } + + Bridge bridge = bridgeMapper.selectById(model.getId()); + if (bridge == null) { + return Result.fail("数据不存在"); + } + + String sql = "SELECT count(1) FROM maint_bridge WHERE id <> ? AND bridge_code = ?"; + Long total = jdbcTemplate.queryForObject(sql, Long.class, model.getId(), model.getBridgeCode()); + if (total > 0) { + return Result.fail("桥梁编码重复"); + } + + sql = "SELECT count(1) FROM maint_bridge WHERE id <> ? AND bridge_name = ?"; + total = jdbcTemplate.queryForObject(sql, Long.class, model.getId(), model.getBridgeName()); + if (total > 0) { + return Result.fail("桥梁名称重复"); + } + + BeanUtils.copyProperties(model, bridge); + CurrentUser user = CurrentUserHolder.get(); + bridge.setUpdateBy(user.getUserId()); + bridge.setUpdateTime(LocalDateTime.now()); + bridgeMapper.updateById(bridge); + + return Result.ok(true); + } + + @Override + @Transactional + public Result delete(String ids) { + String[] idArray = StringUtils.split(ids, ","); + for (String id : idArray) { + Bridge bridge = bridgeMapper.selectById(id); + if (bridge == null) { + return Result.fail("数据不存在"); + } + + String sql = "SELECT count(1) FROM maint_archive_asset WHERE asset_id = ?"; + Long total = jdbcTemplate.queryForObject(sql, Long.class, bridge.getId()); + if (total > 0) { + return Result.fail(String.format("【%s】关联工程建设档案,不能删除", bridge.getBridgeName())); + } + + sql = "SELECT count(1) FROM maint_asset_inventory WHERE asset_id = ?"; + total = jdbcTemplate.queryForObject(sql, Long.class, bridge.getId()); + if (total > 0) { + return Result.fail(String.format("【%s】关联路产采集,不能删除", bridge.getBridgeName())); + } + + sql = "SELECT count(1) FROM maint_defect_asset WHERE asset_id = ?"; + total = jdbcTemplate.queryForObject(sql, Long.class, bridge.getId()); + if (total > 0) { + return Result.fail(String.format("【%s】关联病害,不能删除", bridge.getBridgeName())); + } + + bridgeMapper.deleteById(bridge.getId()); + } + + return Result.ok(true); + } + + @Override + public Result getById(String id) { + Bridge bridge = bridgeMapper.selectById(id); + if (bridge == null) { + return Result.fail("数据不存在"); + } + + BridgeModel model = new BridgeModel(); + BeanUtils.copyProperties(bridge, model); + return Result.ok(model); + } } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Archive.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Archive.java index cb15090..4d24ede 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Archive.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Archive.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 工程建设档案表 */ @@ -19,7 +20,7 @@ public class Archive { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 档案分类ID */ @@ -85,8 +86,8 @@ public class Archive { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -94,6 +95,6 @@ public class Archive { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveAsset.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveAsset.java index adbccc1..546685e 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveAsset.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveAsset.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 工程建设档案-资产关联表 */ @@ -19,7 +19,7 @@ public class ArchiveAsset { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 档案ID */ @@ -48,8 +48,8 @@ public class ArchiveAsset { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -57,6 +57,6 @@ public class ArchiveAsset { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveCategory.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveCategory.java index 64f83e3..325f1fa 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveCategory.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveCategory.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 工程建设档案分类表 */ @@ -19,7 +19,7 @@ public class ArchiveCategory { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 上级分类ID */ @@ -40,7 +40,6 @@ public class ArchiveCategory { /** 路径 */ @Schema(description = "路径") - @TableField("\"path\"") private String path; /** 是否叶子节点 */ @@ -57,8 +56,8 @@ public class ArchiveCategory { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -66,6 +65,6 @@ public class ArchiveCategory { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveFile.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveFile.java index a155cac..eee05cd 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveFile.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveFile.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 工程建设档案文件表 */ @@ -19,7 +19,7 @@ public class ArchiveFile { /** id */ @Schema(description = "id") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 档案ID */ @@ -56,8 +56,8 @@ public class ArchiveFile { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -65,6 +65,6 @@ public class ArchiveFile { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveVolume.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveVolume.java index 67be4ba..44eccb4 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveVolume.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/ArchiveVolume.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 工程建设档案案卷表 */ @@ -19,7 +20,7 @@ public class ArchiveVolume { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 档案ID */ @@ -91,8 +92,8 @@ public class ArchiveVolume { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -100,6 +101,6 @@ public class ArchiveVolume { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java index 2bde69c..55bd93e 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/AssetInventory.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 资产采集表 */ @@ -19,7 +20,7 @@ public class AssetInventory { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID(冗余) */ @@ -86,8 +87,8 @@ public class AssetInventory { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -95,6 +96,6 @@ public class AssetInventory { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Bridge.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Bridge.java index 363e2d7..3353789 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Bridge.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Bridge.java @@ -1,15 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 桥梁信息表 */ @@ -20,7 +20,7 @@ public class Bridge { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID */ @@ -117,8 +117,8 @@ public class Bridge { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -126,6 +126,6 @@ public class Bridge { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java index cb51dad..cba3c8e 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Defect.java @@ -1,15 +1,16 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 隐患表 */ @@ -20,7 +21,7 @@ public class Defect { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID(冗余) */ @@ -164,8 +165,8 @@ public class Defect { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -173,6 +174,6 @@ public class Defect { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectAsset.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectAsset.java index ba3b758..7038d46 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectAsset.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectAsset.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 隐患-资产关联表 */ @@ -19,7 +19,7 @@ public class DefectAsset { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 隐患ID */ @@ -48,8 +48,8 @@ public class DefectAsset { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -57,6 +57,6 @@ public class DefectAsset { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectType.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectType.java index e6ccbb1..e62a6b9 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectType.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/DefectType.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 隐患类别表 */ @@ -19,7 +19,7 @@ public class DefectType { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 名称 */ @@ -44,8 +44,8 @@ public class DefectType { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -53,6 +53,6 @@ public class DefectType { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Facility.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Facility.java index 6eb58f8..1f6f295 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Facility.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Facility.java @@ -1,15 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 设施信息表 */ @@ -20,7 +20,7 @@ public class Facility { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID */ @@ -105,8 +105,8 @@ public class Facility { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -114,6 +114,6 @@ public class Facility { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityType.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityType.java index 2e23bb3..da939b0 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityType.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityType.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 设施类型表 */ @@ -19,7 +19,7 @@ public class FacilityType { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 名称 */ @@ -40,8 +40,8 @@ public class FacilityType { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -49,6 +49,6 @@ public class FacilityType { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityTypeField.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityTypeField.java index edf4a37..61d03e7 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityTypeField.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/FacilityTypeField.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 设施类型字段配置表 */ @@ -19,7 +19,7 @@ public class FacilityTypeField { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 设施类型ID */ @@ -56,8 +56,8 @@ public class FacilityTypeField { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -65,6 +65,6 @@ public class FacilityTypeField { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionPlan.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionPlan.java index 95093d1..cd18043 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionPlan.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionPlan.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 巡查计划表 */ @@ -19,7 +20,7 @@ public class InspectionPlan { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID(冗余) */ @@ -70,8 +71,8 @@ public class InspectionPlan { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -79,6 +80,6 @@ public class InspectionPlan { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java index 74a3383..87e495d 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/InspectionRecord.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 巡查日志表 */ @@ -19,7 +20,7 @@ public class InspectionRecord { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID(冗余) */ @@ -70,8 +71,8 @@ public class InspectionRecord { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -79,6 +80,6 @@ public class InspectionRecord { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Knowledge.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Knowledge.java index b947f6d..4392f32 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Knowledge.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Knowledge.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 知识表 */ @@ -19,7 +19,7 @@ public class Knowledge { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 知识分类ID */ @@ -56,8 +56,8 @@ public class Knowledge { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -65,6 +65,6 @@ public class Knowledge { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/KnowledgeCategory.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/KnowledgeCategory.java index b806c3f..88cdc04 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/KnowledgeCategory.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/KnowledgeCategory.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 知识分类表 */ @@ -19,7 +19,7 @@ public class KnowledgeCategory { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 上级分类ID */ @@ -40,7 +40,6 @@ public class KnowledgeCategory { /** 路径 */ @Schema(description = "路径") - @TableField("\"path\"") private String path; /** 是否叶子节点 */ @@ -57,8 +56,8 @@ public class KnowledgeCategory { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -66,6 +65,6 @@ public class KnowledgeCategory { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceDept.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceDept.java index 2d147cc..69a4aa4 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceDept.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceDept.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 养护单位表 */ @@ -19,7 +19,7 @@ public class MaintenanceDept { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 单位名称 */ @@ -48,8 +48,8 @@ public class MaintenanceDept { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -57,6 +57,6 @@ public class MaintenanceDept { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceEquipment.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceEquipment.java index e499950..6a9ba3c 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceEquipment.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenanceEquipment.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 养护设备表 */ @@ -19,7 +19,7 @@ public class MaintenanceEquipment { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 养护单位ID */ @@ -56,8 +56,8 @@ public class MaintenanceEquipment { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -65,6 +65,6 @@ public class MaintenanceEquipment { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenancePerson.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenancePerson.java index 29e8e1f..160383d 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenancePerson.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/MaintenancePerson.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 养护人员表 */ @@ -19,7 +19,7 @@ public class MaintenancePerson { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 养护单位ID */ @@ -48,8 +48,8 @@ public class MaintenancePerson { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -57,6 +57,6 @@ public class MaintenancePerson { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Road.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Road.java index c0d45e4..b2df013 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Road.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Road.java @@ -1,15 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 道路信息表 */ @@ -20,7 +20,7 @@ public class Road { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID */ @@ -97,8 +97,8 @@ public class Road { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -106,6 +106,6 @@ public class Road { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadSection.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadSection.java index f4a0a94..929b190 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadSection.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadSection.java @@ -1,15 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 路段信息表 */ @@ -20,7 +20,7 @@ public class RoadSection { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID */ @@ -73,8 +73,8 @@ public class RoadSection { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -82,6 +82,6 @@ public class RoadSection { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadUpgrading.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadUpgrading.java index fb317fb..a529b71 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadUpgrading.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/RoadUpgrading.java @@ -1,14 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; + /** * 改扩建信息表 */ @@ -19,7 +20,7 @@ public class RoadUpgrading { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 道路ID */ @@ -83,8 +84,8 @@ public class RoadUpgrading { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -92,6 +93,6 @@ public class RoadUpgrading { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Slope.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Slope.java index 7b254e4..83e145b 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Slope.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/Slope.java @@ -1,15 +1,15 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.math.BigDecimal; -import java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + /** * 边坡信息表 */ @@ -20,7 +20,7 @@ public class Slope { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 管养单位ID */ @@ -97,8 +97,8 @@ public class Slope { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -106,6 +106,6 @@ public class Slope { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/UserRoadSection.java b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/UserRoadSection.java index 567b4ba..70203d2 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/UserRoadSection.java +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/java/com/wanji/software/tocc/infra/maint/model/po/UserRoadSection.java @@ -1,14 +1,14 @@ package com.wanji.software.tocc.infra.maint.model.po; 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 java.time.LocalDate; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + /** * 用户-路段关联表 */ @@ -19,7 +19,7 @@ public class UserRoadSection { /** 主键 */ @Schema(description = "主键") - @TableId(value = "ID", type = IdType.INPUT) + @TableId(value = "ID", type = IdType.ASSIGN_UUID) private String id; /** 用户ID(路长、巡查人员) */ @@ -48,8 +48,8 @@ public class UserRoadSection { /** 创建时间 */ @Schema(description = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; /** 最近修改人 */ @Schema(description = "最近修改人") @@ -57,6 +57,6 @@ public class UserRoadSection { /** 最近修改时间 */ @Schema(description = "最近修改时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; } diff --git a/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/application.yml b/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/application.yml index da89d0d..01958b1 100644 --- a/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/application.yml +++ b/tocc-infra-maint/tocc-infra-maint-biz/src/main/resources/application.yml @@ -22,7 +22,7 @@ mybatis-plus: map-underscore-to-camel-case: true global-config: db-config: - id-type: input + id-type: assign_uuid springdoc: api-docs: diff --git a/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java b/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java index 3e5efc0..16d32e2 100644 --- a/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java +++ b/tocc-system-maint/tocc-system-maint-biz/src/main/java/com/wanji/software/tocc/system/maint/controller/MaintController.java @@ -4,17 +4,13 @@ import com.wanji.software.tocc.common.model.Result; import com.wanji.software.tocc.infra.maint.api.BridgeApi; import com.wanji.software.tocc.infra.maint.api.MaintHealthApi; import com.wanji.software.tocc.infra.maint.api.RoadApi; -import com.wanji.software.tocc.infra.maint.model.BridgeListModel; -import com.wanji.software.tocc.infra.maint.model.BridgeSearchModel; -import com.wanji.software.tocc.infra.maint.model.RoadListModel; -import com.wanji.software.tocc.infra.maint.model.RoadSearchModel; +import com.wanji.software.tocc.infra.maint.model.*; import com.wanji.software.tocc.maint.support.CurrentUserHolder; import com.wanji.software.tocc.maint.support.PageResult; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -58,4 +54,28 @@ public class MaintController { public Result> bridgePage(BridgeSearchModel searchModel) { return bridgeApi.page(searchModel); } + + @PostMapping("/bridge/create") + @Operation(summary = "新增桥梁") + public Result create(@RequestBody BridgeModel model) { + return bridgeApi.create(model); + } + + @PostMapping("/bridge/update") + @Operation(summary = "修改桥梁") + public Result update(@RequestBody BridgeModel model) { + return bridgeApi.update(model); + } + + @PostMapping("/bridge/delete") + @Operation(summary = "删除桥梁") + public Result delete(@Parameter(description = "主键") @RequestParam("ids") String ids) { + return bridgeApi.delete(ids); + } + + @GetMapping("/bridge/get-by-id") + @Operation(summary = "按主键查询桥梁") + public Result getById(@Parameter(description = "主键") @RequestParam("id") String id) { + return bridgeApi.getById(id); + } }