From 8a82baca367e2fb25d8fa55d21f9b25f5ece74df Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期二, 07 十二月 2021 11:13:24 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java | 38 +++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/EquipmentMapper.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IOrderTaskServiceImpl.java | 15 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/OrderTaskMapper.java | 9 +
xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java | 1
xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java | 14 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/PushCallback.java | 41 +++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IOrderTaskService.java | 6
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/ClientMQTT.java | 60 ++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IEquipmentServiceImpl.java | 5
xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/DrivingRecord.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/Recv.java | 30 ++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java | 14 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java | 3
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 3
xboot-admin/src/main/resources/application.yml | 5
/dev/null | 10 -
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java | 1
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IEquipmentService.java | 1
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java | 5
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java | 96 +++++++++++++
27 files changed, 366 insertions(+), 15 deletions(-)
diff --git a/xboot-admin/src/main/resources/application.yml b/xboot-admin/src/main/resources/application.yml
index e3efed9..0499366 100644
--- a/xboot-admin/src/main/resources/application.yml
+++ b/xboot-admin/src/main/resources/application.yml
@@ -26,7 +26,7 @@
url: jdbc:mysql://127.0.0.1:3306/tobacco?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
# Jasypt鍔犲瘑 鍙埌common-utils涓壘鍒癑asyptUtil鍔犺В瀵嗗伐鍏风被鐢熸垚鍔犲瘑缁撴灉 鏍煎紡涓篍NC(鍔犲瘑缁撴灉) 浠ヤ笅瑙ｅ瘑缁撴灉涓�123456
- password: ENC(BM0tNVy9I6d8RXo2G/TS8ItskvLDlA5UwAaqExN5zun31YUmmULLPNrKCg26Ood1)
+ password: ENC(/1qjpLsQSzc4KM+2VhqLecwQu3npNYZo/zclpH/VR34dMdLeW2IVin6V1vH1Xug4)
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
# Druid StatViewServlet閰嶇疆
@@ -168,7 +168,7 @@
# token涓瓨鍌ㄧ敤鎴锋潈闄愭暟鎹� 璁句负true寮�鍚悗鍙伩鍏嶆瘡娆¤姹傚啀鑾峰彇鐢ㄦ埛鏉冮檺锛屼絾鏈夊彲鑳藉鑷寸紪杈戞潈闄愯彍鍗曞悗鏃犳硶璇诲彇鍒版渶鏂版潈闄愭暟鎹紙闇�鐢ㄦ埛閲嶆柊鐧诲綍锛�
storePerms: true
# token杩囨湡鏃堕棿 redis妯″紡鏈夎姹傝嚜鍔ㄥ埛鏂帮紙鍒嗛挓锛�
- tokenExpireTime: 60
+ tokenExpireTime: 600
# 鐢ㄦ埛閫夋嫨 淇濆瓨鐧诲綍鐘舵��/璁颁綇鎴� 瀵瑰簲token杩囨湡鏃堕棿锛堝ぉ锛�
saveLoginTime: 7
# 闄愬埗鐢ㄦ埛鐧婚檰閿欒娆℃暟锛堟锛�
@@ -288,6 +288,7 @@
- /**/*.png
- /**/*.ico
- /xboot/test/**
+ - /xboot/fingerprint/getAll
# 闄愭祦鍙婇粦鍚嶅崟涓嶆嫤鎴殑璺緞
limitUrls:
- /**/*.js
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java b/xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java
index 4faf9f8..dc6848c 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/dao/UserDao.java
@@ -64,4 +64,7 @@
@Modifying
@Query("update User u set u.departmentTitle=?2 where u.departmentId=?1")
void updateDepartmentTitle(String departmentId, String departmentTitle);
+
+ @Query("select count(id) from User u where u.type2=?1")
+ int countByType(int type);
}
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java b/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
index 10efb96..0c7c9f4 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/service/UserService.java
@@ -76,4 +76,6 @@
* @param departmentTitle
*/
void updateDepartmentTitle(String departmentId, String departmentTitle);
+
+ int countByType(int type);
}
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java b/xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java
index 65f6f10..a4d73db 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/serviceimpl/UserServiceImpl.java
@@ -196,4 +196,9 @@
userDao.updateDepartmentTitle(departmentId, departmentTitle);
}
+
+ @Override
+ public int countByType(int type) {
+ return userDao.countByType(type);
+ }
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/appController/LoginController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/appController/LoginController.java
deleted file mode 100644
index af425c0..0000000
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/appController/LoginController.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cn.exrick.xboot.your.appController;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/app/login")
-@Transactional
-public class LoginController {
-}
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
new file mode 100644
index 0000000..78679e7
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/pc/StatisticController.java
@@ -0,0 +1,38 @@
+package cn.exrick.xboot.your.controller.pc;
+
+import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.Result;
+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.*;
+
+import java.util.*;
+
+/**
+ * @author whj
+ */
+@Slf4j
+@RestController
+@Api(tags = "澶у睆缁熻鎺ュ彛")
+@RequestMapping("/xboot/pcStatistic")
+@Transactional
+public class StatisticController {
+
+ @Autowired
+ private RedisTemplateHelper redisTemplateHelper;
+
+ @RequestMapping(value = "/getIndex1", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇棣栭〉鏁版嵁")
+ public Result<Object> getIndex1() {
+ Map<String,Object> map = new HashMap<>();
+ Set<String> scan = redisTemplateHelper.scan("*statistic1::*");
+ for (String str : scan) {
+ map.put(str.substring(12),redisTemplateHelper.get(str));
+ }
+ return new ResultUtil<Object>().setData(map);
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
index e67382f..c204ee7 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Customer.java
@@ -78,6 +78,9 @@
@ApiModelProperty(value = "鎺ヨ揣浜哄悕绉�")
private String recvName;
+ @ApiModelProperty(value = "寰俊id")
+ private String openId;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鎺ヨ揣浜哄垪琛�")
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 027a29e..36e77ca 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
@@ -101,6 +101,9 @@
@ApiModelProperty(value = "澶勭悊鎰忚")
private String content;
+ @ApiModelProperty(value = "琚禐鏁�")
+ private String likes;
+
@Transient
@TableField(exist = false)
private double beginMileage;
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
index d9e5c1e..7d348a0 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -94,6 +94,9 @@
@ApiModelProperty(value = "鏀惰揣浜篿d")
private String customerReceiveId;
+ @ApiModelProperty(value = "鏄惁鐐硅禐 0锛氬惁 1锛氭槸")
+ private String likes;
+
@Transient
@TableField(exist = false)
@ApiModelProperty(value = "鍟嗘埛鍚嶇О")
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
index 4be0641..e490ebd 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/CustomerMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.Customer;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -11,4 +12,6 @@
*/
public interface CustomerMapper extends BaseMapper<Customer> {
+ @Select("select count(id) from t_customer")
+ int count();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/EquipmentMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/EquipmentMapper.java
index cf6a0a7..6ef3104 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/EquipmentMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/EquipmentMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.Equipment;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -11,4 +12,6 @@
*/
public interface EquipmentMapper extends BaseMapper<Equipment> {
+ @Select("select count(id) from t_equipment where type=#{arg0} and status=0")
+ int countByTypeAndStatus(int type);
}
\ No newline at end of file
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 e8906e3..3580ac8 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
@@ -27,4 +27,13 @@
@Select("SELECT a.*,b.name as temp FROM t_order_task a LEFT JOIN t_customer b ON a.customer_id=b.id ${ew.customSqlSegment} ")
@Results({@Result(column="temp", property="customerName", jdbcType = JdbcType.VARCHAR)})
List<OrderTask> list2(@Param(Constants.WRAPPER) QueryWrapper<OrderTask> wrapper2);
+
+ @Select("SELECT sum(num) FROM t_order_task")
+ int sumNum();
+
+ @Select("SELECT count(id) FROM t_order_task where status=#{arg0}")
+ int sumStatus(int type);
+
+ @Select("SELECT count(id) FROM t_order_task where likes=1")
+ int countLike();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
index fff9587..2e7c813 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/UserStatisticMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.UserStatistic;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -11,4 +12,6 @@
*/
public interface UserStatisticMapper extends BaseMapper<UserStatistic> {
+ @Select("select sum(driving) from t_user_statistic")
+ int sumDriving();
}
\ No newline at end of file
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
new file mode 100644
index 0000000..5026b0b
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -0,0 +1,96 @@
+package cn.exrick.xboot.your.schedulings;
+import cn.exrick.xboot.core.common.redis.RedisTemplateHelper;
+import cn.exrick.xboot.core.entity.User;
+import cn.exrick.xboot.core.service.MessageService;
+import cn.exrick.xboot.core.service.UserService;
+import cn.exrick.xboot.your.entity.*;
+import cn.exrick.xboot.your.service.*;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class StatisticPcScheduleImpl {
+
+ @Autowired
+ private IUserStatisticService iUserStatisticService;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private IDrivingRecordService iDrivingRecordService;
+
+ @Autowired
+ private IOrderTaskService iOrderTaskService;
+
+ @Autowired
+ private IAreaService iAreaService;
+
+ @Autowired
+ private ICustomerService iCustomerService;
+
+ @Autowired
+ private RedisTemplateHelper redisTemplate;
+
+ @Autowired
+ private ICarService iCarService;
+
+ @Autowired
+ private MessageService messageService;
+
+ @Autowired
+ private IRemoteCallService iRemoteCallService;
+
+ @Autowired
+ private IEquipmentService iEquipmentService;
+
+ public static final String HEAD = "statistic1::";
+
+ @Scheduled(cron="0 */10 * * * ?")//姣忓皬鏃�
+ public void execute(){
+ redisTemplate.set(HEAD+"car",iCarService.count()+"");//杞﹁締
+ redisTemplate.set(HEAD+"user",userService.countByType(0)+"");//鍙告満
+ redisTemplate.set(HEAD+"user2",userService.countByType(1)+"");//閰嶉�佸憳
+
+ redisTemplate.set(HEAD+"dept","3");//杞繍绔欐暟
+ redisTemplate.set(HEAD+"area",iAreaService.count()+"");//鐗囧尯鏁�
+ redisTemplate.set(HEAD+"customer",iCustomerService.count()+"");//鍟嗘埛鏁�
+
+ redisTemplate.set(HEAD+"out",iDrivingRecordService.count()+"");//鍑鸿溅娆℃暟
+ redisTemplate.set(HEAD+"driving",iUserStatisticService.sumDriving()+"");//琛岄┒閲岀▼
+ redisTemplate.set(HEAD+"num",iOrderTaskService.sumNum()+"");//閫佽揣鍖呮暟
+ redisTemplate.set(HEAD+"status",iOrderTaskService.sumStatus(1)+"");//鐢靛瓙绛炬敹娆℃暟
+
+ 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+"wx",iCustomerService.sumLogin()+"");//灏忕▼搴忕櫥闄嗘鏁�
+ redisTemplate.set(HEAD+"wxRate",iCustomerService.countOpenId()+"");//灏忕▼搴忎娇鐢ㄧ巼
+ int i = iOrderTaskService.countLike();
+ redisTemplate.set(HEAD+"like",i+"");//浜掑姩娆℃暟
+ int count = iOrderTaskService.count();
+ if(count==0){
+ redisTemplate.set(HEAD+"likeRate","0");//浜掑姩鐜�
+ }else{
+ redisTemplate.set(HEAD+"likeRate",(i*100)/count+"");//浜掑姩鐜�
+ }
+
+
+ redisTemplate.set(HEAD+"outCar",iEquipmentService.countByTypeAndStatus(0)+"");//鍑哄彂杞﹁締
+ redisTemplate.set(HEAD+"outCar","0");//鍗遍櫓寮�鍚�
+
+ 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");
+ redisTemplate.set(HEAD+"outCar",iCustomerService.count(wrapper)+"");//浠婃棩鏂板鍟嗘埛
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
index 9e030e0..523b106 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/ICustomerService.java
@@ -11,4 +11,5 @@
*/
public interface ICustomerService extends IService<Customer> {
+ int countOpenId();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IEquipmentService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IEquipmentService.java
index c5391a5..6de0670 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IEquipmentService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IEquipmentService.java
@@ -11,4 +11,5 @@
*/
public interface IEquipmentService extends IService<Equipment> {
+ int countByTypeAndStatus(int i);
}
\ No newline at end of file
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 c13fea2..99198d6 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
@@ -15,4 +15,10 @@
int sum(String id, String format);
List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2);
+
+ int sumNum();
+
+ int sumStatus(int i);
+
+ int countLike();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
index 952a961..7b1f473 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IUserStatisticService.java
@@ -11,4 +11,5 @@
*/
public interface IUserStatisticService extends IService<UserStatistic> {
+ int sumDriving();
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
index cd24a8e..f439be4 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/ICustomerServiceImpl.java
@@ -3,6 +3,7 @@
import cn.exrick.xboot.your.mapper.CustomerMapper;
import cn.exrick.xboot.your.entity.Customer;
import cn.exrick.xboot.your.service.ICustomerService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,4 +24,17 @@
@Autowired
private CustomerMapper customerMapper;
+
+ @Override
+ public int countOpenId() {
+ QueryWrapper<Customer> wrapper = new QueryWrapper<>();
+ wrapper.isNotNull("open_id");
+ int i = customerMapper.selectCount(wrapper);
+ int i2 = customerMapper.count();
+ if(i2==0){
+ return 0;
+ }else{
+ return (i*100)/i2;
+ }
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IEquipmentServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IEquipmentServiceImpl.java
index 9f31b2b..c02141b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IEquipmentServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IEquipmentServiceImpl.java
@@ -23,4 +23,9 @@
@Autowired
private EquipmentMapper equipmentMapper;
+
+ @Override
+ public int countByTypeAndStatus(int type) {
+ return equipmentMapper.countByTypeAndStatus(type);
+ }
}
\ 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 3276289..45d8b76 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
@@ -38,4 +38,19 @@
public List<OrderTask> list2(QueryWrapper<OrderTask> wrapper2) {
return orderTaskMapper.list2(wrapper2);
}
+
+ @Override
+ public int sumNum() {
+ return orderTaskMapper.sumNum();
+ }
+
+ @Override
+ public int sumStatus(int type) {
+ return orderTaskMapper.sumStatus(type);
+ }
+
+ @Override
+ public int countLike() {
+ return orderTaskMapper.countLike();
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
index 6e6090f..d500f2b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IUserStatisticServiceImpl.java
@@ -23,4 +23,9 @@
@Autowired
private UserStatisticMapper userStatisticMapper;
+
+ @Override
+ public int sumDriving() {
+ return userStatisticMapper.sumDriving();
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/ClientMQTT.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/ClientMQTT.java
new file mode 100644
index 0000000..eb6f911
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/ClientMQTT.java
@@ -0,0 +1,60 @@
+package cn.exrick.xboot.your.util;
+
+import java.util.concurrent.ScheduledExecutorService;
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttTopic;
+import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+
+public class ClientMQTT {
+
+ public static final String HOST = "tcp://10.10.101.1:1883";
+ //public static final String TOPIC = "\"5201154049\": \"artemis/event_msa_alarm/5201154049/admin\"";
+ public static final String TOPIC = "5201154049";
+ private static final String clientid = "28156526";
+ private MqttClient client;
+ private MqttConnectOptions options;
+ private String userName = "artemis_28156526_8SS2BGXE";
+ private String passWord = "1GVZ2F7C";
+
+ private ScheduledExecutorService scheduler;
+
+ private void start() {
+ try {
+ // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
+ client = new MqttClient(HOST, clientid, new MemoryPersistence());
+ // MQTT鐨勮繛鎺ヨ缃�
+ options = new MqttConnectOptions();
+ // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃繖閲岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
+ options.setCleanSession(true);
+ // 璁剧疆杩炴帴鐨勭敤鎴峰悕
+ options.setUserName(userName);
+ // 璁剧疆杩炴帴鐨勫瘑鐮�
+ options.setPassword(passWord.toCharArray());
+ // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
+ options.setConnectionTimeout(30);
+ // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
+ options.setKeepAliveInterval(20);
+ // 璁剧疆鍥炶皟
+ client.setCallback(new PushCallback());
+ MqttTopic topic = client.getTopic(TOPIC);
+ //setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
+ options.setWill(topic, "close".getBytes(), 2, true);
+
+ client.connect(options);
+ //璁㈤槄娑堟伅
+ int[] Qos = {1};
+ String[] topic1 = {TOPIC};
+ client.subscribe(topic1, Qos);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) throws MqttException {
+ ClientMQTT client = new ClientMQTT();
+ client.start();
+ }
+}
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 4dee7b7..2dac030 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
@@ -1,5 +1,6 @@
package cn.exrick.xboot.your.util;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@@ -102,13 +103,18 @@
put("https://",findHistoryGpsDataApi);
}
};
- String eventTypes[] = {"5201154049"};
- String body= JSONUtil.toJsonStr(eventTypes);
+ BigDecimal eventTypes[] = {new BigDecimal(new String("5201154049"))};
+ Map<String,Object> map = new HashMap<>();
+ map.put("eventTypes",eventTypes);
+ String body= JSONUtil.toJsonStr(map);
+ System.out.println(body);
String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
return result;
}
public static void main(String[] args) {
+ getTopicInfo();
+
// FindHistoryGpsRequest findHistoryGpsRequest = new FindHistoryGpsRequest();
// findHistoryGpsRequest.setVehicleIndexCode("b279d865eabe497db465eb2f4d2cc87d");
// findHistoryGpsRequest.setPageNo(1);
@@ -119,5 +125,9 @@
// String code[] = {"b279d865eabe497db465eb2f4d2cc87d"};
// System.out.println(findLatestGps(code));
+
+// PreviewURLsVo previewURLsVo = new PreviewURLsVo();
+// previewURLsVo.setCameraIndexCode("b279d865eabe497db465eb2f4d2cc87d");
+// previewURLs(previewURLsVo);
}
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/PushCallback.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/PushCallback.java
new file mode 100644
index 0000000..2ab560f
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/PushCallback.java
@@ -0,0 +1,41 @@
+package cn.exrick.xboot.your.util;
+
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
+/**
+ * 鍙戝竷娑堟伅鐨勫洖璋冪被
+ *
+ * 蹇呴』瀹炵幇MqttCallback鐨勬帴鍙ｅ苟瀹炵幇瀵瑰簲鐨勭浉鍏虫帴鍙ｆ柟娉旵allBack 绫诲皢瀹炵幇 MqttCallBack銆�
+ * 姣忎釜瀹㈡埛鏈烘爣璇嗛兘闇�瑕佷竴涓洖璋冨疄渚嬨�傚湪姝ょず渚嬩腑锛屾瀯閫犲嚱鏁颁紶閫掑鎴锋満鏍囪瘑浠ュ彟瀛樹负瀹炰緥鏁版嵁銆�
+ * 鍦ㄥ洖璋冧腑锛屽皢瀹冪敤鏉ユ爣璇嗗凡缁忓惎鍔ㄤ簡璇ュ洖璋冪殑鍝釜瀹炰緥銆�
+ * 蹇呴』鍦ㄥ洖璋冪被涓疄鐜颁笁涓柟娉曪細
+ *
+ * public void messageArrived(MqttTopic topic, MqttMessage message)鎺ユ敹宸茬粡棰勮鐨勫彂甯冦��
+ *
+ * public void connectionLost(Throwable cause)鍦ㄦ柇寮�杩炴帴鏃惰皟鐢ㄣ��
+ *
+ * public void deliveryComplete(MqttDeliveryToken token))
+ * 鎺ユ敹鍒板凡缁忓彂甯冪殑 QoS 1 鎴� QoS 2 娑堟伅鐨勪紶閫掍护鐗屾椂璋冪敤銆�
+ * 鐢� MqttClient.connect 婵�娲绘鍥炶皟銆�
+ *
+ */
+public class PushCallback implements MqttCallback {
+
+ public void connectionLost(Throwable cause) {
+ // 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩�
+ System.out.println("杩炴帴鏂紑锛屽彲浠ュ仛閲嶈繛");
+ }
+
+ public void deliveryComplete(IMqttDeliveryToken token) {
+ System.out.println("deliveryComplete---------" + token.isComplete());
+ }
+
+ public void messageArrived(String topic, MqttMessage message) throws Exception {
+ // subscribe鍚庡緱鍒扮殑娑堟伅浼氭墽琛屽埌杩欓噷闈�
+ System.out.println("鎺ユ敹娑堟伅涓婚 : " + topic);
+ System.out.println("鎺ユ敹娑堟伅Qos : " + message.getQos());
+ System.out.println("鎺ユ敹娑堟伅鍐呭 : " + new String(message.getPayload()));
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/Recv.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/Recv.java
new file mode 100644
index 0000000..47ea2db
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/Recv.java
@@ -0,0 +1,30 @@
+package cn.exrick.xboot.your.util;
+
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.DeliverCallback;
+
+public class Recv {
+ private final static String QUEUE_NAME = "5201154049";
+
+ public static void main(String[] argv) throws Exception {
+ ConnectionFactory factory = new ConnectionFactory();
+ factory.setHost("111.63.178.115");
+ factory.setPort(1883);
+ factory.setUsername("artemis_28156526_8SS2BGXE");
+ factory.setPassword("1GVZ2F7C");
+ Connection connection = factory.newConnection();
+ Channel channel = connection.createChannel();
+//璇锋敞鎰忥紝鎴戜滑涔熷湪杩欓噷澹版槑浜嗛槦鍒椼�傚洜涓烘垜浠彲鑳藉湪鍙戝竷鑰呬箣鍓嶅惎鍔ㄦ秷璐硅�咃紝鎵�浠ユ垜浠笇鏈涘湪灏濊瘯浣跨敤娑堟伅涔嬪墠纭繚闃熷垪瀛樺湪銆�
+ channel.queueDeclare(QUEUE_NAME, false, false, false, null);
+ System.out.println(" [*] Waiting for messages. To exit press CTRL+C");
+//鎴戜滑鍗冲皢鍛婅瘔鏈嶅姟鍣ㄤ粠闃熷垪涓紶閫掓秷鎭�傚洜涓哄畠浼氬紓姝ュ湴鍚戞垜浠彂閫佹秷鎭紝
+// 鎵�浠ユ垜浠互瀵硅薄鐨勫舰寮忔彁渚涗竴涓洖璋冿紝瀹冨皢缂撳啿娑堟伅锛岀洿鍒版垜浠噯澶囧ソ浣跨敤瀹冧滑銆傝繖灏辨槸DeliverCallback瀛愮被鐨勪綔鐢ㄣ��
+ DeliverCallback deliverCallback = (consumerTag, delivery) -> {
+ String message = new String(delivery.getBody(), "UTF-8");
+ System.out.println(" [x] Received '" + message + "'");
+ };
+ channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> { });
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java
index a7bf6a0..6d8e303 100755
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java
@@ -1,7 +1,7 @@
package cn.exrick.xboot.your.vo;
public class PreviewURLsVo {
- private String protocol;//鍗忚绫诲瀷锛坮tsp-rtsp鍗忚,rtmp-rtmp鍗忚,hls-hLS鍗忚锛夛紝鏈～鍐欎负rtsp鍗忚
+ private String protocol="rtsp";//鍗忚绫诲瀷锛坮tsp-rtsp鍗忚,rtmp-rtmp鍗忚,hls-hLS鍗忚锛夛紝鏈～鍐欎负rtsp鍗忚
private String cameraIndexCode;
private Integer streamType=0;//鐮佹祦绫诲瀷(0-涓荤爜娴�,1-瀛愮爜娴�),鏈～榛樿涓轰富鐮佹祦
private Integer transmode=0;//鍗忚绫诲瀷( 0-udp锛�1-tcp),榛樿涓簍cp锛屽湪protocol璁剧疆涓簉tsp鎴栬�卹tmp鏃舵湁鏁�
--
Gitblit v1.9.1