101captain
2022-04-13 589149ab46aaf6e53b4e24115bebf2ba2b507a15
花城E+防疫相关修改
20个文件已添加
8个文件已修改
1671 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoMemberApi.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoMemberDao.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java 147 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoMemberService.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoMemberServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
New file
@@ -0,0 +1,97 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
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;
import java.util.Date;
/**
 * (ComActAcidRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:59
 */
@Slf4j
@Api(tags = {"防疫登记"})
@RestController
@RequestMapping("comActAcidRecord")
public class ComActAcidRecordApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
        return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActAcidRecord(id);
    }
    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        comActAcidRecordVO.setUserId(this.getUserId());
        comActAcidRecordVO.setCreateTime(new Date());
        return this.communityService.insertComActAcidRecord(comActAcidRecordVO);
    }
    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActAcidRecord(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
New file
@@ -0,0 +1,58 @@
package com.panzhihua.common.model.dtos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActAcidRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:57
 */
@Data
@ApiModel("防疫筛选条件")
public class ComActAcidRecordDTO implements Serializable {
    @ApiModelProperty("页数")
    private Integer page;
    @ApiModelProperty("条数")
    private Integer size;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("有无住址 0无 1有")
    private Integer isAddress;
    /**
     * 出发城市
     */
    @ApiModelProperty(value = "出发城市")
    private String departureCity;
    /**
     * 在攀居住地
     */
    @ApiModelProperty(value = "在攀居住地")
    private String localCity;
    /**
     * 用户id
     */
    private Long userId;
    @ApiModelProperty("开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;
    @ApiModelProperty("结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date stopTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -195,6 +195,8 @@
    @ApiModelProperty("是否微团队成员 1.是 2.否")
    private Integer isFmsMember;
    @ApiModelProperty("是否网格员 1.是 2.否")
    private Integer isEasyPhotoMember;
    @ApiModelProperty("appid")
    private String appId;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
New file
@@ -0,0 +1,111 @@
package com.panzhihua.common.model.vos.community.acid;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
 * @author zzj
 */
@Data
public class ComActAcidRecordExcelVO {
    /**
     * 姓名
     */
    @ExcelProperty(value = "姓名")
    private String name;
    /**
     * 身份证
     */
    @ExcelProperty(value = "身份证")
    private String idCard;
    /**
     * 手机号
     */
    @ExcelProperty(value = "手机号")
    private String phone;
    /**
     * 出发城市
     */
    @ExcelProperty(value = "出发城市")
    private String departureCity;
    /**
     * 出发地址
     */
    @ExcelProperty(value = "详细地址")
    private String departureAddress;
    /**
     * 出发日期
     */
    @ExcelProperty(value = "出发日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date departureDate;
    /**
     * 旅居城市
     */
    @ExcelProperty(value = "中途旅居城市")
    private String touristCity;
    /**
     * 在攀居住地
     */
    @ExcelProperty(value = "在攀居住地")
    private String localCity;
    /**
     * 在攀地址
     */
    @ExcelProperty(value = "详细地址")
    private String localAddress;
    /**
     * 到达日期
     */
    @ExcelProperty(value = "到达日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date arriveDate;
    /**
     * 健康码颜色
     */
    @ExcelProperty(value = "健康码状态")
    private String colorMark;
    /**
     * 行程码
     */
    @ExcelProperty(value = "行程码是否带*")
    private String travelCard;
    /**
     * 危险区
     */
    @ExcelProperty(value = "14天内是否到过中高风险地区")
    private String dangerArea;
    /**
     * 境外城市
     */
    @ExcelProperty(value = "28天内是否到过境外或边境口岸城市")
    private String outsideCity;
    /**
     * 疫苗接种
     */
    @ExcelProperty(value = "新冠疫苗接种情况")
    private String vaccination;
    /**
     * 核酸检测
     */
    @ExcelProperty(value = "48小时内核酸检测")
    private String acidTest;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordVO.java
New file
@@ -0,0 +1,152 @@
package com.panzhihua.common.model.vos.community.acid;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActAcidRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:57
 */
@Data
@ApiModel("防疫登记实体")
public class ComActAcidRecordVO implements Serializable {
    private static final long serialVersionUID = 681488919320181854L;
    private Long id;
    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;
    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;
    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;
    /**
     * 出发城市
     */
    @ApiModelProperty(value = "出发城市")
    private String departureCity;
    /**
     * 出发地址
     */
    @ApiModelProperty(value = "出发地址")
    private String departureAddress;
    /**
     * 出发日期
     */
    @ApiModelProperty(value = "出发日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date departureDate;
    /**
     * 旅居城市
     */
    @ApiModelProperty(value = "旅居城市")
    private String touristCity;
    /**
     * 在攀居住地
     */
    @ApiModelProperty(value = "在攀居住地")
    private String localCity;
    /**
     * 在攀地址
     */
    @ApiModelProperty(value = "在攀地址")
    private String localAddress;
    /**
     * 到达日期
     */
    @ApiModelProperty(value = "到达日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date arriveDate;
    /**
     * 健康码颜色
     */
    @ApiModelProperty(value = "健康码颜色")
    private String colorMark;
    /**
     * 行程码
     */
    @ApiModelProperty(value = "行程码")
    private String travelCard;
    /**
     * 危险区
     */
    @ApiModelProperty(value = "危险区")
    private String dangerArea;
    /**
     * 境外城市
     */
    @ApiModelProperty(value = "境外城市")
    private String outsideCity;
    /**
     * 疫苗接种
     */
    @ApiModelProperty(value = "疫苗接种")
    private String vaccination;
    /**
     * 核酸检测
     */
    @ApiModelProperty(value = "核酸检测")
    private String acidTest;
    /**
     * 填报类型 1自己填报 2为他人填报
     */
    @ApiModelProperty(value = "填报类型 1自己填报 2为他人填报")
    private Integer type;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    @ApiModelProperty("定位地址")
    private String realAddress;
    private Date createTime;
    public interface type{
        int zj=1;
        int tr=2;
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/ComActEasyPhotoMemberVO.java
New file
@@ -0,0 +1,56 @@
package com.panzhihua.common.model.vos.community.easyPhoto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:24
 */
@Data
@ApiModel("随手拍网格员")
public class ComActEasyPhotoMemberVO implements Serializable {
    private static final long serialVersionUID = 309168056104824588L;
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;
    /**
     * 联系电话
     */
    @ApiModelProperty(value = "联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
@@ -23,7 +24,9 @@
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.social.*;
@@ -9508,4 +9511,98 @@
    @GetMapping("/reserve/fiveCount")
    R fiveCount(@RequestParam("reserveId") Long reserveId);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActEasyPhotoMember/del")
    R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActEasyPhotoMember/queryAll")
    R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActEasyPhotoMember/{id}")
    R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActEasyPhotoMember")
    R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
    /**
     * 修改数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActEasyPhotoMember/update")
    R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidRecord/queryAll")
    R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidRecord/{id}")
    R selectOneComActAcidRecord(@PathVariable("id") Long id);
    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidRecord")
    R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidRecord/update")
    R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/del")
    R deleteComActAcidRecord(@RequestParam("id") Long id);
    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxUtil.java
@@ -388,6 +388,26 @@
        }
    }
    /**
     * 预约提醒订阅消息通知
     * @param openId    用户openid
     * @param accessToken   token会话标识
     */
    public static void sendSubscribeTXTZ(String openId, String accessToken, String templateId){
        WxSubscribeDTO subscribeDTO = new WxSubscribeDTO();
        subscribeDTO.setTouser(openId);
        subscribeDTO.setTemplate_id(templateId);
        List<TemplateParam> paras=new ArrayList<TemplateParam>();
        paras.add(new TemplateParam("time2",DateUtils.getCurrentDateStr()));
        paras.add(new TemplateParam("thing3","请尽快完善返攀报备信息,填报当前在攀居住地。"));
        subscribeDTO.setTemplateParamList(paras);
        try {
            sendSubscribe(accessToken,subscribeDTO);
        }catch (Exception e){
            log.error("预约提醒订阅消息推送失败,失败原因:" + e.getMessage());
        }
    }
    public static void main(String[] args) {
        WxXCXTempSend util = new WxXCXTempSend();
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/WxXCXTempSend.java
@@ -28,8 +28,8 @@
@Component
public class WxXCXTempSend extends BaseController {
    public static final String APP_ID = "wx0cef797390444b75";
    private static final String APP_SECRET = "c7ea9aaa7e391a487e8a5b9ba61045d1";
    public static final String APP_ID = "wx118de8a734d269f0";
    private static final String APP_SECRET = "0264342daefde5cd70a6adada09ee5b1";
    private static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
    private static String APP_IMAGE_URL = "https://www.psciio.com//idcard/8fa82cfba258498eab2fa818220fb592.jpg";
    private static String APP_IMAGE_NAME = "5.jpg";
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
New file
@@ -0,0 +1,177 @@
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.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
/**
 * (ComActAcidRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:59
 */
@Slf4j
@Api(tags = {"防疫登记"})
@RestController
@RequestMapping("comActAcidRecord")
public class ComActAcidRecordApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    @Value("${excel.userurl}")
    private String excelUrl;
    @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;
    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
        return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActAcidRecord(id);
    }
    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        return this.communityService.insertComActAcidRecord(comActAcidRecordVO);
    }
    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActAcidRecord(id);
    }
    @ApiOperation(value = "导出")
    @PostMapping("/export")
    public R export(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
        String name = "防疫登记信息导出.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        // 用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.exportComActAcidRecord(comActAcidRecordDTO);
        if (R.isOk(r)) {
            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, ComActAcidRecordExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
                        excelWriter.write(JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActAcidRecordExcelVO.class), 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(excelUrl + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return r;
    }
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActEasyPhotoMemberApi.java
New file
@@ -0,0 +1,95 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
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.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:26
 */
@Slf4j
@Api(tags = {"随手拍网格员"})
@RestController
@RequestMapping("comActEasyPhotoMember")
public class ComActEasyPhotoMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActEasyPhotoMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.comActEasyPhotoMemberSelectAll(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "详情",response = ComActEasyPhotoMemberVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.comActEasyPhotoMemberSelectOne(id);
    }
    /**
     * 新增数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
       return communityService.comActEasyPhotoMemberInsert(comActEasyPhotoMemberVO);
    }
    /**
     * 修改数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
        return communityService.comActEasyPhotoMemberUpdate(comActEasyPhotoMemberVO);
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.comActEasyPhotoMemberDelete(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java
New file
@@ -0,0 +1,106 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import com.panzhihua.service_community.service.ComActAcidRecordService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * (ComActAcidRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:59
 */
@RestController
@RequestMapping("comActAcidRecord")
public class ComActAcidRecordApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActAcidRecordService comActAcidRecordService;
    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
        return this.comActAcidRecordService.pageList(comActAcidRecordDTO);
    }
    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("export")
    public R export(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
        return this.comActAcidRecordService.export(comActAcidRecordDTO);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActAcidRecordService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        return R.ok(this.comActAcidRecordService.save(comActAcidRecord));
    }
    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        return R.ok(this.comActAcidRecordService.updateById(comActAcidRecord));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActAcidRecordService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoMemberApi.java
New file
@@ -0,0 +1,94 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
import com.panzhihua.service_community.entity.ComActEasyPhotoMember;
import com.panzhihua.service_community.service.ComActEasyPhotoMemberService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:26
 */
@RestController
@RequestMapping("comActEasyPhotoMember")
public class ComActEasyPhotoMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActEasyPhotoMemberService comActEasyPhotoMemberService;
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActEasyPhotoMemberService.pageList(commonPage);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActEasyPhotoMemberService.getById(id));
    }
    /**
     * 新增数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
        ComActEasyPhotoMember comActEasyPhotoMember=new ComActEasyPhotoMember();
        BeanUtils.copyProperties(comActEasyPhotoMemberVO,comActEasyPhotoMember);
        return R.ok(this.comActEasyPhotoMemberService.save(comActEasyPhotoMember));
    }
    /**
     * 修改数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO) {
        ComActEasyPhotoMember comActEasyPhotoMember=new ComActEasyPhotoMember();
        BeanUtils.copyProperties(comActEasyPhotoMemberVO,comActEasyPhotoMember);
        return R.ok(this.comActEasyPhotoMemberService.updateById(comActEasyPhotoMember));
    }
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActEasyPhotoMemberService.removeById(id));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
@@ -29,6 +29,10 @@
    public static final String McsOrder_ROUTING_KEY="huacheng.mcsOrder.key";
    public static final String McsOrder_EXCHANGE="huacheng.mcsOrder.exchange";
    public static final String ACID_QUEUE="huacheng.acid.queue";
    public static final String ACID_ROUTING_KEY="huacheng.acid.key";
    public static final String ACID_EXCHANGE="huacheng.acid.exchange";
    @Bean
    public Queue preOrderQueue(){
@@ -65,6 +69,23 @@
    }
    @Bean
    public Queue acidQueue(){
        return new Queue(ACID_QUEUE,true,false,false,null);
    }
    @Bean
    public Exchange acidExchange(){
        Map<String, Object> arguments = new HashMap<>();
        arguments.put("x-delayed-type", ExchangeTypes.DIRECT);
        return new CustomExchange(ACID_EXCHANGE,"x-delayed-message",true,false,arguments);
    }
    @Bean
    public Binding acidBinding(){
        return BindingBuilder.bind(raffleQueue()).to(raffleExchange()).with(ACID_ROUTING_KEY).noargs();
    }
    @Bean
    public Queue mcsOrderQueue(){
        return new Queue(McsOrder_QUEUE,true,false,false,null);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java
New file
@@ -0,0 +1,40 @@
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.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * (ComActAcidRecord)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:58
 */
@Mapper
public interface ComActAcidRecordDao extends BaseMapper<ComActAcidRecord> {
    /**
     * 分页查询
     * @param page
     * @param comActAcidRecordDTO
     * @return
     */
    IPage<ComActAcidRecordVO> pageList(Page page, @Param("commonPage") ComActAcidRecordDTO comActAcidRecordDTO);
    /**
     * 导出
     * @param comActAcidRecordDTO
     * @return
     */
    List<ComActAcidRecordExcelVO> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoMemberDao.java
New file
@@ -0,0 +1,30 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActEasyPhotoMember;
import org.apache.ibatis.annotations.Param;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:24
 */
@Mapper
public interface ComActEasyPhotoMemberDao extends BaseMapper<ComActEasyPhotoMember> {
    /**
     * 分页查询网格员列表
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActEasyPhotoMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java
New file
@@ -0,0 +1,147 @@
package com.panzhihua.service_community.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * (ComActAcidRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:57
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComActAcidRecord implements Serializable {
    private static final long serialVersionUID = 681488919320181854L;
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;
    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;
    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;
    /**
     * 出发城市
     */
    @ApiModelProperty(value = "出发城市")
    private String departureCity;
    /**
     * 出发地址
     */
    @ApiModelProperty(value = "出发地址")
    private String departureAddress;
    /**
     * 出发日期
     */
    @ApiModelProperty(value = "出发日期")
    private Date departureDate;
    /**
     * 旅居城市
     */
    @ApiModelProperty(value = "旅居城市")
    private String touristCity;
    /**
     * 在攀居住地
     */
    @ApiModelProperty(value = "在攀居住地")
    private String localCity;
    /**
     * 在攀地址
     */
    @ApiModelProperty(value = "在攀地址")
    private String localAddress;
    /**
     * 到达日期
     */
    @ApiModelProperty(value = "到达日期")
    private Date arriveDate;
    /**
     * 健康码颜色
     */
    @ApiModelProperty(value = "健康码颜色")
    private String colorMark;
    /**
     * 行程码
     */
    @ApiModelProperty(value = "行程码")
    private String travelCard;
    /**
     * 危险区
     */
    @ApiModelProperty(value = "危险区")
    private String dangerArea;
    /**
     * 境外城市
     */
    @ApiModelProperty(value = "境外城市")
    private String outsideCity;
    /**
     * 疫苗接种
     */
    @ApiModelProperty(value = "疫苗接种")
    private String vaccination;
    /**
     * 核酸检测
     */
    @ApiModelProperty(value = "核酸检测")
    private String acidTest;
    /**
     * 填报类型 1自己填报 2为他人填报
     */
    private Integer type;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 定位地址
     */
    private String realAddress;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoMember.java
New file
@@ -0,0 +1,62 @@
package com.panzhihua.service_community.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:24
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("随手拍网格员")
public class ComActEasyPhotoMember implements Serializable {
    private static final long serialVersionUID = 309168056104824588L;
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;
    /**
     * 联系电话
     */
    @ApiModelProperty(value = "联系电话")
    private String phone;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
New file
@@ -0,0 +1,33 @@
package com.panzhihua.service_community.message;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
 * @author zzj
 */
@Component
public class AcidMessage {
    public static final String DELAYED_QUEUE="huacheng.acid.queue";
    @Resource
    private UserService userService;
    @RabbitListener(queues=DELAYED_QUEUE)
    public void doTemplate(ComActAcidRecordVO comActAcidRecordVO) throws Exception {
       R<LoginUserInfoVO> loginUserInfoVOR= userService.getUserInfoByUserId(comActAcidRecordVO.getUserId().toString());
       LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
       if(loginUserInfoVO!=null&& StringUtils.isNotEmpty(loginUserInfoVO.getOpenid())){
           WxXCXTempSend util = new WxXCXTempSend();
           String accessToken = util.getAppAccessToken();
           WxUtil.sendSubscribeTXTZ(loginUserInfoVO.getOpenid(),accessToken,"pov2BTQ_uILduT5OoVKubeS2dibbZ_p79cy5AMb_BGE");
       }
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java
New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.service_community.entity.ComActAcidRecord;
/**
 * (ComActAcidRecord)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:58
 */
public interface ComActAcidRecordService extends IService<ComActAcidRecord> {
    /**
     * 分页查询
     *
     * @param comActAcidRecordDTO
     * @return
     */
    R pageList(ComActAcidRecordDTO comActAcidRecordDTO);
    /**
     * 导出
     * @param comActAcidRecordDTO
     * @return
     */
    R export(ComActAcidRecordDTO comActAcidRecordDTO);
    /**
     * 新增信息
     * @param comActAcidRecordVO
     * @return
     */
    R insertRecord(ComActAcidRecordVO comActAcidRecordVO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoMemberService.java
New file
@@ -0,0 +1,24 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActEasyPhotoMember;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:25
 */
public interface ComActEasyPhotoMemberService extends IService<ComActEasyPhotoMember> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
New file
@@ -0,0 +1,56 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import com.panzhihua.service_community.dao.ComActAcidRecordDao;
import com.panzhihua.service_community.service.ComActAcidRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * (ComActAcidRecord)表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:58
 */
@Slf4j
@Service
public class ComActAcidRecordServiceImpl extends ServiceImpl<ComActAcidRecordDao, ComActAcidRecord> implements ComActAcidRecordService {
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Override
    public R pageList(ComActAcidRecordDTO comActAcidRecordDTO) {
        return R.ok(this.baseMapper.pageList(new Page<>(comActAcidRecordDTO.getPage(), comActAcidRecordDTO.getSize()),comActAcidRecordDTO));
    }
    @Override
    public R export(ComActAcidRecordDTO comActAcidRecordDTO) {
        return R.ok(this.baseMapper.export(comActAcidRecordDTO));
    }
    @Override
    public R insertRecord(ComActAcidRecordVO comActAcidRecordVO) {
        if(StringUtils.isEmpty(comActAcidRecordVO.getLocalCity())){
            rabbitTemplate.convertAndSend("huacheng.acid.exchange", "huacheng.acid.key", comActAcidRecordVO, message -> {
                message.getMessageProperties().setHeader("x-delay", 24*60*60*1000);
                return message;
            });
        }
        ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        return R.ok(this.save(comActAcidRecord));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoMemberServiceImpl.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActEasyPhotoMember;
import com.panzhihua.service_community.dao.ComActEasyPhotoMemberDao;
import com.panzhihua.service_community.service.ComActEasyPhotoMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
 * 随手拍网格员(ComActEasyPhotoMember)表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 随手拍网格员相关功能
 *
 * @author zzj
 * @since 2022-04-12 10:33:25
 */
@Slf4j
@Service
public class ComActEasyPhotoMemberServiceImpl extends ServiceImpl<ComActEasyPhotoMemberDao, ComActEasyPhotoMember> implements ComActEasyPhotoMemberService {
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
New file
@@ -0,0 +1,85 @@
<?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.ComActAcidRecordDao">
    <resultMap type="com.panzhihua.service_community.entity.ComActAcidRecord" id="ComActAcidRecordBaseResultMap">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="idCard" column="id_card"/>
        <result property="phone" column="phone"/>
        <result property="departureCity" column="departure_city"/>
        <result property="departureAddress" column="departure_address"/>
        <result property="departureDate" column="departure_date"/>
        <result property="touristCity" column="tourist_city"/>
        <result property="localCity" column="local_city"/>
        <result property="localAddress" column="local_address"/>
        <result property="arriveDate" column="arrive_date"/>
        <result property="colorMark" column="color_mark"/>
        <result property="travelCard" column="travel_card"/>
        <result property="dangerArea" column="danger_area"/>
        <result property="outsideCity" column="outside_city"/>
        <result property="vaccination" column="vaccination"/>
        <result property="acidTest" column="acid_test"/>
    </resultMap>
    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO">
        select * from com_act_acid_record
        <where>
            <if test="commonPage.userId !=null">
                and user_id = #{commonPage.userId}
            </if>
            <if test="commonPage.keyword !=null and commonPage.keyword!=''">
                and (name like concat('%',#{commonPage.keyword},'%') or phone like concat('%',#{commonPage.keyword},'%') or id_card like concat('%',#{commonPage.keyword},'%'))
            </if>
            <if test="commonPage.startTime !=null">
                and create_time between #{commonPage.startTime} and #{commonPage.stopTime}
            </if>
            <if test="commonPage.isAddress !=null">
                <if test="commonPage.idAddress == 0">
                    and local_city is null
                </if>
                <if test="commonPage.idAddress == 1">
                    and local_city is not null
                </if>
            </if>
            <if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
                and departure_city = #{commonPage.departureCity}
            </if>
            <if test="commonPage.localCity !=null and commonPage.localCity !=''">
                and local_city = #{commonPage.localCity}
            </if>
        </where>
        order by create_time desc
    </select>
    <select id="export" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO">
        select * from com_act_acid_record
        <where>
            <if test="commonPage.userId !=null">
                and user_id = #{commonPage.userId}
            </if>
            <if test="commonPage.keyword !=null and commonPage.keyword!=''">
                and (name like concat('%',#{commonPage.keyword},'%') or phone like concat('%',#{commonPage.keyword},'%') or id_card like concat('%',#{commonPage.keyword},'%'))
            </if>
            <if test="commonPage.startTime !=null">
                and create_time between #{commonPage.startTime} and #{commonPage.stopTime}
            </if>
            <if test="commonPage.isAddress !=null">
                <if test="commonPage.idAddress == 0">
                    and local_city is null
                </if>
                <if test="commonPage.idAddress == 1">
                    and local_city is not null
                </if>
            </if>
            <if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
                and departure_city = #{commonPage.departureCity}
            </if>
            <if test="commonPage.localCity !=null and commonPage.localCity !=''">
                and local_city = #{commonPage.localCity}
            </if>
        </where>
        order by create_time desc
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoMemberMapper.xml
New file
@@ -0,0 +1,17 @@
<?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.ComActEasyPhotoMemberDao">
    <resultMap type="com.panzhihua.service_community.entity.ComActEasyPhotoMember"
               id="ComActEasyPhotoMemberBaseResultMap">
        <result property="id" column="id"/>
        <result property="communityId" column="community_id"/>
        <result property="name" column="name"/>
        <result property="phone" column="phone"/>
        <result property="createTime" column="create_time"/>
    </resultMap>
    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO">
        select * from com_act_easy_photo_member order by create_time desc
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -242,4 +242,12 @@
     * @return
     */
    int countFmsMember(@Param("phone") String phone, @Param("communityId") Long userCommunityId);
    /**
     * 查看是否网格员
     * @param phone
     * @param userCommunityId
     * @return
     */
    int countEasyPhotoMember(@Param("phone") String phone,@Param("communityId") Long userCommunityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -417,6 +417,11 @@
            if (countFmsMember > 0) {
                loginUserInfoVO.setIsFmsMember(1);
            }
            //是否网格员
            int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
            if (easyPhotoMember > 0) {
                loginUserInfoVO.setIsEasyPhotoMember(1);
            }
            // 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
            Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -546,4 +546,9 @@
        WHERE phone = #{phone} AND community_id = #{communityId}
    </select>
    <select id="countEasyPhotoMember" resultType="Integer">
        SELECT COUNT(id) FROM com_act_easy_photo_member
        WHERE phone = #{phone} AND community_id = #{communityId}
    </select>
</mapper>