Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
f089cd5d60
  1. 8
      supervise-portal-ui/src/api/system/home/home.js
  2. 50
      supervise-portal-ui/src/views/Home/Home.vue
  3. 2
      supervise-report-ui/src/main.js
  4. 13
      supervise-report-ui/src/views/project/projectDaily.vue
  5. 16
      supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue
  6. 105
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java
  7. 14
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java
  8. 3
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java
  9. 2
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml

8
supervise-portal-ui/src/api/system/home/home.js

@ -7,3 +7,11 @@ export function getTodoNum(data) {
method: 'get' method: 'get'
}) })
} }
// 获取当前用户的最新消--首页面右上角展示
export function messageNotice(data) {
return request({
url: '/report/RiskMessagesLog/messageNotice/' + data,
method: 'get'
})
}

50
supervise-portal-ui/src/views/Home/Home.vue

@ -45,29 +45,34 @@
<el-col style="margin-left: 70px;" :span="10"> --> <el-col style="margin-left: 70px;" :span="10"> -->
<div class="grid-content bg-rtop" style="width: 50%;"> <div class="grid-content bg-rtop" style="width: 50%;">
<!-- <img class="anrui" src="@/assets/home/anrui.png"> --> <!-- <img class="anrui" src="@/assets/home/anrui.png"> -->
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<span class="rt_title">消息通知</span> <span class="rt_title">消息通知</span>
<div>
<a style="text-decoration: none;padding: 10px 20px;background-color: #0a59f7;color: #FFFFFF" target="_blank" href="http://jg.yyundong.com/message/#/message/unreadmessage">更多</a>
</div>
</div>
<ul style="margin-top: 40px;"> <ul style="margin-top: 40px;">
<li> <li v-for="(item, index) in message_list" :key="index">
<img src="../../assets/home/notice.png">
<span class="notice">编号01021供应商出现工商风险</span>
<span class="anrui_time">2023-01-22 10:15</span>
</li>
<li>
<img src="../../assets/home/notice.png">
<span class="notice">库存盘点产生货物数量编差风险</span>
<span class="anrui_time">2023-01-25 15:22</span>
</li>
<li>
<img src="../../assets/home/notice.png"> <img src="../../assets/home/notice.png">
<span class="notice">2023-01-29未按时回款</span> <span class="notice">{{ item.templateMessageVo.shName }}</span>
<span class="anrui_time">2023-01-28 09:28</span> <span class="anrui_time">{{ item.templateMessageVo.time }}</span>
</li>
<li>
<img src="../../assets/home/notice.png">
<span class="notice">供应商在途商品超时</span>
<span class="anrui_time">2023-01-29 11:15</span>
</li> </li>
<!-- <li>-->
<!-- <img src="../../assets/home/notice.png">-->
<!-- <span class="notice">库存盘点产生货物数量编差风险</span>-->
<!-- <span class="anrui_time">2023-01-25 15:22</span>-->
<!-- </li>-->
<!-- <li>-->
<!-- <img src="../../assets/home/notice.png">-->
<!-- <span class="notice">2023-01-29未按时回款</span>-->
<!-- <span class="anrui_time">2023-01-28 09:28</span>-->
<!-- </li>-->
<!-- <li>-->
<!-- <img src="../../assets/home/notice.png">-->
<!-- <span class="notice">供应商在途商品超时</span>-->
<!-- <span class="anrui_time">2023-01-29 11:15</span>-->
<!-- </li>-->
</ul> </ul>
</div> </div>
<!-- </el-col> <!-- </el-col>
@ -214,7 +219,8 @@
} from '@/api/system/Role/role.js' } from '@/api/system/Role/role.js'
import User from '@/api/User/login.js' import User from '@/api/User/login.js'
import { import {
getTodoNum getTodoNum,
messageNotice
} from '@/api/system/home/home' } from '@/api/system/home/home'
export default { export default {
@ -282,6 +288,7 @@
shuliang: { shuliang: {
workCount: '' workCount: ''
}, },
message_list: [],
dialogVisible: false, dialogVisible: false,
form: { form: {
original: '', original: '',
@ -343,6 +350,11 @@
// this.shuliang.workCount = resp.data // this.shuliang.workCount = resp.data
// } // }
// }) // })
messageNotice(window.sessionStorage.getItem('userSid')).then((resp) => {
if (resp.success && resp.data !== null) {
this.message_list = resp.data
}
})
}, },
handleConirm() { handleConirm() {
if (this.form.original === '') { if (this.form.original === '') {

2
supervise-report-ui/src/main.js

@ -50,7 +50,7 @@ VueAMap.initAMapApiLoader({
Vue.config.productionTip = false Vue.config.productionTip = false
let token = null let token = null
// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2MjAwNzF9.iAXRy8SKmeGqteP68u_MD32b1hG7pNsYoZQ3C-fgHSI' // let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2NDM3OTN9.a9Zmp99E33LC4fCVSwD5rDpiivzQCXRShw8p8voL4OQ'
token = GetQueryString('token') token = GetQueryString('token')
if (token) { if (token) {
setStorage(token) setStorage(token)

13
supervise-report-ui/src/views/project/projectDaily.vue

@ -258,7 +258,8 @@
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import req from '@/api/project/projectDaily' import req from '@/api/project/projectDaily'
import { import {
parseTime parseTime,
getDateRang
} from '@/utils/index' } from '@/utils/index'
export default { export default {
name: 'DaydatauploadCash', name: 'DaydatauploadCash',
@ -272,15 +273,15 @@
banInfo: false, banInfo: false,
btndisabled: false, btndisabled: false,
viewState: 1, // 1 2 3 4 viewState: 1, // 1 2 3 4
isSearchShow: false, isSearchShow: true,
searchxianshitit: '显示查询条件', searchxianshitit: '隐藏查询条件',
queryParams: { queryParams: {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
dataDateStart: '', dataDateStart: getDateRang('yesterday'),
dataDateEnd: '', dataDateEnd: getDateRang('yesterday'),
projectSid: '' projectSid: ''
} }
}, },
@ -632,6 +633,8 @@
window.open('/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName + window.open('/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName +
'&orderDate=' + orderDate); '&orderDate=' + orderDate);
// window.open('http://192.168.0.117:9533/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName +
// '&orderDate=' + orderDate);
}, },
sendMess(row) { sendMess(row) {
req.sendMess(row.projectSid, row.orderDate).then(res => { req.sendMess(row.projectSid, row.orderDate).then(res => {

16
supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue

@ -11,7 +11,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header"> <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
<el-form-item label="日期"> <el-form-item label="日期">
<el-date-picker v-model="queryParams.date" type="date" clearable value-format="yyyy-MM-dd" <el-date-picker v-model="queryParams.params.date" type="date" clearable value-format="yyyy-MM-dd"
placeholder="选择日期" /> placeholder="选择日期" />
</el-form-item> </el-form-item>
<el-form-item label="类别"> <el-form-item label="类别">
@ -66,7 +66,9 @@
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import {
getDateRang
} from '@/utils/index'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
@ -78,8 +80,8 @@
return { return {
btndisabled: false, btndisabled: false,
viewState: 1, // 1 2 3 4 viewState: 1, // 1 2 3 4
isSearchShow: false, isSearchShow: true,
searchxianshitit: '显示查询条件', searchxianshitit: '隐藏查询条件',
tableLoading: false, tableLoading: false,
tableKey: 0, tableKey: 0,
// 1.,2.3. // 1.,2.3.
@ -117,11 +119,11 @@
total: 0, total: 0,
params: { params: {
customerSid: '', customerSid: '',
date: this.getDate(), date: getDateRang('yesterday'),
type: '', type: '',
} // key } // key
}, },
nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(), // nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(),
thresholdAnalysisTable: [{ thresholdAnalysisTable: [{
num: '1', num: '1',
date: '2023-01-01', date: '2023-01-01',
@ -435,7 +437,7 @@
dosearch() { dosearch() {
this.nowDate = this.queryParams.date; this.queryParams.date=getDateRang('yesterday'),
this.loadList(); this.loadList();
}, },

105
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java

@ -0,0 +1,105 @@
package com.yxt.supervise.report.api.riskmessageslog;
import cn.hutool.core.util.StrUtil;
import com.yxt.common.core.vo.Vo;
import com.yxt.supervise.report.api.imgmessageslog.Linkers;
import lombok.Data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author wangpengfei
* @date 2023/11/22 8:46
*/
@Data
public class RiskMessagesLogVos 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;
List<Linkers> linkers;
private String shSid;
private Integer count;
private List<String> message;
private String type;
private TemplateMessageVo templateMessageVo;
private String isImg;
private String riskLevel="二级风险";
//{time4=2023-09-14 17:17:35, thing8=中通樊家屯仓, thing2=东北角的摄像头,111,22,33}
//{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00}
public TemplateMessageVo getTemplateMessageVo() {
TemplateMessageVo vo=new TemplateMessageVo();
//{time4=2023-09-14 17:17:35, thing8=中通樊家屯仓, thing2=东北角的摄像头,111,22,33}
//{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00}
if(StrUtil.isNotEmpty(type)){
if(type.equals("设备离线")){
vo.setTime(map.get("time4"));
vo.setShName(map.get("thing8")+"设备离线");
}else if(type.equals("设备离线解除")){
vo.setTime(map.get("time5"));
vo.setShName(map.get("thing3")+"设备离线解除");
}else if(type.equals("系统异常")){
vo.setTime(map.get("time4"));
vo.setShName("环境监控未向平台推送数据");
}else if(type.equals("系统异常解除")){
vo.setTime(map.get("time5"));
vo.setShName("环境监控已正常推送数据");
}else if(type.equals("图片对比异常")){
//{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08}
vo.setTime(map.get("time5"));
vo.setShName(map.get("thing3")+"图片对比异常");
}else if(type.equals("每日数据上报")){
//{time1=2023-08-15 09:57, thing3=赵丽晓, thing2=监管数据总览(喜相随生产加工动产质押项…}
vo.setTime(map.get("time1"));
vo.setShName(map.get("thing2")+")每日数据上报");
}
}
this.templateMessageVo=vo;
return templateMessageVo;
}
public List<String> getMessage() {
List<String> l=new ArrayList<>();
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();
l.add(value);
}
}
this.message=l;
return message;
}
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;
}
}

14
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@ -415,28 +415,26 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
public ResultBean<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) { public ResultBean<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) {
ResultBean rb=new ResultBean().fail(); ResultBean rb=new ResultBean().fail();
Map<String,Object> m=new HashMap<>(); Map<String,Object> m=new HashMap<>();
ProjectDailyQuery params = query; // ProjectDailyQuery params = query;
QueryWrapper<ProjectDaily> qw = new QueryWrapper<>(); QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String startDate=""; String startDate="";
if(com.yxt.common.base.utils.StringUtils.isBlank(params.getOrderDate())){ if(com.yxt.common.base.utils.StringUtils.isBlank(query.getOrderDate())){
startDate=sdf.format(DateUtil.yesterday()); startDate=sdf.format(DateUtil.yesterday());
}else{ }else{
startDate=params.getOrderDate(); startDate=query.getOrderDate();
} }
String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(params.getIntervalTime())+1)); String EndDate=sdf.format(DateUtil.offsetDay(DateUtil.parse(startDate),-Integer.parseInt(query.getIntervalTime())+1));
long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY); long i=DateUtil.between(DateUtil.parse(startDate),DateUtil.parse(EndDate), DateUnit.DAY);
if (params != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(startDate)) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(startDate)) {
qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate); qw.le("STR_TO_DATE(orderDate,'%Y-%m-%d')",startDate);
} }
if (com.yxt.common.base.utils.StringUtils.isNotBlank(EndDate)) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(EndDate)) {
qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate); qw.ge("STR_TO_DATE(orderDate,'%Y-%m-%d')",EndDate);
} }
if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getProjectSid())) {
qw.eq("projectSid", params.getProjectSid()); qw.eq("projectSid", query.getProjectSid());
}
} }
List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw); List<ProjectDailyVos> projectDailyVos=baseMapper.getProjectDailys(qw);
List<String> a=new ArrayList<>(); List<String> a=new ArrayList<>();

3
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo; import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVos;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -30,5 +31,5 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
@Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}") @Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}")
Integer getMessageCount(@Param("openId") String openId); Integer getMessageCount(@Param("openId") String openId);
List<RiskMessagesLogVo> messageNotice(@Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw); List<RiskMessagesLogVos> messageNotice(@Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
} }

2
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml

@ -67,7 +67,7 @@
report_sales_day_store report_sales_day_store
<where> ${ew.sqlSegment} </where> <where> ${ew.sqlSegment} </where>
</select> </select>
<select id="messageNotice" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo"> <select id="messageNotice" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVos">
SELECT SELECT
log.messageTime, log.messageTime,
log.content, log.content,

Loading…
Cancel
Save