华统大屏接口修改

huimv-admin/src/main/java/com/huimv/admin/entity/EnergyWarningInfo.java

@@ -7,6 +7,7 @@ import java.time.LocalTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -63,6 +64,7 @@ public class EnergyWarningInfo implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GTM+8")
     private Date date;
 
     /**

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyDataVo.java

@@ -16,5 +16,5 @@ public class EnergyDataVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String nowTime;
 
-    private String count;
+    private Integer count;
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyDataServiceImpl.java

@@ -12,9 +12,11 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.BasePigpen;
 import com.huimv.admin.entity.EnergyData;
+import com.huimv.admin.entity.EnergyWarningInfo;
 import com.huimv.admin.entity.vo.*;
 import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyDataMapper;
+import com.huimv.admin.mapper.EnergyWarningInfoMapper;
 import com.huimv.admin.service.IEnergyDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,8 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     private EnergyDataMapper dataMapper;
     @Autowired
     private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private EnergyWarningInfoMapper warningInfoMapper;
 
     @Override
     public Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -46,12 +50,15 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
         EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
-        Float f = 0.00f;
-        f = (Float.parseFloat(energyDataVo.getElectricityValue()) +
-                Float.parseFloat(energyDataVo.getFeedValue()) +
-                Float.parseFloat(energyDataVo.getGasValue()) + Float.parseFloat(energyDataVo.getWaterValue()));
-        DecimalFormat df1 = new DecimalFormat("#.00");
-        energyDataVo.setCount(df1.format(f));
+        QueryWrapper<EnergyWarningInfo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId);
+        Integer count = warningInfoMapper.selectCount(queryWrapper1);
+//        Float f = 0.00f;
+//        f = (Float.parseFloat(energyDataVo.getElectricityValue()) +
+//                Float.parseFloat(energyDataVo.getFeedValue()) +
+//                Float.parseFloat(energyDataVo.getGasValue()) + Float.parseFloat(energyDataVo.getWaterValue()));
+//        DecimalFormat df1 = new DecimalFormat("#.00");
+        energyDataVo.setCount(count);
         return new Result(ResultCode.SUCCESS, energyDataVo);
     }
 

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -744,14 +744,16 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
 
     @Override
     public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        Date timesmorning = DataUill.getTimesmorning();
         String farmId = paramsMap.get("farmId");
         QueryWrapper<ProtData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("farm_id", farmId).ge("create_date",timesmorning);
         Integer count = protDataMapper.selectCount(queryWrapper);//监测数据条数
         QueryWrapper<ProtWarningInfo> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId);
-        Integer count1 = protWarningInfoMapper.selectCount(queryWrapper1);//及时报警条数
-
+        Integer count1 = protWarningInfoMapper.selectCount(queryWrapper1);//全年报警条数
+        queryWrapper1.ge("create_date", timesmorning);
+        Integer countDay = protWarningInfoMapper.selectCount(queryWrapper1);//今日报警条数
 
         //得到监测保障天数
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -776,9 +778,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("locCount", 27);
         jsonObject.put("ProtCount", count);
-        jsonObject.put("WarningCount", count1);
+        jsonObject.put("WarningCount", countDay);
         jsonObject.put("day", day);
-        jsonObject.put("flowCount",15686.54);
+        jsonObject.put("flowCount",count1);
         return new Result(ResultCode.SUCCESS,jsonObject);
     }