fix: 小程序公告

wl

2022-12-26 e43e2f457c52f9a8d4a0aa9d45aa4a0fba94315d

 src/main/java/com/example/jz/controller/WxAppController.java

@@ -3,6 +3,7 @@

import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -12,11 +13,13 @@
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.CauseVo;
import com.example.jz.modle.vo.MemberVo;
import com.example.jz.modle.vo.ReportVo;
import com.example.jz.service.*;
import com.example.jz.utils.HttpUtil;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
@@ -36,9 +39,11 @@

    private final String wxApp_accessToken_verify_url = "https://api.weixin.qq.com/cgi-bin/token";

    private final String appid = "wxebbb232d366dae09";
    @Value("${wx.appid}")
    private String appid;

    private final String secret = "9a160c97c821eaa163240e8ec9185b77";
    @Value("${wx.secret}")
    private String secret;

    private final String js_code = "";

@@ -63,6 +68,8 @@
    MessageService messageService;
    @Autowired
    GroupUserService groupUserService;
    @Autowired
    PublicityService publicityService;

    @GetMapping("/login")
    @SneakyThrows
@@ -118,10 +125,12 @@
            role = user.getRole();
            id = user.getId();
        }
        User user1 = userDao.selectOne(new QueryWrapper<User>().eq("user_mobile", phone_info.getPurePhoneNumber()));
        HashMap<String, Object> loginMessage = new HashMap<>();
        loginMessage.put("id", id);
        loginMessage.put("token", token);
        loginMessage.put("role", role);
        loginMessage.put("time", user1.getUserIdcard());
        return R.ok(loginMessage);
    }

@@ -389,6 +398,9 @@

    @GetMapping("/group/user/sendMsg")
    public R sendUserMsg(@RequestParam Integer id, @RequestParam Integer groupId, @RequestParam String msg) {
        if (StringUtils.isBlank(msg)) {
            return R.failed("msg is blank");
        }
        Message message = new Message();
        message.setUserId(id);
        message.setText(msg);
@@ -397,4 +409,41 @@
        message.setReportName(userService.getOne(new QueryWrapper<User>().eq("id", reportService.getOne(new QueryWrapper<Report>().eq("id", id)).getUserId())).getRealName());
        return R.ok(messageService.save(message));
    }

    @GetMapping("/group/member/detail")
    public R getMemberDetail(@RequestParam Integer id) {
        Report report = reportService.getOne(new LambdaQueryWrapper<Report>().eq(Report::getId, id));
        ReportVo reportVo = new ReportVo();
        BeanUtils.copyProperties(report, reportVo);
        User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, report.getUserId()));
        reportVo.setReporterName(user.getRealName());
        reportVo.setMobile(user.getUserMobile());
        reportVo.setIdcard(user.getUserIdcard());
        return R.ok(reportVo);
    }

    @GetMapping("/manager/report")
    public R queryReport() {
        return R.ok(reportService.list(new LambdaQueryWrapper<Report>().eq(Report::getStatus, 0))
                .stream()
                .map(item -> {
                    ReportVo reportVo = new ReportVo();
                    BeanUtils.copyProperties(item, reportVo);
                    User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, item.getUserId()));
                    reportVo.setReporterName(user.getRealName());
                    reportVo.setMobile(user.getUserMobile());
                    reportVo.setIdcard(user.getUserIdcard());
                    return reportVo;
                })
                .collect(Collectors.toList()));
    }

    @GetMapping("/publicity")
    public R queryPublicity(@RequestParam(required = false) Integer size) {
        List<Publicity> publicityList = publicityService.list(new LambdaQueryWrapper<Publicity>().eq(Publicity::getStatus, 1));
        if (size != null) {
            return R.ok(publicityList.stream().limit(size));
        }
        return R.ok(publicityList);
    }
}