党建bug修改

101captain

2022-03-31 07e29422c8559295bd6a5594e6f95f9e08d0bc95

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -2,6 +2,12 @@

import java.util.List;

import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -14,6 +20,8 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;

import javax.validation.Valid;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -127,6 +135,26 @@
    R changePassword(@RequestBody ChangePasswordVO changePasswordVO);

    /**
     * 重置密码用户登录密码默认admin123456
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPassword")
    R resetPassword(@RequestParam("userId") Long userId);

    /**
     * 批量重置密码用户登录密码默认admin123456
     *
     * @param userIds
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);

    /**
     * 某社区后台人员查询
     * 
     * @param param
@@ -196,7 +224,7 @@
     * @return 人员详情
     */
    @PostMapping("detailuser")
    R detailUser(@RequestParam("userId") Long userId);
    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);

    /**
     * 设置用户标签
@@ -312,6 +340,27 @@
    R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 新增社区后台物业，社会组织，业主委员会账户
     *
     * @param administratorsUserVO
     *            账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstageproperty")
    R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);


    /**
     * 更新
     *
     * @param administratorsUserVO
     *            编辑账户内容
     * @return 编辑结果
     */
    @PostMapping("updateStreet")
    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营、社区后台账户
     * 
     * @param administratorsUserVO
@@ -339,7 +388,7 @@
     * @return 角色集合
     */
    @PostMapping("/role/listrolebackstage")
    R listRoleBackstage(@RequestParam("communityId") Long communityId);
    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode);

    /**
     * 分页查询后台用户
@@ -555,7 +604,7 @@
     * @return 运营后台数据看板
     */
    @PostMapping("datakanban")
    R dataKanban();
    R dataKanban(@RequestParam("areaCode")String areaCode);

    /**
     * 用户菜单获取
@@ -997,4 +1046,156 @@
     */
    @GetMapping("checkIsTeam")
    R checkCurrentUserIsTeam(@RequestParam("phone") String phone, @RequestParam("communityId") Long communityId);

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
     * @return 商家用户id
     */
    @PostMapping("insertMerchantAccount")
    R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);

    /**
     * 修改便民服务商家绑定账号
     * @param userId
     * @param account
     * @return
     */
    @PutMapping("putMerchantUserAccount")
    R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account);

    /**
     * 禁用/启用便民服务商家用户
     * @param disableOrEnableConvenientMerchantDTO
     * @return
     */
    @PutMapping("disableOrEnableMerchantUsers")
    R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);

    /**
     * 根据openid维护社区团队里是否注册
     * @param openid    用户微信唯一标识
     */
    @GetMapping("judgeCommunityTeam")
    void judgeCommunityTeam(@RequestParam("openid") String openid);

    /**
     * 数据看板升级版
     *
     * @return 运营后台数据看板升级版
     */
    @PostMapping("datakanbans")
    R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto);

    /**
     * 运营后台-用户数据统计汇总
     * @return  用户数据统计汇总
     */
    @GetMapping("community/statistics")
    R communityStatistics(@RequestParam("areaCode") String areaCode);

    /**
     * 运营后台-用户数据统计导出
     * @return  用户数据
     */
    @GetMapping("community/statistics/export")
    R communityStatisticsExport(@RequestParam("areaCode") String areaCode);

    /**
     * 通过UnionId获取用户信息
     * @param unionId
     * @return
     */
    @GetMapping("/getByUnionId")
    R getUserInfoByUnionId(@RequestParam("unionId") String unionId);

    /**
     * 小程序id获取相关信息
     * @param appId
     * @return
     */
    @GetMapping("/sysAppConfig/selectByAppid")
    R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId);

    /**
     * 通过区域编码 类型获取动态模板id
     * @param areaCode
     * @param type
     * @return
     */
    @GetMapping("/sysTemplateConfig/selectTemplate")
    R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);

    /**
     * 微商业街新增商家账号
     * @param mcsMerchantDTO
     * @return 商家用户id
     */
    @PostMapping("insertMcsMerchantAccount")
    R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);

    /**
     * 微商业街修改商家账号
     * @param mcsMerchantDTO
     * @return
     */
    @PutMapping("putMcsMerchantUser")
    R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);

    /**
     * 检查用户是否有效
     * @param userId
     * @param type
     * @return
     */
    @PutMapping("checkUserIsValid")
    Boolean checkUserIsValid(@RequestParam("userId") Long userId, @RequestParam("type") Integer type);

    /**
     * 根据手机号、用户类型查询用户
     * @param phone
     * @param type
     * @return
     */
    @GetMapping("/getSysUserByPhone")
    R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type);

    /**
     * 发送验证码
     * @param phone 手机号
     * @param clientIP 用户ip
     * @param prefixKey redis Key 前缀
     * @param limit 获取次数限制
     * @param timeout 超次数获取时间等待
     * @return
     */
    @GetMapping("/sendMessageCode")
    R sendMessageCode(@RequestParam("phone") String phone,
                              @RequestParam(value = "clientIP", required = false) String clientIP,
                              @RequestParam("prefixKey") String prefixKey,
                              @RequestParam("limit") Integer limit,
                              @RequestParam("timeout") Integer timeout);

    /**
     * 根据openId获取微商业街用户
     * @param openid
     * @return
     */
    @GetMapping("/getMcsUserByOpenId")
    R getMcsUserByOpenId(@RequestParam("openid") String openid);

    /**
     * 商业街用户微信授权-绑定手机号
     * @param bindUserPhoneDTO
     * @return
     */
    @PostMapping("/mcs/bindPhone")
    R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);

    /**
     * 删除用户信息缓存
     * @param phone
     */
    @DeleteMapping("/deleteUserCashByPhone")
    R deleteUserCashByPhone(@RequestParam("phone") String phone);
}