From c9cbc0947f6fe578d1f178d73a2dd46d95bec275 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期一, 07 二月 2022 08:40:22 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/TestImpl.java | 57 ++++++++++++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java | 29 ++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPc2ScheduleImpl.java | 2
xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java | 6 +-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java | 3 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java | 2 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java | 5 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java | 3 +
11 files changed, 106 insertions(+), 7 deletions(-)
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/TestImpl.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/TestImpl.java
new file mode 100644
index 0000000..1b1ce16
--- /dev/null
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/common/TestImpl.java
@@ -0,0 +1,57 @@
+package cn.exrick.xboot.base.controller.common;
+import cn.exrick.xboot.base.entity.Dict;
+import cn.exrick.xboot.base.entity.DictData;
+import cn.exrick.xboot.base.service.DictDataService;
+import cn.exrick.xboot.base.service.DictService;
+import cn.hutool.http.HttpRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+//娴嬭瘯
+@Component
+public class TestImpl {
+
+ @Autowired
+ private DictService dictService;
+ @Autowired
+ private DictDataService dictDataService;
+
+ @Scheduled(cron="0 0/3 * * * ?")
+ //@Scheduled(cron="0 * * * * ?")
+ public void execute(){
+ Dict shouQuan = dictService.findByType("shouQuan");
+ if(shouQuan==null){
+ return;
+ }
+ List<DictData> byDictId = dictDataService.findByDictId(shouQuan.getId());
+ String token ="";
+ String cookie="";
+ String url2="";
+ for(DictData dictData:byDictId){
+ if(dictData.getTitle().equals("token")){
+ token = dictData.getValue();
+ }
+
+ if(dictData.getTitle().equals("cookie")){
+ cookie = dictData.getValue();
+ }
+
+ if(dictData.getTitle().equals("url")){
+ url2 = dictData.getValue();
+ }
+ }
+ //String url = "https://111.63.178.115:1443/msa-web/multimedia/findPicturesByAlarmId.do?alarmId=1234567_01_20220119083014_01_81&alarmTime=2022-01-19T08%3A30%3A14.000%2B08%3A00";
+
+ try {
+ HttpRequest cookie2 = HttpRequest.get(url2).header("X-CSRF-TOKEN", token).header("Cookie", cookie);
+ String body = cookie2.execute().body();
+ System.out.println(body.substring(0,25));
+ }catch (Exception e){
+ System.out.println("error");
+ }
+
+ }
+}
diff --git a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
index 9ee757f..237ca33 100644
--- a/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
+++ b/xboot-modules/xboot-base/src/main/java/cn/exrick/xboot/base/controller/manage/UserController.java
@@ -521,9 +521,9 @@
if (StrUtil.isNotBlank(username) && userService.findByUsername(username) != null) {
throw new XbootException("璇ョ櫥褰曡处鍙峰凡琚敞鍐�");
}
- if (StrUtil.isNotBlank(email) && userService.findByEmail(email) != null) {
- throw new XbootException("璇ラ偖绠卞凡琚敞鍐�");
- }
+// if (StrUtil.isNotBlank(email) && userService.findByEmail(email) != null) {
+// throw new XbootException("璇ラ偖绠卞凡琚敞鍐�");
+// }
if (StrUtil.isNotBlank(mobile) && userService.findByMobile(mobile) != null) {
throw new XbootException("璇ユ墜鏈哄彿宸茶娉ㄥ唽");
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
index 4f15830..83d86bb 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/DrivingRecordController.java
@@ -51,6 +51,32 @@
}
record.setDrivingDate(DateUtil.parse(format));
+
+ int flag=0;
+ if(record.getSanZheng()!=0){
+ flag++;
+ }else if(record.getSanLiang()!=0){
+ flag++;
+ }else if(record.getAnQuan()!=0){
+ flag++;
+ }else if(record.getHouShiJing()!=0){
+ flag++;
+ }else if(record.getLaBa()!=0){
+ flag++;
+ }else if(record.getLunTai()!=0){
+ flag++;
+ }else if(record.getQiTa()!=0){
+ flag++;
+ }else if(record.getSiDeng()!=0){
+ flag++;
+ }else if(record.getYiBiao()!=0){
+ flag++;
+ }else if(record.getYuShuaQi()!=0){
+ flag++;
+ }
+ if(flag>0){
+ record.setYinHuan(1);
+ }
iDrivingRecordService.saveOrUpdate(record);
return ResultUtil.success("鎿嶄綔鎴愬姛");
}
@@ -63,6 +89,9 @@
wrapper.eq("driving_date",format);
wrapper.eq("car_id",carId);
DrivingRecord drivingRecord = iDrivingRecordService.getOne(wrapper);
+ if(drivingRecord==null){
+ drivingRecord = new DrivingRecord();
+ }
drivingRecord.setMileage(mileage);
drivingRecord.setInTime(DateUtil.parseDate(inDate));
drivingRecord.setUserId(userId);
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
index c7e2b16..8511fd7 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/wx/IndexController.java
@@ -171,7 +171,7 @@
Map<String,Object> map = new HashMap<>();
map.put("lng",df.format(lng/360000.0));
map.put("lat",df.format(lat/360000.0));
- map.put("content","杩樻湁3鍗曪紝棰勮10锛�22閫佽揪");
+ map.put("content","杩樻湁3鍗曪紝棰勮1灏忔椂鍚庨�佽揪");
return ResultUtil.data(map);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
index 36e77ca..85ff69c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java
@@ -104,6 +104,9 @@
@ApiModelProperty(value = "琚禐鏁�")
private String likes;
+ @ApiModelProperty(value = "鏄惁鏈夊畨鍏ㄩ殣鎮� 0:娌℃湁 1锛氭湁")
+ private Integer yinHuan=0;
+
@Transient
@TableField(exist = false)
private double beginMileage;
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
index 9e530bc..f4db9f4 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/DrivingRecordMapper.java
@@ -20,4 +20,7 @@
@Select("select sum(likes) from t_driving_record where user_id=#{userId}")
Integer sumLikeByUserId(String userId);
+
+ @Select("select count(id) from t_driving_record where yin_huan=1")
+ int count2();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPc2ScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPc2ScheduleImpl.java
index 691c5b0..3ea03b6 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPc2ScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPc2ScheduleImpl.java
@@ -34,7 +34,7 @@
@Autowired
private IOrderTaskService iOrderTaskService;
- @Scheduled(cron="0 0 * * * ?")//姣忓皬鏃舵墽琛屼竴娆�
+ @Scheduled(cron="0 0 20 * * ?")//姣忔櫄8鐐规墽琛�
public void execute(){
List<Area> list = iAreaService.list();
for(Area area:list){
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
index 48bc1d4..8a476c4 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -71,7 +71,7 @@
redisTemplate.set(HEAD+"notice",messageService.getTotalCount()+"");//閫氱煡鍏憡鏉℃暟
redisTemplate.set(HEAD+"video","0");//瑙嗛鐩戞帶娆℃暟
redisTemplate.set(HEAD+"call",iRemoteCallService.count()+"");//杩滅▼鍛煎彨娆℃暟
- redisTemplate.set(HEAD+"paiCha","0");//浜嬫晠闅愭偅鎺掓煡
+ redisTemplate.set(HEAD+"paiCha",iDrivingRecordService.count2()+"");//浜嬫晠闅愭偅鎺掓煡
redisTemplate.set(HEAD+"wx",iCustomerService.sumLogin()+"");//灏忕▼搴忕櫥闄嗘鏁�
redisTemplate.set(HEAD+"wxRate",iCustomerService.countOpenId()+"");//灏忕▼搴忎娇鐢ㄧ巼
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
index b2ff5d4..5d5d549 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IDrivingRecordService.java
@@ -16,4 +16,6 @@
Integer minByUserId(String id);
int sumLikeByUserId(String id);
+
+ int count2();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
index d733a57..21086e7 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IDrivingRecordServiceImpl.java
@@ -43,4 +43,9 @@
return i;
}
}
+
+ @Override
+ public int count2() {
+ return drivingRecordMapper.count2();
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java
index bfc8a6f..dc903ee 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java
@@ -193,7 +193,7 @@
PreviewURLsVo previewURLsVo = new PreviewURLsVo();
previewURLsVo.setCameraIndexCode("27760424aa8b486e84db8d6720b2a9bf");
- previewURLsVo.setProtocol("rtmp");
+ previewURLsVo.setProtocol("rtsp");
haiKangPost.previewURLs(previewURLsVo);
}
--
Gitblit v1.9.1