diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java index b785dbc8..e96e6478 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.stream.Collectors; +import static com.kms.yg.znjg.service.SyDirService.generateLayerResourceDirectoryNumber; + /** * 图层管理 */ @@ -78,7 +80,9 @@ public class SyLayerController { if (serviceIsRepeat) { throw new Exception("同一层级名称不能重复,请重新输入名称"); } - syLayer.setId(UUID.randomUUID().toString()); + String prefix = "TCFW"; + String layerResourceDirectoryNumber = generateLayerResourceDirectoryNumber(prefix); + syLayer.setId(layerResourceDirectoryNumber); syLayer.setPubDate(new Date()); syLayerService.saveLayer(syLayer); } else { diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java index 8d349cd2..c1ddd1cc 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java @@ -51,7 +51,7 @@ public class SyDir implements Serializable { * 发布日期 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8") private Date pubDate; /** diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java index dd3f7ae1..0644a8a9 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java +++ b/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @TableName bs_sgc_qqjd_scene @@ -30,6 +32,8 @@ public class SyScene implements Serializable { /** * 发布时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss", timezone = "GMT+8") private Date pubDate; /**