数据统计和新增系统修改

business-service/src/main/java/com/ozs/service/impl/MonitorSystemServiceImpl.java

@@ -86,26 +86,25 @@ public class MonitorSystemServiceImpl extends ServiceImpl<MonitorSystemMapper, M
             list.forEach(l -> {
                 if (l.getEnv().equals(1)) {//测试环境
                     monitor.setTestSecret(SM4Utils.decryptData_ECB(l.getClientSecret(), KEY));
-                } else if (l.getEnv().equals(2)) {//正式环境
-                    monitor.setClientSecret(SM4Utils.decryptData_ECB(l.getClientSecret(), KEY));
+//                } else if (l.getEnv().equals(2)) {//正式环境
+//                    monitor.setClientSecret(SM4Utils.decryptData_ECB(l.getClientSecret(), KEY));
                 }
             });
         }
         Integer grantType = 1;
         int row1 = 0;
         int row2 = 0;
-        if (!monitorSystem.getClientId().equals(monitor.getClientId()) || !monitorSystem.getClientSecret().equals(monitor.getClientSecret())
-                || !monitorSystem.getTestSecret().equals(monitor.getTestSecret())) {//客户端编号或者正式环境密钥或者测试环境密钥改变
+        if (!monitorSystem.getClientId().equals(monitor.getClientId()) || !monitorSystem.getTestSecret().equals(monitor.getTestSecret())) {//客户端编号或者正式环境密钥或者测试环境密钥改变
             LambdaQueryWrapper<SvcAddress> wrapper = new LambdaQueryWrapper<SvcAddress>();
             wrapper.eq(SvcAddress::getClientId, monitor.getClientId());
             svcAddressMapper.delete(wrapper);
 
-            SvcAddress svc = new SvcAddress();
-            svc.setClientId(monitorSystem.getClientId());
-            svc.setClientSecret(SM4Utils.encryptData_ECB(monitorSystem.getClientSecret(), KEY));//正式环境
-            svc.setGrantType(grantType);
-            svc.setEnv(2);
-            row1 = svcAddressMapper.insert(svc);
+//            SvcAddress svc = new SvcAddress();
+//            svc.setClientId(monitorSystem.getClientId());
+//            svc.setClientSecret(SM4Utils.encryptData_ECB(monitorSystem.getClientSecret(), KEY));//正式环境
+//            svc.setGrantType(grantType);
+//            svc.setEnv(2);
+//            row1 = svcAddressMapper.insert(svc);
             SvcAddress svc1 = new SvcAddress();
             svc1.setClientId(monitorSystem.getClientId());
             svc1.setClientSecret(SM4Utils.encryptData_ECB(monitorSystem.getTestSecret(), KEY));//测试环境

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/DataStatisticController.java

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.accountmanagment;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
@@ -11,6 +12,7 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.BaseUser;
 import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.vo.*;
 import com.ozs.service.*;
 import com.ozs.system.service.ISysDictDataService;
@@ -326,10 +328,10 @@ public class DataStatisticController extends BaseController {
     @Log(title = "查询终端数、机车数、相机数、预警数", businessType = BusinessType.SELECT)
     public AjaxResult getNum() {
         Long alarmNum = msgAlarmService.getAlarmNum();
-        Long vehicleNum = baseVehicleService.count();
+        Long vehicleNum = baseVehicleService.count(new LambdaQueryWrapper<BaseVehicle>().groupBy(BaseVehicle::getVehicleCode));
         QueryWrapper<BaseTerminal> wrapper = new QueryWrapper<BaseTerminal>();
         wrapper.lambda().eq(BaseTerminal::getStatus, 1);
-        Long terminalNum = baseTerminalService.count();
+        Long terminalNum = baseTerminalService.count(new LambdaQueryWrapper<BaseTerminal>().groupBy(BaseTerminal::getTerminalCode));
         Long cameraNum = baseCameraManagementService.count();
         DataStatisticNum dataStatisticNum = new DataStatisticNum();
         if (!ObjectUtils.isEmpty(alarmNum)) {