:wrench: 管理账号，运行机器数量以一个月内运行过为准，商家账号为当前运行数量

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -174,6 +174,15 @@ public class TEquipmentController {
                 query.eq(TEquipment::getAdminId, id);
             }
             if (type == 3) {
+                // TODO:
+                /**
+                 * 查找该商家的所有子账户，一层一层寻找，一个账户只能关联一个账户，
+                 * t_admin,
+                 * parent_id 指的是子商家的上级 admin_id，
+                 * relation_id 指的是关联上级账户的 admin_id，
+                 * 需要增加一个下级账户的admin_id, sub_account
+                 * child_account 孩子账户有多个，不能这样
+                 */
                 //查找属于这个商家子账户的设备 todo
                 TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
                 if (adminEquipment.getType().equals("0")) {
@@ -229,7 +238,7 @@ public class TEquipmentController {
         if (StringUtils.isNotEmpty(labelId)) {
             TLabel label = labelService.getById(labelId);
             String equipmentIds = label.getEquipmentIds();
-            equipmentIds = equipmentIds.replace("\"", "").replace("[","").replace("]","");
+            equipmentIds = equipmentIds.replace("\"", "").replace("[", "").replace("]", "");
             String[] split = equipmentIds.split(",");
             query.in(TEquipment::getId, split);
         }
@@ -937,7 +946,18 @@ public class TEquipmentController {
             param.setAdminId(String.valueOf(admin.getParentId()));
         }
         machineTotalNum = tEquipmentService.findMachineTotalNum(param);
-        machineUseNum = tEquipmentService.findMachineUseNum(param);
+//        machineUseNum = tEquipmentService.findMachineUseNum(param);
+        switch (type) {
+            case 1:
+                machineUseNum = tEquipmentService.findMachineUseNumAdmin(param);
+                break;
+            case 2:
+            case 3:
+                machineUseNum = tEquipmentService.findMachineUseNum(param);
+                break;
+            default:
+                throw new IllegalArgumentException("未知等级");
+        }
         Map<String, String> map = new HashMap<>();
         map.put("machineTotalNum", machineTotalNum);
         map.put("machineUseNum", machineUseNum);
@@ -1757,7 +1777,7 @@ public class TEquipmentController {
      * 上传日志
      *
      * @param equipmentId 设备ID，用于标识上传日志的设备
-     * @param day 日期，指定要上传日志的日期
+     * @param day         日期，指定要上传日志的日期
      * @return 返回操作结果，成功则返回成功信息，失败则返回失败原因
      */
     @ApiOperation(value = "上传日志")
@@ -1796,7 +1816,7 @@ public class TEquipmentController {
      * 查询指定设备在指定日期的日志是否已上传至七牛云。
      *
      * @param equipmentId 设备ID，用于查询日志所属设备。
-     * @param day 日期，格式为"yyyy-MM-dd"，用于指定要查询的日志日期。
+     * @param day         日期，格式为"yyyy-MM-dd"，用于指定要查询的日志日期。
      * @return 返回一个响应模型对象，如果日志已上传则返回成功信息和日志文件名，否则返回失败信息。
      */
     @ApiOperation(value = "查询日志是否上传成功")

src/main/java/com/szwl/mapper/TEquipmentMapper.java

@@ -20,6 +20,8 @@ public interface TEquipmentMapper extends BaseMapper<TEquipment> {
 
     String findMachineUseNum(StatisticsParam param);
 
+    String findMachineUseNumAdmin(StatisticsParam param);
+
     int insertBatchSomeColumn(List<TEquipment> entityList);
 
     List<TEquipment> getEquipmentByLatLon(String lat1, String lat2, String lon1, String lon2);

src/main/java/com/szwl/service/TEquipmentService.java

@@ -23,6 +23,7 @@ public interface TEquipmentService extends MyIService<TEquipment> {
     public String findMachineTotalNum(StatisticsParam param);
 
     public String findMachineUseNum(StatisticsParam param);
+    public String findMachineUseNumAdmin(StatisticsParam param);
 
     Optional<String> syncOneEquipmentByClientId(String clientId);
 

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -96,6 +96,11 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
     }
 
     @Override
+    public String findMachineUseNumAdmin(StatisticsParam param) {
+        return tEquipmentMapper.findMachineUseNumAdmin(param);
+    }
+
+    @Override
     public Optional<String> syncOneEquipmentByClientId(String clientId) {
         if (StringUtils.isNotEmpty(clientId)) {
             TEquipment oldEquipment = R.getDataIfSuccess(syncOldFeign.getEquipmentByClientId(clientId));