接口修改

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

@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 8087
 
 spring:
   application:

huimv-env-common/src/main/java/com/huimv/env/common/config/ApiPrefixAutoConfiguration.java

@@ -1,16 +1,16 @@
-package com.huimv.env.common.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
-
-    @Override
-    public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("/huimvApi",  c -> c.isAnnotationPresent(RestController.class));
-    }
-
-}
+//package com.huimv.env.common.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+//
+//    @Override
+//    public void configurePathMatch(PathMatchConfigurer configurer) {
+//        configurer.addPathPrefix("",  c -> c.isAnnotationPresent(RestController.class));
+//    }
+//
+//}

huimv-env-common/src/main/java/com/huimv/env/common/config/InterceptorConfig.java

@@ -22,7 +22,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huimvApi/admin/my/*")
-                .excludePathPatterns("/huimvApi/receive/feed");
+                excludePathPatterns("/admin/my/*")
+                .excludePathPatterns("/receive/feed");
     }
 }

huimv-env-common/src/main/java/com/huimv/env/common/entity/EnergyElectricity.java

@@ -46,11 +46,13 @@ public class EnergyElectricity implements Serializable {
     /**
      * 原始值
      */
+
     private String originalValue;
 
     /**
      * 原始数据
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String originalDate;
 
     /**
@@ -68,7 +70,7 @@ public class EnergyElectricity implements Serializable {
     private String voltage;
     private String chipCode;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date uploadDate;
     /*创建时间*/
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")

huimv-env-common/src/main/java/com/huimv/env/common/entity/EnergyWater.java

