28 changed files with 438 additions and 23 deletions
@ -0,0 +1,13 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageslog; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/12 15:28 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class Linkers { |
||||
|
String name; |
||||
|
String mobile; |
||||
|
} |
@ -0,0 +1,21 @@ |
|||||
|
package com.yxt.supervise.report.api.messagetype; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import com.yxt.common.core.domain.EntityWithId; |
||||
|
import io.swagger.annotations.ApiModel; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@ApiModel(value = "消息推送日志", description = "消息推送日志") |
||||
|
@TableName("message_push_log") |
||||
|
@Data |
||||
|
public class MessageType { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String icon; |
||||
|
private String name; |
||||
|
private String code; |
||||
|
} |
@ -0,0 +1,20 @@ |
|||||
|
package com.yxt.supervise.report.api.messagetype; |
||||
|
|
||||
|
import com.yxt.common.core.dto.Dto; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import java.util.Map; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class MessageTypeDto implements Dto { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String icon; |
||||
|
private String name; |
||||
|
private String code; |
||||
|
} |
@ -0,0 +1,14 @@ |
|||||
|
package com.yxt.supervise.report.api.messagetype; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:07 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class MessageTypeQuery implements Query { |
||||
|
private String wxCode; |
||||
|
private String userSid; |
||||
|
} |
@ -0,0 +1,24 @@ |
|||||
|
package com.yxt.supervise.report.api.messagetype; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo; |
||||
|
import com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.HashMap; |
||||
|
import java.util.Map; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:57 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class MessageTypeVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String icon;//图标
|
||||
|
private String name;//标题名
|
||||
|
private String code;// 消息code
|
||||
|
private Object messageLogs; //数据消息
|
||||
|
} |
@ -0,0 +1,26 @@ |
|||||
|
package com.yxt.supervise.report.biz.messagetype; |
||||
|
|
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
|
import com.baomidou.mybatisplus.core.toolkit.Constants; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageType; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeVo; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
import org.apache.ibatis.annotations.Select; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface MessageTypeMapper extends BaseMapper<MessageType> { |
||||
|
@Select("select count(o.id) from message_push_log l left join message_openid o on o.messageSid=l.sid where o.openId=#{openid} and o.state=#{state}") |
||||
|
int getAllByUserSid(@Param("openid") String openid,@Param("state")String state); |
||||
|
@Select("select * from message_type") |
||||
|
List<MessageTypeVo> listAll(); |
||||
|
} |
@ -0,0 +1,32 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8" ?> |
||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
|
<mapper namespace="com.yxt.supervise.report.biz.messagetype.MessageTypeMapper"> |
||||
|
<!-- <where> ${ew.sqlSegment} </where>--> |
||||
|
<!-- ${ew.customSqlSegment} --> |
||||
|
<select id="selectPageVo" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo"> |
||||
|
select l.*,o.state as oState from message_push_log l left join message_openid o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getMessageType" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
where |
||||
|
orderDate=#{orderDate} |
||||
|
</select> |
||||
|
|
||||
|
<select id="getAllMessageType" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_store |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
</mapper> |
@ -0,0 +1,40 @@ |
|||||
|
package com.yxt.supervise.report.biz.messagetype; |
||||
|
|
||||
|
|
||||
|
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.messagetype.MessageTypeDto; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeQuery; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeVo; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/MessageType") |
||||
|
public class MessageTypeRest { |
||||
|
|
||||
|
@Autowired |
||||
|
MessageTypeService MessageTypeService; |
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody MessageTypeDto dto){ |
||||
|
return MessageTypeService.save(dto); |
||||
|
} |
||||
|
@PostMapping("/list") |
||||
|
public ResultBean list(@RequestBody MessageTypeQuery pq){ |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
List<MessageTypeVo> pv = MessageTypeService.listAll(pq); |
||||
|
return rb.success().setData(pv); |
||||
|
} |
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
} |
@ -0,0 +1,116 @@ |
|||||
|
package com.yxt.supervise.report.biz.messagetype; |
||||
|
|
||||
|
|
||||
|
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; |
||||
|
import com.yxt.common.base.utils.PagerUtil; |
||||
|
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.imgmessageslog.ImgMessagesLog; |
||||
|
import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogDto; |
||||
|
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.messagepushlog.MessagePushLog; |
||||
|
import com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageType; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeDto; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeQuery; |
||||
|
import com.yxt.supervise.report.api.messagetype.MessageTypeVo; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; |
||||
|
import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser; |
||||
|
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.ImgMessagesLogMapper; |
||||
|
import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogService; |
||||
|
import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService; |
||||
|
import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; |
||||
|
import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogMapper; |
||||
|
import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest; |
||||
|
import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogMapper; |
||||
|
import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogService; |
||||
|
import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService; |
||||
|
import com.yxt.supervise.report.biz.systemriskmessageslog.SystemRiskMessagesLogService; |
||||
|
import com.yxt.supervise.report.biz.systemriskmessageuser.SystemRiskMessageUserService; |
||||
|
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.apache.commons.lang3.StringUtils; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.util.*; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class MessageTypeService extends MybatisBaseService<MessageTypeMapper, MessageType> { |
||||
|
@Autowired |
||||
|
ImgMessagesLogMapper imgMessagesLogMapper; |
||||
|
@Autowired |
||||
|
RiskMessagesLogMapper riskMessagesLogMapper; |
||||
|
@Autowired |
||||
|
MessagePushLogMapper messagePushLogMapper; |
||||
|
@Autowired |
||||
|
com.yxt.supervise.report.ds.system.systemMapper systemMapper; |
||||
|
@Autowired |
||||
|
ProjectDailyRest projectDailyRest; |
||||
|
@Autowired |
||||
|
RmsMapper rmsMapper; |
||||
|
|
||||
|
public ResultBean save(MessageTypeDto dto) { |
||||
|
//删除同天同项目消息
|
||||
|
// baseMapper.delete(new QueryWrapper<MessageType>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
|
||||
|
ResultBean rb=new ResultBean(); |
||||
|
MessageType entity=new MessageType(); |
||||
|
BeanUtil.copyProperties(dto, entity, "id"); |
||||
|
entity.setSid(UUID.randomUUID().toString()); |
||||
|
baseMapper.insert(entity); |
||||
|
return rb.success().setMsg("保存成功"); |
||||
|
|
||||
|
} |
||||
|
public List<MessageTypeVo> listAll(MessageTypeQuery query) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
String openId=""; |
||||
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(query.getUserSid())) { |
||||
|
SysUser sysUser = systemMapper.getAppletOpenidByUsersid(query.getUserSid()); |
||||
|
openId=sysUser.getAppletOpenid(); |
||||
|
} else if (org.apache.commons.lang3.StringUtils.isNoneBlank(query.getWxCode())) { |
||||
|
ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(query.getWxCode(), "APP_ID", "SECRET"); |
||||
|
JSONObject jsonObject = rbJsonObject.getData(); |
||||
|
openId = jsonObject.get("openid").toString(); |
||||
|
} |
||||
|
List<MessageTypeVo> pagging = baseMapper.listAll(); |
||||
|
for(MessageTypeVo messageTypeVo:pagging){ |
||||
|
if(messageTypeVo.getCode().equals("1001")){ |
||||
|
ImgMessagesLogVo imgMessagesLogVo=imgMessagesLogMapper.getMessage(); |
||||
|
messageTypeVo.setMessageLogs(imgMessagesLogVo); |
||||
|
imgMessagesLogVo.setCount(imgMessagesLogMapper.getMessageCount(openId)); |
||||
|
}else if(messageTypeVo.getCode().equals("1002")){ |
||||
|
MessagePushLogVo messagePushLogVo= messagePushLogMapper.getMessage(); |
||||
|
messageTypeVo.setMessageLogs(messagePushLogVo); |
||||
|
messagePushLogVo.setCount(messagePushLogMapper.getCountByUser(query.getUserSid(), "0")); |
||||
|
}else if(messageTypeVo.getCode().equals("1003")){ |
||||
|
RiskMessagesLogVo riskMessagesLogVo=riskMessagesLogMapper.getMessage(); |
||||
|
RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(riskMessagesLogVo.getRiskSid()); |
||||
|
messageTypeVo.setMessageLogs(riskMessagesLogVo); |
||||
|
riskMessagesLogVo.setType(riskAlarm.getZt()); |
||||
|
riskMessagesLogVo.setCount(riskMessagesLogMapper.getMessageCount(openId)); |
||||
|
} |
||||
|
} |
||||
|
return pagging; |
||||
|
} |
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
} |
Loading…
Reference in new issue