Browse Source

消息中心设置已读

master
dimengzhe 2 years ago
parent
commit
7da73a10eb
  1. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushPcLogVo.java
  2. 17
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushPcUpdateState.java
  3. 17
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushTypeList.java
  4. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.java
  5. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml
  6. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.java
  7. 23
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.xml
  8. 19
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogRest.java
  9. 33
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
  10. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.java
  11. 4
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml

2
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushPcLogVo.java

@ -14,7 +14,7 @@ import java.util.Map;
**/
@Data
public class MessagePushPcLogVo {
private String sid;
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("标题")

17
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushPcUpdateState.java

@ -0,0 +1,17 @@
package com.yxt.supervise.report.api.messagepushlog;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/20
**/
@Data
public class MessagePushPcUpdateState {
private List<MessagePushTypeList> list = new ArrayList<>();
}

17
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushTypeList.java

@ -0,0 +1,17 @@
package com.yxt.supervise.report.api.messagepushlog;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/11/20
**/
@Data
public class MessagePushTypeList {
@ApiModelProperty("类型")
private String type;
@ApiModelProperty("sid")
private String sid;
}

1
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.java

@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
public interface ImgMessageUserMapper extends BaseMapper<ImgMessageUser> {
int updateMessageState(String sid);
}

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml

@ -26,4 +26,8 @@
report_sales_day_store
<where> ${ew.sqlSegment} </where>
</select>
<update id="updateMessageState">
update img_message_user set state = 1 where messageSid = #{sid}
</update>
</mapper>

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.java

@ -31,4 +31,8 @@ public interface MessagePushLogMapper extends BaseMapper<MessagePushLog> {
MessagePushLogVo getMessage();
IPage<MessagePushPcLogVo> listPageByPc(IPage<MessagePushLog> page, @Param(Constants.WRAPPER)QueryWrapper<MessagePushLog> qw,@Param("openId") String openId,@Param("state") String state);
int updateMessageState(String sid);
int updateMessageStateByUserSid(String appletOpenid);
}

23
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.xml

@ -33,8 +33,8 @@
</select>
<select id="listPageByPc" resultType="com.yxt.supervise.report.api.messagepushlog.MessagePushPcLogVo">
select a.content,a.type from (
select l.content,'数据消息' as type
select a.content, a.type,a,sid from (
select l.content, '数据消息' as type,l.sid
from message_push_log l
left join message_openid o on o.messageSid = l.sid
where o.openId = #{openId}
@ -42,7 +42,7 @@
and o.state = #{state}
</if>
union all
select il.content,'风险提示' as type
select il.content, '风险提示' as type,il.sid
from img_messages_log il
left join img_message_user iu on iu.messageSid = il.sid
where iu.openId = #{openId}
@ -50,7 +50,7 @@
and iu.state = #{state}
</if>
union all
select rl.content,'设备状态' as type
select rl.content, '设备状态' as type,rl.sid
from risk_messages_log rl
left join risk_message_user ru on ru.messageSid = rl.sid
where ru.openId = #{openId}
@ -59,4 +59,19 @@
</if>
) a
</select>
<update id="updateMessageState">
update message_openid
set state = 1
where messageSid = #{sid}
</update>
<update id="updateMessageStateByUserSid">
update (select ru.* from risk_message_user ru where openId = #{appletOpenid}
union all
select mo.* from message_openid mo where openId = #{appletOpenid}
union all
select iu.* from img_message_user iu where iu.openId = #{appletOpenid}
)a set state = 1
</update>
</mapper>

19
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogRest.java

@ -5,6 +5,9 @@ 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.messagepushlog.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -45,7 +48,7 @@ public class MessagePushLogRest {
PagerVo<MessagePushLogVo> pv = messagePushLogService.listPage(pq);
return rb.success().setData(pv);
}
@ApiModelProperty("PC分页列表")
@PostMapping("/listPageByPc")
ResultBean<PagerVo<MessagePushPcLogVo>> listPageByPc(@RequestBody PagerQuery<MessagePushPcLogQuery> pagerQuery){
ResultBean rb = ResultBean.fireFail();
@ -53,5 +56,19 @@ public class MessagePushLogRest {
return rb.success().setData(pv);
}
@ApiOperation("全部设为已读")
@PostMapping("/allChangeRead")
public ResultBean allChangeRead(@RequestParam("userSid")String userSid){
return messagePushLogService.allChangeRead(userSid);
}
@ApiOperation("批量设为已读")
@PostMapping("/changeRead")
public ResultBean changeRead(@RequestBody MessagePushPcUpdateState messagePushPcUpdateState){
return messagePushLogService.changeRead(messagePushPcUpdateState);
}
}

33
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java

@ -22,9 +22,11 @@ import com.yxt.supervise.report.api.systemriskmessageslog.SystemRiskMessagesLog;
import com.yxt.supervise.report.api.systemriskmessageslog.SystemRiskMessagesLogDto;
import com.yxt.supervise.report.api.systemriskmessageuser.SystemRiskMessageUser;
import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogService;
import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserMapper;
import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService;
import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogService;
import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserMapper;
import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
import com.yxt.supervise.report.biz.systemriskmessageslog.SystemRiskMessagesLogService;
import com.yxt.supervise.report.biz.systemriskmessageuser.SystemRiskMessageUserService;
@ -59,6 +61,10 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
SystemRiskMessageUserService systemRiskMessageUserService;
@Autowired
FlowTaskFeign flowTaskFeign;
@Autowired
private ImgMessageUserMapper imgMessageUserMapper;
@Autowired
private RiskMessageUserMapper riskMessageUserMapper;
public ResultBean save(MessagePushLogDto dto) {
//删除同天同项目消息
@ -242,4 +248,31 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
PagerVo<MessagePushPcLogVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean changeRead(MessagePushPcUpdateState messagePushPcUpdateState) {
ResultBean rb = ResultBean.fireFail();
List<MessagePushTypeList> list = messagePushPcUpdateState.getList();
list.removeAll(Collections.singleton(null));
if(list.isEmpty()){
return rb.setMsg("请选择数据");
}
for (int i = 0; i <list.size(); i++) {
MessagePushTypeList messagePushTypeList = list.get(i);
if("数据消息".equals(messagePushTypeList.getType())){
baseMapper.updateMessageState(messagePushTypeList.getSid());
}else if("风险提示".equals(messagePushTypeList.getType())){
imgMessageUserMapper.updateMessageState(messagePushTypeList.getSid());
}else if("设备状态".equals(messagePushTypeList.getType())){
riskMessageUserMapper.updateMessageState(messagePushTypeList.getSid());
}
}
return rb.success();
}
public ResultBean allChangeRead(String userSid) {
ResultBean rb = ResultBean.fireFail();
SysUser sysUser = systemMapper.getAppletOpenidByUsersid(userSid);
baseMapper.updateMessageStateByUserSid(sysUser.getAppletOpenid());
return rb.success();
}
}

1
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.java

@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
public interface RiskMessageUserMapper extends BaseMapper<RiskMessageUser> {
int updateMessageState(String sid);
}

4
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml

@ -26,4 +26,8 @@
report_sales_day_store
<where> ${ew.sqlSegment} </where>
</select>
<update id="updateMessageState">
update risk_message_user set state = 1 where messageSid = #{sid}
</update>
</mapper>
Loading…
Cancel
Save