diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java index ab6717e1..341f760a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java @@ -30,25 +30,11 @@ public class ImgMessagesLogRest { PagerVo pv = ImgMessagesLogService.listPage(pq); return rb.success().setData(pv); } - @GetMapping("/getMessageBySid/{sid}") - public ResultBean getMessageBySid(@PathVariable("sid") String sid ){ - return ImgMessagesLogService.getMessageBySid(sid); - } - /** - * 查询待阅 已阅消息数量 - * @param userSid - * @return - */ - @GetMapping("/numberOfJobs/{userSid}") - public ResultBean numberOfJobs(@PathVariable("userSid")String userSid){ - return ImgMessagesLogService.numberOfJobs(userSid); + @GetMapping("/getMessageBySid/{sid}/{wxCode}") + public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode")String wxCode ){ + return ImgMessagesLogService.getMessageBySid(sid,wxCode); } - @PostMapping("/changeState") - public ResultBean changeState(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = ImgMessagesLogService.listPage(pq); - return rb.success().setData(pv); - } + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java index e8243f6f..6ba3366d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java @@ -2,6 +2,7 @@ package com.yxt.supervise.report.biz.imgmessageslog; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -14,12 +15,17 @@ import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLog; import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogDto; import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogQuery; import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo; +import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser; import com.yxt.supervise.report.api.messageopenid.MessageOpenid; +import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser; +import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService; import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest; import com.yxt.supervise.report.ds.rms.RiskAlarm; import com.yxt.supervise.report.ds.rms.RmsMapper; import com.yxt.supervise.report.ds.system.SysUser; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.util.*; @@ -30,12 +36,18 @@ import java.util.*; */ @Service public class ImgMessagesLogService extends MybatisBaseService { + String APP_ID = "wx05604ce2a8bede05"; + String SECRET = "3d36e8a61212cf773a2fa4e6c9a83334"; @Autowired MessageOpenidService messageOpenidService; @Autowired com.yxt.supervise.report.ds.system.systemMapper systemMapper; @Autowired RmsMapper rmsMapper; + @Autowired + ProjectDailyRest projectDailyRest; + @Autowired + ImgMessageUserService imgMessageUserService; public ResultBean save(ImgMessagesLogDto dto) { //删除同天同项目消息 baseMapper.delete(new QueryWrapper().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); @@ -54,12 +66,22 @@ public class ImgMessagesLogService extends MybatisBaseService rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET); + JSONObject jsonObject = rbJsonObject.getData(); + String openid = jsonObject.get("openid").toString(); + if(null!=vo){ + ImgMessageUser imgMessageUser = imgMessageUserService.getOne(new QueryWrapper().eq("openId", openid).eq("messageSid", vo.getSid())); + if (null != imgMessageUser) { + imgMessageUser.setState("1"); + imgMessageUserService.updateById(imgMessageUser); + } + } return rb.success().setData(vo); } @@ -84,37 +106,13 @@ public class ImgMessagesLogService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean numberOfJobs(String userSid){ - ResultBean rb =new ResultBean(); - Map map=new HashMap<>(); -// String openid=systemMapper.getAppletOpenidByUsersid(userSid); - SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid); - int pendingMessages=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"0"); - int readMessage=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"1"); - List list = new ArrayList<>(); - list.add("【一级风险】"); - list.add("【二级风险】"); - list.add("【三级风险】"); - list.add("【四级风险】"); - String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"}; - map.put("readMessage",readMessage); - map.put("pendingMessages",pendingMessages); - map.put("urls",urls); - map.put("notice",list); - return rb.success().setData(map); - } - - public PagerVo changeState(PagerQuery pq) { - ResultBean rb=new ResultBean(); - ImgMessagesLogQuery query = pq.getParams(); -// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); - IPage page = PagerUtil.queryToPage(pq); - SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("o.openId",sysUser.getAppletOpenid()); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; + /** + * 定时查询未查看消息的人 + */ + @Scheduled(cron = "0 0 3 * * ?") + public void build(){ + baseMapper.selectList(new QueryWrapper()); } + } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java index e2130fd8..57b81618 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java @@ -128,7 +128,18 @@ public class ProjectDailyRest { ProjectDaily pv = projectDailyService.fetchByProjectAndDay(ProjectDailys.getProjectSid(), ProjectDailys.getOrderDate()); return rb.success().setData(pv); } - + public boolean changState(String wxCode,String sid){ + ResultBean rbJsonObject = wxLogin(wxCode, APP_ID, SECRET); + JSONObject jsonObject = rbJsonObject.getData(); + String openid = jsonObject.get("openid").toString(); + //String userSid = systemMapper.getUserSidByOpenid(openid); + MessageOpenid messageOpenid = messageOpenidService.getOne(new QueryWrapper().eq("openId", openid).eq("messageSid", sid)); + if (null != messageOpenid) { + messageOpenid.setState("1"); + messageOpenidService.updateById(messageOpenid); + } + return true; + } @GetMapping("/getProjectDailyFiles/{projectSid}/{orderDate}") public ResultBean> getProjectDailyFiles(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) { ResultBean rb = ResultBean.fireFail(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java index f8893536..a015dc84 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java @@ -30,25 +30,9 @@ public class RiskMessagesLogRest { PagerVo pv = RiskMessagesLogService.listPage(pq); return rb.success().setData(pv); } - @GetMapping("/getMessageBySid/{sid}") - public ResultBean getMessageBySid(@PathVariable("sid") String sid ){ - return RiskMessagesLogService.getMessageBySid(sid); - } - /** - * 查询待阅 已阅消息数量 - * @param userSid - * @return - */ - @GetMapping("/numberOfJobs/{userSid}") - public ResultBean numberOfJobs(@PathVariable("userSid")String userSid){ - return RiskMessagesLogService.numberOfJobs(userSid); - } - - @PostMapping("/changeState") - public ResultBean changeState(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = RiskMessagesLogService.listPage(pq); - return rb.success().setData(pv); + @GetMapping("/getMessageBySid/{sid}/{wxCode}") + public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode") String wxCode ){ + return RiskMessagesLogService.getMessageBySid(sid,wxCode); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java index c79aa05d..2ba5de78 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java @@ -2,6 +2,7 @@ package com.yxt.supervise.report.biz.riskmessageslog; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -10,12 +11,16 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser; import com.yxt.supervise.report.api.messageopenid.MessageOpenid; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogQuery; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; +import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser; import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; +import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest; +import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService; import com.yxt.supervise.report.ds.rms.RiskAlarm; import com.yxt.supervise.report.ds.rms.RmsMapper; import com.yxt.supervise.report.ds.system.SysUser; @@ -30,12 +35,18 @@ import java.util.*; */ @Service public class RiskMessagesLogService extends MybatisBaseService { + String APP_ID = "wx05604ce2a8bede05"; + String SECRET = "3d36e8a61212cf773a2fa4e6c9a83334"; @Autowired MessageOpenidService messageOpenidService; @Autowired com.yxt.supervise.report.ds.system.systemMapper systemMapper; @Autowired RmsMapper rmsMapper; + @Autowired + ProjectDailyRest projectDailyRest; + @Autowired + RiskMessageUserService riskMessageUserService; public ResultBean save(RiskMessagesLogDto dto) { //删除同天同项目消息 baseMapper.delete(new QueryWrapper().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); @@ -54,12 +65,22 @@ public class RiskMessagesLogService extends MybatisBaseService rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET); + JSONObject jsonObject = rbJsonObject.getData(); + String openid = jsonObject.get("openid").toString(); + if(null!=vo){ + RiskMessageUser riskMessageUser = riskMessageUserService.getOne(new QueryWrapper().eq("openId", openid).eq("messageSid", vo.getSid())); + if (null != riskMessageUser) { + riskMessageUser.setState("1"); + riskMessageUserService.updateById(riskMessageUser); + } + } return rb.success().setData(vo); } @@ -84,37 +105,4 @@ public class RiskMessagesLogService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean numberOfJobs(String userSid){ - ResultBean rb =new ResultBean(); - Map map=new HashMap<>(); -// String openid=systemMapper.getAppletOpenidByUsersid(userSid); - SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid); - int pendingMessages=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"0"); - int readMessage=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"1"); - List list = new ArrayList<>(); - list.add("【一级风险】"); - list.add("【二级风险】"); - list.add("【三级风险】"); - list.add("【四级风险】"); - String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"}; - map.put("readMessage",readMessage); - map.put("pendingMessages",pendingMessages); - map.put("urls",urls); - map.put("notice",list); - return rb.success().setData(map); - } - - - public PagerVo changeState(PagerQuery pq) { - ResultBean rb=new ResultBean(); - RiskMessagesLogQuery query = pq.getParams(); -// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); - IPage page = PagerUtil.queryToPage(pq); - SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("o.openId",sysUser.getAppletOpenid()); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } }