From b8086d8c8bf084ed20488a005f957e29ee3cbc8e Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 03 五月 2022 20:08:57 +0800
Subject: [PATCH] 最新版本
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java | 4
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic3Controller.java | 95 +++++++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java | 5 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java | 16 +++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java | 23 ++++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java | 33 ++++---
xboot-admin/src/main/resources/application.yml | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java | 2
9 files changed, 159 insertions(+), 27 deletions(-)
diff --git a/xboot-admin/src/main/resources/application.yml b/xboot-admin/src/main/resources/application.yml
index d569c7c..6d8c9e6 100644
--- a/xboot-admin/src/main/resources/application.yml
+++ b/xboot-admin/src/main/resources/application.yml
@@ -172,13 +172,13 @@
# token涓瓨鍌ㄧ敤鎴锋潈闄愭暟鎹� 璁句负true寮�鍚悗鍙伩鍏嶆瘡娆¤姹傚啀鑾峰彇鐢ㄦ埛鏉冮檺锛屼絾鏈夊彲鑳藉鑷寸紪杈戞潈闄愯彍鍗曞悗鏃犳硶璇诲彇鍒版渶鏂版潈闄愭暟鎹紙闇�鐢ㄦ埛閲嶆柊鐧诲綍锛�
storePerms: true
# token杩囨湡鏃堕棿 redis妯″紡鏈夎姹傝嚜鍔ㄥ埛鏂帮紙鍒嗛挓锛�
- tokenExpireTime: 600
+ tokenExpireTime: 60000
# 鐢ㄦ埛閫夋嫨 淇濆瓨鐧诲綍鐘舵��/璁颁綇鎴� 瀵瑰簲token杩囨湡鏃堕棿锛堝ぉ锛�
saveLoginTime: 7
# 闄愬埗鐢ㄦ埛鐧婚檰閿欒娆℃暟锛堟锛�
loginTimeLimit: 10
# 閿欒瓒呰繃娆℃暟鍚庡灏戝垎閽熷悗鎵嶈兘缁х画鐧诲綍锛堝垎閽燂級
- loginAfterTime: 10
+ loginAfterTime: 1
# app搴旂敤 token浜や簰閰嶇疆
appToken:
# 鏄惁寮�鍚悓涓�骞冲彴鍗曡澶囩櫥闄嗭紙濡傚畨鍗撹澶囧彧鍏佽鐧诲綍涓�涓浉鍚岃处鍙凤紝鍚屾椂IOS璁惧鍙厑璁镐竴涓澶囩櫥闄嗭級
@@ -299,6 +299,7 @@
- /index.html
- /xboot/pcStatistic/**
- /xboot/pcStatistic2/**
+ - /xboot/pcStatistic3/**
- /xboot/area/getAll
- /xboot/areaSection/getAll2
- /xboot/message/**
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
index 205ef46..d0fc4cc 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
@@ -18,6 +18,7 @@
import cn.exrick.xboot.your.service.ICarService;
import cn.exrick.xboot.your.service.IEventLogService;
import cn.exrick.xboot.your.util.FaceSystem;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -37,6 +38,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
//浜鸿劯姣斿妫�娴嬭溅鍘㈠紓甯稿紑鍚�
@@ -84,6 +86,16 @@
return;
}
+ String format = DateUtil.format(new Date(),"yyyy-MM-dd HH:mm");
+ QueryWrapper<Alarm> awrapper = new QueryWrapper<>();
+ awrapper.between("create_time",format+"00",format+"59");
+ awrapper.eq("car_no",one.getCarNo());
+ awrapper.eq("type",5);
+ List<Alarm> list = iAlarmService.list(awrapper);
+ if(list.size()>0){
+ return;
+ }
+
User user = userService.get(one.getUserId());
User user1 = userService.get(one.getFollowUserId());
@@ -109,7 +121,7 @@
String avatar = user.getAvatar();
if(StrUtil.isNotEmpty(avatar)){
int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<60){
+ if(result1<50){
flag++;
}else{
deleteFile(f.getId());//鏄竴涓汉鍒犻櫎鍥剧墖 flag=0
@@ -123,7 +135,7 @@
String avatar = user1.getAvatar();
if(StrUtil.isNotEmpty(avatar)){
int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<60){
+ if(result1<50){
flag++;
}else{
deleteFile(f.getId());
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic3Controller.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic3Controller.java
new file mode 100644
index 0000000..f73afb2
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/Statistic3Controller.java
@@ -0,0 +1,95 @@
+package cn.exrick.xboot.your.controller.pc;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.PageVo;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.*;
+import cn.exrick.xboot.your.service.*;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "澶у睆缁熻鍏朵粬椤甸潰鎺ュ彛3")
+@RequestMapping("/xboot/pcStatistic3")
+@Transactional
+public class Statistic3Controller {
+
+ @Autowired
+ private ICustomerService iCustomerService;
+
+ @Autowired
+ private IAlarmService iAlarmService;
+
+ @Autowired
+ private IOrderTaskService iOrderTaskService;
+
+ @Autowired
+ private IDrivingRecordService iDrivingRecordService;
+
+ @RequestMapping(value = "/table1", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍑哄彂杞﹁締")
+ public Result<Object> table1(PageVo page) {
+ String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ QueryWrapper<DrivingRecord> wp = new QueryWrapper<>();
+ wp.between("a.create_time",format+" 00:00:00",format+" 23:59:59");
+ IPage<DrivingRecord> page1 = iDrivingRecordService.page2(PageUtil.initMpPage(page), wp);
+ return new ResultUtil<Object>().setData(page1);
+ }
+
+ //0閰嶉�佷腑锛�1宸查�佽揪锛�2寮傚父绛炬敹
+ @RequestMapping(value = "/table2", method = RequestMethod.GET)
+ @ApiOperation(value = "璁㈠崟閰嶉��")
+ public Result<Object> table2(PageVo page,String sendDate,Integer status) {
+ QueryWrapper<OrderTask> wrapper = new QueryWrapper<>();
+ if(StrUtil.isNotEmpty(sendDate)){
+ wrapper.eq("o.send_date",sendDate);
+ }
+ if(status!=null){
+ wrapper.eq("o.status",status);
+ }
+ IPage<OrderTask> data = iOrderTaskService.page3(PageUtil.initMpPage(page),wrapper);
+ return new ResultUtil<Object>().setData(data);
+ }
+
+ @RequestMapping(value = "/table3", method = RequestMethod.GET)
+ @ApiOperation(value = "寮傚父绛炬敹")
+ public Result<Object> table3(PageVo page,Integer type,String carNo) {
+ QueryWrapper<Alarm> queryWrapper = new QueryWrapper<>();
+ if(type!=null){
+ queryWrapper.eq("type",type);
+ }
+ if(StrUtil.isNotEmpty(carNo)){
+ queryWrapper.like("car_no","%"+carNo+"%");
+ }
+ IPage<Alarm> data = iAlarmService.page(PageUtil.initMpPage(page),queryWrapper);
+ return new ResultUtil<Object>().setData(data);
+ }
+
+ @RequestMapping(value = "/table4", method = RequestMethod.GET)
+ @ApiOperation(value = "浠婃棩鏂板鍟嗘埛")
+ public Result<Object> table4(PageVo page) {
+ QueryWrapper<Customer> wrapper = new QueryWrapper<>();
+ String format = DateUtil.format(new Date(), "yyyy-MM-dd");
+ wrapper.between("create_time",format+" 00:00:00",format+" 23:59:59");
+ IPage<Customer> data = iCustomerService.page(PageUtil.initMpPage(page),wrapper);
+ return new ResultUtil<Object>().setData(data);
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
index 9678cc0..beee9d8 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
@@ -357,10 +357,10 @@
OrderTask2 orderTask2 = new OrderTask2();
BeanUtil.copyProperties(orderTask,orderTask2);
- if(orderTask.getUserId()!=null){
+ if(StrUtil.isNotEmpty(orderTask.getUserId())){
orderTask2.setUserName(getUser(orderTask.getUserId()));
}
- if(orderTask.getCustomerId()!=null){
+ if(StrUtil.isNotEmpty(orderTask.getCustomerId())){
orderTask2.setCustomerName(getCustomer(orderTask.getCustomerId()));
}
list2.add(orderTask2);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
index 5935eaa..4d2c97b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java
@@ -84,4 +84,7 @@
@Select("SELECT o.*,c.name as customerName FROM t_order_task o LEFT JOIN t_customer c ON o.customer_id=c.id")
IPage<OrderTask> page2(Page initMpPage);
+
+ @Select("SELECT o.*,c.name as customerName FROM t_order_task o LEFT JOIN t_customer c ON o.customer_id=c.id ${ew.customSqlSegment}")
+ IPage<OrderTask> page3(Page initMpPage,@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
index 6422c2f..6ba18cb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/HistoryOrder.java
@@ -4,6 +4,7 @@
import cn.exrick.xboot.your.entity.*;
import cn.exrick.xboot.your.service.*;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -31,7 +32,7 @@
@Autowired
private ICustomerService iCustomerService;
- @Scheduled(cron="0 30 21 * * ?")//姣忔櫄涓嬪崍9鐐瑰崐鐐规墽琛�
+ @Scheduled(cron="0 31 21 * * ?")//姣忔櫄涓嬪崍9鐐瑰崐鐐规墽琛�
public void execute(){
String day = getDay(0);
QueryWrapper<OrderTask> wrapper = new QueryWrapper<>();
@@ -51,18 +52,26 @@
}
private String getUser(String id){
- User user = userService.get(id);
- if(user!=null){
- return user.getNickname();
+ if(StrUtil.isNotEmpty(id)){
+ User user = userService.get(id);
+ if(user!=null){
+ return user.getNickname();
+ }else{
+ return null;
+ }
}else{
return null;
}
}
private String getCustomer(String id){
- Customer customer = iCustomerService.getById(id);
- if(customer!=null){
- return customer.getName();
+ if(StrUtil.isNotEmpty(id)){
+ Customer customer = iCustomerService.getById(id);
+ if(customer!=null){
+ return customer.getName();
+ }else{
+ return null;
+ }
}else{
return null;
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
index 11701e6..eeb3fae 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java
@@ -37,4 +37,6 @@
List<OrderTask> list4(QueryWrapper<OrderTask> wrapper2);
IPage<OrderTask> page2(Page initMpPage);
+
+ IPage<OrderTask> page3(Page initMpPage, QueryWrapper<OrderTask> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
index 80c3583..d4946fc 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java
@@ -86,4 +86,9 @@
public IPage<OrderTask> page2(Page initMpPage){
return orderTaskMapper.page2(initMpPage);
}
+
+ @Override
+ public IPage<OrderTask> page3(Page initMpPage, QueryWrapper<OrderTask> wrapper) {
+ return orderTaskMapper.page3(initMpPage,wrapper);
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
index 09a0001..551aa74 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/MQTT.java
@@ -15,6 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.List;
+
@Component
public class MQTT {
@@ -96,17 +98,27 @@
JSONObject jsonObject1 = JSONUtil.parseObj(s1);
String data = jsonObject1.get("data").toString();
JSONObject jsonObject2 = JSONUtil.parseObj(data);
- //System.out.println(jsonObject2.get("alarmId"));//鎶ヨid
- //System.out.println(jsonObject2.get("vehicleIndexCode"));//杞﹁締code
- //System.out.println(jsonObject2.get("eventType"));//鎶ヨ绫诲瀷
- //鏈郴瀹夊叏甯︼細132376
- //鎶界儫锛�132375
- //鎺ユ墦鐢佃瘽锛�132374
- //鐤插姵椹鹃┒锛�132371
String eventType = jsonObject2.get("eventType").toString();
String vehicleIndexCode = jsonObject2.get("vehicleIndexCode").toString();
String alarmId = jsonObject2.get("alarmId").toString();
String alarmTime = jsonObject2.get("alarmTime").toString();
+
+ QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
+ wrapper.eq("code",vehicleIndexCode);
+ Car car = iCarService.getOne(wrapper);
+ if(car==null){
+ return;
+ }
+
+ String format = alarmTime.substring(0,17);
+ QueryWrapper<Alarm> awrapper = new QueryWrapper<>();
+ awrapper.between("create_time",format+"00",format+"59");
+ awrapper.eq("car_no",car.getCarNo());
+ awrapper.eq("type",1);
+ List<Alarm> list = iAlarmService.list(awrapper);
+ if(list.size()>0){
+ return;
+ }
Alarm alarm = new Alarm();
if(eventType.equals("132371")){
@@ -125,13 +137,6 @@
alarm.setType(7);
alarm.setValue("瓒呴��");
}else{
- return;
- }
-
- QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
- wrapper.eq("code",vehicleIndexCode);
- Car car = iCarService.getOne(wrapper);
- if(car==null){
return;
}
--
Gitblit v1.9.1