普达物业接口数隔离

张天森

2022-11-10 79ea30958c05cb9a49f1a323ec4b7a3b6cd61824

普达物业接口数隔离

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -1,18 +1,13 @@
package com.panzhihua.applets.api;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import cn.hutool.core.util.StrUtil;
import com.jcraft.jsch.SftpException;
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
import com.panzhihua.common.controller.BaseController;
@@ -27,7 +22,6 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import com.alibaba.fastjson.JSON;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.common.constants.Constants;
@@ -39,7 +33,6 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.HttpUtils;
import com.panzhihua.common.utlis.SFTPUtil;

import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -184,9 +177,7 @@
            File file1=new File(uuid+"_compress.jpg");
            String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
            //上传完压缩图后把原图清理，防止文件服务器资源爆满
            if (StrUtil.isNotBlank(fileName)){
                minioUtil.removeMinio(fileName);
            }
            minioUtil.removeMinio(fileName);
            return R.ok(imageUrl);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java

@@ -507,6 +507,18 @@
        return communityService.getUserRewards(userId, communityId);
    }

    @ApiOperation(value = "获取普达首页弹窗接口", response = ComActEasyPhotoRewardVO.class)
    @GetMapping("getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("communityId") Long communityId) {
        Long userId = 0L;
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            userId = loginUserInfo.getUserId();
            communityId = loginUserInfo.getCommunityId();
        }
        return communityService.getUserRewardsNew(userId, communityId);
    }

    @ApiOperation(value = "读取用户随手拍奖励")
    @PostMapping("readUserReward")
    public R readUserReward() {

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java

@@ -70,6 +70,7 @@
    private Date updateBy;

    private String workTime;
    private String logo;

    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.java

@@ -31,4 +31,7 @@

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty("物业公司Id")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java

@@ -38,4 +38,8 @@
    private Long streetId;
    @ApiModelProperty("关键字")
    private String keyword;
    @ApiModelProperty("物业公司id")
    private Long propertyId;
    @ApiModelProperty("1是社区团队 2  党员先锋")
    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/PagePropertyWorkerDTO.java

@@ -31,4 +31,6 @@
    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull
    private Long pageSize;
    @ApiModelProperty("物业id")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java

@@ -128,4 +128,6 @@
    private String universityName;

    private String communityName;
    @ApiModelProperty("物业公司Id")
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/easyPhoto/BannerVO.java

@@ -28,4 +28,6 @@
    private String jumpUrl;
    @ApiModelProperty("跳转类型")
    private String jumpType;
    @ApiModelProperty("banner图片地址")
    private String imageUrl;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10656,4 +10656,11 @@
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

    /**
     * 获取社区动态置顶banner
     * @param communityId  社区id
     * */
    @PostMapping("/easyphoto/getUserRewardsNew")
    R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyWorkerApi.java

@@ -27,6 +27,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

import static java.util.Objects.nonNull;

/**
 * 物业公司工作人员(ComPropertyWorker)表控制层
 *
@@ -67,6 +69,9 @@
    @ApiOperation(value = "分页查询物业工作人员", response = ComPropertyWorkerVO.class)
    @PostMapping("/page")
    public R pagePropertyWorker(@RequestBody @Valid PagePropertyWorkerDTO pagePropertyWorkerDTO) {
        if(nonNull(getLoginUserInfo().getPropertyId())){
            pagePropertyWorkerDTO.setRefId(getLoginUserInfo().getPropertyId());
        }
        return communityService.pagePropertyWorker(pagePropertyWorkerDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -650,6 +650,9 @@
        } else {
            pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId());
        }
        if (nonNull(this.getLoginUserInfo().getPropertyId())){
            pageComPbServiceTeamDTO.setPropertyId(this.getLoginUserInfo().getPropertyId());
        }
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2445,6 +2445,10 @@
        return comActEasyPhotoService.getUserReward(userId, communityId);
    }

    @PostMapping("easyphoto/getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserRewardNew(userId, communityId);
    }
    /**
     * 读取用户随手拍奖励
     * 

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -453,4 +453,10 @@
     * @return
     */
    BigScreenDpcStatisticsInfo selectDpcBaseData(@Param("communityId") Long communityId);

    /**
     * 获取社区动态置顶banner
     * */
    List<BannerVO> getBanner(@Param("communityId") Long communityId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java

@@ -70,6 +70,7 @@
    * 工作时间
    * */
    private String workTime;
    private String logo;


    private static final long serialVersionUID = 1L;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java

@@ -113,4 +113,8 @@
     * 大学名称
     */
    private String universityName;
    /**
     * 所属物业公司id
     * */
    private Long propertyId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java

@@ -228,4 +228,9 @@
     * @return
     */
    R addEasyPhotoFeedbackForDpc(ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 获取社区置顶动态banner
     * */
    R getUserRewardNew(Long userId, Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -1079,4 +1079,18 @@
        return R.fail();
    }

    /**
     * 获取社区置顶动态banner
     * @param communityId
     * */
    @Override
    public R getUserRewardNew(Long userId, Long communityId) {
        ComActEasyPhotoRewardVO easyPhotoRewardVO=new ComActEasyPhotoRewardVO();
        List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.getBanner(communityId);
        if(!bannerVOS.isEmpty()){
            easyPhotoRewardVO.setBannerVOS(bannerVOS);
        }
        return R.ok(easyPhotoRewardVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -607,5 +607,8 @@
        SELECT
        (select count(id) from com_act_dpc where community_id = ${communityId} AND is_del = 0) AS dpcNum
    </select>
    <select id="getBanner" resultType="com.panzhihua.common.model.vos.community.easyPhoto.BannerVO">
        select *  from com_act_dyn where type=1 AND on_top=1
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml

@@ -95,6 +95,9 @@
        <if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone != &quot;&quot;'>
            AND cmvm.phone like concat(#{comMngVolunteerMngVO.phone},'%')
        </if>
        <if test="comMngVolunteerMngVO.propertyId != null and comMngVolunteerMngVO.propertyId != ''">
            AND cmvm.property_id=#{comMngVolunteerMngVO.propertyId}
        </if>
        ORDER BY
        integral DESC,
        cmvm.create_at DESC

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java

@@ -26,6 +26,10 @@
        + " where community_id = ${pageComPbServiceTeamDTO.communityId}"
        + "<if test='pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name.trim() != &quot;&quot;'>"
        + " and name LIKE concat( #{pageComPbServiceTeamDTO.name}, '%' ) \n" + " </if> "
            + "<if test='pageComPbServiceTeamDTO.propertyId != null and pageComPbServiceTeamDTO.propertyId != &quot;&quot;'>"
            + " and property_id = #{pageComPbServiceTeamDTO.propertyId} </if> "
            + "<if test='pageComPbServiceTeamDTO.type != null and pageComPbServiceTeamDTO.type != &quot;&quot;'>"
            + " and type = #{pageComPbServiceTeamDTO.type} </if> "
        + "<if test='pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job.trim() != &quot;&quot;'>"
        + "AND job LIKE concat(\n" + "#{pageComPbServiceTeamDTO.job},\n" + "'%')" + " </if> " + "</script>")
    IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page,

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java

@@ -70,4 +70,9 @@
     * 身份证号码
     */
    private String cardNo;
    /**
     * 所属物业公司Id
     * */
    private Long propertyId;
    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -371,6 +371,13 @@
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        return R.ok(loginUserInfoVO);
    }

@@ -523,6 +530,13 @@
            int i = userDao.isDpcMember(phone, sysUserDO.getName());
            if (i>0){
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        return R.ok(loginUserInfoVO);
@@ -1364,6 +1378,7 @@
        log.info("======================type"+administratorsUserVO.getType());
        if (administratorsUserVO.getType().equals(20)){
            roleId=1559112102373756548L;
            administratorsUserVO.setType(3);
        }
        log.info("=======================roleId"+roleId);
        SysRoleDO roleDO = roleDAO.selectById(roleId);