yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

9/4

master
wangpengfei 2 years ago
parent
5e07853266
commit
e7309486c7
5 changed files with 71 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java
  2. 62
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java
  3. 13
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java
  4. 22
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java
  5. 56
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java

22
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java
View File

@ -30,25 +30,11 @@ public class ImgMessagesLogRest {
PagerVo<ImgMessagesLogVo> 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<ImgMessagesLogQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ImgMessagesLogVo> pv = ImgMessagesLogService.listPage(pq);
return rb.success().setData(pv);
}
}

62
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java
View File

@ -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<ImgMessagesLogMapper, ImgMessagesLog> {
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<ImgMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@ -54,12 +66,22 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
return rb.success().setMsg("保存成功");
}
public ResultBean getMessageBySid(String sid) {
public ResultBean getMessageBySid(String sid,String wxCode) {
ResultBean rb=new ResultBean();
RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(sid);
ImgMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
vo.setShName(riskAlarm.getPositionName());
vo.setText(riskAlarm.getContent());
ResultBean<JSONObject> 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<ImgMessageUser>().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<ImgMessagesLogMapp
PagerVo<ImgMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean numberOfJobs(String userSid){
ResultBean rb =new ResultBean();
Map<String,Object> 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<String> 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<ImgMessagesLogVo> changeState(PagerQuery<ImgMessagesLogQuery> pq) {
ResultBean rb=new ResultBean();
ImgMessagesLogQuery query = pq.getParams();
// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
IPage<ImgMessagesLog> page = PagerUtil.queryToPage(pq);
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
QueryWrapper<ImgMessagesLog> qw = new QueryWrapper<>();
qw.eq("o.openId",sysUser.getAppletOpenid());
IPage<ImgMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ImgMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
/**
* 定时查询未查看消息的人
*/
@Scheduled(cron = "0 0 3 * * ?")
public void build(){
baseMapper.selectList(new QueryWrapper<ImgMessagesLog>());
}
}

13
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java
View File

@ -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<JSONObject> 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<MessageOpenid>().eq("openId", openid).eq("messageSid", sid));
if (null != messageOpenid) {
messageOpenid.setState("1");
messageOpenidService.updateById(messageOpenid);
}
return true;
}
@GetMapping("/getProjectDailyFiles/{projectSid}/{orderDate}")
public ResultBean<List<ProjectDailyFiles>> getProjectDailyFiles(@PathVariable("projectSid") String projectSid, @PathVariable("orderDate") String orderDate) {
ResultBean rb = ResultBean.fireFail();

22
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java
View File

@ -30,25 +30,9 @@ public class RiskMessagesLogRest {
PagerVo<RiskMessagesLogVo> 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<RiskMessagesLogQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<RiskMessagesLogVo> 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);
}
}

56
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java
View File

@ -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<RiskMessagesLogMapper, RiskMessagesLog> {
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<RiskMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@ -54,12 +65,22 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
return rb.success().setMsg("保存成功");
}
public ResultBean getMessageBySid(String sid) {
public ResultBean getMessageBySid(String sid,String wxCode) {
ResultBean rb=new ResultBean();
RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(sid);
RiskMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
vo.setShName(riskAlarm.getPositionName());
vo.setText(riskAlarm.getContent());
ResultBean<JSONObject> 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<RiskMessageUser>().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<RiskMessagesLogMa
PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean numberOfJobs(String userSid){
ResultBean rb =new ResultBean();
Map<String,Object> 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<String> 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<RiskMessagesLogVo> changeState(PagerQuery<RiskMessagesLogQuery> pq) {
ResultBean rb=new ResultBean();
RiskMessagesLogQuery query = pq.getParams();
// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
IPage<RiskMessagesLog> page = PagerUtil.queryToPage(pq);
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
qw.eq("o.openId",sysUser.getAppletOpenid());
IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

Write Preview
Loading…
Cancel
Save