Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml
#	device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java
#	device-api/src/main/java/com/xy/dto/DeviceDataDto.java

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xy.mapper.DeviceSimMapper">
-
     <resultMap id="queryPageMap" type="com.xy.dto.DeviceSimDto$PageVo">
         <result column="sim_iccid" property="simIccid"/>
         <association property="deviceInfo" javaType="com.xy.dto.DeviceInfoDto$Vo">
@@ -45,7 +44,8 @@
         SELECT
         di.*,
         ds.net_state,
-        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as dsim_create_time, dsim.is_test, dsim.wait_handle,
+        dsim.id, dsim.type, dsim.activate_time, dsim.timeout, dsim.last_renewal_time, dsim.create_time as
+        dsim_create_time, dsim.is_test, dsim.wait_handle,
         dsys.sim_iccid
         FROM
         device_sim dsim
@@ -56,16 +56,16 @@
         1 = 1
         <if test="queryPage.isBind == false">
             AND NOT EXISTS (
-                SELECT 1
-                FROM device_sysinfo dsys
-                WHERE dsim.id = dsys.sim_iccid
+            SELECT 1
+            FROM device_sysinfo dsys
+            WHERE dsim.id = dsys.sim_iccid
             )
         </if>
         <if test="queryPage.isBind == true">
             AND EXISTS (
-                SELECT 1
-                FROM device_sysinfo dsys
-                WHERE dsim.id = dsys.sim_iccid
+            SELECT 1
+            FROM device_sysinfo dsys
+            WHERE dsim.id = dsys.sim_iccid
             )
             <if test="queryPage.mercId != null">
                 and di.merc_id = #{queryPage.mercId}
@@ -169,9 +169,10 @@
         join device_sim dsim on(dsi.sim_iccid = dsim.id)
         where
         NOT EXISTS (
-            SELECT 1
-            FROM merc_msg_info mmi
-            WHERE di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 2 and mmi.work_type = #{query.workType}
+        SELECT 1
+        FROM merc_msg_info mmi
+        WHERE di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 2 and mmi.work_type =
+        #{query.workType}
         )
         <if test="query.begin != null">
             and dsim.timeout >= #{query.begin}
@@ -186,22 +187,22 @@
         select
         (select count(*)
         from device_info di
-				join device_sysinfo ds on(di.device_id = ds.device_id)
+        join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
-          dsim.timeout >= #{query.begin1} and dsim.timeout &lt;= #{query.end1}
+        dsim.timeout >= #{query.begin1} and dsim.timeout &lt;= #{query.end1}
         <if test="query.mercId != null">
-         and   di.merc_id = #{query.mercId}
+            and di.merc_id = #{query.mercId}
         </if>
         ) as beTimeoutCout,
         (select count(*)
         from device_info di
-				join device_sysinfo ds on(di.device_id = ds.device_id)
+        join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
         dsim.timeout &lt;= #{query.end2}
         <if test="query.mercId != null">
-           and  di.merc_id = #{query.mercId}
+            and di.merc_id = #{query.mercId}
         </if>
         ) as timeoutCout,
         (select count(*)
@@ -210,7 +211,7 @@
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         <where>
             <if test="query.mercId != null">
-                and   di.merc_id = #{query.mercId}
+                and di.merc_id = #{query.mercId}
             </if>
         </where>
         ) as totalNum

device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -492,4 +492,38 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
         return R.ok(vo);
     }
+
+
+    @ApiOperation("设备统计-运营概况")
+    @PostMapping("countDevice")
+    R<DeviceDataDto.CountVO> countDevice(@RequestBody DeviceDataDto.CountDTO dto) {
+        DeviceDataDto.CountVO vo = new DeviceDataDto.CountVO();
+        Integer timeType = dto.getTimeType();
+        int day = 0;
+        if (timeType == 1) {
+            //天
+            day = 1;
+        } else if (timeType == 2) {
+            //周
+            day = 7;
+        } else if (timeType == 3) {
+            //月
+            day = 30;
+        }
+        Date now = DateUtil.date();
+        Date queryDate = DateUtil.offsetDay(now, -day);
+        //新增
+        Long newAdd = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery()
+                .ge(DeviceInfo::getCreateTime, queryDate).eq(DeviceInfo::getActiveState, EnumDeviceActiveStatus.N_1.getCode()));
+        vo.setNewNum(newAdd.intValue());
+        //活跃 产生订单的
+        Integer activeNum = R.feignCheckData(ordersService.deviceActiveCount(new CountDto.MercCountDTO().setStartTime(queryDate)));
+        vo.setActiveNum(activeNum);
+        //设备管理费
+        Long debtNum = deviceChargingService.count(Wrappers.<DeviceCharging>lambdaQuery().lt(DeviceCharging::getTimeout, DateUtil.now()));
+        vo.setDebtNum(debtNum);
+        Long outOfServiceNum = deviceInfoService.count(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getBusyState, EnumDeviceBusyStatus.N_2.getCode()));
+        vo.setOutOfServiceNum(outOfServiceNum.intValue());
+        return R.ok(vo);
+    }
 }

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -218,15 +218,15 @@ public class DeviceSimDto {
         private Boolean isTest;
 
         public LocalDateTime getActivateTime() {
-            return activateTime == null ? null : activateTime.atTime(0,0,0);
+            return activateTime == null ? null : activateTime.atTime(0, 0, 0);
         }
 
         public LocalDateTime getTimeout() {
-            return timeout == null ? null : timeout.atTime(0,0,0);
+            return timeout == null ? null : timeout.atTime(0, 0, 0);
         }
 
         public LocalDateTime getLastRenewalTime() {
-            return lastRenewalTime == null ? null : lastRenewalTime.atTime(0,0,0);
+            return lastRenewalTime == null ? null : lastRenewalTime.atTime(0, 0, 0);
         }
     }