闲置土地判定接口完成

onemap-modules/onemap-apply/pom.xml

@@ -129,11 +129,11 @@
         </dependency>
 
         <!--主要用于在不同类型的对象之间进行属性的自动拷贝-->
-        <dependency>
-            <groupId>net.sf.dozer</groupId>
-            <artifactId>dozer</artifactId>
-            <version>5.5.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.sf.dozer</groupId>-->
+<!--            <artifactId>dozer</artifactId>-->
+<!--            <version>5.5.1</version>-->
+<!--        </dependency>-->
 
         <!--        <dependency>-->
         <!--            <groupId>com.supermap</groupId>-->

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/tdgy/TdgyController.java

@@ -58,7 +58,7 @@ public class TdgyController {
      * 闲置土地判定
      */
     @PostMapping("/idleLandConfirm")
-    public RequestResult idleLandConfirm(@RequestBody LandIdleConfirmVo landIdleConfirmVo) {
+    public RequestResult idleLandConfirm(@Valid @RequestBody LandIdleConfirmVo landIdleConfirmVo) {
         RequestResult requestResult = tdgyService.addIdleLandConfirm(landIdleConfirmVo);
         return requestResult;
     }
@@ -67,7 +67,7 @@ public class TdgyController {
      * 闲置土地处置
      */
     @PostMapping("/idleLandDisposal")
-    public RequestResult idleLandDisposal(@RequestBody LandIdleDisposalVo landIdleDisposalVo) {
+    public RequestResult idleLandDisposal(@Valid @RequestBody LandIdleDisposalVo landIdleDisposalVo) {
         RequestResult requestResult = tdgyService.addIdleLandDisposal(landIdleDisposalVo);
         return requestResult;
     }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleConfirmDTO.java

@@ -1,5 +1,7 @@
 package com.onemap.apply.domain.tdgy.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,22 +11,31 @@ import java.util.List;
  * 土地闲置认定
  */
 @Data
+@TableName("t_land_idle_confirm")
 public class LandIdleConfirmDTO {
     private String id;
     // 土地id
+    @TableField("land_id")
     private String landId;
     // 是否闲置
+    @TableField("is_idle")
     private Boolean isIdle;
     // 闲置原因
+    @TableField("idle_reason")
     private String idleReason;
     // 闲置时间
+    @TableField("idle_time")
     private String idleTime;
     // 认定时间
+    @TableField("confirm_time")
     private Date confirmTime;
     // 认定依据
+    @TableField("confirm_basis")
     private String confirmBasis;
     // 认定书
+    @TableField("confirm_doc")
     private String confirmDoc;
     // 认定照片
-    private List<String> confirmImgList;
+    @TableField("confirm_imgs")
+    private List<String> confirmImgs;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleDisposalDTO.java

@@ -1,5 +1,7 @@
 package com.onemap.apply.domain.tdgy.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -9,20 +11,28 @@ import java.util.List;
  * 土地闲置处置
  */
 @Data
+@TableName("t_land_idle_disposal")
 public class LandIdleDisposalDTO {
     private String id;
     // 土地id
+    @TableField("land_id")
     private String landId;
     //  是否处置
+    @TableField("is_disposal")
     private String isDisposal;
     // 处置时间
+    @TableField("disposal_time")
     private Date disposalTime;
     // 处置方式
+    @TableField("disposal_method")
     private String disposalMethod;
     // 处置情况
+    @TableField("disposal_info")
     private String disposalInfo;
     // 处置书
+    @TableField("disposal_doc")
     private String disposalDoc;
     // 处置照片
-    private List<String> disposalImgList;
+    @TableField("disposal_imgs")
+    private List<String> disposalImgs;
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/tdgy/TdgyServiceImp.java

@@ -1,15 +1,17 @@
 package com.onemap.apply.service.impl.tdgy;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.dozermapper.core.DozerBeanMapper;
 import com.onemap.apply.domain.tdgy.dto.LandIdleConfirmDTO;
 import com.onemap.apply.domain.tdgy.dto.LandIdleDisposalDTO;
 import com.onemap.apply.domain.tdgy.vo.LandIdleConfirmVo;
 import com.onemap.apply.domain.tdgy.vo.LandIdleDisposalVo;
 import com.onemap.apply.mapper.tdgy.LandIdleConfirmMapper;
 import com.onemap.apply.mapper.tdgy.LandIdleDisposalMapper;
+import com.onemap.apply.utils.DozerUtils;
 import com.onemap.common.core.utils.uuid.IdUtils;
 import com.onemap.common.datasource.annotation.Master;
-import org.dozer.DozerBeanMapper;
+
 import com.onemap.apply.domain.tdgy.dto.TdgySjDTO;
 import com.onemap.apply.domain.tdgy.res.TdgySjRes;
 import com.onemap.apply.domain.tdgy.vo.UpdateTdgyVo;
@@ -17,6 +19,7 @@ import com.onemap.apply.mapper.tdgy.TdgyMapper;
 import com.onemap.apply.service.tdgy.TdgyService;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.datasource.annotation.Slave;
+
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,8 +31,8 @@ import java.util.Map;
  */
 @Service
 public class TdgyServiceImp implements TdgyService {
-    @Resource
-    DozerBeanMapper dozerMapper;
+    // @Resource
+    // DozerBeanMapper dozerMapper = new DozerBeanMapper();
 
     @Resource
     private TdgyMapper tdgyMapper;
@@ -87,8 +90,8 @@ public class TdgyServiceImp implements TdgyService {
         if (tdgySjDTO == null) {
             return RequestResult.error("地块不存在");
         }
-
-        TdgySjRes tdgySjRes = dozerMapper.map(tdgySjDTO, TdgySjRes.class);
+        TdgySjRes tdgySjRes = new TdgySjRes();
+        DozerUtils.map(tdgySjDTO, tdgySjRes);
         return RequestResult.success(tdgySjRes);
     }
 
@@ -109,7 +112,7 @@ public class TdgyServiceImp implements TdgyService {
     }
 
     /**
-     * 添加闲置土地认定
+     * 添加闲置土地判定
      *
      * @param landIdleConfirmVo
      * @return
@@ -126,7 +129,7 @@ public class TdgyServiceImp implements TdgyService {
 
         // 添加认定信息
         landIdleConfirmDTO = new LandIdleConfirmDTO();
-        dozerMapper.map(landIdleConfirmVo, landIdleConfirmDTO);
+        DozerUtils.map(landIdleConfirmVo, landIdleConfirmDTO);
 
         String uuid = IdUtils.simpleUUID();
         landIdleConfirmDTO.setId(uuid);
@@ -150,7 +153,8 @@ public class TdgyServiceImp implements TdgyService {
         }
         // 添加处置信息
         landIdleDisposalDTO = new LandIdleDisposalDTO();
-        dozerMapper.map(landIdleDisposalVo, landIdleDisposalDTO);
+        DozerUtils.map(landIdleDisposalVo, landIdleDisposalDTO);
+
         String uuid = IdUtils.simpleUUID();
         landIdleDisposalDTO.setId(uuid);
         landIdleDisposalMapper.insert(landIdleDisposalDTO);