dcs 3 months ago
parent
commit
330c212e81

+ 3 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/operate/dao/OperateFlowDataDao.java

@@ -34,4 +34,7 @@ public interface OperateFlowDataDao {
 
     List<OperateFlowData> deviceCountList(long deviceId, int type);
 
+    List<OperateFlowData> getProjectId(@Param(value = "startDate") String startDate, @Param(value = "endDate") String endDate, @Param(value = "projectId") long projectId);
+
+
 }

+ 6 - 2
virgo.api/src/main/java/com/bosshand/virgo/api/service/WeeklyService.java

@@ -6,7 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.bosshand.virgo.api.dao.*;
 import com.bosshand.virgo.api.model.*;
 import com.bosshand.virgo.api.operate.dao.OperateDeviceDao;
-import com.bosshand.virgo.api.operate.model.OperateDevice;
+import com.bosshand.virgo.api.operate.dao.OperateFlowDataDao;
+import com.bosshand.virgo.api.operate.model.OperateFlowData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +41,9 @@ public class WeeklyService {
     @Autowired
     OperateDeviceDao operateDeviceDao;
 
+    @Autowired
+    OperateFlowDataDao operateFlowDataDao;
+
     @Autowired
     ProjectItemTargetRoomDao projectItemTargetRoomDao;
 
@@ -144,7 +148,7 @@ public class WeeklyService {
             //设备管理
             case 4:
                 if (weeklyType.getData() == null) {
-                    List<OperateDevice> data = operateDeviceDao.getProjectId(startDate, endDate, projectId);
+                    List<OperateFlowData> data = operateFlowDataDao.getProjectId(startDate, endDate, projectId);
                     weeklyType.setData(JSON.toJSONString(data));
                     weeklyTypeDao.update(weeklyType);
                 }

+ 4 - 0
virgo.api/src/main/resources/mapper/OperateFlowDataMapper.xml

@@ -236,4 +236,8 @@
         <include refid="query"/>where a.deviceId = #{deviceId} and a.type = #{type}
     </select>
 
+    <select id="getProjectId" resultMap="operateFlowDataResult">
+        <include refid="query"/>where a.date  <![CDATA[>=]]>  #{startDate} and a.date <![CDATA[<=]]> #{endDate} and a.projectId = #{projectId} and a.flowType = 5
+    </select>
+
 </mapper>