用地报批结构修改

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

@@ -31,7 +31,7 @@ public class ProjectController extends BaseController {
     @PostMapping("")
     public R<Map> AddProject(@RequestBody ProjectVo projectVo) {
         try {
-            String id = projectService.addProject(projectVo);
+            String id = projectService.add(projectVo);
             Map<String, String> map = new HashMap<>();
             map.put("id", id);
             return R.ok(map);
@@ -50,7 +50,7 @@ public class ProjectController extends BaseController {
     public R<Map> GetProject(@PathVariable String id) {
         try {
             Map<String, Object> map = new HashMap<>();
-            Project project = projectService.getProject(id);
+            Project project = projectService.get(id);
             map.put("project", project);
             return R.ok(map);
         } catch (Exception e) {
@@ -66,7 +66,7 @@ public class ProjectController extends BaseController {
     @PostMapping("/list")
     public R<Map> GetProjectList(@RequestBody ProjectFilterVo projectFilterVo) {
         try {
-            Map<String, Object> projects = projectService.getProjectList(projectFilterVo);
+            Map<String, Object> projects = projectService.getList(projectFilterVo);
             return R.ok(projects);
         } catch (Exception e) {
             return R.fail(e.getMessage());
@@ -82,7 +82,7 @@ public class ProjectController extends BaseController {
     @PutMapping("")
     public R<Map> UpdateProject(@RequestBody ProjectUpdateVo projectUpdateVo) {
         try {
-            projectService.updateProject(projectUpdateVo);
+            projectService.update(projectUpdateVo);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());
@@ -98,7 +98,7 @@ public class ProjectController extends BaseController {
     @DeleteMapping("/{id}")
     public R<Map> DeleteProject(@PathVariable String id) {
         try {
-            projectService.deleteProject(id);
+            projectService.delete(id);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -19,13 +19,14 @@ import java.util.Map;
 public class YdysyxzController extends BaseController {
     @Autowired
     private YdysyxzService ydysyxzService;
+
     /**
      * 添加用地预审与选址信息
      */
     @PostMapping()
-    public R<Map>  AddYdysyxz(@RequestBody YdysyxzVo ydysyxzVo) {
+    public R<Map> AddYdysyxz(@RequestBody YdysyxzVo ydysyxzVo) {
         try {
-            String id = ydysyxzService.addYdysyxz(ydysyxzVo);
+            String id = ydysyxzService.add(ydysyxzVo);
             Map<String, String> map = new HashMap<>();
             map.put("id", id);
             return R.ok(map);
@@ -33,6 +34,7 @@ public class YdysyxzController extends BaseController {
             return R.fail(e.getMessage());
         }
     }
+
     /**
      * 获取用地预审与选址信息
      *
@@ -43,12 +45,13 @@ public class YdysyxzController extends BaseController {
     public R<Map> GetYdysyxz(@PathVariable String id) {
         try {
             Map<String, Object> map = new HashMap<>();
-            map.put("ydysyxz", ydysyxzService.getYdysyxz(id));
+            map.put("ydysyxz", ydysyxzService.get(id));
             return R.ok(map);
         } catch (Exception e) {
             return R.fail(e.getMessage());
         }
     }
+
     /**
      * 更新用地预审与选址信息
      *
@@ -58,7 +61,7 @@ public class YdysyxzController extends BaseController {
     @PutMapping()
     public R<Void> UpdateYdysyxz(@RequestBody YdysyxzUpdateVo ydysyxzUpdateVo) {
         try {
-            ydysyxzService.updateYdysyxz(ydysyxzUpdateVo);
+            ydysyxzService.update(ydysyxzUpdateVo);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

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

@@ -14,17 +14,17 @@ public interface ProjectMapper {
      *
      * @param project
      */
-    void addProject(Project project);
+    void add(Project project);
 
     /**
      * 获取项目
      */
-    Project getProject(String projectId);
+    Project get(String projectId);
 
     /**
      * 获取项目列表
      */
-    List<Project> getProjectList(ProjectFilterVo projectFilterVo);
+    List<Project> getList(ProjectFilterVo projectFilterVo);
 
     /**
      * 获取项目总数
@@ -32,19 +32,19 @@ public interface ProjectMapper {
      * @param projectFilterVo
      * @return
      */
-    Integer getProjectCount(ProjectFilterVo projectFilterVo);
+    Integer getCount(ProjectFilterVo projectFilterVo);
 
     /**
      * 更新项目
      *
      * @param projectUpdateVo
      */
-    void updateProject(ProjectUpdateVo projectUpdateVo);
+    void update(ProjectUpdateVo projectUpdateVo);
 
     /**
      * 删除项目
      *
      * @param projectId
      */
-    void deleteProject(String projectId);
+    void delete(String projectId);
 }

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

@@ -14,7 +14,7 @@ public interface YdysyxzMapper {
      *
      * @param ydysyxz
      */
-    void addYdysyxz(Ydysyxz ydysyxz);
+    void add(Ydysyxz ydysyxz);
 
     /**
      * 获取用地预审与选址信息
@@ -22,12 +22,12 @@ public interface YdysyxzMapper {
      * @param projectId
      * @return
      */
-    Ydysyxz getYdysyxz(String projectId);
+    Ydysyxz get(String projectId);
 
     /**
      * 更新用地预审与选址信息
      *
      * @param ydysyxzUpdateVo
      */
-    void updateYdysyxz(YdysyxzUpdateVo ydysyxzUpdateVo);
+    void update(YdysyxzUpdateVo ydysyxzUpdateVo);
 }

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

@@ -17,7 +17,7 @@ public interface ProjectService {
      * @param projectVo
      * @return 项目ID
      */
-    String addProject(ProjectVo projectVo);
+    String add(ProjectVo projectVo);
 
     /**
      * 获取项目
@@ -25,7 +25,7 @@ public interface ProjectService {
      * @param projectId
      * @return 项目对象
      */
-    Project getProject(String projectId);
+    Project get(String projectId);
 
     /**
      * 获取项目列表
@@ -33,7 +33,7 @@ public interface ProjectService {
      * @param projectFilterVo
      * @return 项目列表
      */
-    Map<String, Object> getProjectList(ProjectFilterVo projectFilterVo);
+    Map<String, Object> getList(ProjectFilterVo projectFilterVo);
 
 
     /**
@@ -42,7 +42,7 @@ public interface ProjectService {
      * @param projectUpdateVo
      * @return
      */
-    void updateProject(ProjectUpdateVo projectUpdateVo);
+    void update(ProjectUpdateVo projectUpdateVo);
 
     /**
      * 删除项目
@@ -50,5 +50,5 @@ public interface ProjectService {
      * @param projectId
      * @return
      */
-    void deleteProject(String projectId);
+    void delete(String projectId);
 }

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

@@ -1,4 +1,33 @@
 package com.siwei.apply.service;
 
+import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
+
+/**
+ * 用地报批 服务接口
+ */
 public interface YdbpService {
+    /**
+     * 添加用地报批信息
+     *
+     * @param ydbpVo 用地报批视图对象
+     * @return 用地报批ID
+     */
+    String add(YdbpVo ydbpVo);
+
+    /**
+     * 获取用地报批信息
+     *
+     * @param id 用地报批ID
+     * @return 用地报批对象
+     */
+    Ydysyxz get(String id);
+
+    /**
+     * 更新用地报批信息
+     *
+     * @param ydbpUpdateVo 用地报批更新视图对象
+     */
+    void update(YdbpUpdateVo ydbpUpdateVo);
 }

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

@@ -11,7 +11,7 @@ public interface YdysyxzService {
     /**
      * 添加用地预审与选址信息
      */
-    String addYdysyxz(YdysyxzVo ydysyxzVo);
+    String add(YdysyxzVo ydysyxzVo);
 
     /**
      * 获取用地预审与选址信息
@@ -19,12 +19,12 @@ public interface YdysyxzService {
      * @param projectId 项目ID
      * @return 用地预审与选址信息
      */
-    Ydysyxz getYdysyxz(String projectId);
+    Ydysyxz get(String projectId);
 
     /**
      * 更新用地预审与选址信息
      *
      * @param ydysyxzUpdateVo 用地预审与选址视图对象
      */
-    void updateYdysyxz(YdysyxzUpdateVo ydysyxzUpdateVo);
+    void update(YdysyxzUpdateVo ydysyxzUpdateVo);
 }

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

@@ -15,13 +15,16 @@ import java.util.Map;
 
 import static com.siwei.apply.common.Common.UserId;
 
+/**
+ * 项目服务实现类
+ */
 @Service
 public class ProjectImpl implements ProjectService {
     @Autowired
     private ProjectMapper projectMapper;
 
     @Override
-    public String addProject(ProjectVo projectVo) {
+    public String add(ProjectVo projectVo) {
         Project project = new Project();
         project.generateId();
         project.setName(projectVo.getName());
@@ -29,20 +32,20 @@ public class ProjectImpl implements ProjectService {
         project.setCompany(projectVo.getCompany());
         project.setProjectType(projectVo.getProjectType());
         project.setCreatorId(UserId);
-        projectMapper.addProject(project);
+        projectMapper.add(project);
 
         return project.getId();
     }
 
     @Override
-    public Project getProject(String projectId) {
-        return projectMapper.getProject(projectId);
+    public Project get(String projectId) {
+        return projectMapper.get(projectId);
     }
 
     @Override
-    public Map<String, Object> getProjectList(ProjectFilterVo projectFilterVo) {
-        List<Project> projects = projectMapper.getProjectList(projectFilterVo);
-        Integer count = projectMapper.getProjectCount(projectFilterVo);
+    public Map<String, Object> getList(ProjectFilterVo projectFilterVo) {
+        List<Project> projects = projectMapper.getList(projectFilterVo);
+        Integer count = projectMapper.getCount(projectFilterVo);
 
         Map<String, Object> map = new HashMap<>();
         map.put("projects", projects);
@@ -52,15 +55,15 @@ public class ProjectImpl implements ProjectService {
 
 
     @Override
-    public void updateProject(ProjectUpdateVo projectUpdateVo) {
-        projectMapper.updateProject(projectUpdateVo);
+    public void update(ProjectUpdateVo projectUpdateVo) {
+        projectMapper.update(projectUpdateVo);
     }
 
     @Override
-    public void deleteProject(String projectId) {
+    public void delete(String projectId) {
         if (projectId == null || projectId.isEmpty()) {
             throw new IllegalArgumentException("Project ID cannot be null or empty");
         }
-        projectMapper.deleteProject(projectId);
+        projectMapper.delete(projectId);
     }
 }

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

@@ -1,4 +1,28 @@
 package com.siwei.apply.service.impl;
 
-public class YdbpImpl {
+import com.siwei.apply.domain.Ydysyxz;
+import com.siwei.apply.domain.vo.YdbpUpdateVo;
+import com.siwei.apply.domain.vo.YdbpVo;
+import com.siwei.apply.service.YdbpService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用地报批 服务实现类
+ */
+@Service
+public class YdbpImpl implements YdbpService {
+    @Override
+    public String add(YdbpVo ydbpVo) {
+        return "";
+    }
+
+    @Override
+    public Ydysyxz get(String id) {
+        return null;
+    }
+
+    @Override
+    public void update(YdbpUpdateVo ydbpUpdateVo) {
+
+    }
 }

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

@@ -20,22 +20,22 @@ public class YdysyxzImpl implements YdysyxzService {
     private YdysyxzMapper ydysyxzMapper;
 
     @Override
-    public String addYdysyxz(YdysyxzVo ydysyxzVo) {
+    public String add(YdysyxzVo ydysyxzVo) {
         Ydysyxz ydysyxz = new Ydysyxz();
         BeanUtils.copyProperties(ydysyxzVo, ydysyxz);
         ydysyxz.generateId();
         ydysyxz.setCreatorId(UserId);
-        ydysyxzMapper.addYdysyxz(ydysyxz);
+        ydysyxzMapper.add(ydysyxz);
         return ydysyxz.getId();
     }
 
     @Override
-    public Ydysyxz getYdysyxz(String projectId) {
-        return ydysyxzMapper.getYdysyxz(projectId);
+    public Ydysyxz get(String projectId) {
+        return ydysyxzMapper.get(projectId);
     }
 
     @Override
-    public void updateYdysyxz(YdysyxzUpdateVo ydysyxzUpdateVo) {
-        ydysyxzMapper.updateYdysyxz(ydysyxzUpdateVo);
+    public void update(YdysyxzUpdateVo ydysyxzUpdateVo) {
+        ydysyxzMapper.update(ydysyxzUpdateVo);
     }
 }

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

@@ -14,20 +14,20 @@
         <result column="creator_id" property="creatorId"/>
     </resultMap>
 
-    <insert id="addProject" parameterType="com.siwei.apply.domain.Project">
+    <insert id="add" parameterType="com.siwei.apply.domain.Project">
         INSERT INTO t_project (id, name, code, company,
                                created_at, updated_at, project_type, creator_id)
         VALUES (#{id}, #{name}, #{code}, #{company}, now(), now(), #{projectType},
                 #{creatorId})
     </insert>
 
-    <select id="getProject" resultMap="projectMap">
+    <select id="get" resultMap="projectMap">
         SELECT *
         FROM t_project
         where t_project.id = #{projectId}
     </select>
 
-    <select id="getProjectList" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
+    <select id="getList" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
         SELECT *
         FROM t_project
         <where>
@@ -44,7 +44,7 @@
         ORDER BY updated_at DESC
         LIMIT #{pageSize} offset #{offset}
     </select>
-    <select id="getProjectCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo">
+    <select id="getCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo">
         SELECT COUNT(*)
         FROM t_project
         <where>
@@ -59,7 +59,7 @@
             </if>
         </where>
     </select>
-    <update id="updateProject" parameterType="com.siwei.apply.domain.vo.ProjectUpdateVo">
+    <update id="update" parameterType="com.siwei.apply.domain.vo.ProjectUpdateVo">
         UPDATE t_project
         <set>
             <if test="name != null">name = #{name},</if>
@@ -71,7 +71,7 @@
         WHERE id = #{id}
     </update>
 
-    <delete id="deleteProject" parameterType="String">
+    <delete id="delete" parameterType="String">
         DELETE FROM t_project
         WHERE id = #{projectId}
     </delete>

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

@@ -19,19 +19,19 @@
         <result property="updatedAt" column="updated_at"/>
         <result property="creatorId" column="creator_id"/>
     </resultMap>
-    <insert id="addYdysyxz" parameterType="com.siwei.apply.domain.Ydysyxz">
+    <insert id="add" parameterType="com.siwei.apply.domain.Ydysyxz">
         INSERT INTO t_ydysyxz (id, project_id, jsyj, jsdd, area, has_zz,
                                xmjsyj, zzwh, fz_date, has_onchain, created_at, updated_at, creator_id)
         VALUES (#{id}, #{projectId}, #{jsyj}, #{jsdd}, #{area}, #{hasZz},
                 #{xmjsyj}, #{zzwh}, #{fzDate},
                 false, now(), now(), #{creatorId})
     </insert>
-    <select id="getYdysyxz" resultMap="resMap">
+    <select id="get" resultMap="resMap">
         SELECT *
         FROM t_ydysyxz
         WHERE project_id = #{projectId}
     </select>
-    <update id="updateYdysyxz" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
+    <update id="update" parameterType="com.siwei.apply.domain.vo.YdysyxzUpdateVo">
         UPDATE t_ydysyxz
         <set>
             <if test="jsyj != null">jsyj = #{jsyj},</if>