CeDo
2021-05-31 673fb798866d5f80bcd6c516dd27de8f27306a33
add:社区列表
9个文件已修改
54 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -635,4 +636,11 @@
     */
    @PostMapping("/event/queryPublicity")
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);
    /**
     * 分页查询社区列表
     * @return  结果
     */
    @PostMapping("/event/actList")
    R actList();
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:hostname}:8193/
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
  servlet:
@@ -18,5 +18,5 @@
eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
    preferIpAddress: true
  client:
    serviceUrl:
      defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
spring:
  application:
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCardUtil;
@@ -32,7 +33,6 @@
@RequestMapping("/event")
@Api(tags = {"网格综治事件管理 @chendong", "宣传教育 @chendong","特殊人群上报(开发中..) @chendong"})
public class EventApi extends BaseController {
    @Resource
    private GridService gridService;
@@ -105,4 +105,13 @@
        return gridService.draftRelease(commonEventPublicDTO);
    }
    /**
     * 查询社区列表
     * @return 查找结果
     */
    @GetMapping("/actList")
    @ApiOperation(value = "查询社区列表", response = ComActVO.class)
    R actList(){
        return gridService.actList();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:hostname}:8193/
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
  servlet:
@@ -19,7 +19,7 @@
eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka
#实体加密、解密、字段脱敏拦截设置
domain:
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.service.EventService;
@@ -218,5 +219,13 @@
        return eventService.selectPublicity(pagePublicityEventDTO);
    }
    /**
     * 分页查询宣传教育事件
     * @return  结果
     */
    @PostMapping("/actList")
    R<ComActVO> actList(){
        return eventService.actList();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
@@ -150,4 +151,10 @@
     * @return
     */
    R selectPublicity(PagePublicityEventDTO pagePublicityEventDTO);
    /**
     * 获取社区列表:当前默认所有社区
     * @return
     */
    R<ComActVO> actList();
}
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1077,6 +1077,11 @@
        return R.fail();
    }
    @Override
    public R<ComActVO> actList() {
        return communityService.listCommunityAll();
    }
    /**
     * 添加发布事件流转记录
     * @param eventId 事件ID
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -7,12 +7,12 @@
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:hostname}:8193/
      uri: http://${CONFIG_URL:localhost}:8193/
  profiles:
    active: ${ENV:dev}
eureka:
  client:
    service-url:
      defaultZone: http://${EUREKA_URL:hostname}:8192/eureka
      defaultZone: http://${EUREKA_URL:localhost}:8192/eureka