调整controller的结构

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

@@ -29,7 +29,7 @@ public class ProjectController extends BaseController {
      * @return
      */
     @PostMapping("")
-    public R<Map> AddProject(@RequestBody ProjectVo projectVo) {
+    public R<Map> Add(@RequestBody ProjectVo projectVo) {
         try {
             String id = projectService.add(projectVo);
             Map<String, String> map = new HashMap<>();
@@ -47,7 +47,7 @@ public class ProjectController extends BaseController {
      * @return
      */
     @GetMapping("/{id}")
-    public R<Map> GetProject(@PathVariable String id) {
+    public R<Map> Get(@PathVariable String id) {
         try {
             Map<String, Object> map = new HashMap<>();
             Project project = projectService.get(id);
@@ -64,7 +64,7 @@ public class ProjectController extends BaseController {
      * @return
      */
     @PostMapping("/list")
-    public R<Map> GetProjectList(@RequestBody ProjectFilterVo projectFilterVo) {
+    public R<Map> GetList(@RequestBody ProjectFilterVo projectFilterVo) {
         try {
             Map<String, Object> projects = projectService.getList(projectFilterVo);
             return R.ok(projects);
@@ -80,7 +80,7 @@ public class ProjectController extends BaseController {
      * @return
      */
     @PutMapping("")
-    public R<Map> UpdateProject(@RequestBody ProjectUpdateVo projectUpdateVo) {
+    public R<Map> Update(@RequestBody ProjectUpdateVo projectUpdateVo) {
         try {
             projectService.update(projectUpdateVo);
             return R.ok();
@@ -96,7 +96,7 @@ public class ProjectController extends BaseController {
      * @return
      */
     @DeleteMapping("/{id}")
-    public R<Map> DeleteProject(@PathVariable String id) {
+    public R<Map> Delete(@PathVariable String id) {
         try {
             projectService.delete(id);
             return R.ok();

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

@@ -0,0 +1,70 @@
+package com.siwei.apply.controller;
+
+import com.siwei.apply.domain.Ydbp;
+import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
+import com.siwei.apply.service.YdbpService;
+import com.siwei.common.core.domain.R;
+import com.siwei.common.core.web.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 用地报批 控制器
+ */
+@RestController
+@RequestMapping("/ydbp")
+public class YdbpController extends BaseController {
+    @Autowired
+    private YdbpService ydbpService;
+
+    /**
+     * 添加用地预审与选址信息
+     */
+    @PostMapping()
+    public R<Map> Add(@RequestBody YdbpVo ydbpVo) {
+        try {
+            String id = ydbpService.add(ydbpVo);
+            Map<String, String> map = new HashMap<>();
+            map.put("id", id);
+            return R.ok(map);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 获取用地预审与选址信息
+     *
+     * @param id 项目ID
+     * @return 用地预审与选址信息
+     */
+    @GetMapping("/{id}")
+    public R<Ydbp> Get(@PathVariable String id) {
+        try {
+            Ydbp ydysyxz = ydbpService.get(id);
+            return R.ok(ydysyxz);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 更新用地预审与选址信息
+     *
+     * @param ydbpUpdateVo 用地预审与选址视图对象
+     * @return 操作结果
+     */
+    @PutMapping()
+    public R<Void> Update(@RequestBody YdbpUpdateVo ydbpUpdateVo) {
+        try {
+            ydbpService.update(ydbpUpdateVo);
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+}

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

@@ -24,7 +24,7 @@ public class YdysyxzController extends BaseController {
      * 添加用地预审与选址信息
      */
     @PostMapping()
-    public R<Map> AddYdysyxz(@RequestBody YdysyxzVo ydysyxzVo) {
+    public R<Map> Add(@RequestBody YdysyxzVo ydysyxzVo) {
         try {
             String id = ydysyxzService.add(ydysyxzVo);
             Map<String, String> map = new HashMap<>();
@@ -42,7 +42,7 @@ public class YdysyxzController extends BaseController {
      * @return 用地预审与选址信息
      */
     @GetMapping("/{id}")
-    public R<Map> GetYdysyxz(@PathVariable String id) {
+    public R<Map> Get(@PathVariable String id) {
         try {
             Map<String, Object> map = new HashMap<>();
             map.put("ydysyxz", ydysyxzService.get(id));
@@ -59,7 +59,7 @@ public class YdysyxzController extends BaseController {
      * @return 操作结果
      */
     @PutMapping()
-    public R<Void> UpdateYdysyxz(@RequestBody YdysyxzUpdateVo ydysyxzUpdateVo) {
+    public R<Void> Update(@RequestBody YdysyxzUpdateVo ydysyxzUpdateVo) {
         try {
             ydysyxzService.update(ydysyxzUpdateVo);
             return R.ok();

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

@@ -1,9 +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_ydbp
@@ -22,6 +24,13 @@ public class Ydbp {
     private Map<String, Object> attachment; // 存储附件的目录树
     private Boolean hasOnchain;//是否上链
     private String creatorId; // 创建人ID
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdAt; // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedAt; // 更新时间
+
+    public void generateId() {
+        this.id = UUID.randomUUID().toString();
+    }
 }

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

@@ -19,7 +19,7 @@ public interface ProjectMapper {
     /**
      * 获取项目
      */
-    Project get(String projectId);
+    Project get(String id);
 
     /**
      * 获取项目列表

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

@@ -1,8 +1,31 @@
 package com.siwei.apply.mapper;
 
+import com.siwei.apply.domain.Ydbp;
+import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
 
 // 用地报批 Mapper 接口
 @Mapper
 public interface YdbpMapper {
+    /**
+     * 添加用地预审与选址信息
+     *
+     * @param ydbp
+     */
+    void add(Ydbp ydbp);
+
+    /**
+     * 获取用地预审与选址信息
+     *
+     * @param id
+     * @return
+     */
+    Ydbp get(String id);
+
+    /**
+     * 更新用地预审与选址信息
+     *
+     * @param ydbbpUpdateVo
+     */
+    void update(YdbpUpdateVo ydbbpUpdateVo);
 }

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

@@ -1,6 +1,7 @@
 package com.siwei.apply.mapper;
 
 import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -19,15 +20,15 @@ public interface YdysyxzMapper {
     /**
      * 获取用地预审与选址信息
      *
-     * @param projectId
+     * @param id
      * @return
      */
-    Ydysyxz get(String projectId);
+    Ydysyxz get(String id);
 
     /**
      * 更新用地预审与选址信息
      *
-     * @param ydysyxzUpdateVo
+     * @param ydbpUpdateVo
      */
-    void update(YdysyxzUpdateVo ydysyxzUpdateVo);
+    void update(YdysyxzUpdateVo ydbpUpdateVo);
 }

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

@@ -1,6 +1,6 @@
 package com.siwei.apply.service;
 
-import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdbpVo;
 
@@ -22,7 +22,7 @@ public interface YdbpService {
      * @param id 用地报批ID
      * @return 用地报批对象
      */
-    Ydysyxz get(String id);
+    Ydbp get(String id);
 
     /**
      * 更新用地报批信息

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

@@ -16,10 +16,10 @@ public interface YdysyxzService {
     /**
      * 获取用地预审与选址信息
      *
-     * @param projectId 项目ID
+     * @param id 项目ID
      * @return 用地预审与选址信息
      */
-    Ydysyxz get(String projectId);
+    Ydysyxz get(String id);
 
     /**
      * 更新用地预审与选址信息

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

@@ -1,28 +1,41 @@
 package com.siwei.apply.service.impl;
 
-import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.Ydbp;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdbpVo;
+import com.siwei.apply.mapper.YdbpMapper;
 import com.siwei.apply.service.YdbpService;
+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 YdbpImpl implements YdbpService {
+    @Autowired
+    private YdbpMapper ydbpMapper;
+
     @Override
     public String add(YdbpVo ydbpVo) {
-        return "";
+        Ydbp ydbp = new Ydbp();
+        BeanUtils.copyProperties(ydbpVo, ydbp);
+        ydbp.generateId();
+        ydbp.setCreatorId(UserId);
+        ydbpMapper.add(ydbp);
+        return ydbp.getId();
     }
 
     @Override
-    public Ydysyxz get(String id) {
-        return null;
+    public Ydbp get(String id) {
+        return ydbpMapper.get(id);
     }
 
     @Override
     public void update(YdbpUpdateVo ydbpUpdateVo) {
-
+        ydbpMapper.update(ydbpUpdateVo);
     }
 }

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

@@ -30,8 +30,8 @@ public class YdysyxzImpl implements YdysyxzService {
     }
 
     @Override
-    public Ydysyxz get(String projectId) {
-        return ydysyxzMapper.get(projectId);
+    public Ydysyxz get(String id) {
+        return ydysyxzMapper.get(id);
     }
 
     @Override

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

@@ -24,7 +24,7 @@
     <select id="get" resultMap="projectMap">
         SELECT *
         FROM t_project
-        where t_project.id = #{projectId}
+        where t_project.id = #{id}
     </select>
 
     <select id="getList" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
@@ -44,7 +44,7 @@
         ORDER BY updated_at DESC
         LIMIT #{pageSize} offset #{offset}
     </select>
-    <select id="getCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo">
+    <select id="getCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultType="int">
         SELECT COUNT(*)
         FROM t_project
         <where>

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

@@ -20,24 +20,24 @@
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
+    <!-- 插入语句 -->
+    <insert id="add" parameterType="com.siwei.apply.domain.Ydbp">
+        INSERT INTO t_ydbp (id, project_id, tdyt, yd_area, zs_area, has_zz,
+                            bp_date, pfwh, pf_date, has_onchain, creator_id, created_at, updated_at)
+        VALUES (#{id}, #{projectId}, #{tdyt}, #{ydArea}, #{zsArea}, #{hasZZ},
+                #{bpDate}, #{pfwh}, #{pfDate}, false, #{creatorId}, now(), now())
+    </insert>
 
     <!-- 查询语句 -->
-    <select id="selectById" resultMap="YdbpResultMap">
+    <select id="get" resultMap="YdbpResultMap">
         SELECT *
         FROM t_ydbp
         WHERE id = #{id}
     </select>
 
-    <!-- 插入语句 -->
-    <insert id="insert" parameterType="com.siwei.apply.domain.Ydbp">
-        INSERT INTO t_ydbp (id, project_id, tdyt, yd_area, zs_area, has_zz,
-                            bp_date, pfwh, pf_date, has_onchain, creator_id, created_at, updated_at)
-        VALUES (#{id}, #{projectId}, #{tdyt}, #{ydArea}, #{zsArea}, #{hasZZ},
-                #{bpDate}, #{pfwh}, #{pfDate}, false, #{creatorId}, now(), now())
-    </insert>
 
     <!-- 更新语句 -->
-    <update id="updateById" parameterType="com.siwei.apply.domain.Ydbp">
+    <update id="update" parameterType="com.siwei.apply.domain.Ydbp">
         UPDATE t_ydbp
         <set>
             <if test="projectId != null">project_id = #{projectId},</if>

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

@@ -29,7 +29,7 @@
     <select id="get" resultMap="resMap">
         SELECT *
         FROM t_ydysyxz
-        WHERE project_id = #{projectId}
+        WHERE project_id = #{id}
     </select>
     <update id="update" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
         UPDATE t_ydysyxz