Merge branch 'de_wangfs_202511' into dev

戈灵虎
2 parents 5c63a885 4d185265
Showing 20 changed files with 466 additions and 244 deletions
.vscode/settings.json
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java
urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/util/json/databind/LocalDateTimeStringSerializer.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/OldtreesController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/vo/OldtreesPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/vo/OldtreesRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/vo/OldtreesSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtreeschangelog/OldtreesChangeLogController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtreeschangelog/vo/OldtreesChangeLogRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/tree/TreeController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/tree/vo/TreeRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/tree/vo/TreeSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/treechangelog/TreeChangeLogController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/treechangelog/vo/TreeChangeLogRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/oldtreeschangelog/OldtreesChangeLogDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/oldtreeschangelog/OldtreesChangeLogMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/oldtrees/OldtreesServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/oldtreeschangelog/OldtreesChangeLogServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/treechangelog/TreeChangeLogServiceImpl.java
 {
     "java.compile.nullAnalysis.mode": "automatic",
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "codingcopilot.enableCompletionLanguage": {},
+    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx8G -Xms100m -Xlog:disable"
 }
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.zteits.urbanops.framework.common.biz.infra.logger.dto;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.experimental.Accessors;
 import java.time.LocalDateTime;
@@ -11,6 +12,7 @@ import java.time.LocalDateTime;
  * @author ZIEITS
  */
 @Data
+@Accessors(chain = true)
 public class ApiAccessLogCreateReqDTO {
     /**
+package com.zteits.urbanops.framework.common.util.json.databind;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 将 {@link LocalDateTime} 序列化为 {@code yyyy-MM-dd HH:mm:ss} 字符串
+ */
+public class LocalDateTimeStringSerializer extends JsonSerializer<LocalDateTime> {
+
+    private static final DateTimeFormatter FORMATTER =
+            DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value == null) {
+            gen.writeNull();
+            return;
+        }
+        gen.writeString(FORMATTER.format(value));
+    }
+}
 package com.zteits.urbanops.module.garden.controller.admin.oldtrees;
