yinzuomei
5 years ago
95 changed files with 3771 additions and 369 deletions
@ -0,0 +1,25 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|||
<parent> |
|||
<artifactId>gov-grid</artifactId> |
|||
<groupId>com.epmet</groupId> |
|||
<version>2.0.0</version> |
|||
</parent> |
|||
<modelVersion>4.0.0</modelVersion> |
|||
|
|||
<artifactId>gov-grid-client</artifactId> |
|||
<dependencies> |
|||
<dependency> |
|||
<groupId>javax.validation</groupId> |
|||
<artifactId>validation-api</artifactId> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>org.projectlombok</groupId> |
|||
<artifactId>lombok</artifactId> |
|||
</dependency> |
|||
</dependencies> |
|||
|
|||
|
|||
</project> |
|||
@ -0,0 +1,11 @@ |
|||
FROM java:8 |
|||
|
|||
RUN export LANG="zh_CN.UTF-8" |
|||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime |
|||
RUN echo 'Asia/Shanghai' > /etc/timezone |
|||
|
|||
COPY ./target/*.jar ./app.jar |
|||
|
|||
EXPOSE 8097 |
|||
|
|||
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] |
|||
@ -0,0 +1,15 @@ |
|||
version: "3.7" |
|||
services: |
|||
gov-grid-server: |
|||
container_name: gov-grid-server-dev |
|||
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-grid-server:0.3.0 |
|||
ports: |
|||
- "8097:8097" |
|||
network_mode: host # 使用现有网络 |
|||
volumes: |
|||
- "/opt/epmet-cloud-logs/dev:/logs" |
|||
deploy: |
|||
resources: |
|||
limits: |
|||
cpus: '0.1' |
|||
memory: 250M |
|||
@ -0,0 +1,169 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|||
<modelVersion>4.0.0</modelVersion> |
|||
<version>0.3.0</version> |
|||
<parent> |
|||
<groupId>com.epmet</groupId> |
|||
<artifactId>gov-grid</artifactId> |
|||
<version>2.0.0</version> |
|||
</parent> |
|||
<artifactId>gov-grid-server</artifactId> |
|||
<packaging>jar</packaging> |
|||
|
|||
<dependencies> |
|||
<dependency> |
|||
<groupId>com.epmet</groupId> |
|||
<artifactId>gov-grid-client</artifactId> |
|||
<version>2.0.0</version> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>org.springframework.boot</groupId> |
|||
<artifactId>spring-boot-starter-web</artifactId> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>org.springframework</groupId> |
|||
<artifactId>spring-context-support</artifactId> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>org.springframework.boot</groupId> |
|||
<artifactId>spring-boot-starter-actuator</artifactId> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>com.alibaba.cloud</groupId> |
|||
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>com.alibaba.cloud</groupId> |
|||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> |
|||
</dependency> |
|||
<!-- 替换Feign原生httpclient --> |
|||
<dependency> |
|||
<groupId>io.github.openfeign</groupId> |
|||
<artifactId>feign-httpclient</artifactId> |
|||
<version>10.3.0</version> |
|||
</dependency> |
|||
|
|||
|
|||
<dependency> |
|||
<groupId>com.epmet</groupId> |
|||
<artifactId>gov-org-client</artifactId> |
|||
<version>2.0.0</version> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>com.epmet</groupId> |
|||
<artifactId>resi-partymember-client</artifactId> |
|||
<version>2.0.0</version> |
|||
<scope>compile</scope> |
|||
</dependency> |
|||
<dependency> |
|||
<groupId>com.epmet</groupId> |
|||
<artifactId>resi-group-client</artifactId> |
|||
<version>2.0.0</version> |
|||
<scope>compile</scope> |
|||
</dependency> |
|||
</dependencies> |
|||
|
|||
<build> |
|||
<finalName>${project.artifactId}</finalName> |
|||
<plugins> |
|||
<plugin> |
|||
<groupId>org.springframework.boot</groupId> |
|||
<artifactId>spring-boot-maven-plugin</artifactId> |
|||
</plugin> |
|||
<plugin> |
|||
<groupId>org.apache.maven.plugins</groupId> |
|||
<artifactId>maven-surefire-plugin</artifactId> |
|||
<configuration> |
|||
<skipTests>true</skipTests> |
|||
</configuration> |
|||
</plugin> |
|||
</plugins> |
|||
|
|||
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory> |
|||
<resources> |
|||
<resource> |
|||
<filtering>true</filtering> |
|||
<directory>${basedir}/src/main/resources</directory> |
|||
</resource> |
|||
</resources> |
|||
</build> |
|||
|
|||
<profiles> |
|||
<profile> |
|||
<id>dev-local</id> |
|||
<activation> |
|||
<activeByDefault>true</activeByDefault> |
|||
</activation> |
|||
<properties> |
|||
<server.port>8097</server.port> |
|||
<spring.profiles.active>dev</spring.profiles.active> |
|||
|
|||
<!-- redis配置 --> |
|||
<spring.redis.index>0</spring.redis.index> |
|||
<spring.redis.host>127.0.0.1</spring.redis.host> |
|||
<spring.redis.port>6379</spring.redis.port> |
|||
<spring.redis.password>123456</spring.redis.password> |
|||
<!-- nacos --> |
|||
<nacos.register-enabled>false</nacos.register-enabled> |
|||
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr> |
|||
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace> |
|||
<nacos.config.namespace></nacos.config.namespace> |
|||
<nacos.config.group></nacos.config.group> |
|||
<nacos.config-enabled>false</nacos.config-enabled> |
|||
<nacos.ip/> |
|||
</properties> |
|||
</profile> |
|||
<profile> |
|||
<id>dev</id> |
|||
<!--<activation> |
|||
<activeByDefault>true</activeByDefault> |
|||
</activation>--> |
|||
<properties> |
|||
<server.port>8097</server.port> |
|||
<spring.profiles.active>dev</spring.profiles.active> |
|||
|
|||
<!-- redis配置 --> |
|||
<spring.redis.index>0</spring.redis.index> |
|||
<spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host> |
|||
<spring.redis.port>6379</spring.redis.port> |
|||
<spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password> |
|||
<!-- nacos --> |
|||
<nacos.register-enabled>true</nacos.register-enabled> |
|||
<nacos.server-addr>192.168.10.150:8848</nacos.server-addr> |
|||
<nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace> |
|||
<nacos.config.namespace></nacos.config.namespace> |
|||
<nacos.config.group></nacos.config.group> |
|||
<nacos.config-enabled>false</nacos.config-enabled> |
|||
<nacos.ip/> |
|||
</properties> |
|||
</profile> |
|||
<profile> |
|||
<id>test</id> |
|||
<!--<activation> |
|||
<activeByDefault>true</activeByDefault> |
|||
</activation>--> |
|||
<properties> |
|||
<server.port>8097</server.port> |
|||
<spring.profiles.active>test</spring.profiles.active> |
|||
|
|||
<!-- redis配置 --> |
|||
<spring.redis.index>0</spring.redis.index> |
|||
<spring.redis.host>10.10.10.248</spring.redis.host> |
|||
<spring.redis.port>6379</spring.redis.port> |
|||
<spring.redis.password>123456</spring.redis.password> |
|||
<!-- nacos --> |
|||
<nacos.register-enabled>true</nacos.register-enabled> |
|||
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr> |
|||
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace> |
|||
<nacos.config.namespace></nacos.config.namespace> |
|||
<nacos.config.group></nacos.config.group> |
|||
<nacos.config-enabled>false</nacos.config-enabled> |
|||
<nacos.ip/> |
|||
</properties> |
|||
</profile> |
|||
</profiles> |
|||
|
|||
|
|||
</project> |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet; |
|||
|
|||
import org.springframework.boot.SpringApplication; |
|||
import org.springframework.boot.autoconfigure.SpringBootApplication; |
|||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; |
|||
import org.springframework.cloud.openfeign.EnableFeignClients; |
|||
|
|||
/** |
|||
* |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 |
|||
*/ |
|||
@SpringBootApplication |
|||
@EnableDiscoveryClient |
|||
@EnableFeignClients |
|||
public class GovGridApplication { |
|||
|
|||
public static void main(String[] args) { |
|||
SpringApplication.run(GovGridApplication.class, args); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
/** |
|||
* Copyright (c) 2018 人人开源 All rights reserved. |
|||
* |
|||
* https://www.renren.io
|
|||
* |
|||
* 版权所有，侵权必究！ |
|||
*/ |
|||
|
|||
package com.epmet.config; |
|||
|
|||
import com.epmet.commons.tools.config.ModuleConfig; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
/** |
|||
* 模块配置信息 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 |
|||
*/ |
|||
@Service |
|||
public class ModuleConfigImpl implements ModuleConfig { |
|||
@Override |
|||
public String getName() { |
|||
return "govgrid"; |
|||
} |
|||
} |
|||
@ -0,0 +1,68 @@ |
|||
/** |
|||
* Copyright (c) 2018 人人开源 All rights reserved. |
|||
* |
|||
* https://www.renren.io
|
|||
* |
|||
* 版权所有，侵权必究！ |
|||
*/ |
|||
|
|||
package com.epmet.config; |
|||
|
|||
import com.epmet.commons.tools.constant.Constant; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.context.annotation.Bean; |
|||
import org.springframework.context.annotation.Configuration; |
|||
import springfox.documentation.builders.ApiInfoBuilder; |
|||
import springfox.documentation.builders.PathSelectors; |
|||
import springfox.documentation.builders.RequestHandlerSelectors; |
|||
import springfox.documentation.service.ApiInfo; |
|||
import springfox.documentation.service.ApiKey; |
|||
import springfox.documentation.spi.DocumentationType; |
|||
import springfox.documentation.spring.web.plugins.Docket; |
|||
import springfox.documentation.swagger2.annotations.EnableSwagger2; |
|||
|
|||
import java.util.List; |
|||
|
|||
import static com.google.common.collect.Lists.newArrayList; |
|||
|
|||
/** |
|||
* Swagger配置 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 |
|||
*/ |
|||
@Configuration |
|||
@EnableSwagger2 |
|||
public class SwaggerConfig { |
|||
|
|||
@Bean |
|||
public Docket createRestApi() { |
|||
return new Docket(DocumentationType.SWAGGER_2) |
|||
.apiInfo(apiInfo()) |
|||
.select() |
|||
//加了ApiOperation注解的类，才生成接口文档
|
|||
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) |
|||
//包下的类，才生成接口文档
|
|||
//.apis(RequestHandlerSelectors.basePackage("io.renren.controller"))
|
|||
.paths(PathSelectors.any()) |
|||
.build() |
|||
.directModelSubstitute(java.util.Date.class, String.class) |
|||
.securitySchemes(security()); |
|||
} |
|||
|
|||
private ApiInfo apiInfo() { |
|||
return new ApiInfoBuilder() |
|||
.title("人人开源") |
|||
.description("系统模块开发文档") |
|||
.termsOfServiceUrl("https://www.renren.io/community") |
|||
.version("1.4.0") |
|||
.build(); |
|||
} |
|||
|
|||
private List<ApiKey> security() { |
|||
return newArrayList( |
|||
new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header") |
|||
); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,126 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.resi.group.dto.group.form.*; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; |
|||
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; |
|||
import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; |
|||
import com.epmet.service.ResiGroupService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
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.RestController; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 政府端管理楼院小组业务 |
|||
* @ClassName ResiGroupController |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:30 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("resi/group") |
|||
public class ResiGroupController { |
|||
@Autowired |
|||
ResiGroupService resiGroupService; |
|||
/** |
|||
* 小组审核历史列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return |
|||
*/ |
|||
@PostMapping("audited") |
|||
public Result<List<GroupAuditedResultDTO>> audited(@RequestBody GroupAuditedFromDTO formDTO) { |
|||
return resiGroupService.audited(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 本网格小组列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<List < GroupAuditedResultDTO>> |
|||
*/ |
|||
@PostMapping("groupsingrid") |
|||
public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiGroupService.getGroupsInGrid(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 小组管理界面信息 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<GovGroupSummarizeResultDTO> |
|||
*/ |
|||
@PostMapping("getgroupsummarize") |
|||
public Result<GovGroupSummarizeResultDTO> getGroupSummarize(GovGroupSummarizeFromDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiGroupService.getGroupSummarize(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 查询小组待审核列表 |
|||
* @Param ApplyingGroupsFormDTO.class |
|||
* @return Result<List<ApplyingGroupResultDTO>> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 13:59 |
|||
**/ |
|||
@PostMapping("auditing") |
|||
public Result<List<ApplyingGroupResultDTO>> auditing(@LoginUser TokenDto tokenDto, @RequestBody ApplyingGroupsFormDTO applyingGroupsFormDTO){ |
|||
applyingGroupsFormDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(applyingGroupsFormDTO); |
|||
return resiGroupService.auditing(applyingGroupsFormDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 得到待审核/未审核小组信息的详情 |
|||
* @Param CommonGroupIdFromDTO -> String groupId |
|||
* @return Result<ApplyingGroupDetailResultDTO> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:08 |
|||
**/ |
|||
@PostMapping("applygroupdetail") |
|||
public Result<ApplyingGroupDetailResultDTO> applyGroupDetail(@LoginUser TokenDto tokenDto, @RequestBody CommonGroupIdFromDTO groupIdFromDTO){ |
|||
groupIdFromDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(groupIdFromDTO); |
|||
return resiGroupService.applyGroupDetail(groupIdFromDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 建组申请-审核通过 |
|||
* @Param AgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:25 |
|||
**/ |
|||
@PostMapping("approve") |
|||
public Result agreeApplying(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO){ |
|||
agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(agreeApplyGroupFormDTO); |
|||
return resiGroupService.agreeApplying(agreeApplyGroupFormDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 建组申请-审核驳回 |
|||
* @Param DisAgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:26 |
|||
**/ |
|||
@PostMapping("reject") |
|||
public Result disagreeApplying(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO){ |
|||
disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO); |
|||
return resiGroupService.disagreeApplying(disAgreeApplyGroupFormDTO); |
|||
} |
|||
} |
|||
@ -0,0 +1,88 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.annotation.LoginUser; |
|||
import com.epmet.commons.tools.security.dto.TokenDto; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.resi.partymember.dto.warmhearted.form.*; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; |
|||
import com.epmet.service.ResiWarmheartedService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
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.RestController; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 政府端管理热心居民业务 |
|||
* @ClassName ResiWarmheartedController |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:30 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("resi/warmhearted") |
|||
public class ResiWarmheartedController { |
|||
|
|||
@Autowired |
|||
private ResiWarmheartedService resiWarmheartedService; |
|||
|
|||
/** |
|||
* 热心居民审核历史列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return |
|||
*/ |
|||
@PostMapping("audited") |
|||
public Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO) { |
|||
return resiWarmheartedService.audited(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param |
|||
* @Author sun |
|||
* @Description 政府端-获取待审核的热心居民申请列表 |
|||
**/ |
|||
@PostMapping("auditing") |
|||
public Result<List<ResiWarmAuditResultDTO>> auditing(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiWarmheartedService.auditing(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param |
|||
* @Author sun |
|||
* @Description 政府端-热心居民申请-审核通过 |
|||
**/ |
|||
@PostMapping("approve") |
|||
public Result approve(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditApproveFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiWarmheartedService.approve(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param |
|||
* @Author sun |
|||
* @Description 政府端-热心居民申请-审核驳回 |
|||
**/ |
|||
@PostMapping("reject") |
|||
public Result reject(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmAuditRejectFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiWarmheartedService.reject(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @param |
|||
* @Author sun |
|||
* @Description 政府端-热心居民申请详情信息 |
|||
**/ |
|||
@PostMapping("getdetail") |
|||
public Result<ResiWarmAuditResultDTO> getDetail(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmGetDetailFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return resiWarmheartedService.getDetail(formDTO); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.epmet.exception; |
|||
|
|||
import com.epmet.commons.tools.exception.ErrorCode; |
|||
|
|||
/** |
|||
* 模块错误编码，由9位数字组成，前6位为模块编码，后3位为业务编码 |
|||
* <p> |
|||
* 如：100001001（100001代表模块，001代表业务代码） |
|||
* </p> |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 |
|||
*/ |
|||
public interface ModuleErrorCode extends ErrorCode { |
|||
|
|||
} |
|||
@ -0,0 +1,94 @@ |
|||
package com.epmet.feign; |
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; |
|||
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; |
|||
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; |
|||
import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; |
|||
import com.epmet.resi.group.dto.group.form.*; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/17 15:24 |
|||
*/ |
|||
@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) |
|||
public interface ResiGroupFeignClient { |
|||
/** |
|||
* 小组审核历史列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<List < GroupAuditedResultDTO>> |
|||
*/ |
|||
@PostMapping("/resi/group/group/audited") |
|||
Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 本网格小组列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<List < GroupAuditedResultDTO>> |
|||
*/ |
|||
@PostMapping("/resi/group/group/groupsingrid") |
|||
Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 小组管理界面信息 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<GovGroupSummarizeResultDTO> |
|||
*/ |
|||
@PostMapping("/resi/group/group/getgovgroupsummarize") |
|||
Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO); |
|||
|
|||
/** |
|||
* @Description 得到小组待审核列表，用户信息不注入TokenDTO，通过外部服务调用直接传入参数 |
|||
* @Param ApplyingGroupsFormDTO.class |
|||
* @return Result<List<ApplyingGroupResultDTO>> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 13:59 |
|||
**/ |
|||
@PostMapping("/resi/group/group/getapplyinggroups") |
|||
Result<List<ApplyingGroupResultDTO>> getApplyingGroups(ApplyingGroupsFormDTO applyingGroupsFormDTO); |
|||
|
|||
/** |
|||
* @Description 得到待审核/未审核小组信息的详情 |
|||
* @Param CommonGroupIdFromDTO -> String groupId |
|||
* @return Result<ApplyingGroupDetailResultDTO> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:08 |
|||
**/ |
|||
@PostMapping("/resi/group/group/getapplyinggroupdetail") |
|||
Result<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId); |
|||
|
|||
/** |
|||
* @Description 建组申请-审核通过 |
|||
* @Param AgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:25 |
|||
**/ |
|||
@PostMapping("/resi/group/group/agreeapplying") |
|||
Result agreeApplying(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO); |
|||
|
|||
/** |
|||
* @Description 建组申请-审核驳回 |
|||
* @Param DisAgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:26 |
|||
**/ |
|||
@PostMapping("/resi/group/group/disagreeapplying") |
|||
Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO); |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
package com.epmet.feign; |
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack; |
|||
import com.epmet.resi.partymember.dto.warmhearted.form.*; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 调用epmet-user服务 |
|||
* |
|||
* @author 赵奇风 |
|||
*/ |
|||
@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class) |
|||
public interface ResiPartymemberFeignClient { |
|||
/** |
|||
* 居民端-热心居民申请-提交申请数据 |
|||
* |
|||
* @author zhaoqf |
|||
**/ |
|||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/audited") |
|||
Result<List<ResiWarmheartedAuditedResultDTO>> audited(@RequestBody ResiWarmheartedAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表 |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/auditing") |
|||
Result<List<ResiWarmAuditResultDTO>> auditing(@RequestBody ResiWarmAuditFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核通过 |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/approve") |
|||
Result approve(@RequestBody ResiWarmAuditApproveFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核驳回 |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/reject") |
|||
Result reject(@RequestBody ResiWarmAuditRejectFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表 |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@PostMapping(value = "resi/partymember/resiwarmheartedapply/getdetail") |
|||
Result<ResiWarmAuditResultDTO> getDetail(@RequestBody ResiWarmGetDetailFormDTO formDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,88 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.ModuleUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.ResiGroupFeignClient; |
|||
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; |
|||
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; |
|||
import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; |
|||
import com.epmet.resi.group.dto.group.form.*; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/17 15:27 |
|||
*/ |
|||
@Component |
|||
public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { |
|||
@Override |
|||
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "audited", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getGroupsInGrid", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<GovGroupSummarizeResultDTO> getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getGovGroupSummarize", formDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 得到小组待审核列表，用户信息不注入TokenDTO，通过外部服务调用直接传入参数 |
|||
* @Param ApplyingGroupsFormDTO.class |
|||
* @return Result<List<ApplyingGroupResultDTO>> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 13:59 |
|||
**/ |
|||
@Override |
|||
public Result<List<ApplyingGroupResultDTO>> getApplyingGroups(ApplyingGroupsFormDTO applyingGroupsFormDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getApplyingGroups", applyingGroupsFormDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 得到待审核/未审核小组信息的详情 |
|||
* @Param CommonGroupIdFromDTO -> String groupId |
|||
* @return Result<ApplyingGroupDetailResultDTO> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:08 |
|||
**/ |
|||
@Override |
|||
public Result<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getApplyingGroupDetail", groupId); |
|||
} |
|||
|
|||
/** |
|||
* @Description 建组申请-审核通过 |
|||
* @Param AgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:25 |
|||
**/ |
|||
@Override |
|||
public Result agreeApplying(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "agreeApplying", agreeApplyGroupFormDTO); |
|||
} |
|||
|
|||
/** |
|||
* @Description 建组申请-审核驳回 |
|||
* @Param DisAgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:26 |
|||
**/ |
|||
@Override |
|||
public Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "disagreeApplying", disAgreeApplyGroupFormDTO); |
|||
} |
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.ModuleUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.ResiPartymemberFeignClient; |
|||
import com.epmet.resi.partymember.dto.warmhearted.form.*; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/16 17:01 |
|||
*/ |
|||
@Component |
|||
public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient { |
|||
@Override |
|||
public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "audited", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<List<ResiWarmAuditResultDTO>> auditing(ResiWarmAuditFormDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "auditing", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result approve(ResiWarmAuditApproveFormDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "approve", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result reject(ResiWarmAuditRejectFormDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "reject", formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getDetail", formDTO); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,81 @@ |
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; |
|||
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; |
|||
import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; |
|||
import com.epmet.resi.group.dto.group.form.*; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @IntefaceName ResiGroupService |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:40 |
|||
*/ |
|||
public interface ResiGroupService { |
|||
/** |
|||
* 小组审核历史列表 |
|||
* @param formDTO 参数 |
|||
* @return Result<List<GroupAuditedResultDTO>> |
|||
*/ |
|||
Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 本网格小组列表 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<List<GroupsInGridResultDTO>> |
|||
*/ |
|||
Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 小组管理界面信息 |
|||
* |
|||
* @param formDTO 参数 |
|||
* @return Result<GovGroupSummarizeResultDTO> |
|||
*/ |
|||
Result<GovGroupSummarizeResultDTO> getGroupSummarize(GovGroupSummarizeFromDTO formDTO); |
|||
|
|||
/** |
|||
* @Description 查询小组待审核列表-调用resi-group服务 |
|||
* @Param ApplyingGroupsFormDTO.class |
|||
* @return Result<List<ApplyingGroupResultDTO>> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 13:59 |
|||
**/ |
|||
Result<List<ApplyingGroupResultDTO>> auditing(ApplyingGroupsFormDTO applyingGroupsFormDTO); |
|||
|
|||
/** |
|||
* @Description 得到待审核/未审核小组信息的详情-调用resi-group服务 |
|||
* @Param CommonGroupIdFromDTO -> String groupId |
|||
* @return Result<ApplyingGroupDetailResultDTO> |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:08 |
|||
**/ |
|||
Result<ApplyingGroupDetailResultDTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO); |
|||
|
|||
/** |
|||
* @Description 建组申请-审核通过-调用resi-group服务 |
|||
* @Param AgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:25 |
|||
**/ |
|||
Result agreeApplying(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO); |
|||
|
|||
/** |
|||
* @Description 建组申请-审核驳回-调用resi-group服务 |
|||
* @Param DisAgreeApplyGroupFormDTO |
|||
* @return Result |
|||
* @Author wangc |
|||
* @Date 2020.04.20 14:26 |
|||
**/ |
|||
Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO); |
|||
|
|||
} |
|||
@ -0,0 +1,61 @@ |
|||
package com.epmet.service; |
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.resi.partymember.dto.warmhearted.form.*; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @IntefaceName ResiWarmheartedService |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:37 |
|||
*/ |
|||
@Service |
|||
public interface ResiWarmheartedService { |
|||
/** |
|||
* 热心居民审核历史列表 |
|||
* @param formDTO 参数 |
|||
* @return ResiWarmheartedAuditedResultDTO |
|||
*/ |
|||
Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
Result<List<ResiWarmAuditResultDTO>> auditing(ResiWarmAuditFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核通过 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
Result approve(ResiWarmAuditApproveFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核驳回 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
Result reject(ResiWarmAuditRejectFormDTO formDTO); |
|||
|
|||
/** |
|||
* 政府端-热心居民申请详情信息 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO); |
|||
} |
|||
@ -0,0 +1,65 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.ResiGroupFeignClient; |
|||
import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO; |
|||
import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO; |
|||
import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO; |
|||
import com.epmet.resi.group.dto.group.form.*; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO; |
|||
import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO; |
|||
import com.epmet.service.ResiGroupService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @ClassName ResiGroupServiceImpl |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:38 |
|||
*/ |
|||
@Service |
|||
public class ResiGroupServiceImpl implements ResiGroupService{ |
|||
@Autowired |
|||
private ResiGroupFeignClient resiGroupFeignClient; |
|||
@Override |
|||
public Result<List<GroupAuditedResultDTO>> audited(GroupAuditedFromDTO formDTO) { |
|||
return resiGroupFeignClient.audited(formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<List<GroupsInGridResultDTO>> getGroupsInGrid(GroupAuditedFromDTO formDTO) { |
|||
return resiGroupFeignClient.getGroupsInGrid(formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<GovGroupSummarizeResultDTO> getGroupSummarize(GovGroupSummarizeFromDTO formDTO) { |
|||
return resiGroupFeignClient.getGovGroupSummarize(formDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<List<ApplyingGroupResultDTO>> auditing(ApplyingGroupsFormDTO applyingGroupsFormDTO) { |
|||
return resiGroupFeignClient.getApplyingGroups(applyingGroupsFormDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result<ApplyingGroupDetailResultDTO> applyGroupDetail(CommonGroupIdFromDTO groupIdFromDTO) { |
|||
return resiGroupFeignClient.getApplyingGroupDetail(groupIdFromDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result agreeApplying(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) { |
|||
return resiGroupFeignClient.agreeApplying(agreeApplyGroupFormDTO); |
|||
} |
|||
|
|||
@Override |
|||
public Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) { |
|||
return resiGroupFeignClient.disagreeApplying(disAgreeApplyGroupFormDTO); |
|||
} |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.epmet.service.impl; |
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.feign.ResiPartymemberFeignClient; |
|||
import com.epmet.resi.partymember.dto.warmhearted.form.*; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmAuditResultDTO; |
|||
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; |
|||
import com.epmet.service.ResiWarmheartedService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description |
|||
* @ClassName ResiWarmheartedServiceImpl |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:41 |
|||
*/ |
|||
@Service |
|||
public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { |
|||
@Autowired |
|||
private ResiPartymemberFeignClient resiPartymemberFeignClient; |
|||
|
|||
@Override |
|||
public Result<List<ResiWarmheartedAuditedResultDTO>> audited(ResiWarmheartedAuditedFromDTO formDTO) { |
|||
return resiPartymemberFeignClient.audited(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@Override |
|||
public Result<List<ResiWarmAuditResultDTO>> auditing(ResiWarmAuditFormDTO formDTO) { |
|||
return resiPartymemberFeignClient.auditing(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核通过 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@Override |
|||
public Result approve(ResiWarmAuditApproveFormDTO formDTO) { |
|||
return resiPartymemberFeignClient.approve(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 政府端-热心居民申请-审核驳回 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@Override |
|||
public Result reject(ResiWarmAuditRejectFormDTO formDTO) { |
|||
return resiPartymemberFeignClient.reject(formDTO); |
|||
} |
|||
|
|||
/** |
|||
* 政府端-热心居民申请详情信息 |
|||
* |
|||
* @param |
|||
* @return void |
|||
* @author sun |
|||
*/ |
|||
@Override |
|||
public Result<ResiWarmAuditResultDTO> getDetail(ResiWarmGetDetailFormDTO formDTO) { |
|||
return resiPartymemberFeignClient.getDetail(formDTO); |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,10 @@ |
|||
package com.epmet.util; |
|||
|
|||
/** |
|||
* @Description 网格管理模块常量类 |
|||
* @IntefaceName ModuleConstant |
|||
* @Author wangc |
|||
* @date 2020.04.16 15:42 |
|||
*/ |
|||
public interface ModuleConstant { |
|||
} |
|||
@ -0,0 +1,71 @@ |
|||
server: |
|||
port: @server.port@ |
|||
servlet: |
|||
context-path: /gov/grid |
|||
|
|||
spring: |
|||
main: |
|||
allow-bean-definition-overriding: true |
|||
application: |
|||
name: gov-grid-server |
|||
#环境 dev|test|prod |
|||
profiles: |
|||
active: dev |
|||
messages: |
|||
encoding: UTF-8 |
|||
basename: i18n/messages_common |
|||
jackson: |
|||
time-zone: GMT+8 |
|||
date-format: yyyy-MM-dd HH:mm:ss |
|||
redis: |
|||
database: @spring.redis.index@ |
|||
host: @spring.redis.host@ |
|||
port: @spring.redis.port@ |
|||
password: @spring.redis.password@ |
|||
timeout: 30s |
|||
cloud: |
|||
nacos: |
|||
discovery: |
|||
server-addr: @nacos.server-addr@ |
|||
#nacos的命名空间ID，默认是public |
|||
namespace: @nacos.discovery.namespace@ |
|||
#不把自己注册到注册中心的地址 |
|||
register-enabled: @nacos.register-enabled@ |
|||
ip: @nacos.ip@ |
|||
config: |
|||
enabled: @nacos.config-enabled@ |
|||
server-addr: @nacos.server-addr@ |
|||
namespace: @nacos.config.namespace@ |
|||
group: @nacos.config.group@ |
|||
file-extension: yaml |
|||
management: |
|||
endpoints: |
|||
web: |
|||
exposure: |
|||
include: "*" |
|||
endpoint: |
|||
health: |
|||
show-details: ALWAYS |
|||
|
|||
|
|||
feign: |
|||
hystrix: |
|||
enabled: true |
|||
client: |
|||
config: |
|||
default: |
|||
loggerLevel: BASIC |
|||
httpclient: |
|||
enabled: true |
|||
|
|||
hystrix: |
|||
command: |
|||
default: |
|||
execution: |
|||
isolation: |
|||
thread: |
|||
timeoutInMilliseconds: 60000 #缺省为1000 |
|||
|
|||
ribbon: |
|||
ReadTimeout: 300000 |
|||
ConnectTimeout: 300000 |
|||
@ -0,0 +1,159 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<configuration> |
|||
<include resource="org/springframework/boot/logging/logback/base.xml"/> |
|||
|
|||
<property name="log.path" value="logs/gov-grid"/> |
|||
|
|||
<!-- 彩色日志格式 --> |
|||
<property name="CONSOLE_LOG_PATTERN" |
|||
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/> |
|||
|
|||
<!--1. 输出到控制台--> |
|||
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> |
|||
<!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息--> |
|||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> |
|||
<level>debug</level> |
|||
</filter> |
|||
<encoder> |
|||
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern> |
|||
<!-- 设置字符集 --> |
|||
<charset>UTF-8</charset> |
|||
</encoder> |
|||
</appender> |
|||
|
|||
<!--2. 输出到文档--> |
|||
<!-- 2.1 level为 DEBUG 日志，时间滚动输出 --> |
|||
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |
|||
<!-- 正在记录的日志文档的路径及文档名 --> |
|||
<file>${log.path}/debug.log</file> |
|||
<!--日志文档输出格式--> |
|||
<encoder> |
|||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> |
|||
<charset>UTF-8</charset> <!-- 设置字符集 --> |
|||
</encoder> |
|||
<!-- 日志记录器的滚动策略，按日期，按大小记录 --> |
|||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
|||
<!-- 日志归档 --> |
|||
<fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern> |
|||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> |
|||
<maxFileSize>100MB</maxFileSize> |
|||
</timeBasedFileNamingAndTriggeringPolicy> |
|||
<!--日志文档保留天数--> |
|||
<maxHistory>15</maxHistory> |
|||
</rollingPolicy> |
|||
<!-- 此日志文档只记录debug级别的 --> |
|||
<filter class="ch.qos.logback.classic.filter.LevelFilter"> |
|||
<level>debug</level> |
|||
<onMatch>ACCEPT</onMatch> |
|||
<onMismatch>DENY</onMismatch> |
|||
</filter> |
|||
</appender> |
|||
|
|||
<!-- 2.2 level为 INFO 日志，时间滚动输出 --> |
|||
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |
|||
<!-- 正在记录的日志文档的路径及文档名 --> |
|||
<file>${log.path}/info.log</file> |
|||
<!--日志文档输出格式--> |
|||
<encoder> |
|||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> |
|||
<charset>UTF-8</charset> |
|||
</encoder> |
|||
<!-- 日志记录器的滚动策略，按日期，按大小记录 --> |
|||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
|||
<!-- 每天日志归档路径以及格式 --> |
|||
<fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern> |
|||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> |
|||
<maxFileSize>100MB</maxFileSize> |
|||
</timeBasedFileNamingAndTriggeringPolicy> |
|||
<!--日志文档保留天数--> |
|||
<maxHistory>15</maxHistory> |
|||
</rollingPolicy> |
|||
<!-- 此日志文档只记录info级别的 --> |
|||
<filter class="ch.qos.logback.classic.filter.LevelFilter"> |
|||
<level>info</level> |
|||
<onMatch>ACCEPT</onMatch> |
|||
<onMismatch>DENY</onMismatch> |
|||
</filter> |
|||
</appender> |
|||
|
|||
<!-- 2.3 level为 WARN 日志，时间滚动输出 --> |
|||
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |
|||
<!-- 正在记录的日志文档的路径及文档名 --> |
|||
<file>${log.path}/warn.log</file> |
|||
<!--日志文档输出格式--> |
|||
<encoder> |
|||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> |
|||
<charset>UTF-8</charset> <!-- 此处设置字符集 --> |
|||
</encoder> |
|||
<!-- 日志记录器的滚动策略，按日期，按大小记录 --> |
|||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
|||
<fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern> |
|||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> |
|||
<maxFileSize>100MB</maxFileSize> |
|||
</timeBasedFileNamingAndTriggeringPolicy> |
|||
<!--日志文档保留天数--> |
|||
<maxHistory>15</maxHistory> |
|||
</rollingPolicy> |
|||
<!-- 此日志文档只记录warn级别的 --> |
|||
<filter class="ch.qos.logback.classic.filter.LevelFilter"> |
|||
<level>warn</level> |
|||
<onMatch>ACCEPT</onMatch> |
|||
<onMismatch>DENY</onMismatch> |
|||
</filter> |
|||
</appender> |
|||
|
|||
<!-- 2.4 level为 ERROR 日志，时间滚动输出 --> |
|||
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> |
|||
<!-- 正在记录的日志文档的路径及文档名 --> |
|||
<file>${log.path}/error.log</file> |
|||
<!--日志文档输出格式--> |
|||
<encoder> |
|||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> |
|||
<charset>UTF-8</charset> <!-- 此处设置字符集 --> |
|||
</encoder> |
|||
<!-- 日志记录器的滚动策略，按日期，按大小记录 --> |
|||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> |
|||
<fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern> |
|||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> |
|||
<maxFileSize>100MB</maxFileSize> |
|||
</timeBasedFileNamingAndTriggeringPolicy> |
|||
<!--日志文档保留天数--> |
|||
<maxHistory>15</maxHistory> |
|||
</rollingPolicy> |
|||
<!-- 此日志文档只记录ERROR级别的 --> |
|||
<filter class="ch.qos.logback.classic.filter.LevelFilter"> |
|||
<level>ERROR</level> |
|||
<onMatch>ACCEPT</onMatch> |
|||
<onMismatch>DENY</onMismatch> |
|||
</filter> |
|||
</appender> |
|||
|
|||
<!-- 开发、测试环境 --> |
|||
<springProfile name="dev,test"> |
|||
<logger name="org.springframework.web" level="INFO"/> |
|||
<logger name="org.springboot.sample" level="INFO"/> |
|||
<logger name="com.epmet.dao" level="INFO"/> |
|||
<logger name="com.epmet.dao" level="DEBUG"/> |
|||
<root level="INFO"> |
|||
<appender-ref ref="DEBUG_FILE"/> |
|||
<appender-ref ref="INFO_FILE"/> |
|||
<appender-ref ref="WARN_FILE"/> |
|||
<appender-ref ref="ERROR_FILE"/> |
|||
</root> |
|||
</springProfile> |
|||
|
|||
<!-- 生产环境 --> |
|||
<springProfile name="prod"> |
|||
<logger name="org.springframework.web" level="INFO"/> |
|||
<logger name="org.springboot.sample" level="INFO"/> |
|||
<logger name="com.epmet.dao" level="INFO"/> |
|||
<root level="INFO"> |
|||
<appender-ref ref="CONSOLE"/> |
|||
<appender-ref ref="DEBUG_FILE"/> |
|||
<appender-ref ref="INFO_FILE"/> |
|||
<appender-ref ref="WARN_FILE"/> |
|||
<appender-ref ref="ERROR_FILE"/> |
|||
</root> |
|||
</springProfile> |
|||
|
|||
</configuration> |
|||
@ -0,0 +1,20 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" |
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|||
<parent> |
|||
<artifactId>epmet-module</artifactId> |
|||
<groupId>com.epmet</groupId> |
|||
<version>2.0.0</version> |
|||
</parent> |
|||
<modelVersion>4.0.0</modelVersion> |
|||
|
|||
<artifactId>gov-grid</artifactId> |
|||
<packaging>pom</packaging> |
|||
<modules> |
|||
<module>gov-grid-client</module> |
|||
<module>gov-grid-server</module> |
|||
</modules> |
|||
|
|||
|
|||
</project> |
|||
@ -0,0 +1,47 @@ |
|||
package com.epmet.resi.group.dto.group.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 政府端查询待审核的小组 |
|||
* @ClassName ApplyingGroupsFormDTO |
|||
* @Author wangc |
|||
* @date 2020.04.17 14:59 |
|||
*/ |
|||
@Data |
|||
public class ApplyingGroupsFormDTO implements Serializable{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户Id |
|||
* */ |
|||
@NotBlank(message = "客户Id不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格Id |
|||
* */ |
|||
@NotBlank(message = "网格Id不能为空") |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 请求页码 最小是1 |
|||
* */ |
|||
@Min(value = 1) |
|||
private Integer pageNo; |
|||
|
|||
/** |
|||
* 每页数据 默认20 |
|||
* */ |
|||
private Integer pageSize = 20; |
|||
|
|||
/** |
|||
* 用户Id |
|||
* */ |
|||
@NotBlank(message = "用户Id不能为空") |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.resi.group.dto.group.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 通用的传参DTO 只传groupId和userId |
|||
* @ClassName CommonGroupIdFromDTO |
|||
* @Author wangc |
|||
* @date 2020.04.20 14:04 |
|||
*/ |
|||
@Data |
|||
public class CommonGroupIdFromDTO implements Serializable{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 组Id |
|||
* */ |
|||
@NotBlank(message = "组Id不能为空") |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 用户Id |
|||
* */ |
|||
@NotBlank(message = "用户Id不能为空") |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.resi.group.dto.group.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/20 9:30 |
|||
*/ |
|||
@Data |
|||
public class GovGroupSummarizeFromDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 小组id |
|||
*/ |
|||
private String groupId; |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package com.epmet.resi.group.dto.group.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/17 13:39 |
|||
*/ |
|||
@Data |
|||
public class GroupAuditedFromDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 客户id |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空") |
|||
private String customerId; |
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "网格id不能为空") |
|||
private String gridId; |
|||
/** |
|||
* 页码 |
|||
*/ |
|||
@NotBlank(message = "页码不能为空") |
|||
private Integer pageNo; |
|||
/** |
|||
* 每页显示数量 |
|||
*/ |
|||
@NotBlank(message = "每页显示数量不能为空") |
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,78 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Description 建组申请详情 |
|||
* @ClassName ApplyingGroupDetailResultDTO |
|||
* @Author wangc |
|||
* @date 2020.04.17 16:13 |
|||
*/ |
|||
@Data |
|||
public class ApplyingGroupDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 组Id |
|||
* */ |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 组名称 |
|||
* */ |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 组头像 |
|||
* */ |
|||
private String groupHeadPhoto; |
|||
|
|||
/** |
|||
* 组介绍 |
|||
* */ |
|||
private String groupIntroduction; |
|||
|
|||
/** |
|||
* 申请时间 |
|||
* */ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 组长名称 |
|||
* */ |
|||
private String groupLeaderName; |
|||
|
|||
/** |
|||
* 已同意该申请approved 、已驳回rejected |
|||
* */ |
|||
private String status; |
|||
|
|||
/** |
|||
* 驳回理由 |
|||
* */ |
|||
private String rejectReason; |
|||
|
|||
/** |
|||
* 从数据库中获取组长的用户Id,方便获取组长用户信息,返回时将此值置为NULL |
|||
* */ |
|||
private String leaderId; |
|||
|
|||
/** |
|||
* 街道 |
|||
* */ |
|||
private String street; |
|||
|
|||
/** |
|||
* 未读已读标识 unread read |
|||
* */ |
|||
private String readFlag; |
|||
|
|||
/** |
|||
* 从数据库中获取组操作记录Id,返回时将此值置为NULL |
|||
* */ |
|||
private String operationId; |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* @Description 政府端查询待审核的小组 |
|||
* @ClassName ApplyingGroupResultDTO |
|||
* @Author wangc |
|||
* @date 2020.04.17 15:20 |
|||
*/ |
|||
@Data |
|||
public class ApplyingGroupResultDTO implements Serializable{ |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 组Id |
|||
* */ |
|||
private String groupId; |
|||
|
|||
/** |
|||
* 组名称 |
|||
* */ |
|||
private String groupName; |
|||
|
|||
/** |
|||
* 组头像 |
|||
* */ |
|||
private String groupHeadPhoto; |
|||
|
|||
/** |
|||
* 申请时间 |
|||
* */ |
|||
private String createdTime; |
|||
|
|||
/** |
|||
* 审核人员已读未读标识(未读:unread ; 已读:read ) |
|||
* */ |
|||
private String readFlag; |
|||
|
|||
/** |
|||
* 消息通知内容 |
|||
* */ |
|||
private String messageText; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,43 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/20 9:24 |
|||
*/ |
|||
@Data |
|||
public class GovGroupSummarizeResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 组id |
|||
*/ |
|||
private String groupId; |
|||
/** |
|||
* 组头像 |
|||
*/ |
|||
private String groupHeadPhoto; |
|||
/** |
|||
* 组名 |
|||
*/ |
|||
private String groupName; |
|||
/** |
|||
* 成员总数 |
|||
*/ |
|||
private Integer totalMember; |
|||
/** |
|||
* 组长名称 |
|||
*/ |
|||
private String leaderName; |
|||
/** |
|||
* 组介绍 |
|||
*/ |
|||
private String groupIntroduction; |
|||
/** |
|||
* 话题总数 |
|||
*/ |
|||
private Integer totalTopics; |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/17 13:40 |
|||
*/ |
|||
@Data |
|||
public class GroupAuditedResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 小组ID |
|||
*/ |
|||
private String groupId; |
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
private String groupName; |
|||
/** |
|||
* 小组头像 |
|||
*/ |
|||
private String groupHeadPhoto; |
|||
/** |
|||
* 小组介绍 |
|||
*/ |
|||
private String groupIntroduction; |
|||
/** |
|||
* 小组状态已驳回rejected ，已通过approved |
|||
*/ |
|||
private String status; |
|||
/** |
|||
* 审核时间HH:mm |
|||
*/ |
|||
private Date auditedTime; |
|||
/** |
|||
* 消息通知内容 |
|||
*/ |
|||
private String messageText; |
|||
|
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2020/4/17 15:53 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class GroupsInGridResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 小组id |
|||
*/ |
|||
private String groupId; |
|||
/** |
|||
* 小组名称 |
|||
*/ |
|||
private String groupName; |
|||
/** |
|||
* 小组头像 |
|||
*/ |
|||
private String groupHeadPhoto; |
|||
/** |
|||
* 成员总数 |
|||
*/ |
|||
private Integer totalMember; |
|||
/** |
|||
* 党员总数 |
|||
*/ |
|||
private Integer totalPartyMember; |
|||
/** |
|||
* 当前状态审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed |
|||
*/ |
|||
private String status; |
|||
} |
|||
@ -0,0 +1,7 @@ |
|||
-- @Date 2020-04-17 15:37 |
|||
-- @Author wangc |
|||
-- @Description 数据库epmet_resi_group中的resi_group_operation(小组操作记录)表新增两个字段，db语句： |
|||
ALTER TABLE resi_group_operation ADD ( |
|||
READ_FLAG VARCHAR (8) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)', |
|||
MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容' |
|||
); |
|||
@ -0,0 +1,51 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.warmhearted.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 政府端-人工审核热心居民申请-审核通过-入参配置 |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class ResiWarmAuditApproveFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 热心居民申请id |
|||
*/ |
|||
@NotBlank(message = "申请ID不能为空") |
|||
private String applyId; |
|||
|
|||
/** |
|||
* 用户Id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 所属端 app |
|||
*/ |
|||
private String app; |
|||
|
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.warmhearted.form; |
|||
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表-入参配置 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class ResiWarmAuditFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 用户当前所在网格所属客户id |
|||
*/ |
|||
@NotBlank(message = "客户id不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 用户当前所在网格id |
|||
*/ |
|||
@NotBlank(message = "网格id不能为空") |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 页码 |
|||
*/ |
|||
@Min(1) |
|||
private Integer pageNo; |
|||
|
|||
/** |
|||
* 每页显示条数 |
|||
*/ |
|||
private Integer pageSize = 10; |
|||
|
|||
/** |
|||
* 审核状态 【key:audit_status,value:(under_auditting:待审核，approved:通过，rejected :未通过)】 |
|||
*/ |
|||
private String auditStatus; |
|||
|
|||
} |
|||
22
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java → epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmAuditRejectFormDTO.java
22
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java → epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmAuditRejectFormDTO.java
@ -0,0 +1,42 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.warmhearted.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 政府端-热心居民申请详情信息-入参配置 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class ResiWarmGetDetailFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 热心居民申请id |
|||
*/ |
|||
@NotBlank(message = "申请ID不能为空") |
|||
private String applyId; |
|||
|
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.resi.partymember.dto.warmhearted.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription 热心居民-审核历史请求参数 |
|||
* @date 2020/4/16 13:51 |
|||
*/ |
|||
@Data |
|||
public class ResiWarmheartedAuditedFromDTO implements Serializable { |
|||
private static final long serialVersionUID = -7290137219142856024L; |
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
/** |
|||
* 网格id |
|||
*/ |
|||
private String gridId; |
|||
/** |
|||
* 页码 |
|||
*/ |
|||
private Integer pageNo; |
|||
/** |
|||
* 每页显示数量 |
|||
*/ |
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,106 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.resi.partymember.dto.warmhearted.result; |
|||
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 政府端-获取待审核的热心居民申请列表-返参配置 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class ResiWarmAuditResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -1L; |
|||
|
|||
/** |
|||
* 申请单Id |
|||
*/ |
|||
private String applyId; |
|||
|
|||
/** |
|||
* 客户Id (customer.id) |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 网格Id (customer_grid.id) |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 申请用户id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 热心居民申请理由 (300字) |
|||
*/ |
|||
private String reason; |
|||
|
|||
/** |
|||
* 审核状态 【key:audit_status,value:(under_auditting:待审核，approved:通过，rejected :未通过)】 |
|||
*/ |
|||
private String auditStatus; |
|||
|
|||
/** |
|||
* 拒绝理由 |
|||
*/ |
|||
private String refuseReason; |
|||
|
|||
/** |
|||
* 申请用户头像 |
|||
*/ |
|||
private String userHeadPhoto; |
|||
|
|||
/** |
|||
* 申请用户的显示昵称 |
|||
*/ |
|||
private String userNickName; |
|||
|
|||
/** |
|||
* 阅读标记 未读unread 界面显示红点，已读read不显示红点 |
|||
*/ |
|||
private String readFlag; |
|||
|
|||
/** |
|||
* 消息通知内容 |
|||
*/ |
|||
private String messageText; |
|||
|
|||
/** |
|||
* 热心居民申请行为记录表Id (resi_warmhearted_visit.id) |
|||
*/ |
|||
private String resiWarmVisitId; |
|||
|
|||
/** |
|||
* 申请时间 |
|||
*/ |
|||
private Date applyTime; |
|||
|
|||
/** |
|||
* 街道 |
|||
*/ |
|||
private String street; |
|||
|
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
package com.epmet.resi.partymember.dto.warmhearted.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription 热心居民-审核历史返回值 |
|||
* @date 2020/4/16 13:52 |
|||
*/ |
|||
@Data |
|||
public class ResiWarmheartedAuditedResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 4109086860497055842L; |
|||
/** |
|||
* 申请单id |
|||
*/ |
|||
private String applyId; |
|||
/** |
|||
* 申请用户id |
|||
*/ |
|||
private String userId; |
|||
/** |
|||
* 申请用户头像 |
|||
*/ |
|||
private String userHeadPhoto; |
|||
/** |
|||
* 申请用户显示昵称 |
|||
*/ |
|||
private String userNickName; |
|||
/** |
|||
* 申请时间HH:mm |
|||
*/ |
|||
private Date applyTime; |
|||
/** |
|||
* 已驳回rejected ，已通过approved |
|||
*/ |
|||
private String status; |
|||
/** |
|||
* 消息通知内容 |
|||
*/ |
|||
private String messageText; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.modules.feign; |
|||
|
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.CustomerGridDTO; |
|||
import com.epmet.dto.form.CustomerGridFormDTO; |
|||
import com.epmet.dto.form.ListCustomerGridFormDTO; |
|||
import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
|
|||
|
|||
/** |
|||
* @Description Feign调用gov-org-server模块 |
|||
* @ClassName GovOrgFeginFallBack |
|||
* @Author sun |
|||
*/ |
|||
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) |
|||
public interface GovOrgFeignClient { |
|||
|
|||
/** |
|||
* 根据网格Id查询网格信息 |
|||
* @param customerGridFormDTO |
|||
* @return |
|||
*/ |
|||
@PostMapping("/gov/org/customergrid/getcustomergridbygridid") |
|||
Result<CustomerGridDTO> getCustomerGridByGridId(@RequestBody CustomerGridFormDTO customerGridFormDTO); |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.modules.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.constant.ServiceConstant; |
|||
import com.epmet.commons.tools.utils.ModuleUtils; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.CustomerGridDTO; |
|||
import com.epmet.dto.form.CustomerGridFormDTO; |
|||
import com.epmet.modules.feign.GovOrgFeignClient; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Description Feign |
|||
* @ClassName GovOrgFeginFallBack |
|||
* @Author sun |
|||
*/ |
|||
@Component |
|||
public class GovOrgFeignClientFallBack implements GovOrgFeignClient { |
|||
|
|||
/** |
|||
* 根据网格Id查询网格信息 |
|||
* @param customerGridFormDTO |
|||
* @return |
|||
*/ |
|||
@Override |
|||
public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) { |
|||
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId",customerGridFormDTO); |
|||
} |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.modules.warmhearted.constant; |
|||
|
|||
/** |
|||
* @Description 热心居民模块消息通知 |
|||
* @Author sun |
|||
*/ |
|||
public interface ResiWarmUserMessageConstant { |
|||
|
|||
/** |
|||
* 消息标题 |
|||
*/ |
|||
String GROUP_TITLE = "您有一条小组消息"; |
|||
|
|||
/** |
|||
* 热心居民提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为热心居民，请审核。 |
|||
*/ |
|||
String RESIWARM_APPLY_MSG = "%s申请成为热心居民，请审核。"; |
|||
|
|||
/** |
|||
* 热心居民申请审核通过给申请人发送消息：您好，您申请的第三网格热心居民已审核通过，请查看。 |
|||
*/ |
|||
String AUDIT_APPROVE_MSG = "您好，您申请的%s热心居民已审核通过，请查看。"; |
|||
|
|||
/** |
|||
* 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，由于不符合条件的原因，已被驳回。 |
|||
*/ |
|||
String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，由于不符合条件的原因，已被驳回。"; |
|||
|
|||
} |
|||
@ -0,0 +1,5 @@ |
|||
#epmet_resi_partymember数据库-热心居民申请表新增字段 |
|||
ALTER TABLE resi_warmhearted_apply ADD ( |
|||
READ_FLAG VARCHAR (255) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)', |
|||
MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容' |
|||
); |
|||
Loading…
Reference in new issue