用地预审与选址结构修改

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdysyxzController.java

@@ -1,8 +1,14 @@
 package com.siwei.apply.controller;
 
+import com.siwei.apply.domain.vo.YdysyxzVo;
+import com.siwei.apply.service.YdysyxzService;
+import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 用地预审与选址 控制器
@@ -10,4 +16,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/ydysyxz")
 public class YdysyxzController extends BaseController {
+    @Autowired
+    private YdysyxzService ydysyxzService;
+    /**
+     * 添加用地预审与选址信息
+     */
+    @PostMapping()
+    public R<Map>  AddYdysyxz(@RequestBody YdysyxzVo ydysyxzVo) {
+        try {
+            String id = ydysyxzService.addYdysyxz(ydysyxzVo);
+            Map<String, String> map = new HashMap<>();
+            map.put("id", id);
+            return R.ok(map);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Ydysyxz.java

@@ -1,8 +1,11 @@
 package com.siwei.apply.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 用地预审与选址 对象 t_ydysyxz
@@ -21,4 +24,14 @@ public class Ydysyxz {
     // JSONB 对应 Java 的 Map 或自定义对象
     private Map<String, Object> attachment;//存储附件的目录树
     private Boolean hasOnchain;//是否上链
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createAt;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateAt;
+    private String creatorId;
+
+    public void generateId() {
+        this.id = UUID.randomUUID().toString();
+    }
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/YdysyxzMapper.java

@@ -1,9 +1,32 @@
 package com.siwei.apply.mapper;
 
+import com.siwei.apply.domain.Ydysyxz;
 import org.apache.ibatis.annotations.Mapper;
+
 /**
  * 用地预审与选址 t_ydysyxz
  */
 @Mapper
 public interface YdysyxzMapper {
+    /**
+     * 添加用地预审与选址信息
+     *
+     * @param ydysyxz
+     */
+    void addYdysyxz(Ydysyxz ydysyxz);
+
+    /**
+     * 获取用地预审与选址信息
+     *
+     * @param projectId
+     * @return
+     */
+    Ydysyxz getYdysyxz(String projectId);
+
+    /**
+     * 更新用地预审与选址信息
+     *
+     * @param ydysyxz
+     */
+    void updateYdysyxz(Ydysyxz ydysyxz);
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/YdysyxzService.java

@@ -1,5 +1,9 @@
 package com.siwei.apply.service;
 
+import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
+import com.siwei.apply.domain.vo.YdysyxzVo;
+
 /**
  * 用地预审与选址 服务接口
  */
@@ -7,5 +11,20 @@ public interface YdysyxzService {
     /**
      * 添加用地预审与选址信息
      */
-    String addYdysyxz();
+    String addYdysyxz(YdysyxzVo ydysyxzVo);
+
+    /**
+     * 获取用地预审与选址信息
+     *
+     * @param projectId 项目ID
+     * @return 用地预审与选址信息
+     */
+    Ydysyxz getYdysyxz(String projectId);
+
+    /**
+     * 更新用地预审与选址信息
+     *
+     * @param ydysyxzUpdateVo 用地预审与选址视图对象
+     */
+    void updateYdysyxz(YdysyxzUpdateVo ydysyxzUpdateVo);
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdysyxzImpl.java

@@ -0,0 +1,41 @@
+package com.siwei.apply.service.impl;
+
+import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
+import com.siwei.apply.domain.vo.YdysyxzVo;
+import com.siwei.apply.mapper.YdysyxzMapper;
+import com.siwei.apply.service.YdysyxzService;
+import com.siwei.common.core.utils.bean.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.siwei.apply.common.Common.UserId;
+
+/**
+ * 用地预审与选址 服务实现类
+ */
+@Service
+public class YdysyxzImpl implements YdysyxzService {
+    @Autowired
+    private YdysyxzMapper ydysyxzMapper;
+
+    @Override
+    public String addYdysyxz(YdysyxzVo ydysyxzVo) {
+        Ydysyxz ydysyxz = new Ydysyxz();
+        BeanUtils.copyProperties(ydysyxzVo, ydysyxz);
+        ydysyxz.generateId();
+        ydysyxz.setCreatorId(UserId);
+        ydysyxzMapper.addYdysyxz(ydysyxz);
+        return ydysyxz.getId();
+    }
+
+    @Override
+    public Ydysyxz getYdysyxz(String projectId) {
+        return null;
+    }
+
+    @Override
+    public void updateYdysyxz(YdysyxzUpdateVo ydysyxzUpdateVo) {
+
+    }
+}

siwei-modules/siwei-apply/src/main/resources/mapper/YdysyxzMapper.xml

@@ -15,20 +15,23 @@
         <result property="fzDate" column="fz_date"/>
         <result property="attachment" column="attachment" jdbcType="OTHER" javaType="java.util.Map"/>
         <result property="hasOnchain" column="has_onchain"/>
+        <result property="createAt" column="create_at"/>
+        <result property="updateAt" column="update_at"/>
+        <result property="creatorId" column="creator_id"/>
     </resultMap>
     <insert id="addYdysyxz" parameterType="com.siwei.apply.domain.Ydysyxz">
         INSERT INTO t_ydysyxz (id, project_id, jsyj, jsdd, area, has_zz,
-                               xmjsyj, zzwh, fz_date, attachment, has_onchain)
+                               xmjsyj, zzwh, fz_date, has_onchain,create_at, update_at, creator_id)
         VALUES (#{id}, #{projectId}, #{jsyj}, #{jsdd}, #{area}, #{hasZz},
-                #{xmjsyj}, #{zzwh}, #{fzDate}, #{attachment, jdbcType=OTHER},
-                #{hasOnchain})
+                #{xmjsyj}, #{zzwh}, #{fzDate},
+                #{hasOnchain}), now(), now(), #{creatorId})
     </insert>
     <select id="getYdysyxz" resultMap="resMap">
         SELECT *
         FROM t_ydysyxz
         WHERE project_id = #{projectId}
     </select>
-    <update id="updateYdysyxz" parameterType="com.siwei.apply.domain.Ydysyxz">
+    <update id="updateYdysyxz" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
         UPDATE t_ydysyxz
         SET jsyj        = #{jsyj},
             jsdd        = #{jsdd},
@@ -37,8 +40,8 @@
             xmjsyj      = #{xmjsyj},
             zzwh        = #{zzwh},
             fz_date     = #{fzDate},
-            attachment  = #{attachment, jdbcType=OTHER},
-            has_onchain = #{hasOnchain}
+            has_onchain = #{hasOnchain},
+            update_at   = now()
         WHERE project_id = #{projectId}
     </update>
 </mapper>