From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java |   95 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
index 731068a..bba69a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
@@ -1,18 +1,28 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
-import com.panzhihua.service_community.service.ComActMessageService;
-import com.panzhihua.service_community.service.ComStreetService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.util.List;
 
 import javax.annotation.Resource;
-import java.util.List;
+
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.service_community.service.CodDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.service_community.service.ComStreetService;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Author: llming
@@ -24,21 +34,27 @@
 public class StreetApi {
     @Resource
     private ComStreetService comStreetService;
+    @Autowired
+    private CodDataService codDataService;
 
     /**
      * 新增街道
-     * @param comStreetVO 新增信息
+     * 
+     * @param comStreetVO
+     *            新增信息
      * @return 新增结果
      */
     @PostMapping("addstreet")
     @Transactional(rollbackFor = Exception.class)
-    public R addStreet(@RequestBody ComStreetVO comStreetVO) {
+    public R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVO) {
         return comStreetService.addStreet(comStreetVO);
     }
 
     /**
      * 分页查询街道
-     * @param pageComStreetDTO 查询条件
+     * 
+     * @param pageComStreetDTO
+     *            查询条件
      * @return 新增结果
      */
     @PostMapping("pagestreet")
@@ -49,7 +65,9 @@
 
     /**
      * 查询街道
-     * @param comStreetVO 查询条件
+     * 
+     * @param comStreetVO
+     *            查询条件
      * @return 新增结果
      */
     @PostMapping("liststreet")
@@ -60,14 +78,57 @@
 
     /**
      * 街道
-     * @param Ids 动态id
+     * 
+     * @param Ids
+     *            动态id
      * @return 删除结果
      */
     @PostMapping("deletestreet")
     @Transactional(rollbackFor = Exception.class)
     public R delectStreat(@RequestBody List<Long> Ids) {
         R r = comStreetService.delectStreat(Ids);
-        return R.ok(r);
+        return r;
+    }
+
+    /**
+     * 街道详情
+     * @param id
+     * @return
+     */
+    @GetMapping("detailStreet")
+    public R detailStreet(@RequestParam("id") Long id) {
+        return comStreetService.detailStreet(id);
+    }
+
+
+    @PostMapping("/updateStreet")
+    public R updateStreet(@RequestBody ComStreetVO comStreetVO){
+        return comStreetService.update(comStreetVO);
+    }
+
+    @GetMapping("/removeStreet")
+    public R remove(@RequestParam(value = "id",required = false)Long id){
+        return comStreetService.remove(id);
+    }
+
+    @GetMapping("/removeCommunity")
+    public R removeCommunity(@RequestParam(value = "id",required = false)Long id){
+        return comStreetService.removeCommunity(id);
+    }
+
+    @PostMapping("/repassCommunity")
+    public R repassCommunity(@RequestBody ComActVO comActVO){
+       return comStreetService.repassCommunity(comActVO);
+    }
+
+    @PostMapping("/repassStreet")
+    public R repassStreet(@RequestBody ComStreetVO comActVO){
+        return comStreetService.repssStreet(comActVO);
+    }
+
+    @PostMapping("importData")
+    public void importData(@RequestParam("file") MultipartFile file) throws IOException {
+        codDataService.importData(file);
     }
 
 }

--
Gitblit v1.7.1