添加昨日今日的24小时图标统计

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/HadSiteStaticMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -23,4 +24,10 @@ public interface HadSiteStaticMapper extends CrudMapper<HadSiteStatic> {
                         @Param("startTime") Date startTime,
                         @Param("endTime") Date endTime,
                        @Param("siteId") Integer siteId);
+
+
+    List<HadSiteStatic> list(@Param("userId") Integer userId,
+                             @Param("startTime") Date startTime,
+                             @Param("endTime") Date endTime,
+                             @Param("siteId") Integer siteId);
 }

fiveep-persistence/src/main/resources/mapper/mysql/HadSiteStaticMapper.xml

@@ -38,5 +38,23 @@
 
         )as t
     </select>
+    <select id="list" resultType="com.bizmatics.model.HadSiteStatic">
+        select *
+        from
+        had_site_static as hs
+        INNER JOIN user_site as us
+        on hs.site_id = us.site_id
+        <where>
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+            <if test="startTime != null and endTime != null">
+                and hs.had_time between #{startTime} and #{endTime}
+            </if>
+        </where>
+    </select>
 
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/HadSiteStaticService.java

@@ -22,6 +22,8 @@ public interface HadSiteStaticService extends CrudService<HadSiteStatic> {
 
      List<HadSiteStatic> list(Integer siteId, Date startTime, Date endTime);
 
+     List<HadSiteStatic> list(Integer siteId, Date startTime, Date endTime,Integer userId);
+
 
 
      Double getCount(Integer userId, Date startTime, Date endTime,Integer siteId);

fiveep-service/src/main/java/com/bizmatics/service/impl/HadSiteStaticServiceImpl.java

@@ -6,6 +6,7 @@ import com.bizmatics.model.HadSiteStatic;
 import com.bizmatics.persistence.mapper.HadSiteStaticMapper;
 import com.bizmatics.service.HadSiteStaticService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.Arith;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -42,8 +43,14 @@ public class HadSiteStaticServiceImpl extends AbstractCrudService<HadSiteStaticM
         return this.list(queryWrapper);
     }
 
+    @Override
+    public List<HadSiteStatic> list(Integer siteId, Date startTime, Date endTime,Integer userId) {
+        return baseMapper.list(userId,startTime,endTime,siteId);
+    }
+
     @Override
     public Double getCount(Integer userId, Date startTime, Date endTime,Integer siteId) {
-        return baseMapper.selectCount(userId,startTime,endTime,siteId);
+        Double aDouble = baseMapper.selectCount(userId, startTime, endTime, siteId);
+        return Arith.div(aDouble,1,2);
     }
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -57,14 +57,15 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
             list.add(getTreedBySite("昨日", siteId, ysTime, yeTime));
             list.add(getTreedBySite("今日", siteId, sTime, eTime));
         }else {
-            list.add(getTrendOne("昨日", userId, ysTime));
-            list.add(getTrendOne("今日", userId, sTime));
+            list.add(getTrendOne("昨日", userId, ysTime,yeTime));
+            list.add(getTrendOne("今日", userId, sTime,eTime));
         }
         return list;
     }
 
 
-    public CommonIcoVO getTrendOne(String name,Integer userId,Date startTime){
+    public CommonIcoVO getTrendOne(String name,Integer userId,Date startTime,Date endTime){
+        List<HadSiteStatic> list = hadSiteStaticService.list(null, startTime, endTime, userId);
         List<Object> objects = new ArrayList<>();
         objects.add(0.0);
         List<Object> dates = new ArrayList<>();
@@ -72,9 +73,15 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         for (int i = 2; i < 24 ; i+=2) {
             //结束时间
             Date hours = DateUtils.setHours(startTime, i);
-            objects.add(hadSiteStaticService.getCount(userId,startTime,hours,null));
             startTime = hours;
             dates.add(DateUtils.getTime(hours));
+            Double hourCount = 0.00;
+            for (HadSiteStatic hadSiteStatic:list) {
+                CommonIcoVO commonIcoVO = JsonUtils.fromJson(hadSiteStatic.getLoadIco(), CommonIcoVO.class);
+                List<Double> dataList = (List<Double>) commonIcoVO.getList();
+                hourCount+=dataList.get(i/2);
+            }
+            objects.add(Arith.div(hourCount,1,2));
         }
         return CommonIcoVO.builder().name(name).list(objects).listDate(dates).build();
     }