字段注入修改

sgj

12 小时以前 024dc397e65ed55d7addbaf6fb153ce3f2548a6c

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapReplyService.java

@@ -8,6 +8,7 @@
import com.fzzy.igds.domain.SnapReply;
import com.fzzy.igds.mapper.SnapReplyMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.WxUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -22,6 +23,8 @@

    @Resource
    private SnapReplyMapper snapReplyMapper;
    @Resource
    private WxUtil wxUtil;


    /**
@@ -32,8 +35,9 @@
     */
    public void listPage(Page<SnapReply> page, IgdsBaseParam param) {
        QueryWrapper<SnapReply> queryWrapper = new QueryWrapper<>();

        param.setCompanyId(ContextUtil.getCompanyId());
        if (StringUtils.isBlank(param.getCompanyId())) {
            param.setCompanyId(ContextUtil.getCompanyId());
        }
        queryWrapper.eq("company_id", param.getCompanyId());

        //库区检索
@@ -41,6 +45,31 @@
            queryWrapper.eq("dept_id", param.getDeptId());
        }

        //是否处理检索
        if (StringUtils.isNotBlank(param.getKey())) {
            queryWrapper.eq("is_handle", param.getKey());
        }

        queryWrapper.orderByDesc("create_time");
        queryWrapper.orderByDesc("id");
        snapReplyMapper.selectPage(page, queryWrapper);
    }

    public void listPageByListDept(Page<SnapReply> page, IgdsBaseParam param, List<String> listDept) {
        if (listDept == null || listDept.isEmpty()) {
            return;
        }

        QueryWrapper<SnapReply> queryWrapper = new QueryWrapper<>();
        if (StringUtils.isBlank(param.getCompanyId())) {
            param.setCompanyId(ContextUtil.getCompanyId());
        }
        queryWrapper.eq("company_id", param.getCompanyId());

        //库区检索
        if (!listDept.isEmpty()) {
            queryWrapper.in("dept_id", listDept);
        }
        //是否处理检索
        if (StringUtils.isNotBlank(param.getKey())) {
            queryWrapper.eq("is_handle", param.getKey());
@@ -140,4 +169,55 @@
        return snapReplyMapper.deleteById(snapReply) > 0 ? BaseResp.success() : BaseResp.error("删除失败");
    }



    /**
     * 发送警告到微信
     * @param deptId
     */
    public BaseResp sendNotice(String deptId){
        //todo 未完成
        if(StringUtils.isEmpty(deptId)){
            return BaseResp.error("请选择库区");
        }


//        //需要推送的用户
//        List<SysUser> users= new ArrayList<>();
//        String res = "";
//        //遍历用户，发送微信消息
//        for (SysUser user : users) {
//            if(StringUtils.isNotEmpty(user.getOpenId())){
//                boolean b = weChatUtil.sendMessage(
//                        user.getOpenId(),
//                        snapReply.getId(),
//                        snapReply.getCompanyId(),
//                        "库区告警批复测试推送",
//                        snapReply.getDeptId(),
//                        snapReply.getContent(),
//                        DateFormatUtils.format(snapReply.getCreateTime(),"yyyy-MM-dd HH:mm:ss"),
//                        "",
//                        "",
//                        user.getUserName());
//                if(!b){
//                    res += user.getUserName() + "用户微信推送失败,";
//                    return BaseResp.error(res);
//
//                }
//            }else{
//                log.debug("------用户openid不存在，不进行推送------");
//                res += user.getUserName() + "用户未绑定,";
//                return BaseResp.error(res);
//
//            }
//        }
//        if(StringUtils.isEmpty(res)){
//            return BaseResp.success("微信:推送成功;");
//        }else{
//            return BaseResp.error("微信:"+res+";");
//        }
        return BaseResp.success("微信:推送成功;");

    }

}