springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -9674,6 +9674,9 @@ @GetMapping("/comActAcidRecord/statics") R comActAcidRecordStatics(@RequestParam("date")String date); @GetMapping("/comActAcidRecord/test") R test(); /** * 分页查询所有数据 * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java
@@ -279,4 +279,9 @@ public R statics(@RequestParam("date")String date){ return this.communityService.comActAcidRecordStatics(date); } @GetMapping("/test") public R test(){ return this.communityService.test(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java
@@ -161,4 +161,8 @@ public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){ return this.comActAcidRecordService.detailByApp(id,localCity); } @GetMapping("/test") public R test(){ return this.comActAcidRecordService.test(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCunDao.java
New file @@ -0,0 +1,18 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.ComCun; /** * (ComCun)表数据库访问层 * projectName 成都呐喊信息技术有限公司-智慧社区项目 * description: 相关功能 * * @author zzj * @since 2022-06-10 15:12:40 */ @Mapper public interface ComCunDao extends BaseMapper<ComCun> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysUserDao.java
New file @@ -0,0 +1,18 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.panzhihua.service_community.entity.SysUser; /** * 用户表 后台用户+小程序用户(SysUser)表数据库访问层 * projectName 成都呐喊信息技术有限公司-智慧社区项目 * description: 用户表 后台用户+小程序用户相关功能 * * @author zzj * @since 2022-06-10 15:34:17 */ @Mapper public interface SysUserDao extends BaseMapper<SysUser> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComAreaTownCommunity.java
@@ -51,4 +51,6 @@ @ApiModelProperty(value = "社区") private String community; private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComCun.java
New file @@ -0,0 +1,45 @@ package com.panzhihua.service_community.entity; 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; /** * (ComCun)表实体类 * projectName 成都呐喊信息技术有限公司-智慧社区项目 * description: 相关功能 * * @author zzj * @since 2022-06-10 15:12:39 */ @Data @Builder @AllArgsConstructor @NoArgsConstructor @ApiModel("") public class ComCun implements Serializable { private static final long serialVersionUID = -52058950684473753L; private String area; private String town; private String community; private String account; private String name; private String phone; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/SysUser.java
New file @@ -0,0 +1,269 @@ 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; /** * 用户表 后台用户+小程序用户(SysUser)表实体类 * projectName 成都呐喊信息技术有限公司-智慧社区项目 * description: 用户表 后台用户+小程序用户相关功能 * * @author zzj * @since 2022-06-10 15:34:16 */ @Data @Builder @AllArgsConstructor @NoArgsConstructor @ApiModel("用户表 后台用户+小程序用户") public class SysUser implements Serializable { private static final long serialVersionUID = -70884515430727555L; /** * 主键 */ @ApiModelProperty(value = "主键") private Long userId; /** * 登录账户 */ @ApiModelProperty(value = "登录账户") private String account; /** * 登录密码 */ @ApiModelProperty(value = "登录密码") private String password; /** * 微信小程序唯一标识 */ @ApiModelProperty(value = "微信小程序唯一标识") private String openid; /** * 会话密钥 */ @ApiModelProperty(value = "会话密钥") private String sessionKey; /** * 用户在开放平台的唯一标识符 */ @ApiModelProperty(value = "用户在开放平台的唯一标识符") private String unionid; /** * 手机号 */ @ApiModelProperty(value = "手机号") private String phone; /** * 昵称 */ @ApiModelProperty(value = "昵称") private String nickName; /** * 真实名字 */ @ApiModelProperty(value = "真实名字") private String name; /** * 社区ID */ @ApiModelProperty(value = "社区ID") private Long communityId; /** * 性别 1 男 2 女 */ @ApiModelProperty(value = "性别 1 男 2 女") private Object sex; /** * 身份证号 */ @ApiModelProperty(value = "身份证号") private String idCard; /** * 生日 */ @ApiModelProperty(value = "生日") private Date birthday; /** * 头像 */ @ApiModelProperty(value = "头像") private String imageUrl; /** * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台 */ @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台") private Object type; /** * 职业 */ @ApiModelProperty(value = "职业") private String job; /** * 是否志愿者 0 否 1 是 */ @ApiModelProperty(value = "是否志愿者 0 否 1 是") private Object isVolunteer; /** * 是否党员 0 否 1 是 */ @ApiModelProperty(value = "是否党员 0 否 1 是") private Object isPartymember; /** * 1 启用 2 禁用 */ @ApiModelProperty(value = "1 启用 2 禁用") private Object status; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") private Date createAt; /** * 最后登录时间 */ @ApiModelProperty(value = "最后登录时间") private Date lastLoginTime; /** * 标签多个用,隔开 */ @ApiModelProperty(value = "标签多个用,隔开") private String tags; /** * 家庭id */ @ApiModelProperty(value = "家庭id") private Long familyId; /** * 人脸采集照片url */ @ApiModelProperty(value = "人脸采集照片url") private String faceUrl; /** * 人脸采集审核状态 0 待审核 1 审核通过 2驳回 */ @ApiModelProperty(value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回") private Integer faceState; /** * 驳回原因 */ @ApiModelProperty(value = "驳回原因") private String rejectReson; /** * 小区id */ @ApiModelProperty(value = "小区id") private Object areaId; /** * 证件照(人相面)照片 */ @ApiModelProperty(value = "证件照(人相面)照片") private String cardPhotoFront; /** * 证件照(国徽面)照片 */ @ApiModelProperty(value = "证件照(国徽面)照片") private String cardPhotoBack; /** * 户口本 */ @ApiModelProperty(value = "户口本") private String familyBook; /** * 连续登陆天数 每天凌晨定时任务更新 */ @ApiModelProperty(value = "连续登陆天数 每天凌晨定时任务更新") private Integer continuousLandingDays; /** * 小程序首页是否显示公告(1.是 2.否) */ @ApiModelProperty(value = "小程序首页是否显示公告(1.是 2.否)") private Integer isTips; /** * 网格员工作状态(1.在岗 2.脱岗 3.已下班) */ @ApiModelProperty(value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)") private Integer workStatus; /** * 网格员上班开始时间 */ @ApiModelProperty(value = "网格员上班开始时间") private Integer workStartTime; /** * 网格员上班结束时间 */ @ApiModelProperty(value = "网格员上班结束时间") private Integer workEndTime; /** * 高龄认证显示提示(1.是 2.否) */ @ApiModelProperty(value = "高龄认证显示提示(1.是 2.否)") private Integer bigAgeTips; /** * 明文密码 */ @ApiModelProperty(value = "明文密码") private String plaintextPassword; /** * 街道id */ @ApiModelProperty(value = "街道id") private Long streetId; /** * 绑定单位 */ @ApiModelProperty(value = "绑定单位") private String relationName; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java
@@ -104,4 +104,6 @@ * @return */ R detailByCommunity(Long id); R test(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -15,9 +15,9 @@ import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.entity.ComActAcidDangerMember; import com.panzhihua.service_community.entity.ComActAcidRecord; import com.panzhihua.service_community.entity.ComActAcidUpdateRecord; import com.panzhihua.service_community.entity.*; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComStreetDO; import com.panzhihua.service_community.service.ComActAcidRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -60,6 +60,12 @@ private ComActAcidUpdateRecordDao comActAcidUpdateRecordDao; @Resource private ComAreaTownCommunityDao comAreaTownCommunityDao; @Resource private ComCunDao comCunDao; @Resource private ComStreetDAO comStreetDAO; @Resource private SysUserDao sysUserDao; @Override public R pageList(ComActAcidRecordDTO comActAcidRecordDTO) { @@ -480,4 +486,63 @@ } return R.ok(comActAcidRecordVO); } @Override public R test() { List<ComCun> comCuns=comCunDao.selectList(new QueryWrapper<ComCun>()); comCuns.forEach(comCun->{ ComActDO comActDO= comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,comCun.getCommunity())); if(comActDO==null){ ComStreetDO comStreetDO = comStreetDAO.selectOne(new QueryWrapper<ComStreetDO>().lambda().eq(ComStreetDO::getName,comCun.getTown())); if(comStreetDO==null){ comStreetDO=new ComStreetDO(); comStreetDO.setName(comCun.getTown()); areaCheck(comCun,comStreetDO); comStreetDO.setAccount(comCun.getAccount()); comStreetDAO.insert(comStreetDO); } comActDO=new ComActDO(); comActDO.setStreetId(comStreetDO.getStreetId()); comActDO.setAreaCode(comStreetDO.getAreaCode().toString()); comActDO.setName(comCun.getCommunity()); comActDO.setContacts(comCun.getName()); comActDO.setContactsPhone(comCun.getPhone()); comActDAO.insert(comActDO); } ComAreaTownCommunity community=comAreaTownCommunityDao.selectOne(new QueryWrapper<ComAreaTownCommunity>().lambda().eq(ComAreaTownCommunity::getArea,comCun.getArea()).eq(ComAreaTownCommunity::getTown,comCun.getTown()).eq(ComAreaTownCommunity::getCommunity,comCun.getCommunity())); if(community==null){ community=new ComAreaTownCommunity(); community.setArea(comCun.getArea()); community.setTown(comCun.getTown()); community.setCommunity(comCun.getCommunity()); comAreaTownCommunityDao.insert(community); }else { community.setCommunityId(comActDO.getCommunityId()); comAreaTownCommunityDao.updateById(community); } SysUser sysUser=sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getAccount,comCun.getAccount())); if(sysUser!=null){ System.out.println(comCun.getAccount()+","+comCun.getCommunity()); } else { sysUser=new SysUser(); sysUser.setAccount(comCun.getAccount()); sysUser.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR."); sysUser.setName(comCun.getCommunity()); sysUser.setType(9); sysUserDao.insert(sysUser); } }); return null; } public static void areaCheck(ComCun area,ComStreetDO comStreetDO){ switch (area.getArea()){ case "西区": comStreetDO.setAreaCode(510423); break; case "东区": comStreetDO.setAreaCode(510402); break; case "仁和区": comStreetDO.setAreaCode(510411); break; case "米易县": comStreetDO.setAreaCode(510421); break; case "盐边县": comStreetDO.setAreaCode(510422); break; } } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComCunMapper.xml
New file @@ -0,0 +1,14 @@ <?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.ComCunDao"> <resultMap type="com.panzhihua.service_community.entity.ComCun" id="ComCunBaseResultMap"> <result property="area" column="area"/> <result property="town" column="town"/> <result property="community" column="community"/> <result property="account" column="account"/> <result property="name" column="name"/> <result property="phone" column="phone"/> </resultMap> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysUserMapper.xml
New file @@ -0,0 +1,47 @@ <?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.SysUserDao"> <resultMap type="com.panzhihua.service_community.entity.SysUser" id="SysUserBaseResultMap"> <result property="userId" column="user_id"/> <result property="account" column="account"/> <result property="password" column="password"/> <result property="openid" column="openid"/> <result property="sessionKey" column="session_key"/> <result property="unionid" column="unionid"/> <result property="phone" column="phone"/> <result property="nickName" column="nick_name"/> <result property="name" column="name"/> <result property="communityId" column="community_id"/> <result property="sex" column="sex"/> <result property="idCard" column="id_card"/> <result property="birthday" column="birthday"/> <result property="imageUrl" column="image_url"/> <result property="type" column="type"/> <result property="job" column="job"/> <result property="isVolunteer" column="is_volunteer"/> <result property="isPartymember" column="is_partymember"/> <result property="status" column="status"/> <result property="createAt" column="create_at"/> <result property="lastLoginTime" column="last_login_time"/> <result property="tags" column="tags"/> <result property="familyId" column="family_id"/> <result property="faceUrl" column="face_url"/> <result property="faceState" column="face_state"/> <result property="rejectReson" column="reject_reson"/> <result property="areaId" column="area_id"/> <result property="cardPhotoFront" column="card_photo_front"/> <result property="cardPhotoBack" column="card_photo_back"/> <result property="familyBook" column="family_book"/> <result property="continuousLandingDays" column="continuous_landing_days"/> <result property="isTips" column="is_tips"/> <result property="workStatus" column="work_status"/> <result property="workStartTime" column="work_start_time"/> <result property="workEndTime" column="work_end_time"/> <result property="bigAgeTips" column="big_age_tips"/> <result property="plaintextPassword" column="plaintext_password"/> <result property="streetId" column="street_id"/> <result property="relationName" column="relation_name"/> </resultMap> </mapper>