springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -119,6 +119,12 @@ private Integer isHiddenDanger; /** * 隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患) */ @ApiModelProperty("隐患类型(1.火灾隐患2.汛情隐患3.疫情隐患)，多条以逗号隔开") private String hiddenDangerType; /** * 隐患名称 */ @ApiModelProperty("隐患名称") @@ -200,6 +206,15 @@ } /** * 巡查类型 */ public interface hiddenDangerType { int huo = 1; int xun = 2; int yi = 3; } /** * 是否 */ public interface isOk { springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationNoSecretVO.java
New file @@ -0,0 +1,252 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import com.panzhihua.common.model.helper.sensitive.Sensitive; import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.ComMngHouseVo; import com.panzhihua.common.model.vos.user.UserElectronicFileVO; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; /** * 实有人口Vo */ @Data @ApiModel("实有人口表") @EncryptDecryptClass public class ComMngPopulationNoSecretVO { /** * 自增 id */ @ApiModelProperty("实有人口id") @JsonSerialize(using = ToStringSerializer.class) private Long id; /** * 街道id */ @ApiModelProperty("街道id") private Integer streetId; /** * 社区id */ @ApiModelProperty("社区id") private Integer actId; /** * 小区id（实有房屋id） */ @ApiModelProperty("小区id（实有房屋id）") @JsonSerialize(using = ToStringSerializer.class) private long villageId; /** * 家庭成员（姓名） */ @ApiModelProperty("家庭成员（姓名）") @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空") private String name; @ApiModelProperty("性别（1.男 2.女 3.未知）") @NotBlank(groups = {AddGroup.class}, message = "性别不可为空") private Integer sex; @ApiModelProperty("年龄") @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空") private Integer age; @ApiModelProperty("身份证号码") private String cardNo; @ApiModelProperty("出生年月") private String birthday; @ApiModelProperty("街路巷") @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空") private String road; @ApiModelProperty("门牌号") @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空") private String doorNo; @ApiModelProperty("楼排号") @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空") private String floor; @ApiModelProperty("单元号") @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空") private String unitNo; @ApiModelProperty("户室（房间号）") @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空") private String houseNo; @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)") @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空") private Integer politicalOutlook; @ApiModelProperty("政治面貌名称") private String politicalOutlookName; @ApiModelProperty("工作单位") private String workCompany; @ApiModelProperty("特殊情况") private String specialSituation; @ApiModelProperty("联系方式") @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空") private String phone; @ApiModelProperty("备注") private String remark; @ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业") private String label; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty("籍贯") private String nativePlace; @ApiModelProperty("民族") private String nationCode; @ApiModelProperty("民族") private String nation; @ApiModelProperty("小区名字") private String alley; @ApiModelProperty("户主关系列表") private List<ComHouseMemberVo> comMngFamilyInfoVOS; @ApiModelProperty("家庭成员信息") private List<ComMngFamilyInfoVO> familyInfoVOList; @ApiModelProperty("用户电子档信息") private UserElectronicFileVO userElectronicFileVO; @ApiModelProperty("是否租住 是否租住(0.否 1.是)") @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空") private Integer isRent; @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)") private Integer cultureLevel; @ApiModelProperty("文化程度名称") private String cultureLevelName; @ApiModelProperty("职业") private String profession; @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)") private Integer marriage; @ApiModelProperty("婚姻状况名称") private String marriageName; @ApiModelProperty("健康状况") private String healthy; @ApiModelProperty("外地or本地（1.本地 2.外地）") private Integer outOrLocal; @ApiModelProperty("户口所在地") private String censusRegister; /** * 居住地址 */ @ApiModelProperty("居住地址") private String address; @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)") private Integer relation; @ApiModelProperty("与户主关系名称") private String relationName; @ApiModelProperty("身份证无加密字段") private String cardNoStr; @ApiModelProperty("房屋列表") private List<ComMngHouseVo> houseList; @ApiModelProperty("车辆列表") private List<ComMngPopulationCarVO> carList; @ApiModelProperty("吸毒信息") private List<ComDrugPopulationVO> comDrugPopulationVOs; @ApiModelProperty("社区矫正信息") private List<ComCorrectPopulationVO> comCorrectPopulationVOs; @ApiModelProperty("精神障碍信息") private List<ComMajorPopulationVO> comMajorPopulationVOs; @ApiModelProperty("邪教信息") private List<ComCultPopulationVO> comCultPopulationVOs; @ApiModelProperty("刑释信息") private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs; @ApiModelProperty("上访信息") private List<ComKeyPopulationVO> comKeyPopulationVOs; @ApiModelProperty("退役军人信息") private List<ComVeteransPopulationVO> comVeteransPopulationVOs; @ApiModelProperty("残疾人信息") private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs; @ApiModelProperty("低保户信息") private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs; @ApiModelProperty("高龄老人信息") private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList; @ApiModelProperty("养老人员信息") private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList; public interface sex { int nan = 1; int nv = 2; int no = 3; } /** * 是否租住 */ public interface isOk { int yes = 1; int no = 0; } /** * 政治面貌 */ public interface politicalOutlook { int dang = 1; int tuan = 3; int wu = 12; int qun = 13; int no = 13; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
@@ -13,7 +13,7 @@ @ApiModel public class FourMemberDetailVO { @ApiModelProperty("基础数据及房屋数据") private ComMngPopulationVO comMngPopulationVO; private ComMngPopulationNoSecretVO comMngPopulationVO; @ApiModelProperty("党员数据") private ComPbMemberVO partyBuildingMemberVO; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -12,10 +12,7 @@ import com.panzhihua.common.enums.PopulRelationEnum; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActFourMemberVO; import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO; import com.panzhihua.common.model.vos.community.ComMngPopulationVO; import com.panzhihua.common.model.vos.community.FourMemberDetailVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; @@ -205,7 +202,7 @@ // comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday())); // } ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO(); ComMngPopulationNoSecretVO comMngPopulationVO = new ComMngPopulationNoSecretVO(); BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO); // 查询户主关系信息 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -1,7 +1,9 @@ package com.panzhihua.service_community.service.impl; import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -33,6 +35,9 @@ import com.panzhihua.service_community.service.ComSwPatrolRecordService; import lombok.extern.slf4j.Slf4j; import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isBlank; /** * @auther txb @@ -89,20 +94,16 @@ @Override public R addPatrolRecord(ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO) { // 巡查记录 ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO(); BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO); Long patrolRecordId = Snowflake.getId(); comSwPatrolRecordDO.setId(patrolRecordId); if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){ comSwPatrolRecordDO.setPatrolTime(new Date()); }else { comSwPatrolRecordDO.setPatrolTime( DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format)); String patrolTypeString = comSwPatrolRecordAddDTO.getPatrolType(); Integer isHiddenDanger = comSwPatrolRecordAddDTO.getIsHiddenDanger(); String hiddenDangerTypeString = comSwPatrolRecordAddDTO.getHiddenDangerType(); if (isBlank(patrolTypeString)) { return R.fail("巡查类型不能为空"); } // comSwPatrolRecordDO.setPatrolTime(new Date()); comSwPatrolRecordDO.setSuccessionTime( DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(), DateUtils.yyyyMMdd_format)); if (isNull(isHiddenDanger) || (isHiddenDanger.intValue() == ComSwPatrolRecordAddDTO.isOk.yes && isBlank(hiddenDangerTypeString))) { return R.fail("隐患类型不能为空"); } StringBuilder nameString = new StringBuilder(); StringBuilder phoneString = new StringBuilder(); // 根据传递的巡查人员id查询巡查人员的名字和电话 @@ -120,6 +121,29 @@ } } } if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDangerDescription())) { comSwPatrolRecordAddDTO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription()); } if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDagerName())) { comSwPatrolRecordAddDTO.setDangerName(comSwPatrolRecordAddDTO.getDagerName()); } List<String> patrolTypes = Arrays.asList(patrolTypeString.split(",")); patrolTypes.forEach(patrolType -> { // 巡查记录 ComSwPatrolRecordDO comSwPatrolRecordDO = new ComSwPatrolRecordDO(); BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwPatrolRecordDO); Long patrolRecordId = Snowflake.getId(); comSwPatrolRecordDO.setId(patrolRecordId); comSwPatrolRecordDO.setPatrolType(patrolType); if(StringUtils.isEmpty(comSwPatrolRecordAddDTO.getPatrolTime())){ comSwPatrolRecordDO.setPatrolTime(new Date()); }else { comSwPatrolRecordDO.setPatrolTime( DateUtils.stringToDate(comSwPatrolRecordAddDTO.getPatrolTime(), DateUtils.yyyyMMdd_format)); } // comSwPatrolRecordDO.setPatrolTime(new Date()); comSwPatrolRecordDO.setSuccessionTime( DateUtils.stringToDate(comSwPatrolRecordAddDTO.getSuccessionTime(), DateUtils.yyyyMMdd_format)); comSwPatrolRecordDO.setPersonName(nameString.toString()); comSwPatrolRecordDO.setPersonPhone(phoneString.toString()); comSwPatrolRecordDAO.insert(comSwPatrolRecordDO); @@ -128,19 +152,14 @@ Long patrolRecordReport = Snowflake.getId(); comSwPatrolRecordReportDO.setId(patrolRecordReport); comSwPatrolRecordReportDO.setPatrolRecordId(patrolRecordId); if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDangerDescription())) { comSwPatrolRecordAddDTO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription()); } if (StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getDagerName())) { comSwPatrolRecordAddDTO.setDangerName(comSwPatrolRecordAddDTO.getDagerName()); } if (comSwPatrolRecordAddDTO.getIsHiddenDanger().intValue() == ComSwPatrolRecordAddDTO.isOk.yes) { if (isHiddenDanger.intValue() == ComSwPatrolRecordAddDTO.isOk.yes && hiddenDangerTypeString.contains(patrolType)) { // 如果存在安全隐患，自动生成安全隐患报告 ComSwDangerReportDO comSwDangerReportDO = new ComSwDangerReportDO(); Long dangerReportId = Snowflake.getId(); comSwDangerReportDO.setId(dangerReportId); comSwPatrolRecordReportDO.setReportId(dangerReportId); comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType()); comSwDangerReportDO.setDangerType(patrolType); if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) { comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode())); @@ -162,6 +181,7 @@ comSwSafetyWorkRecordDAO.insert(comSwSafetyWorkRecordDO); } comSwPatrolRecordReportDAO.insert(comSwPatrolRecordReportDO); }); return R.ok(); }
@@ -78,6 +78,7 @@ comPropertyAlarm.setSerialNo(deviceInfo.getCallid()); comPropertyAlarm.setStatus(1); comPropertyAlarm.setCreateTime(new Date()); comPropertyAlarm.setType(1); comPropertyAlarmDao.insert(comPropertyAlarm); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java
@@ -69,4 +69,6 @@ private String password; private String idCard; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -341,7 +341,7 @@ loginUserInfoVO.setVolunteerStatus(state); } //是否四长四员 Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getUserId,sysUserDO.getUserId())); Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard())); if(countFourMember>0){ loginUserInfoVO.setIsFourMember(1); }
