springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -13,6 +13,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO; import com.panzhihua.common.model.vos.user.NoticeUnReadVO; import com.panzhihua.common.model.vos.user.SysUserAgreementVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; @@ -358,4 +359,10 @@ public R readUserReward(){ return communityService.readUserReward(this.getUserId(),this.getCommunityId()); } @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class) @GetMapping("easyphoto/classify/list") public R easyPhotoClassifyList() { return communityService.listPhotoClassify(); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java
New file @@ -0,0 +1,51 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @Slf4j @Api(tags = {"随手拍分类"}) @RestController @RequestMapping("/classify") public class EasyPhotoClassifyApi { @Resource private CommunityService communityService; @ApiOperation(value = "随手拍分类-新增") @PostMapping("/add") public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return communityService.addPhotoClassify(addPhotoClassify); } @ApiOperation(value = "随手拍分类-编辑") @PostMapping("/edit") public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return communityService.editPhotoClassify(addPhotoClassify); } @ApiOperation(value = "随手拍分类-分页") @PostMapping("/page") public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return communityService.pagePhotoClassify(addPhotoClassify); } @ApiOperation(value = "随手拍分类-详情") @GetMapping("/detail") public R detailPhotoClassify(@RequestParam("id") Long id) { return communityService.detailPhotoClassify(id); } @ApiOperation(value = "随手拍分类-删除") @GetMapping("/delete") public R deletePhotoClassify(@RequestParam("id") Long id) { return communityService.deletePhotoClassify(id); } } springcloud_k8s_panzhihuazhihuishequ/common/common.iml
New file @@ -0,0 +1,154 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="Spring" name="Spring"> <configuration /> </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-core:5.6.7" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.38" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.38" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" /> <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" /> <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.14" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" /> <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" /> <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" /> <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" /> <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" /> <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.10.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" /> <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" /> <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" /> <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" /> <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" /> <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" /> <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" /> <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" /> <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" /> <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" /> <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" /> <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" /> <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.8.1" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" /> <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" /> <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" /> <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" /> <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" /> <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.5" level="project" /> <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" /> <orderEntry type="library" name="Maven: com.tencentcloudapi:tencentcloud-sdk-java:3.1.286" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.12.0" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" /> <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" /> <orderEntry type="library" name="Maven: com.squareup.okhttp:logging-interceptor:2.7.5" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.7" level="project" /> <orderEntry type="library" name="Maven: com.esotericsoftware:reflectasm:1.11.9" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" /> <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" /> <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" /> <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" /> <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" /> </component> </module> springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java
New file @@ -0,0 +1,29 @@ package com.panzhihua.common.model.dtos.community.easyPhoto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("添加随手拍活动请求参数") public class AddEasyPhotoClassifyDTO { @ApiModelProperty("随手拍分类id") private Long id; @ApiModelProperty("随手拍分类名称") private String name; @ApiModelProperty("权重") private Integer weight; @ApiModelProperty("备注") private String remark; @ApiModelProperty(value = "分页每页数量",example = "10") private Long pageSize = 10L; @ApiModelProperty(value = "分页当前记录数",example = "1") private Long pageNum = 1L; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/ExportEasyPhotoDTO.java
New file @@ -0,0 +1,31 @@ package com.panzhihua.common.model.dtos.community.easyPhoto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; import java.util.List; @Data public class ExportEasyPhotoDTO { @ApiModelProperty(value = "批量勾选时传参数组") private List<Integer> ids; @ApiModelProperty(value = "关键词") private String keyWord; @ApiModelProperty("社区id") private Long communityId; private Integer type; @ApiModelProperty("处理人名字") private String handlerName; @ApiModelProperty("查询-创建开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createBegin; @ApiModelProperty("查询-创建结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createEnd; @ApiModelProperty("城管安排状态") private Integer urbanStatus; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -106,7 +106,7 @@ @ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0") private Integer isNeedFeedBack; @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈 4.完成随手拍") @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍") private Integer type; @ApiModelProperty(value = "登录用户id",hidden = true) @@ -143,7 +143,7 @@ @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)") private String lngLat; @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般）") @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般 5.无）") private Integer activityType; @ApiModelProperty(value = "参加活动奖励金额") @@ -170,4 +170,34 @@ @ApiModelProperty(value = "完成人名称") private String completeName; @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回") private Integer isReportUrban; @ApiModelProperty(value = "城管移交说明（备注）") private String transferReason; @ApiModelProperty("移交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date transferTime; @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理") private Integer urbanStatus; @ApiModelProperty(value = "社区名字") private String communityName; @ApiModelProperty(value = "随手拍分类id") private Long classifyId; @ApiModelProperty(value = "随手拍分类名称") private String classifyName; /** * 是否上报城管 0未上报 1已上报 2已退回 */ public interface isReportUrban{ int no = 0; int yes = 1; int ret = 2; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoClassifyVO.java
New file @@ -0,0 +1,23 @@ package com.panzhihua.common.model.vos.community.easyPhoto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("随手拍分类返回参数") public class ComActEasyPhotoClassifyVO { @ApiModelProperty("随手拍分类id") private Long id; @ApiModelProperty("随手拍分类名称") private String name; @ApiModelProperty("权重") private Integer weight; @ApiModelProperty("备注") private String remark; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoCountVO.java
New file @@ -0,0 +1,9 @@ package com.panzhihua.common.model.vos.community.easyPhoto; import lombok.Data; @Data public class ComActEasyPhotoCountVO { private Integer total; private Integer today; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ExportEasyPhotoVO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.vos.community.easyPhoto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; @Data public class ExportEasyPhotoVO { @ExcelProperty("所属社区") private String communityName; @ExcelProperty("发起人") private String sponsorName; @ExcelProperty("事件详情") private String detail; @ExcelProperty("发生地点") private String happenAddr; @ExcelProperty("事件类型") private String photoType="其他"; @ExcelProperty("联系电话") private String phone; @ExcelProperty("处理人名字") private String handlerName; @ExcelProperty("创建时间") private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireStatisticsSummaryHeaderAdminVO.java
@@ -26,6 +26,9 @@ @ApiModelProperty("未填报党员") private Integer noPartymemberCount = 0; @ApiModelProperty("填报率") private Integer tag = 0; private BigDecimal tag = BigDecimal.ZERO; @ApiModelProperty("社区小程序用户总人数") private Integer userCount = 0; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -10,10 +10,7 @@ import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.*; import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO; import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO; import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO; @@ -337,6 +334,24 @@ @PostMapping("puteasyphotostatus") R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); /** * 城管随手拍统计 */ @PostMapping("/esayPhotoCount") R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); /** * * 城管安排 */ @PostMapping("updatePageeasyphoto") R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); /** * * 随手拍城管导出 */ @PostMapping("exportEasyPhoto") R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO); /** * 新增社区 * @@ -4217,6 +4232,9 @@ @PostMapping("timedTaskActivityNotice") R timedTaskActivityNotice(); /** * 定时任务检测待发布，调研中的问卷调查状态 */ @PostMapping("timedTaskQuestionnaire") R timedTaskQuestionnaire(); @@ -4265,5 +4283,69 @@ * @return 问卷调查统计汇总表头统计数据 */ @GetMapping("/questnaire/statisticsSummary/header") R statisticsSummaryHeader(@RequestParam("questId") Long questId); R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId); /** * 运营后台-新增随手拍分类 * @param addPhotoClassify 请求参数 * @return 新增结果 */ @PostMapping("/classify/admin/add") R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-编辑随手拍分类 * @param addPhotoClassify 请求参数 * @return 编辑结果 */ @PostMapping("/classify/admin/edit") R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-分页查询随手拍分类 * @param addPhotoClassify 请求参数 * @return 随手拍分类列表 */ @PostMapping("/classify/admin/page") R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-随手拍分类详情 * @param id 随手拍分类id * @return 随手拍分类 */ @GetMapping("/classify/admin/detail") R detailPhotoClassify(@RequestParam("id") Long id); /** * 运营后台-随手拍分类删除 * @param id 随手拍分类id * @return 删除结果 */ @GetMapping("/classify/admin/delete") R deletePhotoClassify(@RequestParam("id") Long id); /** * 运营后台-查询随手拍分类列表 * @return 随手拍分类列表 */ @GetMapping("/classify/admin/list") R listPhotoClassify(); /** * 社区后台-切换随手拍公示状态 * @param comActEasyPhotoVO 请求参数 * @return 切换结果 */ @PostMapping("/easyphoto/switch/publicity") R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); /** * 查询社区待处理随手拍id集合 * @param communityId 社区id * @return 社区待处理随手拍id集合 */ @GetMapping("/easyphoto/noHandle/list") R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -791,4 +791,12 @@ */ @GetMapping("getUserOpenId") R getUserOpenId(@RequestParam("userId")Long userId); /** * 查询社区后台工作人员列表 * @param communityId 社区id * @return 社区后台工作人员列表 */ @GetMapping("getUserListByCommunityId") R getUserListByCommunityId(@RequestParam("communityId")Long communityId); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -1,36 +1,42 @@ package com.panzhihua.community_backstage.api; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.common.utlis.*; import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.stream.Collectors; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -47,6 +53,21 @@ private UserService userService; @Resource private CommunityService communityService; @Value("${excel.userurl}") private String excelUrl; // FTP 登录用户名 @Value("${ftp.username}") private String userName; // FTP 登录密码 @Value("${ftp.password}") private String password; // FTP 服务器地址IP地址 @Value("${ftp.host}") private String host; // FTP 端口 @Value("${ftp.port}") private int port; @ApiOperation(value = "活动负责人下拉选择", response = ActivityManagerVO.class) @GetMapping("listactivitymanager") @@ -258,6 +279,87 @@ comActEasyPhotoVO.setCommunityId(communityId); // comActEasyPhotoVO.setBackUserId(userId); return communityService.pageEasyPhoto(comActEasyPhotoVO); } @ApiOperation(value = "城管分页查询随手拍") @PostMapping("pageeasyphoto/urban") public R pageEasyPhotoUrban(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { comActEasyPhotoVO.setIsReportUrban(1); return communityService.pageEasyPhoto(comActEasyPhotoVO); } @ApiOperation(value = "城管随手拍统计") @PostMapping("pageeasyphoto/urbanCount") public R pageEasyPhotoUrbanCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return communityService.esayphotoCount(comActEasyPhotoVO); } /** * 城管安排 * * @param comActEasyPhotoVO 查询参数 * @return 心愿列表 */ @ApiOperation(value = "城管安排") @PostMapping("updatePageeasyphoto") public R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return communityService.updatePageeasyphoto(comActEasyPhotoVO); } @ApiOperation(value = "城管随手拍导出") @PostMapping("exportEasyPhoto") public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO){ String url = excelUrl; String name = "随手拍.xlsx"; String ftpUrl = "/mnt/data/web/excel/"; R r=communityService.exportEasyPhoto(exportEasyPhotoDTO); if(R.isOk(r)){ List<ExportEasyPhotoVO> comActEasyPhotoVOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ExportEasyPhotoVO.class); try { SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { String property = System.getProperty("user.dir"); String fileName = property + File.separator + name; // 这里 需要指定写用哪个class去写 ExcelWriter excelWriter = null; InputStream inputStream = null; try { excelWriter = EasyExcel.write(fileName, ExportEasyPhotoVO.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet("随手拍导出").build(); excelWriter.write(comActEasyPhotoVOS, writeSheet); excelWriter.finish(); File file = new File(fileName); inputStream = new FileInputStream(file); sftp.uploadMore(ftpUrl, name, inputStream); sftp.logout(); inputStream.close(); String absolutePath = file.getAbsolutePath(); boolean delete = file.delete(); log.info("删除excel【{}】结果【{}】", absolutePath, delete); } finally { // 千万别忘记finish 会帮忙关闭流 if (inputStream != null) { inputStream.close(); } if (excelWriter != null) { excelWriter.finish(); } } } return R.ok(url + name); } catch (Exception e) { e.printStackTrace(); log.error("文件传输失败【{}】", e.getMessage()); return R.fail(); } } return R.fail("未查询到数据"); } @ApiOperation(value = "查询所有社区列表") @GetMapping("community/list") public R getCommunityLists(){ return communityService.getCommunityLists(); } @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class) @@ -522,4 +624,35 @@ return communityService.grantReward(grantRewardDTO); } @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class) @GetMapping("easyphoto/classify/list") public R easyPhotoClassifyList() { return communityService.listPhotoClassify(); } @ApiOperation(value = "随手拍切换公示状态", response = ComActEasyPhotoClassifyVO.class) @PostMapping("easyphoto/switch/publicity") public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return communityService.easyPhotoSwitchPublicity(comActEasyPhotoVO); } @ApiOperation(value = "查询社区后台工作人员列表", response = ComActEasyPhotoClassifyVO.class) @GetMapping("easyphoto/user/list") public R easyPhotoUserList() { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if(loginUserInfo == null){ return R.fail("请先登录"); } return userService.getUserListByCommunityId(loginUserInfo.getCommunityId()); } @ApiOperation(value = "查询社区后台待处理随手拍id") @GetMapping("easyphoto/noHandle/list") public R easyPhotoNoHandleList() { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if(loginUserInfo == null){ return R.fail("请先登录"); } return communityService.easyPhotoNoHandleList(loginUserInfo.getCommunityId()); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityQuestnaireApi.java
@@ -224,7 +224,7 @@ if (firstvo != null) { Date time = firstvo.getCreateAt(); if(time!=null) { String sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(time); String sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(time); dateStr = sd; } } @@ -349,7 +349,11 @@ @ApiOperation(value = "问卷调查统计汇总表头统计-lyq", response = QuestnaireStatisticsSummaryHeaderAdminVO.class) @GetMapping("/statistics/summary/header") public R statisticsSummaryHeader(@RequestParam("questId") Long questId) { return communityService.statisticsSummaryHeader(questId); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); if(loginUserInfo == null){ return R.fail("请先登录"); } return communityService.statisticsSummaryHeader(questId,loginUserInfo.getCommunityId()); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -478,6 +479,24 @@ } /** * 城管安排 * * @param comActEasyPhotoVO 查询参数 * @return 心愿列表 */ @PostMapping("updatePageeasyphoto") public R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return comActEasyPhotoService.updatePageeasyphoto(comActEasyPhotoVO); } /** * 城管导出 */ @PostMapping("exportEasyPhoto") public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO){ return comActEasyPhotoService.export(exportEasyPhotoDTO); } /** * 随手拍详情 * * @param id 随手拍主键 @@ -645,6 +664,14 @@ @PostMapping("puteasyphotostatus") public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return comActEasyPhotoService.putEasypHotoStatus(comActEasyPhotoVO); } /** * 城管随手拍统计 */ @PostMapping("/esayPhotoCount") public R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return comActEasyPhotoService.easyPhotoCount(comActEasyPhotoVO); } /** @@ -1551,6 +1578,12 @@ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO); } /** * 小程序-用户弹窗添加不在提醒接口 * @param questId 问卷id * @param userId 用户id * @return 添加结果 */ @GetMapping("questnaire/add/noNotice") public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){ return comActQuestnaireService.addNoNotice(questId,userId); @@ -1839,29 +1872,71 @@ return comActActivityService.timedTaskActivityNotice(); } /** * 问卷调查统计汇总 * @param summaryDTO 请求参数 * @return 统计汇总 */ @PostMapping("questnaire/statisticsSummary") public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) { return comActQuestnaireService.statisticsSummary(summaryDTO); } /** * 问卷调查统计汇总导出数据查询 * @param questId 调查问卷id * @return 调查统计汇总导出数据 */ @GetMapping("questnaire/statisticsSummary/export") public R statisticsSummaryExport(@RequestParam("questId") Long questId) { return comActQuestnaireService.statisticsSummaryExport(questId); } /** * 问卷调查统计汇总表头统计 * @param questId 调查问卷id * @return 问卷调查统计汇总表头统计数据 */ @GetMapping("questnaire/statisticsSummary/header") public R statisticsSummaryHeader(@RequestParam("questId") Long questId) { return comActQuestnaireService.statisticsSummaryHeader(questId); public R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId) { return comActQuestnaireService.statisticsSummaryHeader(questId,communityId); } /** * 定时任务检测待发布，调研中的问卷调查状态 */ @PostMapping("timedTaskQuestionnaire") public R timedTaskQuestionnaire(){ return comActQuestnaireService.timedTaskQuestionnaire(); } /** * 小程序-新增问卷调查浏览数量 * @param questId 问卷调查id * @return 增加结果 */ @GetMapping("questnaire/add/view") public R addQuestnaireView(@RequestParam("questId") Long questId) { return comActQuestnaireService.addQuestnaireView(questId); } /** * 社区后台-切换随手拍公示状态 * @param comActEasyPhotoVO 请求参数 * @return 切换结果 */ @PostMapping("easyphoto/switch/publicity") public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { return comActEasyPhotoService.easyPhotoSwitchPublicity(comActEasyPhotoVO); } /** * 查询社区待处理随手拍id集合 * @param communityId 社区id * @return 社区待处理随手拍id集合 */ @GetMapping("easyphoto/noHandle/list") public R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId) { return comActEasyPhotoService.easyPhotoNoHandleList(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java
New file @@ -0,0 +1,77 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/classify") public class EasyPhotoClassifyApi { @Resource private ComActEasyPhotoClassifyService comActEasyPhotoClassifyService; /** * 运营后台-新增随手拍分类 * @param addPhotoClassify 请求参数 * @return 新增结果 */ @PostMapping("/admin/add") public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return comActEasyPhotoClassifyService.addPhotoClassify(addPhotoClassify); } /** * 运营后台-编辑随手拍分类 * @param addPhotoClassify 请求参数 * @return 编辑结果 */ @PostMapping("/admin/edit") public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return comActEasyPhotoClassifyService.editPhotoClassify(addPhotoClassify); } /** * 运营后台-随手拍分类详情 * @param id 随手拍分类id * @return 随手拍分类 */ @GetMapping("/admin/detail") public R detailPhotoClassify(@RequestParam("id") Long id) { return comActEasyPhotoClassifyService.detailPhotoClassify(id); } /** * 运营后台-分页查询随手拍分类 * @param addPhotoClassify 请求参数 * @return 随手拍分类列表 */ @PostMapping("/admin/page") public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) { return comActEasyPhotoClassifyService.pagePhotoClassify(addPhotoClassify); } /** * 运营后台-查询随手拍分类列表 * @return 随手拍分类列表 */ @GetMapping("/admin/list") public R listPhotoClassify() { return comActEasyPhotoClassifyService.listPhotoClassify(); } /** * 运营后台-随手拍分类删除 * @param id 随手拍分类id * @return 删除结果 */ @GetMapping("/admin/delete") public R deletePhotoClassify(@RequestParam("id") Long id) { return comActEasyPhotoClassifyService.deletePhotoClassify(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoClassifyMapper.java
New file @@ -0,0 +1,35 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; /** * @auther lyq * @create 2021-08-19 15:50:58 * @describe 随手拍分类表mapper类 */ @Mapper public interface ComActEasyPhotoClassifyMapper extends BaseMapper<ComActEasyPhotoClassifyDO> { /** * 运营后台-分页查询随手拍分类 * @param photoClassifyDTO 请求参数 * @return 随手拍分类列表 */ IPage<ComActEasyPhotoClassifyVO> getPhotoClassifyPage(Page page, @Param("photoClassifyDTO") AddEasyPhotoClassifyDTO photoClassifyDTO); /** * 运营后台-查询随手拍分类列表 * @return 随手拍分类列表 */ List<ComActEasyPhotoClassifyVO> getPhotoClassifyList(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -3,13 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO; import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO; import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO; import com.panzhihua.common.model.vos.screen.EastPhotoVO; import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO; import com.panzhihua.common.model.vos.screen.PbWorkVO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -198,13 +199,19 @@ "p.activity_id, " + "p.activity_amount, " + "count(pu.id)giveThumbsUpNum, " + "p.handle_photo_list " + "p.handle_photo_list," + "c.name communityName," + "p.transfer_time," + "p.is_report_urban," + "p.transfer_reason," + "p.urban_status " + "FROM " + "com_act_easy_photo p " + "JOIN sys_user u on p.sponsor_id=u.user_id " + "LEFT JOIN sys_user su on p.handler_id=su.user_id " + "LEFT JOIN sys_user su1 on p.complete_id=su1.user_id " + "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " + "LEFT JOIN com_act c on p.community_id=c.community_id " + "WHERE p.del_tag = 0 and p.id=#{id}") ComActEasyPhotoVO detailEasyPhoto(Long id); @Select("SELECT " + @@ -247,6 +254,8 @@ "p.feedback_at, " + "p.activity_type, " + "p.activity_amount, " + "p.classify_id, " + "class.`name` as classifyName, " + "p.examine_at " + "FROM " + "com_act_easy_photo p " + @@ -254,8 +263,9 @@ "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id " + "left JOIN sys_user su ON p.handler_id = su.user_id " + "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id " + "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id " + " <where>" + " p.del_tag = 0 " + " p.del_tag = 0 and p.is_publicity = 1 " + "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" + " and p.community_id=#{comActEasyPhotoVO.communityId} " + " </if> " + @@ -267,6 +277,9 @@ " </if> " + "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" + "AND p.`status` in (2,4) " + " </if> " + "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != ""'>" + "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%')) " + " </if> " + "group by p.id "+ "order by p.create_at desc "+ @@ -318,4 +331,14 @@ // " `status` = 1 " + // " AND community_id = #{communityId} and del_tag = 0") ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId); ComActEasyPhotoCountVO easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO); List<ExportEasyPhotoVO> export(ExportEasyPhotoDTO exportEasyPhotoDTO); List<ExportEasyPhotoVO> exportByIds(List<Integer> ids); /** * 查询社区待处理随手拍id集合 * @param communityId 社区id * @return 社区待处理随手拍id集合 */ List<Long> easyPhotoNoHandleIds(@Param("communityId")Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -154,11 +154,26 @@ */ QuestnaireDetailAdminVO getQuesDetail(@Param("questId") Long questId,@Param("userId") Long userId); /** * 问卷调查统计汇总 * @param summaryDTO 请求参数 * @return 统计汇总 */ IPage<QuestnaireStatisticsSummaryAdminVO> getStatisticsSummaryAdmin(Page page, @Param("summaryDTO") StatisticsSummaryDTO summaryDTO); /** * 问卷调查统计汇总导出数据查询 * @param questId 调查问卷id * @return 调查统计汇总导出数据 */ List<QuestnaireStatisticsSummaryExcelAdminVO> getStatisticsSummaryExcelAdmin(@Param("questId") Long questId); QuestnaireStatisticsSummaryHeaderAdminVO statisticsSummaryHeader(@Param("questId") Long questId); /** * 问卷调查统计汇总表头统计 * @param questId 调查问卷id * @return 问卷调查统计汇总表头统计数据 */ QuestnaireStatisticsSummaryHeaderAdminVO statisticsSummaryHeader(@Param("questId") Long questId,@Param("communityId") Long communityId); void addNoNotice(@Param("questId") Long questId,@Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoClassifyDO.java
New file @@ -0,0 +1,80 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @auther lyq * @create 2021-08-19 15:50:58 * @describe 随手拍分类表实体类 */ @Data @TableName("com_act_easy_photo_classify") public class ComActEasyPhotoClassifyDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键id */ @TableId(type = IdType.AUTO) private Long id; /** * 随手拍分类名称 */ private String name; /** * 状态（1.启用 2.禁用） */ private Integer status; /** * 权重 */ private Integer weight; /** * 备注 */ private String remark; /** * 创建时间 */ private Date createAt; /** * 修改时间 */ private Date updateAt; /** * 状态（1.启用 2.禁用） */ public interface status{ int yes = 1; int no = 2; } @Override public String toString() { return "ComActEasyPhotoClassifyDO{" + "id=" + id + ", name=" + name + ", status=" + status + ", weight=" + weight + ", remark=" + remark + ", createAt=" + createAt + ", updateAt=" + updateAt + "}"; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -145,6 +145,34 @@ * 完成人id */ private Long completeId; /** * 是否上报到城管（ 0未上报 1已上报 2已退回） */ private Integer isReportUrban; /** * 城管安排状态 （0未安排 1已安排 2已处理） */ private Integer urbanStatus; /** * 城管退回原因 */ private String backResult; /** * 移交时间 */ private Date transferTime; /** * 移交说明 */ private String transferReason; /** * 退回时间 */ private Date backTime; /** * 随手拍分类id */ private Long classifyId; /** * 参加活动标签（1.优质 2.精良 3.普通 4.一般） @@ -154,6 +182,7 @@ int jl = 2; int pt = 3; int yb = 4; int wu = 5; } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoClassifyService.java
New file @@ -0,0 +1,57 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO; /** * @auther lyq * @create 2021-08-19 15:50:58 * @describe 随手拍分类表服务类 */ public interface ComActEasyPhotoClassifyService extends IService<ComActEasyPhotoClassifyDO> { /** * 运营后台-新增随手拍分类 * @param addPhotoClassify 请求参数 * @return 新增结果 */ R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-编辑随手拍分类 * @param addPhotoClassify 请求参数 * @return 编辑结果 */ R editPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-随手拍分类详情 * @param id 随手拍分类id * @return 随手拍分类 */ R detailPhotoClassify(Long id); /** * 运营后台-分页查询随手拍分类 * @param addPhotoClassify 请求参数 * @return 随手拍分类列表 */ R pagePhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify); /** * 运营后台-查询随手拍分类列表 * @return 随手拍分类列表 */ R listPhotoClassify(); /** * 运营后台-随手拍分类删除 * @param id 随手拍分类id * @return 删除结果 */ R deletePhotoClassify(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.dtos.community.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; @@ -114,5 +115,22 @@ */ R readUserReward(Long userId,Long communityId); R easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO); /** * 社区后台-切换随手拍公示状态 * @param comActEasyPhotoVO 请求参数 * @return 切换结果 */ R easyPhotoSwitchPublicity(ComActEasyPhotoVO comActEasyPhotoVO); R updatePageeasyphoto(ComActEasyPhotoVO comActEasyPhotoVO); R export(ExportEasyPhotoDTO exportEasyPhotoDTO); /** * 查询社区待处理随手拍id集合 * @param communityId 社区id * @return 社区待处理随手拍id集合 */ R easyPhotoNoHandleList(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
@@ -117,15 +117,44 @@ */ R getQuesDetail(Long questId,Long userId); /** * 问卷调查统计汇总 * @param summaryDTO 请求参数 * @return 统计汇总 */ R statisticsSummary(StatisticsSummaryDTO summaryDTO); /** * 问卷调查统计汇总导出数据查询 * @param questId 调查问卷id * @return 调查统计汇总导出数据 */ R statisticsSummaryExport(Long questId); R statisticsSummaryHeader(Long questId); /** * 问卷调查统计汇总表头统计 * @param questId 调查问卷id * @return 问卷调查统计汇总表头统计数据 */ R statisticsSummaryHeader(Long questId,Long communityId); /** * 定时任务检测待发布，调研中的问卷调查状态 */ R timedTaskQuestionnaire(); /** * 小程序-新增问卷调查浏览数量 * @param questId 问卷调查id * @return 增加结果 */ R addQuestnaireView(Long questId); /** * 小程序-用户弹窗添加不在提醒接口 * @param questId 问卷id * @param userId 用户id * @return 添加结果 */ R addNoNotice(Long questId,Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java
New file @@ -0,0 +1,119 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO; import com.panzhihua.service_community.dao.ComActEasyPhotoClassifyMapper; import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO; import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Date; /** * @auther lyq * @create 2021-08-19 15:50:58 * @describe 随手拍分类表服务实现类 */ @Slf4j @Service public class ComActEasyPhotoClassifyServiceImpl extends ServiceImpl<ComActEasyPhotoClassifyMapper, ComActEasyPhotoClassifyDO> implements ComActEasyPhotoClassifyService { /** * 运营后台-新增随手拍分类 * @param addPhotoClassify 请求参数 * @return 新增结果 */ @Override public R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){ ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectOne(new QueryWrapper<ComActEasyPhotoClassifyDO>().lambda() .eq(ComActEasyPhotoClassifyDO::getName,addPhotoClassify.getName())); if(photoClassifyDO != null){ return R.fail("该随手拍分类已存在，请勿重复添加"); } photoClassifyDO = new ComActEasyPhotoClassifyDO(); BeanUtils.copyProperties(addPhotoClassify,photoClassifyDO); photoClassifyDO.setCreateAt(new Date()); photoClassifyDO.setStatus(ComActEasyPhotoClassifyDO.status.yes); if(this.baseMapper.insert(photoClassifyDO) > 0){ return R.ok(); }else{ return R.fail(); } } /** * 运营后台-编辑随手拍分类 * @param addPhotoClassify 请求参数 * @return 编辑结果 */ @Override public R editPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){ ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectById(addPhotoClassify.getId()); if(photoClassifyDO == null){ return R.fail("该随手拍分类不存在"); } BeanUtils.copyProperties(addPhotoClassify,photoClassifyDO); photoClassifyDO.setUpdateAt(new Date()); if(this.baseMapper.updateById(photoClassifyDO) > 0){ return R.ok(); }else{ return R.fail(); } } /** * 运营后台-随手拍分类详情 * @param id 随手拍分类id * @return 随手拍分类 */ @Override public R detailPhotoClassify(Long id){ ComActEasyPhotoClassifyVO photoClassifyVO = new ComActEasyPhotoClassifyVO(); ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectById(id); if(photoClassifyDO == null){ return R.fail("该随手拍分类不存在"); } BeanUtils.copyProperties(photoClassifyDO,photoClassifyVO); return R.ok(photoClassifyVO); } /** * 运营后台-分页查询随手拍分类 * @param addPhotoClassify 请求参数 * @return 随手拍分类列表 */ @Override public R pagePhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){ return R.ok(this.baseMapper.getPhotoClassifyPage(new Page(addPhotoClassify.getPageNum(),addPhotoClassify.getPageSize()),addPhotoClassify)); } /** * 运营后台-查询随手拍分类列表 * @return 随手拍分类列表 */ @Override public R listPhotoClassify(){ return R.ok(this.baseMapper.getPhotoClassifyList()); } /** * 运营后台-随手拍分类删除 * @param id 随手拍分类id * @return 删除结果 */ @Override public R deletePhotoClassify(Long id){ if(this.baseMapper.deleteById(id) > 0){ return R.ok(); }else{ return R.fail(); } } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -8,8 +8,10 @@ import com.panzhihua.common.model.dtos.community.GrantRewardDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO; import com.panzhihua.common.utlis.*; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; @@ -18,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; @@ -87,7 +90,6 @@ }else { comActEasyPhotoVO1.setHaveGiveThumbsUp(1); } comActEasyPhotoVO1.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO1.getPhone())); if(comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)){ //查询随手拍活动 @@ -102,6 +104,8 @@ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward()); }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward()); }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.wu)){ comActEasyPhotoVO1.setActivityMoney(BigDecimal.ZERO); } } } @@ -148,7 +152,7 @@ comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList); } comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone())); // comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone())); if(comActEasyPhotoVO.getAddrRemark()==null){ comActEasyPhotoVO.setAddrRemark(""); } @@ -248,11 +252,19 @@ switch (type){ case 1: if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){ return R.fail("该随手拍已审核，不可重复操作"); return R.fail("该随手拍已处理，不可重复操作"); } cmActEasyPhotoDO.setStatus(2);//进行中 cmActEasyPhotoDO.setIsNeedFeedBack(1); cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId()); cmActEasyPhotoDO.setIsPublicity(comActEasyPhotoVO.getIsPublicity()); if(comActEasyPhotoVO.getIsReportUrban().equals(ComActEasyPhotoVO.isReportUrban.yes)){ cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.yes); cmActEasyPhotoDO.setTransferReason(comActEasyPhotoVO.getTransferReason()); cmActEasyPhotoDO.setTransferTime(nowDate); }else{ cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no); cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId()); } cmActEasyPhotoDO.setExamineAt(nowDate); cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType()); if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){ @@ -269,17 +281,17 @@ comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO); break; case 2: if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){ return R.fail("该随手拍已审核，不可重复操作"); } cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId()); cmActEasyPhotoDO.setStatus(3);//已驳回 cmActEasyPhotoDO.setExamineAt(nowDate); cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason()); // if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){ // return R.fail("该随手拍已处理，不可重复操作"); // } // cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId()); // cmActEasyPhotoDO.setStatus(3);//已驳回 // cmActEasyPhotoDO.setExamineAt(nowDate); // cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason()); break; case 3: if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){ return R.fail("该随手拍不是待反馈状态，不可进行反馈"); return R.fail("该随手拍不是进行中状态，不可进行反馈"); } //给随手拍新增反馈信息 ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO(); @@ -304,13 +316,13 @@ photoFeedback.setCreateBy(comActEasyPhotoVO.getUserId()); comActEasyPhotoFeedbackMapper.insert(photoFeedback); } if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){ cmActEasyPhotoDO.setExamineAt(nowDate); cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId()); cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType()); //审核通过判断随手拍是否有活动并计算用户收益 comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO); } // if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){ // cmActEasyPhotoDO.setExamineAt(nowDate); // cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId()); // cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType()); // //审核通过判断随手拍是否有活动并计算用户收益 // comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO); // } cmActEasyPhotoDO.setFeedbackAt(nowDate); cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc); cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId()); @@ -628,5 +640,66 @@ return R.ok(); } @Override public R easyPhotoCount(ComActEasyPhotoVO comActEasyPhotoVO) { return R.ok(this.comActEasyPhotoDAO.easyPhotoCount(comActEasyPhotoVO)); } @Override public R updatePageeasyphoto(ComActEasyPhotoVO comActEasyPhotoVO) { ComActEasyPhotoDO comActEasyPhotoDO=new ComActEasyPhotoDO(); BeanUtils.copyProperties(comActEasyPhotoVO,comActEasyPhotoDO); int result=this.comActEasyPhotoDAO.updateById(comActEasyPhotoDO); if(result>0){ return R.ok(); } return R.fail(); } @Override public R export(ExportEasyPhotoDTO exportEasyPhotoDTO) { if(exportEasyPhotoDTO!=null){ List<ExportEasyPhotoVO> list; if(!CollectionUtils.isEmpty(exportEasyPhotoDTO.getIds())){ list=this.comActEasyPhotoDAO.exportByIds(exportEasyPhotoDTO.getIds()); } else { list=this.comActEasyPhotoDAO.export(exportEasyPhotoDTO); } return R.ok(list); } return R.fail("参数错误"); } /** * 社区后台-切换随手拍公示状态 * @param comActEasyPhotoVO 请求参数 * @return 切换结果 */ @Override public R easyPhotoSwitchPublicity(ComActEasyPhotoVO comActEasyPhotoVO){ //查询随手拍 ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(comActEasyPhotoVO.getId()); if(easyPhotoDO == null){ return R.fail("未查询到随手拍记录"); } easyPhotoDO.setIsPublicity(comActEasyPhotoVO.getIsPublicity()); if(this.baseMapper.updateById(easyPhotoDO) > 0){ return R.ok(); }else{ return R.fail(); } } /** * 查询社区待处理随手拍id集合 * @param communityId 社区id * @return 社区待处理随手拍id集合 */ @Override public R easyPhotoNoHandleList(Long communityId){ return R.ok(this.baseMapper.easyPhotoNoHandleIds(communityId)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -518,6 +518,7 @@ Long userId = answerQuestnaireVO.getUserId(); Long questId = answerQuestnaireVO.getQuestId(); Date nowDate = new Date(); ComActQuestnaireDO questnaireDO = questnaireDAO.selectById(questId); if (questnaireDO == null) { return R.fail("调查问卷不存在！"); @@ -681,6 +682,11 @@ return R.ok(result); } /** * 问卷调查统计汇总 * @param summaryDTO 请求参数 * @return 统计汇总 */ @Override public R statisticsSummary(StatisticsSummaryDTO summaryDTO){ IPage<QuestnaireStatisticsSummaryAdminVO> summaryAdminList = questnaireDAO.getStatisticsSummaryAdmin(new Page(summaryDTO.getPageNum(),summaryDTO.getPageSize()),summaryDTO); @@ -691,9 +697,14 @@ summary.setTag(BigDecimal.valueOf(summary.getCount()).divide(BigDecimal.valueOf(summary.getAllCount()),2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100))); } }); return R.ok(questnaireDAO.getStatisticsSummaryAdmin(new Page(summaryDTO.getPageNum(),summaryDTO.getPageSize()),summaryDTO)); return R.ok(summaryAdminList); } /** * 问卷调查统计汇总导出数据查询 * @param questId 调查问卷id * @return 调查统计汇总导出数据 */ @Override public R statisticsSummaryExport(Long questId){ List<QuestnaireStatisticsSummaryExcelAdminVO> summaryExcelList = questnaireDAO.getStatisticsSummaryExcelAdmin(questId); @@ -707,12 +718,28 @@ return R.ok(summaryExcelList); } /** * 问卷调查统计汇总表头统计 * @param questId 调查问卷id * @return 问卷调查统计汇总表头统计数据 */ @Override public R statisticsSummaryHeader(Long questId){ QuestnaireStatisticsSummaryHeaderAdminVO summaryHeaderAdminVO = this.questnaireDAO.statisticsSummaryHeader(questId); public R statisticsSummaryHeader(Long questId,Long communityId){ QuestnaireStatisticsSummaryHeaderAdminVO summaryHeaderAdminVO = this.questnaireDAO.statisticsSummaryHeader(questId,communityId); if(summaryHeaderAdminVO != null){ if(!summaryHeaderAdminVO.getUserCount().equals(0)){ BigDecimal nub1 = BigDecimal.valueOf(summaryHeaderAdminVO.getAllCount()); BigDecimal nub2 = BigDecimal.valueOf(summaryHeaderAdminVO.getUserCount()); BigDecimal result = nub1.divide(nub2,2,RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); summaryHeaderAdminVO.setTag(result); } } return R.ok(summaryHeaderAdminVO); } /** * 定时任务检测待发布，调研中的问卷调查状态 */ @Override @Transactional(rollbackFor = Exception.class) public R timedTaskQuestionnaire(){ @@ -720,7 +747,7 @@ //查询所有开始时间已经超过当前时间的待发布状态调查问卷 List<ComActQuestnaireDO> questnaireDOList = questnaireDAO.selectList(new QueryWrapper<ComActQuestnaireDO>().lambda() .eq(ComActQuestnaireDO::getState,ComActQuestnaireDO.state.dfb).eq(ComActQuestnaireDO::getIsHide,0) .ge(ComActQuestnaireDO::getStartTime,nowDate)); .le(ComActQuestnaireDO::getStartTime,nowDate)); questnaireDOList.forEach(questnaire -> { questnaire.setState(ComActQuestnaireDO.state.dyz); questnaire.setPublishTime(nowDate); @@ -730,7 +757,7 @@ //查询所有结束时间已经超过当前时间的调研中状态调查问卷 List<ComActQuestnaireDO> questnaireList = questnaireDAO.selectList(new QueryWrapper<ComActQuestnaireDO>().lambda() .eq(ComActQuestnaireDO::getState,ComActQuestnaireDO.state.dyz).eq(ComActQuestnaireDO::getIsHide,0) .ge(ComActQuestnaireDO::getEndTime,nowDate)); .le(ComActQuestnaireDO::getEndTime,nowDate)); questnaireList.forEach(questnaire -> { questnaire.setState(ComActQuestnaireDO.state.yjs); questnaireDAO.updateById(questnaire); @@ -738,6 +765,11 @@ return R.ok(); } /** * 小程序-新增问卷调查浏览数量 * @param questId 问卷调查id * @return 增加结果 */ @Override public R addQuestnaireView(Long questId){ ComActQuestnaireDO questnaireDO = questnaireDAO.selectById(questId); @@ -748,6 +780,12 @@ return R.ok(); } /** * 小程序-用户弹窗添加不在提醒接口 * @param questId 问卷id * @param userId 用户id * @return 添加结果 */ @Override public R addNoNotice(Long questId,Long userId){ questnaireDAO.addNoNotice(questId,userId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoClassifyDOMapper.xml
New file @@ -0,0 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoClassifyMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO"> <id column="id" property="id" /> <result column="name" property="name" /> <result column="status" property="status" /> <result column="weight" property="weight" /> <result column="remark" property="remark" /> <result column="create_at" property="createAt" /> <result column="update_at" property="updateAt" /> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, name, status, weight, remark, create_at, update_at </sql> <select id="getPhotoClassifyPage" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO"> select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify <where> <if test="photoClassifyDTO.name != null and photoClassifyDTO.name != """> and `name` like concat (#{photoClassifyDTO.name},'%') </if> </where> order by create_at desc </select> <select id="getPhotoClassifyList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO"> select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify order by create_at desc </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
@@ -57,19 +57,35 @@ p.activity_type, p.activity_amount, p.activity_id, p.examine_at p.is_report_urban, p.classify_id, ca.`name` as classifyName, p.examine_at, c.name communityName, p.urban_status FROM com_act_easy_photo p LEFT JOIN sys_user u ON p.sponsor_id = u.user_id LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id LEFT JOIN sys_user su ON p.handler_id = su.user_id left join com_act c on p.community_id =c.community_id left join com_act_easy_photo_classify ca on ca.id = p.classify_id WHERE p.del_tag = 0 p.del_tag = 0 and p.`status` != 3 <if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'> and p.community_id=#{comActEasyPhotoVO.communityId} </if> <if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' > AND p.`status` = #{comActEasyPhotoVO.status} </if> <if test='comActEasyPhotoVO.isPublicity != null' > AND p.`is_publicity` = #{comActEasyPhotoVO.isPublicity} </if> <if test='comActEasyPhotoVO.isReportUrban != null' > AND p.`is_report_urban` = #{comActEasyPhotoVO.isReportUrban} </if> <if test='comActEasyPhotoVO.urbanStatus != null' > AND p.`urban_status` = #{comActEasyPhotoVO.urbanStatus} </if> <if test='comActEasyPhotoVO.createBegin != null '> AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} @@ -82,7 +98,8 @@ <if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != ""'> AND (u.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.happen_addr like concat(#{comActEasyPhotoVO.keyWord},'%') or su.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') su.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%') ) </if> GROUP BY @@ -116,4 +133,120 @@ AND del_tag = 0 </select> <select id="easyPhotoCount" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoCountVO"> select count(*) total,(select count(*) today from com_act_easy_photo where transfer_time BETWEEN DATE_FORMAT(CURDATE(),'%Y-%m-%d %H:%i:%s') and DATE_ADD(CURRENT_DATE, INTERVAL 1 DAY) <if test="urbanStatus !=null"> and urban_status=#{urbanStatus} </if>) today from com_act_easy_photo <where> 1=1 <if test="urbanStatus !=null"> and urban_status=#{urbanStatus} </if> </where> </select> <select id="export" resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoVO"> SELECT p.id, u.`name` sponsor_name, u.phone phone, count( pu.id ) giveThumbsUpNum, u.image_url, p.happen_addr, su.`name` handler_name, p.`status`, p.`detail`, p.`is_need_feed_back`, p.`photo_path_list`, p.create_at, p.feedback_at, p.is_report, p.is_publicity, p.activity_type, p.activity_amount, p.activity_id, p.examine_at, c.name communityName, p.is_report_urban, p.urban_status FROM com_act_easy_photo p LEFT JOIN sys_user u ON p.sponsor_id = u.user_id LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id LEFT JOIN sys_user su ON p.handler_id = su.user_id left join com_act c on p.community_id =c.community_id WHERE p.del_tag = 0 and p.`is_report_urban` =1 <if test='communityId != null and communityId != 0'> and p.community_id=#{communityId} </if> <if test='urbanStatus != null ' > AND p.`urban_status` = #{urbanStatus} </if> <if test='createBegin != null '> AND p.create_at BETWEEN #{createBegin} AND #{createEnd} </if> <if test='keyWord != null and keyWord != ""'> AND (u.`name` like concat(#{keyWord},'%') or p.happen_addr like concat(#{keyWord},'%') or su.`name` like concat(#{keyWord},'%') or p.detail like concat(#{keyWord},'%') ) </if> GROUP BY p.id ORDER BY p.create_at DESC </select> <select id="exportByIds" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO"> SELECT p.id, u.`name` sponsor_name, u.phone phone, count( pu.id ) giveThumbsUpNum, u.image_url, p.happen_addr, su.`name` handler_name, p.`status`, p.`detail`, p.`is_need_feed_back`, p.`photo_path_list`, p.create_at, p.feedback_at, p.is_report, p.is_publicity, p.activity_type, p.activity_amount, p.activity_id, p.examine_at, c.name communityName, p.is_report_urban, p.urban_status FROM com_act_easy_photo p LEFT JOIN sys_user u ON p.sponsor_id = u.user_id LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id LEFT JOIN sys_user su ON p.handler_id = su.user_id left join com_act c on p.community_id =c.community_id WHERE p.id in <foreach collection="list" item="ids" index="index" open="(" close=")" separator=","> #{ids} </foreach> GROUP BY p.id ORDER BY p.create_at DESC </select> <select id="easyPhotoNoHandleIds" resultType="Long"> select id from com_act_easy_photo where `status` = 1 and community_id = #{communityId} and del_tag = 0 </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
@@ -194,12 +194,13 @@ AND user_id NOT IN ( SELECT user_id FROM com_act_questnaire_user_answer WHERE questnaire_id = #{questId} )) AS noVolunteerCount, ( SELECT count( user_id ) count( id ) FROM sys_user AS su com_pb_member AS su WHERE is_partymember = 1 AND user_id NOT IN ( SELECT user_id FROM com_act_questnaire_user_answer WHERE questnaire_id = #{questId} )) AS noPartymemberCount community_id = #{communityId} AND user_id NOT IN ( SELECT user_id FROM com_act_questnaire_user_answer WHERE questnaire_id = #{questId} )) AS noPartymemberCount, (select count(user_id) from sys_user where community_id = 2 and type = 1) as userCount FROM com_act_questnaire_user_answer AS caqua LEFT JOIN com_act_questnaire AS caq ON caq.id = caqua.questnaire_id springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1006,4 +1006,14 @@ return userService.getUserOpenId(userId); } /** * 查询社区后台工作人员列表 * @param communityId 社区id * @return 社区后台工作人员列表 */ @GetMapping("getUserListByCommunityId") public R getUserListByCommunityId(@RequestParam("communityId")Long communityId) { return userService.getUserListByCommunityId(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -443,4 +443,7 @@ "</script>") List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId); @Select("select user_id,`name` from sys_user as su where type = 3 and community_id = #{communityId}") List<SysUserVO> getUserListByCommunityId(@Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -485,4 +485,11 @@ */ R getUserOpenId(Long userId); /** * 查询社区后台工作人员列表 * @param communityId 社区id * @return 社区后台工作人员列表 */ R getUserListByCommunityId(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2251,4 +2251,14 @@ } return R.fail(); } /** * 查询社区后台工作人员列表 * @param communityId 社区id * @return 社区后台工作人员列表 */ @Override public R getUserListByCommunityId(Long communityId){ return R.ok(this.userDao.getUserListByCommunityId(communityId)); } } springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -222,6 +222,7 @@ noLoginUrl.add("/api/applets/index/pagecomacteasyphotocomment"); noLoginUrl.add("/api/applets/index/pagemicrowish"); noLoginUrl.add("/api/applets/index/microwish"); noLoginUrl.add("/api/applets/index/easyphoto/classify/list"); noLoginUrl.add("/api/applets/index/getUserReward"); noLoginUrl.add("/api/applets/pagediscuss"); noLoginUrl.add("/api/applets/discuss");
