springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/RealAssetsFloorType.java
New file @@ -0,0 +1,24 @@ package com.panzhihua.common.enums; import lombok.Getter; /** * 楼层类型 * * @author llming */ @Getter public enum RealAssetsFloorType { HIGN(1, "高层"), CENTRE(2, "中层"), LOW(2, "底层"); private final int code; private final String info; RealAssetsFloorType(int code, String info) { this.code = code; this.info = info; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngRealAssetsExcelVO.java
@@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * @description: 实有单位 @@ -24,7 +25,7 @@ private String category; @ExcelProperty(value = "占地面积" ,index = 3) private String square; private BigDecimal square; @ExcelProperty(value = "数量" ,index = 4) private Integer num; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -173,7 +173,7 @@ @ApiOperation(value = "上传照片") @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) { String name = file.getOriginalFilename().toLowerCase();; String name = file.getOriginalFilename(); List<String> formateList = Arrays.asList( "avi", "flv", "mpg", "mpeg", "mpe", "m1v", "m2v", "mpv2", "mp2v", "dat", "ts", "tp", "tpr", "pva", "pss", "mp4", "m4v", "m4p", "m4b", "3gp", "3gpp", "3g2", "3gp2", "ogg", "mov", "qt", "amr", "rm", "ram", "rmvb", "rpm"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -170,7 +171,7 @@ if (null != communityId && communityId != 0) { comCvtBusinessDOS = comCvtBusinessDAO.selectList(new QueryWrapper<ComCvtBusinessDO>().lambda().eq(ComCvtBusinessDO::getCommunityId, communityId)); } else { comCvtBusinessDOS = comCvtBusinessDAO.selectList(null); comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>()); } Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS); list.forEach(comCvtServeExcelVO -> { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngProvinceServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngAreaVO; @@ -36,7 +37,7 @@ @Override public R getProvince() { List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(null); List<ComMngProvinceDO> provinceDOS = comMngProvinceDAO.selectList(new LambdaQueryWrapper<>()); List<ComMngProvinceVO> vos = new ArrayList<>(); provinceDOS.forEach(p -> { ComMngProvinceVO vo = new ComMngProvinceVO(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealAssetsServiceImpl.java
@@ -1,15 +1,20 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.enums.RealAssetsFloorType; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO; import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO; import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO; import com.panzhihua.service_community.dao.ComMngRealAssetsDAO; import com.panzhihua.service_community.dao.ComMngStructBuildTypeDAO; import com.panzhihua.service_community.model.dos.ComMngRealAssetsDO; import com.panzhihua.service_community.model.dos.ComMngStructBuildTypeDO; import com.panzhihua.service_community.service.ComMngRealAssetsService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -24,10 +29,12 @@ * @date: 2021/3/19 11:55 */ @Service public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO> implements ComMngRealAssetsService { public class ComMngRealAssetsServiceImpl extends ServiceImpl<ComMngRealAssetsDAO, ComMngRealAssetsDO> implements ComMngRealAssetsService { @Resource private ComMngRealAssetsDAO comMngRealAssetsDAO; @Resource private ComMngStructBuildTypeDAO buildTypeDAO; @Override public R pageQueryComMngRealAssets(PageComMngRealAssetsDTO pageComMngRealAssetsDTO) { @@ -48,19 +55,19 @@ @Override public R saveComMngRealAssets(ComMngRealAssetsVO comMngRealAssetsVO) { if(null!=comMngRealAssetsVO.getId() && comMngRealAssetsVO.getId()!=0){ if (null != comMngRealAssetsVO.getId() && comMngRealAssetsVO.getId() != 0) { //修改 ComMngRealAssetsDO comMngRealAssetsDO = comMngRealAssetsDAO.selectById(comMngRealAssetsVO.getId()); BeanUtils.copyProperties(comMngRealAssetsVO,comMngRealAssetsDO); BeanUtils.copyProperties(comMngRealAssetsVO, comMngRealAssetsDO); int update = comMngRealAssetsDAO.updateById(comMngRealAssetsDO); if(update>0){ if (update > 0) { return R.ok(); } }else{ } else { ComMngRealAssetsDO comMngRealAssetsDO = new ComMngRealAssetsDO(); BeanUtils.copyProperties(comMngRealAssetsVO,comMngRealAssetsDO); BeanUtils.copyProperties(comMngRealAssetsVO, comMngRealAssetsDO); int insert = comMngRealAssetsDAO.insert(comMngRealAssetsDO); if(insert>0){ if (insert > 0) { return R.ok(); } } @@ -71,11 +78,11 @@ @Override public R deleteComMngRealAssets(Long id) { ComMngRealAssetsDO comMngRealAssetsDO = comMngRealAssetsDAO.selectById(id); if(null==comMngRealAssetsDO){ if (null == comMngRealAssetsDO) { return R.fail("该资产不存在"); } int delete = comMngRealAssetsDAO.deleteById(id); if(delete>0){ if (delete > 0) { return R.ok(); } return R.fail("删除失败"); @@ -84,25 +91,38 @@ @Override public R detailComMngRealAssets(Long id) { ComMngRealAssetsDO comMngRealAssetsDO = comMngRealAssetsDAO.selectById(id); if(null==comMngRealAssetsDO){ if (null == comMngRealAssetsDO) { return R.fail("该资产不存在"); } ComMngRealAssetsVO comMngRealAssetsVO = new ComMngRealAssetsVO(); BeanUtils.copyProperties(comMngRealAssetsDO,comMngRealAssetsVO); BeanUtils.copyProperties(comMngRealAssetsDO, comMngRealAssetsVO); return R.ok(comMngRealAssetsVO); } @Override public R listSaveMngRealAssetsExcelVO(List<ComMngRealAssetsExcelVO> list, Long communityId) { List<ComMngRealAssetsDO> comMngRealAssetsDOS = new ArrayList<>(); list.forEach(l->{ List<ComMngStructBuildTypeDO> buildTypeDOS = buildTypeDAO.selectList(new LambdaQueryWrapper<>()); list.forEach(l -> { ComMngStructBuildTypeDO buildTypeDO = buildTypeDOS.stream().filter(buildType -> buildType.getName().equals(l.getBuildTypeName())).findFirst().orElse(null); if (buildTypeDO == null) { throw new ServiceException("不存在类型建筑类型：" + l.getBuildTypeName()); } ComMngRealAssetsDO comMngRealAssetsDO = new ComMngRealAssetsDO(); BeanUtils.copyProperties(l,comMngRealAssetsDO); comMngRealAssetsDO.setBuildTypeId(buildTypeDO.getId()); BeanUtils.copyProperties(l, comMngRealAssetsDO); comMngRealAssetsDO.setCommunityId(communityId); if (l.getFloorType().equals(RealAssetsFloorType.HIGN.getInfo())) { comMngRealAssetsDO.setFloorType(RealAssetsFloorType.HIGN.getCode()); } else if (l.getFloorType().equals(RealAssetsFloorType.CENTRE.getInfo())) { comMngRealAssetsDO.setFloorType(RealAssetsFloorType.CENTRE.getCode()); } else if (l.getFloorType().equals(RealAssetsFloorType.LOW.getInfo())) { comMngRealAssetsDO.setFloorType(RealAssetsFloorType.LOW.getCode()); } comMngRealAssetsDOS.add(comMngRealAssetsDO); }); boolean batch = this.saveBatch(comMngRealAssetsDOS); if(batch){ if (batch) { return R.ok(); } return R.fail("请检查数据是否重复，格合是否正确"); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -61,7 +62,7 @@ @Override public R listBuildType() { List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>(); List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null); List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(new LambdaQueryWrapper<>()); if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) { comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> { ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -174,7 +175,7 @@ */ @Override public R listadvpos() { List<ComOpsAdvPosDO> comOpsAdvPosDOS = comOpsAdvPosDAO.selectList(null); List<ComOpsAdvPosDO> comOpsAdvPosDOS = comOpsAdvPosDAO.selectList(new LambdaQueryWrapper<>()); List<ComOpsAdvPosVO> comOpsAdvPosVOS=new ArrayList<>(); comOpsAdvPosDOS.forEach(comOpsAdvPosDO -> { ComOpsAdvPosVO comOpsAdvPosVO=new ComOpsAdvPosVO(); @@ -191,7 +192,7 @@ */ @Override public R listAdvjump() { List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(null); List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(new LambdaQueryWrapper<>()); List<ComOpsAdvJumpVO> comOpsAdvJumpVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comOpsAdvJumpDOS)) { comOpsAdvJumpDOS.forEach(comOpsAdvJumpDO -> { springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -98,7 +98,7 @@ partyOrganizationVOS= JSONArray.parseArray(orgs,PartyOrganizationVO.class); } } else { List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(null); List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>()); if (!ObjectUtils.isEmpty(comPbOrgDOS)) { List<PartyOrganizationVO> partyOrganizationVOList=new ArrayList<>(); comPbOrgDOS.forEach(comPbOrgDO -> { springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -404,7 +404,7 @@ @Override public R listTag() { List<String> list=new ArrayList<>(); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null); List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>()); if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList()); } @@ -995,7 +995,7 @@ */ @Override public R listAgreement() { List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(null); List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>()); if (ObjectUtils.isEmpty(sysUserAgreementDOS)) { return R.fail(); }