@@ -54,6 +54,7 @@ public class EnergyWater implements Serializable {
     /**
      * 原始数据
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String originalDate;
 
     /**
@@ -69,11 +70,12 @@ public class EnergyWater implements Serializable {
 
     private String other3;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
     private String voltage;
     private String chipCode;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date uploadDate;
 
 

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyDataServiceImpl.java

@@ -451,13 +451,13 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         if ("1".equals(type)) {
             QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
-            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByDesc("create_date");
             Page<EnergyWater> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, waterMapper.selectPage(page, queryWrapper));
         } else {
             QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(id), "unit_id", id);
-            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime).orderByDesc("create_date");
             Page<EnergyElectricity> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, electricityMapper.selectPage(page, queryWrapper));
         }
@@ -469,76 +469,99 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         String farmId = paramsMap.get("farmId");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
-        String id = paramsMap.get("id");
-
-        JSONArray jsonArray = new JSONArray();
-        if (("".equals(id) || null == id)) {
-            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId);
-            queryWrapper1.eq("f_type", 3);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper1);
-            if (basePigpens.size() != 0) {
-                for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId);
-                    queryWrapper.eq("unit_id", basePigpen.getId());
-                    if ("".equals(startTime) || null == startTime) {
-                        queryWrapper.ge("create_date", DataUill.getTimesmorning());
-                    } else {
-                        queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-                    }
-                    List<EnergyWater> waters = waterMapper.selectList(queryWrapper);
-                    Double waterCount = 0.00;
-                    if (waters.size() > 0) {
-                        for (EnergyWater water : waters) {
-                            waterCount = waterCount + Double.parseDouble(water.getWaterValue());
-                        }
-                    }
-                    QueryWrapper<EnergyElectricity> queryWrapper2 = new QueryWrapper<>();
-                    queryWrapper2.eq("farm_id", farmId);
-                    queryWrapper2.eq("unit_id", basePigpen.getId());
-                    queryWrapper2.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-                    List<EnergyElectricity> electricities = electricityMapper.selectList(queryWrapper2);
-                    Double electricityCount = 0.00;
-                    if (waters.size() > 0) {
-                        for (EnergyElectricity electriciti : electricities) {
-                            electricityCount = electricityCount + Double.parseDouble(electriciti.getElectricityValue());
-                        }
-                    }
-                    JSONObject jsonObject = new JSONObject();
-                    jsonObject.put("waterCount", waterCount);
-                    jsonObject.put("electricityCount", electricityCount);
-                    jsonObject.put("unitName", basePigpen.getBuildName());
-                    jsonArray.add(jsonObject);
-                }
+        String deviceCode = paramsMap.get("deviceCode");
+        QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime),"create_date", startTime, endTime);
+        queryWrapper.eq("chip_code", deviceCode);
+        List<EnergyWater> energyWaters = waterMapper.selectList(queryWrapper);
+        QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).between(StringUtils.isNotBlank(startTime),"create_date", startTime, endTime);
+        queryWrapper1.eq("chip_code", deviceCode);
+        List<EnergyElectricity> electricities = electricityMapper.selectList(queryWrapper1);
+        Double waterCount = 0.00;
+        Double electricityCount = 0.00;
+        if (energyWaters.size() != 0) {
+            for (EnergyWater energyWater : energyWaters) {
+                waterCount = waterCount + Double.parseDouble(energyWater.getWaterValue());
+            }
+        }
+        if (electricities.size() != 0) {
+            for (EnergyElectricity electricity : electricities) {
+                electricityCount = electricityCount + Double.parseDouble(electricity.getElectricityValue());
             }
-        } else {
-
-            QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId);
-            queryWrapper.eq("unit_id", id);
-            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-            EnergyDto energyDto = waterMapper.listCount(queryWrapper);
-
-            QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId);
-            queryWrapper1.eq("unit_id", id);
-            queryWrapper1.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
-            EnergyDto energyDto1 = electricityMapper.listCount(queryWrapper1);
-
-            QueryWrapper<BasePigpen> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId);
-            queryWrapper2.eq("id", id);
-            BasePigpen basePigpen = basePigpenMapper.selectOne(queryWrapper2);
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("waterCount", energyDto.getWaterCount());
-            jsonObject.put("electricityCount", energyDto1.getElectricityCount());
-            jsonObject.put("unitName", basePigpen.getBuildName());
-            jsonArray.add(jsonObject);
-
         }
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("waterCount", waterCount);
+        jsonObject.put("electricity", electricityCount);
+
+//        JSONArray jsonArray = new JSONArray();
+//        if (("".equals(id) || null == id)) {
+//            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+//            queryWrapper1.eq("farm_id", farmId);
+//            queryWrapper1.eq("f_type", 3);
+//            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper1);
+//            if (basePigpens.size() != 0) {
+//                for (BasePigpen basePigpen : basePigpens) {
+//                    QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+//                    queryWrapper.eq("farm_id", farmId);
+//                    queryWrapper.eq("unit_id", basePigpen.getId());
+//                    if ("".equals(startTime) || null == startTime) {
+//                        queryWrapper.ge("create_date", DataUill.getTimesmorning());
+//                    } else {
+//                        queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+//                    }
+//                    List<EnergyWater> waters = waterMapper.selectList(queryWrapper);
+//                    Double waterCount = 0.00;
+//                    if (waters.size() > 0) {
+//                        for (EnergyWater water : waters) {
+//                            waterCount = waterCount + Double.parseDouble(water.getWaterValue());
+//                        }
+//                    }
+//                    QueryWrapper<EnergyElectricity> queryWrapper2 = new QueryWrapper<>();
+//                    queryWrapper2.eq("farm_id", farmId);
+//                    queryWrapper2.eq("unit_id", basePigpen.getId());
+//                    queryWrapper2.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+//                    List<EnergyElectricity> electricities = electricityMapper.selectList(queryWrapper2);
+//                    Double electricityCount = 0.00;
+//                    if (waters.size() > 0) {
+//                        for (EnergyElectricity electriciti : electricities) {
+//                            electricityCount = electricityCount + Double.parseDouble(electriciti.getElectricityValue());
+//                        }
+//                    }
+//                    JSONObject jsonObject = new JSONObject();
+//                    jsonObject.put("waterCount", waterCount);
+//                    jsonObject.put("electricityCount", electricityCount);
+//                    jsonObject.put("unitName", basePigpen.getBuildName());
+//                    jsonArray.add(jsonObject);
+//                }
+//            }
+//        } else {
+//
+//            QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("farm_id", farmId);
+//            queryWrapper.eq("unit_id", id);
+//            queryWrapper.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+//            EnergyDto energyDto = waterMapper.listCount(queryWrapper);
+//
+//            QueryWrapper<EnergyElectricity> queryWrapper1 = new QueryWrapper<>();
+//            queryWrapper1.eq("farm_id", farmId);
+//            queryWrapper1.eq("unit_id", id);
+//            queryWrapper1.between(StringUtils.isNotBlank(startTime), "create_date", startTime, endTime);
+//            EnergyDto energyDto1 = electricityMapper.listCount(queryWrapper1);
+//
+//            QueryWrapper<BasePigpen> queryWrapper2 = new QueryWrapper<>();
+//            queryWrapper2.eq("farm_id", farmId);
+//            queryWrapper2.eq("id", id);
+//            BasePigpen basePigpen = basePigpenMapper.selectOne(queryWrapper2);
+//            JSONObject jsonObject = new JSONObject();
+//            jsonObject.put("waterCount", energyDto.getWaterCount());
+//            jsonObject.put("electricityCount", energyDto1.getElectricityCount());
+//            jsonObject.put("unitName", basePigpen.getBuildName());
+//            jsonArray.add(jsonObject);
+//
+//        }
 
-        return new Result(ResultCode.SUCCESS, jsonArray);
+        return new Result(ResultCode.SUCCESS, jsonObject);
     }