69 changed files with 1926 additions and 56 deletions
@ -0,0 +1,23 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageslog; |
||||
|
|
||||
|
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("risk_messages_log") |
||||
|
@Data |
||||
|
public class ImgMessagesLog extends EntityWithId { |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
private String content; |
||||
|
private String projectSid; |
||||
|
private String orderDate; |
||||
|
private String riskSid; |
||||
|
} |
@ -0,0 +1,26 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageslog; |
||||
|
|
||||
|
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 ImgMessagesLogDto implements Dto { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
//private Map<String, Template> content;
|
||||
|
private Map<String, String> content; |
||||
|
private List<String> messageOpenids; |
||||
|
private String openid;//小程序openid
|
||||
|
private String projectSid; |
||||
|
private String orderDate; |
||||
|
private String riskSid; |
||||
|
} |
@ -0,0 +1,14 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageslog; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:07 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ImgMessagesLogQuery implements Query { |
||||
|
private String userSid; |
||||
|
private String state;//0未读 1 已读 2全部
|
||||
|
} |
@ -0,0 +1,47 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageslog; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.HashMap; |
||||
|
import java.util.List; |
||||
|
import java.util.Map; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:57 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ImgMessagesLogVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
private String content; |
||||
|
//消息状态
|
||||
|
private String oState; |
||||
|
private Map<String,String> map; |
||||
|
private String riskSid; |
||||
|
private String shName; |
||||
|
private List<String> devices; |
||||
|
private String text; |
||||
|
|
||||
|
|
||||
|
public Map<String, String> getMap() { |
||||
|
Map<String, String> strMap = new HashMap<>(); |
||||
|
|
||||
|
String[] keyValuePairs = content.split("[{;,}]"); |
||||
|
|
||||
|
for (String pair : keyValuePairs) { |
||||
|
// 按照等号拆分键和值
|
||||
|
String[] keyValue = pair.split("="); |
||||
|
if (keyValue.length == 2) { |
||||
|
String key = keyValue[0].trim(); |
||||
|
String value = keyValue[1].trim(); |
||||
|
strMap.put(key, value); |
||||
|
} |
||||
|
} |
||||
|
this.map = strMap; |
||||
|
return map; |
||||
|
} |
||||
|
} |
@ -0,0 +1,20 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageuser; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import io.swagger.annotations.ApiModel; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:34 |
||||
|
*/ |
||||
|
@ApiModel(value = "消息用户微信openid关联", description = "消息用户微信openid关联") |
||||
|
@TableName("risk_message_user") |
||||
|
@Data |
||||
|
public class ImgMessageUser { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.dto.Dto; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:34 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ImgMessageUserDto implements Dto { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:35 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ImgMessageUserQuery implements Query { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.imgmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:35 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ImgMessageUserVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,23 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageslog; |
||||
|
|
||||
|
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("risk_messages_log") |
||||
|
@Data |
||||
|
public class RiskMessagesLog extends EntityWithId { |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
private String content; |
||||
|
private String projectSid; |
||||
|
private String orderDate; |
||||
|
private String riskSid; |
||||
|
} |
@ -0,0 +1,26 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageslog; |
||||
|
|
||||
|
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 RiskMessagesLogDto implements Dto { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
//private Map<String, Template> content;
|
||||
|
private Map<String, String> content; |
||||
|
private List<String> messageOpenids; |
||||
|
private String openid;//小程序openid
|
||||
|
private String projectSid; |
||||
|
private String orderDate; |
||||
|
private String riskSid; |
||||
|
} |
@ -0,0 +1,14 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageslog; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:07 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class RiskMessagesLogQuery implements Query { |
||||
|
private String userSid; |
||||
|
private String state;//0未读 1 已读 2全部
|
||||
|
} |
@ -0,0 +1,47 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageslog; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.HashMap; |
||||
|
import java.util.List; |
||||
|
import java.util.Map; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:57 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class RiskMessagesLogVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageTime; |
||||
|
private String pagepath; |
||||
|
private String content; |
||||
|
//消息状态
|
||||
|
private String oState; |
||||
|
private Map<String,String> map; |
||||
|
private String riskSid; |
||||
|
private String shName; |
||||
|
private List<String> devices; |
||||
|
private String text; |
||||
|
|
||||
|
|
||||
|
public Map<String, String> getMap() { |
||||
|
Map<String, String> strMap = new HashMap<>(); |
||||
|
|
||||
|
String[] keyValuePairs = content.split("[{;,}]"); |
||||
|
|
||||
|
for (String pair : keyValuePairs) { |
||||
|
// 按照等号拆分键和值
|
||||
|
String[] keyValue = pair.split("="); |
||||
|
if (keyValue.length == 2) { |
||||
|
String key = keyValue[0].trim(); |
||||
|
String value = keyValue[1].trim(); |
||||
|
strMap.put(key, value); |
||||
|
} |
||||
|
} |
||||
|
this.map = strMap; |
||||
|
return map; |
||||
|
} |
||||
|
} |
@ -0,0 +1,20 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageuser; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import io.swagger.annotations.ApiModel; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:34 |
||||
|
*/ |
||||
|
@ApiModel(value = "消息用户微信openid关联", description = "消息用户微信openid关联") |
||||
|
@TableName("risk_message_user") |
||||
|
@Data |
||||
|
public class RiskMessageUser { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.dto.Dto; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:34 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class RiskMessageUserDto implements Dto { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:35 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class RiskMessageUserQuery implements Query { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.api.riskmessageuser; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 10:35 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class RiskMessageUserVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String messageSid; |
||||
|
private String openId; |
||||
|
private String state; |
||||
|
} |
@ -0,0 +1,25 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageslog; |
||||
|
|
||||
|
|
||||
|
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.imgmessageslog.ImgMessagesLog; |
||||
|
import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
import org.apache.ibatis.annotations.Select; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface ImgMessagesLogMapper extends BaseMapper<ImgMessagesLog> { |
||||
|
@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); |
||||
|
IPage<ImgMessagesLogVo> selectPageVo(IPage<ImgMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<ImgMessagesLog> qw); |
||||
|
@Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1") |
||||
|
ImgMessagesLogVo getMessageBySid(@Param("sid") String sid); |
||||
|
} |
@ -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.imgmessageslog.ImgMessagesLogMapper"> |
||||
|
<!-- <where> ${ew.sqlSegment} </where>--> |
||||
|
<!-- ${ew.customSqlSegment} --> |
||||
|
<select id="selectPageVo" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo"> |
||||
|
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="getImgMessagesLog" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
where |
||||
|
orderDate=#{orderDate} |
||||
|
</select> |
||||
|
|
||||
|
<select id="getAllImgMessagesLog" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_store |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
</mapper> |
@ -0,0 +1,54 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageslog; |
||||
|
|
||||
|
|
||||
|
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.ImgMessagesLogDto; |
||||
|
import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogQuery; |
||||
|
import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/ImgMessagesLog") |
||||
|
public class ImgMessagesLogRest { |
||||
|
|
||||
|
@Autowired |
||||
|
ImgMessagesLogService ImgMessagesLogService; |
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody ImgMessagesLogDto dto){ |
||||
|
return ImgMessagesLogService.save(dto); |
||||
|
} |
||||
|
@PostMapping("/listPage") |
||||
|
public ResultBean listPage(@RequestBody PagerQuery<ImgMessagesLogQuery> pq){ |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
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); |
||||
|
} |
||||
|
|
||||
|
@PostMapping("/changeState") |
||||
|
public ResultBean changeState(@RequestBody PagerQuery<ImgMessagesLogQuery> pq){ |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
PagerVo<ImgMessagesLogVo> pv = ImgMessagesLogService.listPage(pq); |
||||
|
return rb.success().setData(pv); |
||||
|
} |
||||
|
|
||||
|
} |
@ -0,0 +1,125 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageslog; |
||||
|
|
||||
|
|
||||
|
import cn.hutool.core.bean.BeanUtil; |
||||
|
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.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.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.messageopenid.MessageOpenid; |
||||
|
import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService; |
||||
|
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.stereotype.Service; |
||||
|
|
||||
|
import java.util.*; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapper, ImgMessagesLog> { |
||||
|
@Autowired |
||||
|
MessageOpenidService messageOpenidService; |
||||
|
@Autowired |
||||
|
com.yxt.supervise.report.ds.system.systemMapper systemMapper; |
||||
|
@Autowired |
||||
|
RmsMapper rmsMapper; |
||||
|
public ResultBean save(ImgMessagesLogDto dto) { |
||||
|
//删除同天同项目消息
|
||||
|
baseMapper.delete(new QueryWrapper<ImgMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
ImgMessagesLog entity=new ImgMessagesLog(); |
||||
|
BeanUtil.copyProperties(dto, entity, "id"); |
||||
|
entity.setSid(UUID.randomUUID().toString()); |
||||
|
baseMapper.insert(entity); |
||||
|
for(String openid:dto.getMessageOpenids()){ |
||||
|
MessageOpenid messageOpenid=new MessageOpenid(); |
||||
|
messageOpenid.setOpenId(openid); |
||||
|
messageOpenid.setMessageSid(entity.getSid()); |
||||
|
messageOpenid.setSid(UUID.randomUUID().toString()); |
||||
|
messageOpenidService.save(messageOpenid); |
||||
|
} |
||||
|
return rb.success().setMsg("保存成功"); |
||||
|
|
||||
|
} |
||||
|
public ResultBean getMessageBySid(String sid) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
ImgMessagesLogVo vo= baseMapper.getMessageBySid(sid); |
||||
|
RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid()); |
||||
|
vo.setShName(riskAlarm.getPositionName()); |
||||
|
String [] split=riskAlarm.getRemarks().split(","); |
||||
|
List<String> list=new ArrayList<>(); |
||||
|
for (String u:split){ |
||||
|
list.add(u); |
||||
|
} |
||||
|
vo.setDevices(list); |
||||
|
return rb.success().setData(vo); |
||||
|
|
||||
|
} |
||||
|
public PagerVo<ImgMessagesLogVo> listPage(PagerQuery<ImgMessagesLogQuery> pq) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
ImgMessagesLogQuery query = pq.getParams(); |
||||
|
// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
|
||||
|
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); |
||||
|
IPage<ImgMessagesLog> page = PagerUtil.queryToPage(pq); |
||||
|
QueryWrapper<ImgMessagesLog> qw = new QueryWrapper<>(); |
||||
|
System.out.println(query.getState()); |
||||
|
qw.eq("o.openId",sysUser.getAppletOpenid()); |
||||
|
if(StringUtils.isNotNull(query.getState())){ |
||||
|
if(query.getState().equals("2")){} |
||||
|
else if(query.getState().equals("0")){ |
||||
|
qw.eq("o.state",0); |
||||
|
}else if(query.getState().equals("1")){ |
||||
|
qw.eq("o.state",1); |
||||
|
} |
||||
|
} |
||||
|
IPage<ImgMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw); |
||||
|
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; |
||||
|
} |
||||
|
} |
@ -0,0 +1,16 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageuser; |
||||
|
|
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface ImgMessageUserMapper extends BaseMapper<ImgMessageUser> { |
||||
|
|
||||
|
|
||||
|
} |
@ -0,0 +1,29 @@ |
|||||
|
<?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.imgmessageuser.ImgMessageUserMapper"> |
||||
|
<!-- <where> ${ew.sqlSegment} </where>--> |
||||
|
<!-- ${ew.customSqlSegment} --> |
||||
|
<select id="getImgMessageUser" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
where |
||||
|
orderDate=#{orderDate} |
||||
|
</select> |
||||
|
|
||||
|
<select id="getAllImgMessageUser" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_store |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
</mapper> |
@ -0,0 +1,29 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageuser; |
||||
|
|
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserDto; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/ImgMessageUser") |
||||
|
public class ImgMessageUserRest { |
||||
|
|
||||
|
@Autowired |
||||
|
ImgMessageUserService ImgMessageUserService; |
||||
|
|
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody List<ImgMessageUserDto> dto){ |
||||
|
return ImgMessageUserService.save(dto); |
||||
|
} |
||||
|
} |
@ -0,0 +1,32 @@ |
|||||
|
package com.yxt.supervise.report.biz.imgmessageuser; |
||||
|
|
||||
|
|
||||
|
import cn.hutool.core.bean.BeanUtil; |
||||
|
import com.yxt.common.base.service.MybatisBaseService; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser; |
||||
|
import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserDto; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import java.util.UUID; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class ImgMessageUserService extends MybatisBaseService<ImgMessageUserMapper, ImgMessageUser> { |
||||
|
|
||||
|
public ResultBean save(List<ImgMessageUserDto> dto) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
for(ImgMessageUserDto dto1:dto){ |
||||
|
ImgMessageUser entity=new ImgMessageUser(); |
||||
|
BeanUtil.copyProperties(dto1, entity, "id"); |
||||
|
entity.setSid(UUID.randomUUID().toString()); |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
return rb.success().setMsg("保存成功"); |
||||
|
|
||||
|
} |
||||
|
} |
@ -0,0 +1,25 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageslog; |
||||
|
|
||||
|
|
||||
|
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.riskmessageslog.RiskMessagesLog; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
import org.apache.ibatis.annotations.Select; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> { |
||||
|
@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); |
||||
|
IPage<RiskMessagesLogVo> selectPageVo(IPage<RiskMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw); |
||||
|
@Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1") |
||||
|
RiskMessagesLogVo getMessageBySid(@Param("sid") String sid); |
||||
|
} |
@ -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.riskmessageslog.RiskMessagesLogMapper"> |
||||
|
<!-- <where> ${ew.sqlSegment} </where>--> |
||||
|
<!-- ${ew.customSqlSegment} --> |
||||
|
<select id="selectPageVo" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo"> |
||||
|
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="getRiskMessagesLog" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
where |
||||
|
orderDate=#{orderDate} |
||||
|
</select> |
||||
|
|
||||
|
<select id="getAllRiskMessagesLog" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_store |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
</mapper> |
@ -0,0 +1,54 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageslog; |
||||
|
|
||||
|
|
||||
|
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.riskmessageslog.RiskMessagesLogDto; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogQuery; |
||||
|
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/RiskMessagesLog") |
||||
|
public class RiskMessagesLogRest { |
||||
|
|
||||
|
@Autowired |
||||
|
RiskMessagesLogService RiskMessagesLogService; |
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody RiskMessagesLogDto dto){ |
||||
|
return RiskMessagesLogService.save(dto); |
||||
|
} |
||||
|
@PostMapping("/listPage") |
||||
|
public ResultBean listPage(@RequestBody PagerQuery<RiskMessagesLogQuery> pq){ |
||||
|
ResultBean rb = ResultBean.fireFail(); |
||||
|
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); |
||||
|
} |
||||
|
|
||||
|
} |
@ -0,0 +1,120 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageslog; |
||||
|
|
||||
|
|
||||
|
import cn.hutool.core.bean.BeanUtil; |
||||
|
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.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.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.biz.messageopenid.MessageOpenidService; |
||||
|
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.stereotype.Service; |
||||
|
|
||||
|
import java.util.*; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMapper, RiskMessagesLog> { |
||||
|
@Autowired |
||||
|
MessageOpenidService messageOpenidService; |
||||
|
@Autowired |
||||
|
com.yxt.supervise.report.ds.system.systemMapper systemMapper; |
||||
|
@Autowired |
||||
|
RmsMapper rmsMapper; |
||||
|
public ResultBean save(RiskMessagesLogDto dto) { |
||||
|
//删除同天同项目消息
|
||||
|
baseMapper.delete(new QueryWrapper<RiskMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
RiskMessagesLog entity=new RiskMessagesLog(); |
||||
|
BeanUtil.copyProperties(dto, entity, "id"); |
||||
|
entity.setSid(UUID.randomUUID().toString()); |
||||
|
baseMapper.insert(entity); |
||||
|
for(String openid:dto.getMessageOpenids()){ |
||||
|
MessageOpenid messageOpenid=new MessageOpenid(); |
||||
|
messageOpenid.setOpenId(openid); |
||||
|
messageOpenid.setMessageSid(entity.getSid()); |
||||
|
messageOpenid.setSid(UUID.randomUUID().toString()); |
||||
|
messageOpenidService.save(messageOpenid); |
||||
|
} |
||||
|
return rb.success().setMsg("保存成功"); |
||||
|
|
||||
|
} |
||||
|
public ResultBean getMessageBySid(String sid) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
RiskMessagesLogVo vo= baseMapper.getMessageBySid(sid); |
||||
|
RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid()); |
||||
|
vo.setShName(riskAlarm.getPositionName()); |
||||
|
vo.setText(riskAlarm.getContent()); |
||||
|
return rb.success().setData(vo); |
||||
|
|
||||
|
} |
||||
|
public PagerVo<RiskMessagesLogVo> listPage(PagerQuery<RiskMessagesLogQuery> pq) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
RiskMessagesLogQuery query = pq.getParams(); |
||||
|
// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
|
||||
|
SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); |
||||
|
IPage<RiskMessagesLog> page = PagerUtil.queryToPage(pq); |
||||
|
QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>(); |
||||
|
System.out.println(query.getState()); |
||||
|
qw.eq("o.openId",sysUser.getAppletOpenid()); |
||||
|
if(StringUtils.isNotNull(query.getState())){ |
||||
|
if(query.getState().equals("2")){} |
||||
|
else if(query.getState().equals("0")){ |
||||
|
qw.eq("o.state",0); |
||||
|
}else if(query.getState().equals("1")){ |
||||
|
qw.eq("o.state",1); |
||||
|
} |
||||
|
} |
||||
|
IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw); |
||||
|
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; |
||||
|
} |
||||
|
} |
@ -0,0 +1,17 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageuser; |
||||
|
|
||||
|
|
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
|
||||
|
import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Mapper |
||||
|
public interface RiskMessageUserMapper extends BaseMapper<RiskMessageUser> { |
||||
|
|
||||
|
|
||||
|
} |
@ -0,0 +1,29 @@ |
|||||
|
<?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.riskmessageuser.RiskMessageUserMapper"> |
||||
|
<!-- <where> ${ew.sqlSegment} </where>--> |
||||
|
<!-- ${ew.customSqlSegment} --> |
||||
|
<select id="getRiskMessageUser" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
<select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_log |
||||
|
where |
||||
|
orderDate=#{orderDate} |
||||
|
</select> |
||||
|
|
||||
|
<select id="getAllRiskMessageUser" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo"> |
||||
|
SELECT |
||||
|
* |
||||
|
FROM |
||||
|
report_sales_day_store |
||||
|
<where> ${ew.sqlSegment} </where> |
||||
|
</select> |
||||
|
</mapper> |
@ -0,0 +1,29 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageuser; |
||||
|
|
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserDto; |
||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||
|
import org.springframework.web.bind.annotation.RestController; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@RestController |
||||
|
@RequestMapping("/RiskMessageUser") |
||||
|
public class RiskMessageUserRest { |
||||
|
|
||||
|
@Autowired |
||||
|
RiskMessageUserService RiskMessageUserService; |
||||
|
|
||||
|
@PostMapping("/save") |
||||
|
public ResultBean save(@RequestBody List<RiskMessageUserDto> dto){ |
||||
|
return RiskMessageUserService.save(dto); |
||||
|
} |
||||
|
} |
@ -0,0 +1,32 @@ |
|||||
|
package com.yxt.supervise.report.biz.riskmessageuser; |
||||
|
|
||||
|
|
||||
|
import cn.hutool.core.bean.BeanUtil; |
||||
|
import com.yxt.common.base.service.MybatisBaseService; |
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser; |
||||
|
import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserDto; |
||||
|
import org.springframework.stereotype.Service; |
||||
|
|
||||
|
import java.util.List; |
||||
|
import java.util.UUID; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/27 9:56 |
||||
|
*/ |
||||
|
@Service |
||||
|
public class RiskMessageUserService extends MybatisBaseService<RiskMessageUserMapper, RiskMessageUser> { |
||||
|
|
||||
|
public ResultBean save(List<RiskMessageUserDto> dto) { |
||||
|
ResultBean rb=new ResultBean(); |
||||
|
for(RiskMessageUserDto dto1:dto){ |
||||
|
RiskMessageUser entity=new RiskMessageUser(); |
||||
|
BeanUtil.copyProperties(dto1, entity, "id"); |
||||
|
entity.setSid(UUID.randomUUID().toString()); |
||||
|
baseMapper.insert(entity); |
||||
|
} |
||||
|
return rb.success().setMsg("保存成功"); |
||||
|
|
||||
|
} |
||||
|
} |
@ -0,0 +1,72 @@ |
|||||
|
package com.yxt.supervise.report.ds.rms; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
|
import io.swagger.annotations.ApiModel; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
import java.util.UUID; |
||||
|
|
||||
|
/** |
||||
|
* @author feikefei |
||||
|
* @create 2023-06-19-11:28 |
||||
|
*/ |
||||
|
@Data |
||||
|
@ApiModel(value = "风险报警表") |
||||
|
@TableName("risk_alarm") |
||||
|
public class RiskAlarm { |
||||
|
@ApiModelProperty("ID,唯一编号") |
||||
|
private Integer id ; |
||||
|
@ApiModelProperty("字符型编号") |
||||
|
private String sid = UUID.randomUUID().toString(); |
||||
|
@ApiModelProperty("记录创建时间") |
||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
||||
|
private Date createTime = new Date(); |
||||
|
@ApiModelProperty("备注信息") |
||||
|
private String remarks; |
||||
|
@ApiModelProperty("客户Sid") |
||||
|
private String customerSid; |
||||
|
@ApiModelProperty("客户名称") |
||||
|
private String customerName; |
||||
|
@ApiModelProperty("风险处于位置1.主体2.供应商3.仓库4.门店") |
||||
|
private Integer positionCode; |
||||
|
@ApiModelProperty("风险处于位置Sid") |
||||
|
private String positionSid; |
||||
|
@ApiModelProperty("风险处于位置名称") |
||||
|
private String positionName; |
||||
|
@ApiModelProperty("风险触发时间") |
||||
|
private Date triggerTime; |
||||
|
@ApiModelProperty("风险处理状态:0=待处理,1=处理中,2=已办结") |
||||
|
private Integer treatmentStatus; |
||||
|
@ApiModelProperty("风险处理时间") |
||||
|
private Date treatmentTime; |
||||
|
@ApiModelProperty("风险处理内容") |
||||
|
private String treatmentContent; |
||||
|
@ApiModelProperty("风险消除程度0.未消除1.已消除") |
||||
|
private Integer eliminationStatus; |
||||
|
@ApiModelProperty("风险消除时间") |
||||
|
private Date eliminationTime; |
||||
|
@ApiModelProperty("风险消除内容") |
||||
|
private String eliminationContent; |
||||
|
@ApiModelProperty("风险指标Sid") |
||||
|
private String indicatorSid; |
||||
|
@ApiModelProperty("风险指标代码") |
||||
|
private String indicatorCode; |
||||
|
@ApiModelProperty("风险指标名称") |
||||
|
private String indicatorName; |
||||
|
@ApiModelProperty("风险等级(程度)Sid") |
||||
|
private String levelSid; |
||||
|
@ApiModelProperty("风险等级(程度)代码") |
||||
|
private String levelCode; |
||||
|
@ApiModelProperty("风险等级(程度)名称") |
||||
|
private String levelName; |
||||
|
@ApiModelProperty("风险类别Sid") |
||||
|
private String typeSid; |
||||
|
@ApiModelProperty("风险类别代码") |
||||
|
private String typeCode; |
||||
|
@ApiModelProperty("风险类别名称") |
||||
|
private String typeName; |
||||
|
private String content; |
||||
|
} |
@ -0,0 +1,23 @@ |
|||||
|
package com.yxt.supervise.report.ds.rms; |
||||
|
|
||||
|
import com.baomidou.dynamic.datasource.annotation.DS; |
||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
|
import com.yxt.supervise.report.ds.crm.ProjectInfo; |
||||
|
import com.yxt.supervise.report.ds.crm.UserProject; |
||||
|
import com.yxt.supervise.report.ds.warehouse.StoreHouse; |
||||
|
import org.apache.ibatis.annotations.Mapper; |
||||
|
import org.apache.ibatis.annotations.Param; |
||||
|
import org.apache.ibatis.annotations.Select; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
@DS("rms") |
||||
|
@Mapper |
||||
|
public interface RmsMapper extends BaseMapper<RiskAlarm> { |
||||
|
@Select("select * from risk_alarm where sid =#{sid}") |
||||
|
RiskAlarm getRiskByMessSid (@Param("sid")String sid ); |
||||
|
@Select("select * from risk_alarm where indicatorCode=#{code} order by triggerTime desc limit 1") |
||||
|
RiskAlarm getRiskByCode (@Param("code")String code ); |
||||
|
|
||||
|
|
||||
|
} |
@ -0,0 +1,16 @@ |
|||||
|
package com.supervise.rms.api.riskalarm; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/3 17:06 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class Device { |
||||
|
|
||||
|
private String name; |
||||
|
private String serialNumber; |
||||
|
private String status; |
||||
|
|
||||
|
} |
@ -0,0 +1,37 @@ |
|||||
|
package com.supervise.rms.api.riskalarm; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/3 15:27 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class DeviceImages { |
||||
|
private String endImage; |
||||
|
private String endTime; |
||||
|
private String name; |
||||
|
private String similarity; |
||||
|
private String startImage; |
||||
|
private String startTime; |
||||
|
|
||||
|
public String getEndImage() { |
||||
|
String end="https://supervise.yxtsoft.com/downfile/monitor/"+endImage; |
||||
|
this.endImage=end; |
||||
|
return endImage; |
||||
|
} |
||||
|
|
||||
|
public void setEndImage(String endImage) { |
||||
|
this.endImage = endImage; |
||||
|
} |
||||
|
|
||||
|
public String getStartImage() { |
||||
|
String start="https://supervise.yxtsoft.com/downfile/monitor/"+startImage; |
||||
|
this.startImage=start; |
||||
|
return startImage; |
||||
|
} |
||||
|
|
||||
|
public void setStartImage(String startImage) { |
||||
|
this.startImage = startImage; |
||||
|
} |
||||
|
} |
@ -0,0 +1,21 @@ |
|||||
|
package com.supervise.rms.feign.crm; |
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/21 9:19 |
||||
|
*/ |
||||
|
@FeignClient( |
||||
|
contextId = "supervise-crm-projectinformation", |
||||
|
name = "supervise-crm", |
||||
|
path = "v1/projectinformation") |
||||
|
public interface ProjectInformationFeign { |
||||
|
@GetMapping("/listAll") |
||||
|
public ResultBean listAll(); |
||||
|
@GetMapping("/getProjectNameBySid") |
||||
|
public String getProjectNameBySid(@RequestParam("sid")String sid); |
||||
|
} |
@ -0,0 +1,21 @@ |
|||||
|
package com.supervise.rms.feign.crm; |
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import io.swagger.annotations.ApiOperation; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/3 9:54 |
||||
|
*/ |
||||
|
@FeignClient( |
||||
|
contextId = "supervise-crm-storehouseproject", |
||||
|
name = "supervise-crm", |
||||
|
path = "v1/storehouseproject") |
||||
|
public interface StoreHouseProjectFeign { |
||||
|
@ApiOperation("根据仓库sid查询项目信息") |
||||
|
@PostMapping("/selectProjectByshSid/{sid}") |
||||
|
public ResultBean<StoreHouseProjectVo> selectProjectByshSid(@PathVariable("sid")String sid); |
||||
|
} |
@ -0,0 +1,19 @@ |
|||||
|
package com.supervise.rms.feign.crm; |
||||
|
|
||||
|
import com.yxt.common.core.vo.Vo; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/19 15:37 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class StoreHouseProjectVo implements Vo { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String shSid; |
||||
|
private String projectSid; |
||||
|
//仓库名称
|
||||
|
private String name; |
||||
|
private String picUrl; // 图片访问url
|
||||
|
} |
@ -0,0 +1,25 @@ |
|||||
|
package com.supervise.rms.feign.crm; |
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import io.swagger.annotations.ApiOperation; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.GetMapping; |
||||
|
import org.springframework.web.bind.annotation.PathVariable; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/3 10:06 |
||||
|
*/ |
||||
|
@FeignClient( |
||||
|
contextId = "supervise-crm-userproject", |
||||
|
name = "supervise-crm", |
||||
|
path = "userproject") |
||||
|
public interface UserProjectFeign { |
||||
|
@ApiOperation("根据项目sid查询") |
||||
|
@GetMapping("/getUsersByprojectSid") |
||||
|
public ResultBean<List<String>> getUsersByprojectSid(@RequestParam("projectSid") String projectSid); |
||||
|
} |
@ -0,0 +1,46 @@ |
|||||
|
package com.supervise.rms.feign.crm; |
||||
|
|
||||
|
import com.yxt.common.core.query.Query; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/8/6 11:35 |
||||
|
*/ |
||||
|
public class UserProjectVo implements Query { |
||||
|
private String id; |
||||
|
private String sid; |
||||
|
private String projectSid; |
||||
|
private String userSid; |
||||
|
|
||||
|
public String getId() { |
||||
|
return id; |
||||
|
} |
||||
|
|
||||
|
public void setId(String id) { |
||||
|
this.id = id; |
||||
|
} |
||||
|
|
||||
|
public String getSid() { |
||||
|
return sid; |
||||
|
} |
||||
|
|
||||
|
public void setSid(String sid) { |
||||
|
this.sid = sid; |
||||
|
} |
||||
|
|
||||
|
public String getProjectSid() { |
||||
|
return projectSid; |
||||
|
} |
||||
|
|
||||
|
public void setProjectSid(String projectSid) { |
||||
|
this.projectSid = projectSid; |
||||
|
} |
||||
|
|
||||
|
public String getUserSid() { |
||||
|
return userSid; |
||||
|
} |
||||
|
|
||||
|
public void setUserSid(String userSid) { |
||||
|
this.userSid = userSid; |
||||
|
} |
||||
|
} |
@ -0,0 +1,22 @@ |
|||||
|
package com.supervise.rms.feign.report; |
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.*; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/7/19 13:55 |
||||
|
*/ |
||||
|
@FeignClient( |
||||
|
contextId = "supervise-report-wechat", |
||||
|
name = "supervise-report", |
||||
|
path = "/v1/wechat") |
||||
|
public interface WechatFeign { |
||||
|
@GetMapping("/shMessage") |
||||
|
public void shMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid); |
||||
|
@GetMapping("/shImgMessage") |
||||
|
public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid); |
||||
|
} |
@ -0,0 +1,77 @@ |
|||||
|
package com.supervise.rms.feign.system; |
||||
|
|
||||
|
import com.baomidou.mybatisplus.annotation.TableField; |
||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
|
import com.yxt.common.core.domain.BaseEntity; |
||||
|
import io.swagger.annotations.ApiModel; |
||||
|
import io.swagger.annotations.ApiModelProperty; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* Project: anrui_portal(门户建设) <br/> |
||||
|
* File: SysUser.java <br/> |
||||
|
* Class: SysUser <br/> |
||||
|
* Description: 用户表. <br/> |
||||
|
* Copyright: Copyright (c) 2011 <br/> |
||||
|
* Company: https://gitee.com/liuzp315 <br/>
|
||||
|
* Makedate: 2021-08-03 00:24:30 <br/> |
||||
|
* |
||||
|
* @author liupopo |
||||
|
* @version 1.0 |
||||
|
* @since 1.0 |
||||
|
*/ |
||||
|
@ApiModel(value = "用户表", description = "用户表") |
||||
|
@TableName("sys_user") |
||||
|
@Data |
||||
|
public class SysUser extends BaseEntity { |
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
|
||||
|
@ApiModelProperty("登录名,登录名不能相同") |
||||
|
private String userName; |
||||
|
|
||||
|
@ApiModelProperty("密码(加密或签名后)") |
||||
|
private String password; |
||||
|
|
||||
|
@ApiModelProperty("密码修改时限") |
||||
|
private String pwdDayslimit; |
||||
|
|
||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
||||
|
@ApiModelProperty("最后一次密码修改时间") |
||||
|
private Date pwdModifyTime; |
||||
|
|
||||
|
@ApiModelProperty("在线状态(0为离线、1为在线)") |
||||
|
private Integer onlineState; |
||||
|
|
||||
|
@ApiModelProperty("用户登录时随机生成身份验证字符串") |
||||
|
private String token; |
||||
|
|
||||
|
@ApiModelProperty("是否是管理员:1管理员,2一般用户,0是超级管理员,3尚无单位人员") |
||||
|
private String isAdmin; |
||||
|
|
||||
|
@ApiModelProperty("手机登录唯一标识,手机与用户绑定字段") |
||||
|
private String appId; |
||||
|
|
||||
|
@ApiModelProperty("关联的人员sid") |
||||
|
private String staffSid; |
||||
|
|
||||
|
@ApiModelProperty("手机号") |
||||
|
private String mobile; |
||||
|
|
||||
|
@ApiModelProperty("用户类型:1员工、2客户、3供应商") |
||||
|
private Integer userType; |
||||
|
|
||||
|
@ApiModelProperty("用户头像") |
||||
|
private String headImage; |
||||
|
private String openId; |
||||
|
private String appletOpenid; |
||||
|
@TableField(exist = false) |
||||
|
private List<String> roleNames; |
||||
|
private String unionid; |
||||
|
//d订阅状态
|
||||
|
private String subscriptionStatus; |
||||
|
} |
@ -0,0 +1,21 @@ |
|||||
|
package com.supervise.rms.feign.system; |
||||
|
|
||||
|
import com.yxt.common.core.result.ResultBean; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
|
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @author wangpengfei |
||||
|
* @date 2023/9/3 10:17 |
||||
|
*/ |
||||
|
@FeignClient( |
||||
|
contextId = "supervise-system-sysUser", |
||||
|
name = "supervise-system", |
||||
|
path = "v1/sysuser") |
||||
|
public interface sysUserFeign { |
||||
|
@PostMapping("/getUsersBySid") |
||||
|
public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list); |
||||
|
} |
Loading…
Reference in new issue