+import com.fhs.core.trans.anno.TransMethodResult;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import org.apache.catalina.security.SecurityUtil;
@@ -94,6 +95,7 @@ public class OldtreesController {
     @Operation(summary = "获取古树台账详细信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:oldtrees:query')")
+    @TransMethodResult
     public CommonResult<OldtreesRespVO> getOldtrees(@RequestParam("id") String id) {
         OldtreesDO oldtrees = oldtreesService.getOldtrees(id);
         return success(BeanUtils.toBean(oldtrees, OldtreesRespVO.class));
@@ -125,20 +127,18 @@ public class OldtreesController {
     private void fillDictData(List<OldtreesDO> list) {
         for (OldtreesDO gardenTree : list) {
-            String maintainUnit = DictFrameworkUtils.parseDictDataValue("maintain_unit", gardenTree.getMaintainunit());
-            gardenTree.setMaintainunit(maintainUnit);
-            String street = DictFrameworkUtils.parseDictDataValue("street_belong", gardenTree.getStreet());
+            String street = DictFrameworkUtils.parseDictDataLabel("street_belong", gardenTree.getStreet());
             gardenTree.setStreet(street);
-            String ownership = DictFrameworkUtils.parseDictDataValue("tree_ownership", gardenTree.getOldtreeownership());
+            String ownership = DictFrameworkUtils.parseDictDataLabel("tree_ownership", gardenTree.getOldtreeownership());
             gardenTree.setOldtreeownership(ownership);
-            String growthVigor = DictFrameworkUtils.parseDictDataValue("growth_vigor", gardenTree.getGrowthvigor());
+            String growthVigor = DictFrameworkUtils.parseDictDataLabel("growth_vigor", gardenTree.getGrowthvigor());
             gardenTree.setGrowthvigor(growthVigor);
-            String treeLevel = DictFrameworkUtils.parseDictDataValue("tree_level", gardenTree.getTreelevel());
+            String treeLevel = DictFrameworkUtils.parseDictDataLabel("tree_level", gardenTree.getTreelevel());
             gardenTree.setTreelevel(treeLevel);
-            String dataState = DictFrameworkUtils.parseDictDataValue("data_state", gardenTree.getDatastate());
+            String dataState = DictFrameworkUtils.parseDictDataLabel("data_state", gardenTree.getDatastate());
             gardenTree.setDatastate(dataState);
         }
     }
 package com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import lombok.*;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 package com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.framework.common.util.json.databind.LocalDateTimeStringSerializer;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -11,13 +15,16 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
 @Schema(description = "管理后台 - 古树名木 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class OldtreesRespVO {
     @Schema(description = "id", example = "4258")
-    @ExcelProperty("id")
+//    @ExcelProperty("id")
     private String id;
     @Schema(description = "编号")
@@ -25,7 +32,7 @@ public class OldtreesRespVO {
     private String famoustreenumber;
     @Schema(description = "级别--数据字典：一级、两级")
-    @ExcelProperty("级别--数据字典：一级、两级")
+    @ExcelProperty("级别")
     private String treelevel;
     @Schema(description = "树种", example = "2")
@@ -37,14 +44,11 @@ public class OldtreesRespVO {
     private String location;
     @Schema(description = "养护单位")
-    private String maintainunit;
-
-    @Schema(description = "养护单位名称")
     @ExcelProperty("养护单位")
-    private String maintainUnitName;
+    private String maintainunit;
     @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
-    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
+    @ExcelProperty("权属分类")
     private String oldtreeownership;
     @Schema(description = "生长地点")
@@ -92,7 +96,7 @@ public class OldtreesRespVO {
     private String weekday;
     @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
-    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
+//    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
     private String growthvigor;
     @Schema(description = "生长环境")
@@ -104,27 +108,27 @@ public class OldtreesRespVO {
     private String treephotoone;
     @Schema(description = "春季养护管理措施")
-    @ExcelProperty("春季养护管理措施")
+//    @ExcelProperty("春季养护管理措施")
     private String springmaintenance;
     @Schema(description = "夏季养护管理措施")
-    @ExcelProperty("夏季养护管理措施")
+//    @ExcelProperty("夏季养护管理措施")
     private String summermaintenance;
     @Schema(description = "秋季养护管理措施")
-    @ExcelProperty("秋季养护管理措施")
+//    @ExcelProperty("秋季养护管理措施")
     private String autumnmaintenance;
     @Schema(description = "冬季养护管理措施")
-    @ExcelProperty("冬季养护管理措施")
+//    @ExcelProperty("冬季养护管理措施")
     private String wintermaintenance;
     @Schema(description = "年度")
-    @ExcelProperty("年度")
+//    @ExcelProperty("年度")
     private String annual;
     @Schema(description = "养护记录备注", example = "随便")
-    @ExcelProperty("养护记录备注")
+//    @ExcelProperty("养护记录备注")
     private String curingremark;
     @Schema(description = "古树照片二")
@@ -140,19 +144,19 @@ public class OldtreesRespVO {
     private String nameplatephoto;
     @Schema(description = "数据状态(已更新、未更新)")
-    @ExcelProperty("数据状态(已更新、未更新)")
+//    @ExcelProperty("数据状态(已更新、未更新)")
     private String datastate;
     @Schema(description = "养护员工--作业队下派古树时选择的派发员工")
-    @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
+//    @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
     private String curingstaff;
     @Schema(description = "状态（驳回/确认）")
-    @ExcelProperty("状态（驳回/确认）")
+//    @ExcelProperty("状态（驳回/确认）")
     private String state;
     @Schema(description = "平台驳回状态（平台驳回）")
-    @ExcelProperty("平台驳回状态（平台驳回）")
+//    @ExcelProperty("平台驳回状态（平台驳回）")
     private String platformstate;
     @Schema(description = "所属街道")
@@ -160,31 +164,43 @@ public class OldtreesRespVO {
     private String street;
     @Schema(description = "责任人姓名", example = "赵六")
-    @ExcelProperty("责任人姓名")
+//    @ExcelProperty("责任人姓名")
     private String responsibleusername;
     @Schema(description = "责任人电话")
-    @ExcelProperty("责任人电话")
+//    @ExcelProperty("责任人电话")
     private String responsibleuserphone;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "createbyName")
+    private Long createby;
+
     @Schema(description = "创建者")
-    @ExcelProperty("创建者")
-    private String createby;
+//    @ExcelProperty("创建者")
+    private String createbyName;
     @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
+//    @ExcelProperty("创建时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime createtime;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "updatebyName")
+    private Long updateby;
+
     @Schema(description = "更新者")
-    @ExcelProperty("更新者")
-    private String updateby;
+//    @ExcelProperty("更新者")
+    private String updatebyName;
     @Schema(description = "更新时间")
-    @ExcelProperty("更新时间")
-    private String updatetime;
+//    @ExcelProperty("更新时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime updatetime;
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20245")
-    @ExcelProperty("部门id")
+//    @ExcelProperty("部门id")
     private Long deptId;
     private List<String> treeImgList;
 package com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zteits.urbanops.module.garden.dal.dataobject.oldtrees.OldtreesDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 古树名木新增/修改 Request VO")
@@ -141,4 +146,46 @@ public class OldtreesSaveReqVO {
     private List<String> nameplatephotoList;
+
+    public OldtreesSaveReqVO imgToDomain(){
+        if (!CollectionUtils.isEmpty(treeImgList)) {
+            if (treeImgList.size() > 0) {
+                this.treephotoone = treeImgList.get(0);
+            }
+            if (treeImgList.size() > 1) {
+                this.treephototwo = treeImgList.get(1);
+            }
+            if (treeImgList.size() > 2) {
+                this.treephotothree = treeImgList.get(2);
+            }
+        }
+        if (!CollectionUtils.isEmpty(nameplatephotoList)) {
+            if (nameplatephotoList.size() > 0) {
+                this.nameplatephoto = nameplatephotoList.get(0);
+            }
+        }
+        return this;
+    }
+    public OldtreesSaveReqVO domainToImg(){
+        if (CollectionUtils.isEmpty(treeImgList)) {
+            treeImgList = new ArrayList<>();
+        }
+        if (CollectionUtils.isEmpty(nameplatephotoList)) {
+            nameplatephotoList = new ArrayList<>();
+        }
+        if (!StringUtils.isEmpty(treephotoone)) {
+            treeImgList.add(treephotoone);
+        }
+        if (!StringUtils.isEmpty(treephototwo)) {
+            treeImgList.add(treephototwo);
+        }
+        if (!StringUtils.isEmpty(treephotothree)) {
+            treeImgList.add(treephotothree);
+        }
+        if (!StringUtils.isEmpty(nameplatephoto)) {
+            nameplatephotoList.add(nameplatephoto);
+        }
+        return this;
+    }
+
 }
 \ No newline at end of file
@@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-import jakarta.validation.constraints.*;
 import jakarta.validation.*;
 import jakarta.servlet.http.*;
 import java.util.*;
@@ -23,6 +22,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
+import com.fhs.core.trans.anno.TransMethodResult;
 import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
 import com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo.*;
@@ -75,6 +75,7 @@ public class OldtreesChangeLogController {
     @Operation(summary = "获得古树名木修改记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:oldtrees-change-log:query')")
+    @TransMethodResult
     public CommonResult<OldtreesChangeLogRespVO> getOldtreesChangeLog(@RequestParam("id") String id) {
         OldtreesChangeLogDO oldtreesChangeLog = oldtreesChangeLogService.getOldtreesChangeLog(id);
         return success(BeanUtils.toBean(oldtreesChangeLog, OldtreesChangeLogRespVO.class));
@@ -83,6 +84,7 @@ public class OldtreesChangeLogController {
     @GetMapping({"/page","/list"})
     @Operation(summary = "查询古树名木修改记录列表")
     @PreAuthorize("@ss.hasPermission('garden:oldtrees-change-log:query')")
+    @TransMethodResult
     public CommonResult<PageResult<OldtreesChangeLogRespVO>> getOldtreesChangeLogPage(@Valid OldtreesChangeLogPageReqVO pageReqVO) {
         PageResult<OldtreesChangeLogDO> pageResult = oldtreesChangeLogService.getOldtreesChangeLogPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, OldtreesChangeLogRespVO.class));
 package com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.VO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
+import com.zteits.urbanops.framework.common.util.json.databind.LocalDateTimeStringSerializer;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
 @Schema(description = "管理后台 - 古树名木修改记录 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class OldtreesChangeLogRespVO {
+public class OldtreesChangeLogRespVO implements VO {
     @Schema(description = "id", example = "148")
     @ExcelProperty("id")
@@ -39,6 +49,7 @@ public class OldtreesChangeLogRespVO {
     @Schema(description = "养护单位")
     @ExcelProperty("养护单位")
+    @Trans(type = TransType.SIMPLE, target = DeptDO.class, fields = "name",ref = "maintainunit")
     private String maintainunit;
     @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
@@ -165,21 +176,33 @@ public class OldtreesChangeLogRespVO {
     @ExcelProperty("负责人电话")
     private String responsibleuserphone;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "createbyName")
+    private Long createby;
+
     @Schema(description = "创建者")
     @ExcelProperty("创建者")
-    private String createby;
+    private String createbyName;
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime createtime;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "updatebyName")
+    private Long updateby;
+
     @Schema(description = "更新者")
     @ExcelProperty("更新者")
-    private String updateby;
+    private String updatebyName;
     @Schema(description = "更新时间")
     @ExcelProperty("更新时间")
-    private String updatetime;
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime updatetime;
     private List<String> treeImgList;
 package com.zteits.urbanops.module.garden.controller.admin.tree;
+import com.fhs.core.trans.anno.TransMethodResult;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
 import com.zteits.urbanops.framework.security.core.LoginUser;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
@@ -89,6 +90,7 @@ public class TreeController {
     @Operation(summary = "获得一树一档案")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:tree:query')")
+    @TransMethodResult
     public CommonResult<TreeRespVO> getTree(@RequestParam("id") Long id) {
         TreeDO tree = treeService.getTree(id);
         return success(BeanUtils.toBean(tree, TreeRespVO.class));
@@ -142,20 +144,17 @@ public class TreeController {
     private void fillDictData(List<TreeDO> list) {
         for (TreeDO gardenTree : list) {
-            String maintainUnit = DictFrameworkUtils.parseDictDataValue("maintain_unit", gardenTree.getMaintainunit());
-            gardenTree.setMaintainunit(maintainUnit);
-
-            String street = DictFrameworkUtils.parseDictDataValue("street_belong", gardenTree.getStreet());
+            String street = DictFrameworkUtils.parseDictDataLabel("street_belong", gardenTree.getStreet());
             gardenTree.setStreet(street);
-            String ownership = DictFrameworkUtils.parseDictDataValue("tree_ownership", gardenTree.getOldtreeownership());
+            String ownership = DictFrameworkUtils.parseDictDataLabel("tree_ownership", gardenTree.getOldtreeownership());
             gardenTree.setOldtreeownership(ownership);
-            String growthVigor = DictFrameworkUtils.parseDictDataValue("growth_vigor", gardenTree.getGrowthvigor());
+            String growthVigor = DictFrameworkUtils.parseDictDataLabel("growth_vigor", gardenTree.getGrowthvigor());
             gardenTree.setGrowthvigor(growthVigor);
-            String treeLevel = DictFrameworkUtils.parseDictDataValue("tree_level", gardenTree.getTreelevel());
+            String treeLevel = DictFrameworkUtils.parseDictDataLabel("tree_level", gardenTree.getTreelevel());
             gardenTree.setTreelevel(treeLevel);
-            String dataState = DictFrameworkUtils.parseDictDataValue("data_state", gardenTree.getDatastate());
+            String dataState = DictFrameworkUtils.parseDictDataLabel("data_state", gardenTree.getDatastate());
             gardenTree.setDatastate(dataState);
         }
     }
 package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.framework.common.util.json.databind.LocalDateTimeStringSerializer;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -11,13 +15,16 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
 @Schema(description = "管理后台 - 一树一档案 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class TreeRespVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28236")
-    @ExcelProperty("id")
+//    @ExcelProperty("id")
     private Long id;
     @Schema(description = "编号")
@@ -37,7 +44,7 @@ public class TreeRespVO {
     private String treeheight;
     @Schema(description = "冠幅")
-    @ExcelProperty("冠幅")
+//    @ExcelProperty("冠幅")
     private String canopy;
     @Schema(description = "胸径")
@@ -45,11 +52,11 @@ public class TreeRespVO {
     private String dbh;
     @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
-    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
+    @ExcelProperty("生长势")
     private String growthvigor;
     @Schema(description = "级别--数据字典：一级、两级")
-    @ExcelProperty("级别--数据字典：一级、两级")
+    @ExcelProperty("级别")
     private String treelevel;
     @Schema(description = "经度")
@@ -61,24 +68,19 @@ public class TreeRespVO {
     private String latitude;
     @Schema(description = "所在地")
-    @ExcelProperty("所在地")
+//    @ExcelProperty("所在地")
     private String location;
     @Schema(description = "养护单位")
-    @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
-            key = "id", fields = "name", ref = "maintainUnitName")
-    private String maintainunit;
-
-    @Schema(description = "养护单位名称")
     @ExcelProperty("养护单位")
-    private String maintainUnitName;
+    private String maintainunit;
     @Schema(description = "管护单位")
     @ExcelProperty("管护单位")
     private String managedutyunit;
     @Schema(description = "道路id")
-    @ExcelProperty("道路id")
+//    @ExcelProperty("道路id")
     private Long road;
     @Schema(description = "所属街道")
@@ -86,11 +88,11 @@ public class TreeRespVO {
     private String street;
     @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
-    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
+    @ExcelProperty("权属分类")
     private String oldtreeownership;
     @Schema(description = "数据状态(已更新、未更新)")
-    @ExcelProperty("数据状态(已更新、未更新)")
+//    @ExcelProperty("数据状态(已更新、未更新)")
     private String datastate;
     @Schema(description = "估测树龄")
@@ -137,28 +139,40 @@ public class TreeRespVO {
     @ExcelProperty("古树照片五")
     private String treephotofive;
-    @Schema(description = "创建者")
-    @ExcelProperty("创建者")
-    private String createby;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "createbyName")
+    private Long createby;
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
+    @Schema(description = "创建者")
+//    @ExcelProperty("创建者")
+    private String createbyName;
+
+    @Schema(description = "创建时间")
+//    @ExcelProperty("创建时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime createtime;
-    @Schema(description = "更新者")
-    @ExcelProperty("更新者")
-    private String updateby;
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "updatebyName")
+    private Long updateby;
-    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("更新时间")
+    @Schema(description = "更新者")
+//    @ExcelProperty("更新者")
+    private String updatebyName;
+
+    @Schema(description = "更新时间")
+//    @ExcelProperty("更新时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime updatetime;
     @Schema(description = "备注", example = "你说的对")
-    @ExcelProperty("备注")
+//    @ExcelProperty("备注")
     private String remark;
     @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17101")
-    @ExcelProperty("部门id")
+//    @ExcelProperty("部门id")
     private Long deptId;
     private List<String> treeImgList;
 package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
+import com.zteits.urbanops.module.garden.dal.dataobject.tree.TreeDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import jakarta.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import java.time.LocalDateTime;
 @Schema(description = "管理后台 - 一树一档案新增/修改 Request VO")
@@ -121,5 +125,47 @@ public class TreeSaveReqVO {
     private List<String> treeImgList;
+    public TreeSaveReqVO imgToDomain(){
+        if (!CollectionUtils.isEmpty(treeImgList)) {
+            if (treeImgList.size() > 0) {
+                this.treephotoone = treeImgList.get(0);
+            }
+            if (treeImgList.size() > 1) {
+                this.treephototwo = treeImgList.get(1);
+            }
+            if (treeImgList.size() > 2) {
+                this.treephotothree = treeImgList.get(2);
+            }
+            if (treeImgList.size() > 3) {
+                this.treephotofour = treeImgList.get(3);
+            }
+            if (treeImgList.size() > 4) {
+                this.treephotofive = treeImgList.get(4);
+            }
+        }
+        return this;
+    }
+    public TreeSaveReqVO domainToImg(){
+        if (CollectionUtils.isEmpty(treeImgList)) {
+            treeImgList = new ArrayList<>();
+        }
+        if (!StringUtils.isEmpty(treephotoone)) {
+            treeImgList.add(treephotoone);
+        }
+        if (!StringUtils.isEmpty(treephototwo)) {
+            treeImgList.add(treephototwo);
+        }
+        if (!StringUtils.isEmpty(treephotothree)) {
+            treeImgList.add(treephotothree);
+        }
+        if (!StringUtils.isEmpty(treephotofour)) {
+            treeImgList.add(treephotofour);
+        }
+        if (!StringUtils.isEmpty(treephotofive)) {
+            treeImgList.add(treephotofive);
+        }
+        return this;
+    }
+
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.controller.admin.treechangelog;
+import com.fhs.core.trans.anno.TransMethodResult;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -75,6 +76,7 @@ public class TreeChangeLogController {
     @Operation(summary = "获得一树一档案修改记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:tree-change-log:query')")
+    @TransMethodResult
     public CommonResult<TreeChangeLogRespVO> getTreeChangeLog(@RequestParam("id") Long id) {
         TreeChangeLogDO treeChangeLog = treeChangeLogService.getTreeChangeLog(id);
         return success(BeanUtils.toBean(treeChangeLog, TreeChangeLogRespVO.class));
-package com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 一树一档案修改记录 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class TreeChangeLogRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3528")
-    @ExcelProperty("id")
-    private Long id;
-
-    @Schema(description = "garden_tree 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26527")
-    @ExcelProperty("garden_tree 的主键")
-    private Long treeid;
-
-    @Schema(description = "编号")
-    @ExcelProperty("编号")
-    private String treenumber;
-
-    @Schema(description = "拉丁名", example = "赵六")
-    @ExcelProperty("拉丁名")
-    private String latinname;
-
-    @Schema(description = "树种", example = "1")
-    @ExcelProperty("树种")
-    private String treetype;
-
-    @Schema(description = "树高")
-    @ExcelProperty("树高")
-    private String treeheight;
-
-    @Schema(description = "冠幅")
-    @ExcelProperty("冠幅")
-    private String canopy;
-
-    @Schema(description = "胸径")
-    @ExcelProperty("胸径")
-    private String dbh;
-
-    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
-    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
-    private String growthvigor;
-
-    @Schema(description = "级别--数据字典：一级、两级")
-    @ExcelProperty("级别--数据字典：一级、两级")
-    private String treelevel;
-
-    @Schema(description = "经度")
-    @ExcelProperty("经度")
-    private String longitude;
-
-    @Schema(description = "纬度")
-    @ExcelProperty("纬度")
-    private String latitude;
-
-    @Schema(description = "所在地")
-    @ExcelProperty("所在地")
-    private String location;
-
-    @Schema(description = "养护单位")
-    @ExcelProperty("养护单位")
-    private String maintainunit;
-
-    @Schema(description = "管护单位")
-    @ExcelProperty("管护单位")
-    private String managedutyunit;
-
-    @Schema(description = "道路id")
-    @ExcelProperty("道路id")
-    private Long road;
-
-    @Schema(description = "所属街道")
-    @ExcelProperty("所属街道")
-    private String street;
-
-    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
-    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
-    private String oldtreeownership;
-
-    @Schema(description = "数据状态(已更新、未更新)")
-    @ExcelProperty("数据状态(已更新、未更新)")
-    private String datastate;
-
-    @Schema(description = "估测树龄")
-    @ExcelProperty("估测树龄")
-    private String estimationtreeage;
-
-    @Schema(description = "冠幅东西")
-    @ExcelProperty("冠幅东西")
-    private String canopyeastwest;
-
-    @Schema(description = "冠幅南北")
-    @ExcelProperty("冠幅南北")
-    private String canopysouthnorth;
-
-    @Schema(description = "干周")
-    @ExcelProperty("干周")
-    private String weekday;
-
-    @Schema(description = "生长地点")
-    @ExcelProperty("生长地点")
-    private String growlocation;
-
-    @Schema(description = "生长环境")
-    @ExcelProperty("生长环境")
-    private String growthenvironment;
-
-    @Schema(description = "树木照片一")
-    @ExcelProperty("树木照片一")
-    private String treephotoone;
-
-    @Schema(description = "古树照片二")
-    @ExcelProperty("古树照片二")
-    private String treephototwo;
-
-    @Schema(description = "古树照片三")
-    @ExcelProperty("古树照片三")
-    private String treephotothree;
-
-    @Schema(description = "古树照片四")
-    @ExcelProperty("古树照片四")
-    private String treephotofour;
-
-    @Schema(description = "古树照片五")
-    @ExcelProperty("古树照片五")
-    private String treephotofive;
-
-    @Schema(description = "创建者")
-    @ExcelProperty("创建者")
-    private String createby;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createtime;
-
-    @Schema(description = "更新者")
-    @ExcelProperty("更新者")
-    private String updateby;
-
-    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("更新时间")
-    private LocalDateTime updatetime;
-
-    @Schema(description = "备注", example = "你猜")
-    @ExcelProperty("备注")
-    private String remark;
-
-}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.framework.common.util.json.databind.LocalDateTimeStringSerializer;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
+@Schema(description = "管理后台 - 一树一档案修改记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TreeChangeLogRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3528")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "garden_tree 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26527")
+    @ExcelProperty("garden_tree 的主键")
+    private Long treeid;
+
+    @Schema(description = "编号")
+    @ExcelProperty("编号")
+    private String treenumber;
+
+    @Schema(description = "拉丁名", example = "赵六")
+    @ExcelProperty("拉丁名")
+    private String latinname;
+
+    @Schema(description = "树种", example = "1")
+    @ExcelProperty("树种")
+    private String treetype;
+
+    @Schema(description = "树高")
+    @ExcelProperty("树高")
+    private String treeheight;
+
+    @Schema(description = "冠幅")
+    @ExcelProperty("冠幅")
+    private String canopy;
+
+    @Schema(description = "胸径")
+    @ExcelProperty("胸径")
+    private String dbh;
+
+    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
+    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
+    private String growthvigor;
+
+    @Schema(description = "级别--数据字典：一级、两级")
+    @ExcelProperty("级别--数据字典：一级、两级")
+    private String treelevel;
+
+    @Schema(description = "经度")
+    @ExcelProperty("经度")
+    private String longitude;
+
+    @Schema(description = "纬度")
+    @ExcelProperty("纬度")
+    private String latitude;
+
+    @Schema(description = "所在地")
+    @ExcelProperty("所在地")
+    private String location;
+
+    @Schema(description = "养护单位")
+    @ExcelProperty("养护单位")
+    @Trans(type = TransType.SIMPLE, target = DeptDO.class, fields = "name",ref = "maintainunit")
+    private String maintainunit;
+
+    @Schema(description = "管护单位")
+    @ExcelProperty("管护单位")
+    private String managedutyunit;
+
+    @Schema(description = "道路id")
+    @ExcelProperty("道路id")
+    private Long road;
+
+    @Schema(description = "所属街道")
+    @ExcelProperty("所属街道")
+    private String street;
+
+    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
+    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
+    private String oldtreeownership;
+
+    @Schema(description = "数据状态(已更新、未更新)")
+    @ExcelProperty("数据状态(已更新、未更新)")
+    private String datastate;
+
+    @Schema(description = "估测树龄")
+    @ExcelProperty("估测树龄")
+    private String estimationtreeage;
+
+    @Schema(description = "冠幅东西")
+    @ExcelProperty("冠幅东西")
+    private String canopyeastwest;
+
+    @Schema(description = "冠幅南北")
+    @ExcelProperty("冠幅南北")
+    private String canopysouthnorth;
+
+    @Schema(description = "干周")
+    @ExcelProperty("干周")
+    private String weekday;
+
+    @Schema(description = "生长地点")
+    @ExcelProperty("生长地点")
+    private String growlocation;
+
+    @Schema(description = "生长环境")
+    @ExcelProperty("生长环境")
+    private String growthenvironment;
+
+    @Schema(description = "树木照片一")
+    @ExcelProperty("树木照片一")
+    private String treephotoone;
+
+    @Schema(description = "古树照片二")
+    @ExcelProperty("古树照片二")
+    private String treephototwo;
+
+    @Schema(description = "古树照片三")
+    @ExcelProperty("古树照片三")
+    private String treephotothree;
+
+    @Schema(description = "古树照片四")
+    @ExcelProperty("古树照片四")
+    private String treephotofour;
+
+    @Schema(description = "古树照片五")
+    @ExcelProperty("古树照片五")
+    private String treephotofive;
+
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "createbyName")
+    private Long createby;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String createbyName;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime createtime;
+
+    @Trans(type = TransType.SIMPLE, target = AdminUserDO.class, fields = "nickname", ref = "updatebyName")
+    private Long updateby;
+
+    @Schema(description = "更新者")
+    @ExcelProperty("更新者")
+    private String updatebyName;
+
+    @Schema(description = "更新时间")
+    @ExcelProperty("更新时间")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime updatetime;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    private List<String> treeImgList;
+
+    private List<String> nameplatephotoList;
+
+}
@@ -5,6 +5,7 @@ import java.util.*;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -25,6 +25,7 @@ public interface OldtreesChangeLogMapper extends BaseMapperX&lt;OldtreesChangeLogDO
                 .selectAs(DeptDO::getName, OldtreesChangeLogDO::getMaintainunit)
                 .selectAll(OldtreesChangeLogDO.class)
                 .leftJoin(DeptDO.class, DeptDO::getId, OldtreesChangeLogDO::getMaintainunit)
+                .eqIfPresent(OldtreesChangeLogDO::getOldtreeid, reqVO.getOldtreeid())
                 .eqIfPresent(OldtreesChangeLogDO::getFamoustreenumber, reqVO.getFamoustreenumber())
                 .eqIfPresent(OldtreesChangeLogDO::getTreelevel, reqVO.getTreelevel())
                 .eqIfPresent(OldtreesChangeLogDO::getTreetype, reqVO.getTreetype())
@@ -44,13 +44,12 @@ public class OldtreesServiceImpl implements OldtreesService {
     @Override
     public String createOldtrees(OldtreesSaveReqVO createReqVO) {
+
+        createReqVO.imgToDomain();
+
         // 插入
         OldtreesDO oldtrees = BeanUtils.toBean(createReqVO, OldtreesDO.class);
-        if (!ObjectUtils.isEmpty(oldtrees)) {
-            oldtrees.imgToDomain();
-        }
-
         String id = oldtrees.getId();
         if (!StringUtils.hasText(id)) {
             id = UUID.randomUUID().toString().replace("-", "");
@@ -66,6 +65,7 @@ public class OldtreesServiceImpl implements OldtreesService {
         OldtreesChangeLogDO changeLog = new OldtreesChangeLogDO();
         BeanUtils.copyProperties(createReqVO, changeLog);
+        changeLog.setId(id);
         changeLog.setOldtreeid(id);
         changeLog.setCreateby(createReqVO.getCreateby());
         changeLog.setCreatetime(createReqVO.getCreatetime());
@@ -79,6 +79,8 @@ public class OldtreesServiceImpl implements OldtreesService {
     @Override
     public void updateOldtrees(OldtreesSaveReqVO updateReqVO) {
+
+        updateReqVO.imgToDomain();
         // 校验存在
         OldtreesDO dbOlderTree = validateOldtreesExists(updateReqVO.getId());
@@ -93,10 +95,9 @@ public class OldtreesServiceImpl implements OldtreesService {
         // 更新
         OldtreesDO updateObj = BeanUtils.toBean(updateReqVO, OldtreesDO.class);
-        updateObj.imgToDomain();
-
         OldtreesChangeLogDO changeLog = new OldtreesChangeLogDO();
         org.springframework.beans.BeanUtils.copyProperties(updateReqVO, changeLog);
+        changeLog.setId(updateReqVO.getId());
         changeLog.setOldtreeid(updateReqVO.getId());
         changeLog.setCreateby(updateReqVO.getUpdateby());
         changeLog.setCreatetime(LocalDateTime.now());
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.service.oldtreeschangelog;
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,7 +75,11 @@ public class OldtreesChangeLogServiceImpl implements OldtreesChangeLogService {
     @Override
     public OldtreesChangeLogDO getOldtreesChangeLog(String id) {
-        return oldtreesChangeLogMapper.selectById(id);
+        OldtreesChangeLogDO oldtreesChangeLogDO = oldtreesChangeLogMapper.selectById(id);
+        if (!ObjectUtils.isEmpty(oldtreesChangeLogDO)) {
+            oldtreesChangeLogDO.domainToImg();
+        }
+        return oldtreesChangeLogDO;
     }
     @Override
@@ -67,13 +67,10 @@ public class TreeServiceImpl implements TreeService {
     @Override
     public Long createTree(TreeSaveReqVO createReqVO) {
+        createReqVO.imgToDomain();
         // 插入
         TreeDO tree = BeanUtils.toBean(createReqVO, TreeDO.class);
-        if (!ObjectUtils.isEmpty(tree)) {
-            tree.imgToDomain();
-        }
-
         TreeDO treeDO = treeMapper.selectByTreeNumber(createReqVO.getTreenumber());
         if (!ObjectUtils.isEmpty(treeDO)) {
             throw exception(TREE_NUMBER_EXISTS);
@@ -109,6 +106,7 @@ public class TreeServiceImpl implements TreeService {
     @Override
     public void updateTree(TreeSaveReqVO updateReqVO) {
+        updateReqVO.imgToDomain();
         // 校验存在
         TreeDO dbTree = validateTreeExists(updateReqVO.getId());
         if (!ObjectUtils.isEmpty(dbTree) && !dbTree.getTreenumber().equals(updateReqVO.getTreenumber())) {
@@ -120,7 +118,6 @@ public class TreeServiceImpl implements TreeService {
         // 更新
         TreeDO updateObj = BeanUtils.toBean(updateReqVO, TreeDO.class);
-        updateObj.imgToDomain();
         if (ObjectUtils.isEmpty(updateReqVO.getStreet())) {
             Long road = updateReqVO.getRoad();
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.service.treechangelog;
 import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,7 +75,11 @@ public class TreeChangeLogServiceImpl implements TreeChangeLogService {
     @Override
     public TreeChangeLogDO getTreeChangeLog(Long id) {
-        return treeChangeLogMapper.selectById(id);
+        TreeChangeLogDO treeChangeLog = treeChangeLogMapper.selectById(id);
+        if (!ObjectUtils.isEmpty(treeChangeLog)) {
+            treeChangeLog.domainToImg();
+        }
+        return treeChangeLog;
     }
     @Override