接口调优

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyDataMapper.java

@@ -46,6 +46,7 @@ public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
     String listGasCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
+    EnergyDataVo listAllCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     /*11111*/
     List<EnergyAllDataVo> listYearGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);

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

@@ -70,36 +70,41 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         QueryWrapper<EnergyData> electricityqueryWrapper = new QueryWrapper<>();
         QueryWrapper<EnergyData> feedqueryWrapper = new QueryWrapper<>();
         QueryWrapper<EnergyData> gasqueryWrapper = new QueryWrapper<>();
-        if (ObjectUtil.isNotEmpty(waterDisplayType)) {
-            waterqueryWrapper.eq("display_type", waterDisplayType);
-        }
-        if (ObjectUtil.isNotEmpty(electricityDisplayType)) {
-            electricityqueryWrapper.eq("display_type", electricityDisplayType);
-        }
-        if (ObjectUtil.isNotEmpty(feedDisplayType)) {
-            feedqueryWrapper.eq("display_type", feedDisplayType);
-        }
-        if (ObjectUtil.isNotEmpty(gasDisplayType)) {
-            gasqueryWrapper.eq("display_type", gasDisplayType);
-        }
+
+        EnergyDataVo energyDataVo;
         Date monthmorning = DataUill.getTimesMonthmorning();
-        waterqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
-        electricityqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
-        feedqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
-        gasqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
-        EnergyDataVo energyDataVo = dataMapper.listWaterCount(waterqueryWrapper);
-        energyDataVo.setGasValue(dataMapper.listGasCount(gasqueryWrapper));
-        energyDataVo.setFeedValue(dataMapper.listFeedCount(feedqueryWrapper));
-        energyDataVo.setElectricityValue(dataMapper.listElectricityCount(electricityqueryWrapper));
-        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);
+        if ("1".equals(waterDisplayType)||"1".equals(electricityDisplayType)||"1".equals(feedDisplayType)
+                ||"1".equals(gasDisplayType)) {
+            if (ObjectUtil.isNotEmpty(waterDisplayType)) {
+                waterqueryWrapper.eq("display_type", waterDisplayType);
+            }
+            if (ObjectUtil.isNotEmpty(electricityDisplayType)) {
+                electricityqueryWrapper.eq("display_type", electricityDisplayType);
+            }
+            if (ObjectUtil.isNotEmpty(feedDisplayType)) {
+                feedqueryWrapper.eq("display_type", feedDisplayType);
+            }
+            if (ObjectUtil.isNotEmpty(gasDisplayType)) {
+                gasqueryWrapper.eq("display_type", gasDisplayType);
+            }
+            waterqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
+            electricityqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
+            feedqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
+            gasqueryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
+            energyDataVo = dataMapper.listWaterCount(waterqueryWrapper);
+            energyDataVo.setGasValue(dataMapper.listGasCount(gasqueryWrapper));
+            energyDataVo.setFeedValue(dataMapper.listFeedCount(feedqueryWrapper));
+            energyDataVo.setElectricityValue(dataMapper.listElectricityCount(electricityqueryWrapper));
+            QueryWrapper<EnergyWarningInfo> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("farm_id", farmId);
+            Integer count = warningInfoMapper.selectCount(queryWrapper1);
+            energyDataVo.setCount(count);
+        }else {
+            QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("display_type", waterDisplayType);
+            queryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
+            energyDataVo = dataMapper.listAllCount(queryWrapper);
+        }
         return new Result(ResultCode.SUCCESS, energyDataVo);
     }
 

huimv-admin/src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 server:
   port: 8011
   ssl:
-    key-store: classpath:10767421_huatong.ifarmcloud.com.jks
+    key-store: classpath:14272001_huatong.ifarmcloud.com.jks
     key-store-type: jks
-    key-store-password: sjp124g3
+    key-store-password: rgweqv2s
 
 spring:
   application:

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnergyDataMapper.xml

@@ -98,6 +98,14 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="listAllCount" resultType="com.huimv.admin.entity.vo.EnergyDataVo">
+        select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',
+        Convert((IFNUll(sum(feed_value),'0')),DECIMAL(10,2)) 'feedValue',Convert((IFNUll(sum(gas_value),'0')),DECIMAL(10,2)) 'gasValue',
+        now() 'nowTime'
+         from energy_data
+        ${ew.customSqlSegment}
+    </select>
+
 
 
     <!--为的是给前端不改变值的写法-->