From 2239236e90f313ee86d6649ee8df7117e75254e1 Mon Sep 17 00:00:00 2001
From: "862857010@qq.com" <862857010@>
Date: Wed, 5 Jul 2023 15:20:14 +0800
Subject: [PATCH] =?UTF-8?q?1.sql=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=202.=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/iotInfo/IotInfoMapper.xml    |  2 +-
 .../quartz/service/impl/EquipmentInfoServiceImpl.java  |  6 ++++--
 .../java/com/ruoyi/quartz/task/EquipmentInfoTask.java  | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cjy-project/src/main/resources/mapper/iotInfo/IotInfoMapper.xml b/cjy-project/src/main/resources/mapper/iotInfo/IotInfoMapper.xml
index c36c830b..c3774861 100644
--- a/cjy-project/src/main/resources/mapper/iotInfo/IotInfoMapper.xml
+++ b/cjy-project/src/main/resources/mapper/iotInfo/IotInfoMapper.xml
@@ -449,7 +449,7 @@
 
 
     <select id="selectIotInfoForList" resultType="com.cjy.iot.domain.IotInfo">
-        select t1.id,t1.resource_name as resourceName,t1.lon,t1.lat,t1.monitor_path as monitorPath
+        select t1.id,t1.resource_name as resourceName,t1.lon,t1.lat,t1.monitor_path as monitorPath,t1.device_index as deviceIndex
         from b_iot_info t1
         <where>
             <if test="type != null  and type != ''">and t1.type = #{type}</if>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/EquipmentInfoServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/EquipmentInfoServiceImpl.java
index 26bb5f25..2eacea40 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/EquipmentInfoServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/EquipmentInfoServiceImpl.java
@@ -63,6 +63,7 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
             return;
         }
         enterpriseInfo.setOrganName(params.toString());
+        //获取用户的organCode
         List<EnterpriseInfoExtend> enterpriseInfoExtends = enterpriseInfoService.selectEnterpriseInfoList(enterpriseInfo);
         if (CollectionUtils.isEmpty(enterpriseInfoExtends)) {
             return;
@@ -71,6 +72,7 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
         enterpriseInfoExtends.stream().forEach(r -> {
             TpLinkConfig tpLinkConfig = new TpLinkConfig();
             tpLinkConfig.setOrganCode(r.getOrganCode());
+            //获取对应organCode的   ak  sk
             List<TpLinkConfig> tpLinkConfigs = tpLinkConfigService.selectTpLinkConfigList(tpLinkConfig);
             if (!CollectionUtils.isEmpty(tpLinkConfigs)) {
                 tpLinkConfigs.stream().forEach(t -> {
@@ -82,7 +84,7 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
                         map.put("limit", 100);
                         map1.put("enterpriseId", t.getEnterpriseId());
                         map.put("filterAnd", map1);
-                        //获取设备列表
+                        //获取设备列表 接口调用
                         String iotInfo = getIotInfo(t, HttpMethod.POST.toString(), ApiConstants.EquipmentUrl, JSONObject.toJSONString(map));
                         System.out.println(iotInfo);
                         JSONObject jsonObject = JSONObject.parseObject(iotInfo);
@@ -131,7 +133,6 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
                         //获取企业信息  获取到的企业ID 保存到配置表
                         String enterprise = getIotInfo(t, HttpMethod.POST.toString(), ApiConstants.EnterpriseUrl, JSONObject.toJSONString(map));
                         JSONObject json = JSONObject.parseObject(enterprise);
-
                         if (json.get("error_code").toString().equals("0")) {
                             //获取企业信息
                             map.put("start", 1);
@@ -233,6 +234,7 @@ public class EquipmentInfoServiceImpl implements EquipmentInfoService {
                             map1.put("queryCategory", "device");
                             map1.put("regionAccumulate", 0);
                             map1.put("accuracy", "hour");
+                            //TODO 不知道这个参数的作用
                             List<Long> timeList = new ArrayList<>();
                             timeList.add(2023051800L);
                             timeList.add(2023051901L);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/EquipmentInfoTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/EquipmentInfoTask.java
index 67871c64..3d55e375 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/EquipmentInfoTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/EquipmentInfoTask.java
@@ -24,7 +24,7 @@ public class EquipmentInfoTask {
     }
 
     /**
-     * 获取企业信息
+     * 获取企业信息 第一步执行
      */
     public void getEnterpriseConfigInfoList(String params) {
         System.out.println("获取企业信息 start");
@@ -33,7 +33,7 @@ public class EquipmentInfoTask {
     }
 
     /**
-     * 获取项目信息
+     * 获取项目信息 第二步执行
      */
     public void getProjectConfigInfoList(String params) {
         System.out.println("获取项目信息 start");
@@ -42,7 +42,7 @@ public class EquipmentInfoTask {
     }
 
     /**
-     * 获取分组信息
+     * 获取分组信息 第三步执行
      */
     public void getGroupInfoList(String params) {
         System.out.println("获取分组信息 start");
@@ -54,8 +54,8 @@ public class EquipmentInfoTask {
      * 获取客流信息
      */
     public void getPassengerFlowInfoList(String params) {
-        System.out.println("获取分组信息 start");
+        System.out.println("获取客流信息 start");
         equipmentInfoService.selectPassengerFlowInfo(params);
-        System.out.println("获取分组信息 end");
+        System.out.println("获取客流信息 end");
     }
 }