bug修改

101captain

2022-07-20 c05bad812ebc01873b684dde649ae29e66b5642a

bug修改

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -3,6 +3,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.utlis.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -29,6 +30,8 @@
public class UserApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
    @GetMapping("info")
@@ -73,4 +76,13 @@
        Long userId = this.getUserId();
        return userService.listmenu(userId);
    }
    @ApiOperation("重置密码")
    @GetMapping("/unlock")
    public R unlock(@RequestParam("type")Integer type,@RequestParam("isReset")Integer isReset,@RequestParam("account")String account){
        stringRedisTemplate.delete("LOGIN_FAIL_"+account+"_"+type);
        if(isReset==1){
            userService.resetPasswordAccount(type,account);
        }
        return R.ok();
    }
}

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

@@ -144,6 +144,9 @@
    @GetMapping("resetPassword")
    R resetPassword(@RequestParam("userId") Long userId);

    @GetMapping("/resetPasswordAccount")
    R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);

    /**
     * 批量重置密码用户登录密码默认admin123456
     *

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

@@ -94,7 +94,7 @@

    @GetMapping("/areaTownCommunity")
    public R test(@RequestParam("name")String name,@RequestParam("userId")Long userId){
        Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L};
        Long[] idArray={4L,17959L,16522L,16196L,16214L,17949L,89234L};
        if("panzhihua".equals(name)){
            List<ComAreaCounty> list=comAreaTownCommunityDao.selectArea();
            list.forEach(lis->{

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

@@ -47,6 +47,8 @@
//        + "AND a.is_volunteer=#{activitySignVO.type}-1   " + " </if> " + " order by a.create_at desc " + "</script>")
    IPage<ActivitySignVO> listActivitySign(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);

    IPage<ActivitySignVO> listActivitySignParty(Page page, @Param("activitySignVO") ActivitySignVO activitySignVO);

@Select("<script> " + "SELECT " + "u.user_id id, " + "u.image_url, " + "u.name, " + "u.nick_name, u.openid, "
        + "CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, "
        + "u.phone, " + "u.tags, " + "a.create_at,  " + "a.is_volunteer, a.status , a.reason, t.limit " + "FROM " + "com_act_act_sign a "

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

@@ -345,10 +345,14 @@
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {

        ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
        if(comActActivityDO!=null&&comActActivityDO.getType()==5){
            IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
                    .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
            return R.ok(activitySignVOS);
        }
        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
            .listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
        // List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }


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

@@ -116,6 +116,49 @@
            </if>
        order by a.create_at desc
    </select>
    <select id="listActivitySignParty" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT u.user_id id, u.image_url, cpm.name, u.nick_name,
        CASE WHEN t.type = 1 and a.is_volunteer = 1 THEN '志愿者' WHEN t.type = 1 and a.is_volunteer = 0 THEN '居民' WHEN t.type=2 THEN '居民' ELSE '党员' END identity,
        u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , a.times,
        a.reason, IF(r.times IS NULL, 0, r.award * r.times) AS award, t.limit
        FROM com_act_act_sign a
        JOIN sys_user u ON a.user_id = u.user_id
        JOIN com_pb_member cpm on a.user_id = cpm.user_id
        left join com_act_activity t on a.activity_id = t.id
        LEFT JOIN (
        SELECT * FROM (
        SELECT * FROM com_act_act_regist
        WHERE activity_id = #{activitySignVO.activityId}
        ORDER BY id DESC LIMIT 1000000
        ) temp GROUP BY activity_id, user_id
        ) r ON a.activity_id = r.activity_id AND a.user_id = r.user_id
        WHERE a.activity_id = #{activitySignVO.activityId}
        <if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>
            AND u.phone = #{activitySignVO.phone}
        </if>
        <if test='activitySignVO.status != null'>
            AND a.status = #{activitySignVO.status}
        </if>
        <if test='activitySignVO.tags != null and activitySignVO.tags != &quot;&quot;'>
            AND u.tags like concat('%',#{activitySignVO.tags},'%')
        </if>
        <if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>
            AND u.`name` = #{activitySignVO.name}
        </if>
        <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>
            AND u.is_partymember = 0 and a.is_volunteer=0
        </if>
        <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>
            AND u.is_partymember = 1
        </if>
        <if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>
            AND a.is_volunteer=1
        </if>
        <if test='activitySignVO.type != null and activitySignVO.type != 0'>
            AND a.is_volunteer=#{activitySignVO.type}-1
        </if>
        order by a.create_at desc
    </select>
    <select id="selectList" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT s.id,s.activity_id,s.user_id,s.create_at,s.is_volunteer, r.times, r.times * r.award AS award FROM `com_act_act_sign` s
        LEFT JOIN (

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1437,4 +1437,8 @@
        return userService.getCommunityList(name,id);
    }

    @GetMapping("/resetPasswordAccount")
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
        return userService.resetPassword(type,account);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -904,4 +904,12 @@
     * 获取城镇或村落列表
     * */
    R getCommunityList(String name,Long id);

    /**
     * 重置密码
     * @param type
     * @param account
     * @return
     */
    R resetPassword(Integer type,String account);
}

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

@@ -3678,6 +3678,16 @@
        return R.ok(null);
    }

    @Override
    public R resetPassword(Integer type, String account) {
        SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type));
        if(sysUserDO!=null){
            sysUserDO.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR.");
            userDao.updateById(sysUserDO);
        }
        return R.ok();
    }


    @Override
    public R getAreaAndStreet() {