From b10b759a44c642b779a12eb8781d77b08a4e0af3 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 21 Nov 2023 18:02:18 +0800 Subject: [PATCH 1/6] 11/21 --- .../biz/projectdaily/ProjectDailyService.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 1da98a29..0f6917c2 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -415,29 +415,27 @@ public class ProjectDailyService extends ServiceImpl> getProjectDailyZx(ProjectDailyQuery query) { ResultBean rb=new ResultBean().fail(); Map m=new HashMap<>(); - ProjectDailyQuery params = query; +// ProjectDailyQuery params = query; QueryWrapper qw = new QueryWrapper<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); 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()); }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); - 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); } - 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); } - if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { - qw.eq("projectSid", params.getProjectSid()); + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getProjectSid())) { + qw.eq("projectSid", query.getProjectSid()); } - } List projectDailyVos=baseMapper.getProjectDailys(qw); List a=new ArrayList<>(); List b=new ArrayList<>(); From 4ea1ba04d474af9c4a35466605f42b86468748a3 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 21 Nov 2023 18:28:54 +0800 Subject: [PATCH 2/6] 111 --- supervise-report-ui/src/main.js | 2 +- .../src/views/project/projectDaily.vue | 13 ++++++++----- .../src/views/reportCenter/thresholdAnalysis.vue | 16 +++++++++------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/supervise-report-ui/src/main.js b/supervise-report-ui/src/main.js index f293ac64..208eaf65 100644 --- a/supervise-report-ui/src/main.js +++ b/supervise-report-ui/src/main.js @@ -50,7 +50,7 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false let token = null -// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2MjAwNzF9.iAXRy8SKmeGqteP68u_MD32b1hG7pNsYoZQ3C-fgHSI' +// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2NDM3OTN9.a9Zmp99E33LC4fCVSwD5rDpiivzQCXRShw8p8voL4OQ' token = GetQueryString('token') if (token) { setStorage(token) diff --git a/supervise-report-ui/src/views/project/projectDaily.vue b/supervise-report-ui/src/views/project/projectDaily.vue index 4fba6a5c..189edc5d 100644 --- a/supervise-report-ui/src/views/project/projectDaily.vue +++ b/supervise-report-ui/src/views/project/projectDaily.vue @@ -258,7 +258,8 @@ import pageye from '@/components/pagination/pageye' import req from '@/api/project/projectDaily' import { - parseTime + parseTime, + getDateRang } from '@/utils/index' export default { name: 'DaydatauploadCash', @@ -272,15 +273,15 @@ banInfo: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 - isSearchShow: false, - searchxianshitit: '显示查询条件', + isSearchShow: true, + searchxianshitit: '隐藏查询条件', queryParams: { current: 1, size: 10, total: 0, params: { - dataDateStart: '', - dataDateEnd: '', + dataDateStart: getDateRang('yesterday'), + dataDateEnd: getDateRang('yesterday'), projectSid: '' } }, @@ -632,6 +633,8 @@ window.open('/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName + '&orderDate=' + orderDate); + // window.open('http://192.168.0.117:9533/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName + + // '&orderDate=' + orderDate); }, sendMess(row) { req.sendMess(row.projectSid, row.orderDate).then(res => { diff --git a/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue b/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue index d563d70b..9b8397ee 100644 --- a/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue +++ b/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue @@ -11,7 +11,7 @@
- @@ -66,7 +66,9 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import * as echarts from 'echarts'; - + import { + getDateRang + } from '@/utils/index' export default { components: { ButtonBar, @@ -78,8 +80,8 @@ return { btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 - isSearchShow: false, - searchxianshitit: '显示查询条件', + isSearchShow: true, + searchxianshitit: '隐藏查询条件', tableLoading: false, tableKey: 0, // 类型1.全部,2.常规商品3.烟草 @@ -117,11 +119,11 @@ total: 0, params: { customerSid: '', - date: this.getDate(), + date: getDateRang('yesterday'), type: '', } // 类别key }, - nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(), + // nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(), thresholdAnalysisTable: [{ num: '1', date: '2023-01-01', @@ -435,7 +437,7 @@ dosearch() { - this.nowDate = this.queryParams.date; + this.queryParams.date=getDateRang('yesterday'), this.loadList(); }, From d7a72c613552a24d4534a90a6950d9e5d7b87b73 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 22 Nov 2023 08:51:54 +0800 Subject: [PATCH 3/6] 11/22 --- .../riskmessageslog/RiskMessagesLogVos.java | 105 ++++++++++++++++++ .../RiskMessagesLogMapper.java | 3 +- .../riskmessageslog/RiskMessagesLogMapper.xml | 2 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java new file mode 100644 index 00000000..ad33566d --- /dev/null +++ b/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 map; + private String riskSid; + private String shName; + private List devices; + private String text; + List linkers; + private String shSid; + private Integer count; + private List 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 getMessage() { + List 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 getMap() { + Map 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; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java index 6e2ff33a..2f00f6a7 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java +++ b/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.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog; 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.Param; import org.apache.ibatis.annotations.Select; @@ -30,5 +31,5 @@ public interface RiskMessagesLogMapper extends BaseMapper { @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); - List messageNotice(@Param(Constants.WRAPPER) Wrapper qw); + List messageNotice(@Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml index d1ec1a26..96fe4e9e 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml +++ b/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 ${ew.sqlSegment} - SELECT log.messageTime, log.content, From 67f357781767269dec3d2a459be6aa14ac3bddde Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 08:58:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/system/home/home.js | 8 ++++ supervise-portal-ui/src/views/Home/Home.vue | 45 +++++++++++-------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/supervise-portal-ui/src/api/system/home/home.js b/supervise-portal-ui/src/api/system/home/home.js index ac525413..93906f92 100644 --- a/supervise-portal-ui/src/api/system/home/home.js +++ b/supervise-portal-ui/src/api/system/home/home.js @@ -7,3 +7,11 @@ export function getTodoNum(data) { method: 'get' }) } + +// 获取当前用户的最新消--首页面右上角展示 +export function messageNotice(data) { + return request({ + url: '/report/RiskMessagesLog/messageNotice/' + data, + method: 'get' + }) +} diff --git a/supervise-portal-ui/src/views/Home/Home.vue b/supervise-portal-ui/src/views/Home/Home.vue index 9bdd31dc..bbbfb033 100644 --- a/supervise-portal-ui/src/views/Home/Home.vue +++ b/supervise-portal-ui/src/views/Home/Home.vue @@ -48,26 +48,26 @@ 消息通知
    -
  • +
  • - 编号01021供应商出现工商风险 - 2023-01-22 10:15 -
    • -
  • - - 库存盘点产生货物数量编差风险 - 2023-01-25 15:22 -
    • -
  • - - 2023-01-29未按时回款 - 2023-01-28 09:28 -
    • -
  • - - 供应商在途商品超时 - 2023-01-29 11:15 + {{ item.templateMessageVo.shName }} + {{ item.templateMessageVo.time }}
    • + + + + + + + + + + + + + + +
- 消息通知 +
+ 消息通知 + 更多 +
  • From 696eb2a5804043ae05f9d9e129c7f24c4977f865 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 22 Nov 2023 09:24:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-portal-ui/src/views/Home/Home.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/supervise-portal-ui/src/views/Home/Home.vue b/supervise-portal-ui/src/views/Home/Home.vue index 31843d48..1c7ab3f5 100644 --- a/supervise-portal-ui/src/views/Home/Home.vue +++ b/supervise-portal-ui/src/views/Home/Home.vue @@ -47,7 +47,9 @@
    消息通知 - 更多 +
    + 更多 +