Merge branch 'master' of http://114.55.171.231:3000/Euni4U/backend

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/DeviceController.java

@@ -151,4 +151,13 @@ public class DeviceController {
         return success(true);
     }
 
+    @GetMapping("/get-vip-device-count")
+    @Operation(summary = "时间范围获取会员设备数量")
+    public CommonResult<List<Map<String, Object>>> getVipDeviceCountByDay(@RequestParam("startDate") String startDate,
+                                                                          @RequestParam("endDate") String endDate,
+                                                                          @RequestParam(value = "orgid", defaultValue = "0") Integer orgid) {
+        List<Map<String, Object>> list = deviceService.getVipDeviceCountByDay(startDate, endDate, orgid);
+        return success(list);
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java

@@ -96,4 +96,9 @@ public interface DeviceMapper extends BaseMapperX<DeviceDO> {
     * 首页查询设备数量统计
     * */
     DeviceStatistics  getDevice_Statistics(@Param("orgid") Integer orgid);
+    
+    /**
+     * 按天统计开通会员的设备数量
+     */
+    List<Map<String, Object>> countVipDevicesByDay(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("orgid") Integer orgid);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceService.java

@@ -113,4 +113,14 @@ public interface DeviceService {
      * @param vipReqVO 会员信息更新参数
      */
     void updateDeviceVip(@Valid DeviceVipReqVO vipReqVO);
+
+    /**
+     * 根据日期范围查询会员设备数量
+     *
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     * @param orgid 机构ID
+     * @return 会员设备数量统计列表
+     */
+    List<Map<String, Object>> getVipDeviceCountByDay(String startDate, String endDate, Integer orgid);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/device/DeviceServiceImpl.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.device.DeviceMapper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import lombok.extern.slf4j.Slf4j;
@@ -257,4 +258,9 @@ public class DeviceServiceImpl implements DeviceService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> getVipDeviceCountByDay(String startDate, String endDate, Integer orgid) {
+        return deviceMapper.countVipDevicesByDay(startDate, endDate, orgid);
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/device/DeviceMapper.xml

@@ -49,4 +49,16 @@
         </where>
         GROUP BY SUBSTRING_INDEX(location, '/', 1)
     </select>
+
+    <select id="countVipDevicesByDay" resultType="map">
+        SELECT DATE_FORMAT(vipstarttime, '%Y-%m-%d') AS date, COUNT(*) AS count
+        FROM tb_device
+        WHERE isvip = 1
+        AND vipstarttime BETWEEN #{startDate} AND #{endDate}
+        <if test="orgid != null and orgid != 0">
+            AND orgid = #{orgid}
+        </if>
+        GROUP BY DATE_FORMAT(vipstarttime, '%Y-%m-%d')
+        ORDER BY date
+    </select>
 </mapper>