水电表平台修改7

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/ArrangeRecordController.java

@@ -17,8 +17,13 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.crypto.SecretKey;
 import javax.servlet.http.HttpServletRequest;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.util.Base64;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.Map;
 
 /**
@@ -65,8 +70,9 @@ public class ArrangeRecordController {
     @GetMapping("/test")
     public Integer test(HttpServletRequest request, @RequestParam("macAddress") String macAddress,
                         @RequestParam(value = "diskAddress", required = false) String diskAddress) {
+
         System.out.println("这个是mac地址：" + macAddress);
-        System.out.println("这个是硬盘地址：" + macAddress);
+        System.out.println("这个是硬盘地址：" + diskAddress);
         String ipAddr = IpUtil.getIpAddr(request);
         System.out.println("这里是ip地址：" + ipAddr);
         ArrangeRecord record = new ArrangeRecord();
@@ -132,13 +138,19 @@ public class ArrangeRecordController {
                     record.setCreateDate(date);
                     record.setIpAddress(ipAddr);
                     arrangeRecordService.save(record);
-                    if (i < 0) {
+                    if (date.getTime() < arrangeList.getEndTime().getTime()) {
                         return 0;
                     } else {
                         return 3;
                     }
                 } else {
-                    return 3;
+                    Date date = new Date();
+                    record.setMacAddress(decryptedMAC);
+                    record.setIpAddress(ipAddr);
+                    record.setCreateDate(date);
+                    arrangeRecordService.save(record);
+                    System.out.println("ip验证不符合");
+                    return 2;
                 }
             }
 
@@ -152,7 +164,7 @@ public class ArrangeRecordController {
                         record.setCreateDate(date);
                         record.setIpAddress(ipAddr);
                         arrangeRecordService.save(record);
-                        if (i < 0) {
+                        if (date.getTime() < arrangeList.getEndTime().getTime()) {
                             return 0;
                         } else {
                             return 3;
@@ -169,6 +181,7 @@ public class ArrangeRecordController {
                     record.setCreateDate(new Date());
                     record.setIpAddress(ipAddr);
                     arrangeRecordService.save(record);
+                    System.out.println("倒数第三出现了异常");
                     return 2;
                 }
 
@@ -185,7 +198,7 @@ public class ArrangeRecordController {
                         record.setMacAddress(decryptedMAC);
                         int i = date.compareTo(arrangeList.getEndTime());
                         arrangeRecordService.save(record);
-                        if (i < 0) {
+                        if (date.getTime() < arrangeList.getEndTime().getTime()) {
                             return 0;
                         } else {
                             return 3;
@@ -204,12 +217,18 @@ public class ArrangeRecordController {
                     record.setMacAddress(decryptedMAC);
                     record.setDiskAddress(diskAddress);
                     arrangeRecordService.save(record);
+                    System.out.println("倒数第二出现了异常");
                     return 2;
                 }
             }
 
         } catch (Exception e) {
             e.printStackTrace();
+            record.setCreateDate(new Date());
+            record.setIpAddress(ipAddr);
+            record.setMacAddress(macAddress);
+            arrangeRecordService.save(record);
+            System.out.println("最后出现了异常");
             return 2;
         }
 
@@ -244,4 +263,22 @@ public class ArrangeRecordController {
     }
 
 
+
+    public static void main(String[] args) {
+        try {
+            Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+            while (interfaces.hasMoreElements()) {
+                NetworkInterface networkInterface = interfaces.nextElement();
+                Enumeration<InetAddress> addresses = networkInterface.getInetAddresses();
+                while (addresses.hasMoreElements()) {
+                    InetAddress address = addresses.nextElement();
+                    if (!address.isLoopbackAddress() && address instanceof Inet4Address) {
+                        System.out.println("Local IP Address: " + address.getHostAddress());
+                    }
+                }
+            }
+        } catch (SocketException e) {
+            e.printStackTrace();
+        }
+    }
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/EnergyElectricityController.java

@@ -1,6 +1,12 @@
 package com.huimv.env.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.env.admin.entity.WaterAndElectricityVo;
+import com.huimv.env.common.entity.EnergyElectricity;
+import com.huimv.env.common.entity.EnergyWater;
 import com.huimv.env.common.service.IEnergyElectricityService;
+import com.huimv.env.common.service.IEnergyWaterService;
 import com.huimv.env.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -9,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,6 +32,8 @@ import java.util.Map;
 public class EnergyElectricityController {
     @Autowired
     private IEnergyElectricityService energyElectricityService;
+    @Autowired
+    private IEnergyWaterService waterService;
 
     @RequestMapping("/listPigpen")
     public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
@@ -35,4 +44,27 @@ public class EnergyElectricityController {
     public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return energyElectricityService.listData(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/sendData")
+    public List sendData(@RequestBody WaterAndElectricityVo vo) {
+        String startDate = vo.getStartDate();
+        String endDate = vo.getEndDate();
+        List<String> deviceCode = vo.getDeviceCode();
+        String type = vo.getType();//1 为水 2为电
+        String start = startDate + " 00:00:00";
+        String end = endDate + " 23:59:59";
+        if ("1".equals(type)) {
+            QueryWrapper<EnergyWater> queryWrapper = new QueryWrapper<>();
+            queryWrapper.between("create_date", start, end)
+                    .in( "chip_code", deviceCode).orderByDesc("create_date");
+            List<EnergyWater> list = waterService.list(queryWrapper);
+            return list;
+        } else {
+            QueryWrapper<EnergyElectricity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.between("create_date", start, end)
+                    .in("chip_code", deviceCode).orderByDesc("create_date");
+            List<EnergyElectricity> list = energyElectricityService.list(queryWrapper);
+            return list;
+        }
+    }
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/timer/WaterAndElectricity.java

@@ -42,7 +42,7 @@ public class WaterAndElectricity {
 
 
 
-    @Scheduled(cron = "0 0 */1 * * ? ")
+    @Scheduled(cron = "0 59 * * * ? ")
     private void sendDate() throws Exception {
         QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", 26);

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

@@ -23,6 +23,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
                 excludePathPatterns("/huimvAdmin/admin/my/*","/huimvAdmin/arrange-record/test")
-                .excludePathPatterns("/huimvAdmin/receive/feed");
+                .excludePathPatterns("/huimvAdmin/receive/feed","/huimvAdmin/energy-electricity/sendData");
     }
 }

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

@@ -448,6 +448,11 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         if ("".equals(pageSize) || null == pageSize) {
             pageSize = "10";
         }
+        if (!"".equals(startTime) || null != startTime) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 00:00:00";
+        }
+
         String isLook = paramsMap.get("isLook");
         String id = paramsMap.get("id");
         String type = paramsMap.get("type");//1 为水 2为电

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.huimv.env.common.entity.BaseFarm;
 import com.huimv.env.common.entity.EnergyEnvDevice;
+import com.huimv.env.common.mapper.BaseFarmMapper;
 import com.huimv.env.common.mapper.EnergyEnvDeviceMapper;
 import com.huimv.env.common.service.IEnergyEnvDeviceService;
 import com.huimv.env.common.utils.Result;
@@ -30,6 +32,8 @@ import java.util.Map;
 public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMapper, EnergyEnvDevice> implements IEnergyEnvDeviceService {
     @Autowired
     private EnergyEnvDeviceMapper energyEnvDeviceMapper;
+    @Autowired
+    private BaseFarmMapper farmMapper;
 
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -57,6 +61,9 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
 
     @Override
     public Result add(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice) {
+        QueryWrapper<BaseFarm> farmQueryWrapper = new QueryWrapper<>();
+        farmQueryWrapper.eq("id", energyEnvDevice.getFarmId());
+        BaseFarm farm = farmMapper.selectOne(farmQueryWrapper);
         QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("device_name", energyEnvDevice.getDeviceName()).eq("farm_id",energyEnvDevice.getFarmId());
         Integer count = energyEnvDeviceMapper.selectCount(queryWrapper);
@@ -75,6 +82,7 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         if (count2>0) {
             return new Result(10001,"该单元已绑定设备",false);
         }
+        energyEnvDevice.setRemark(farm.getFarmName());
         energyEnvDeviceMapper.insert(energyEnvDevice);
         return new Result(ResultCode.SUCCESS,"添加成功");
     }

huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DataServiceImpl.java

@@ -48,10 +48,10 @@ public class DataServiceImpl implements DataService {
             Integer unitId = deviceCode.getUnitId();
             //小口径水表
             if ("01".equals(devType) || "02".equals(devType)){
-                saveShui(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId);
+                saveShui(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getUnitName(),deviceCode.getRemark());
             }
             if ("03".equals(devType)){
-                saveDian(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId);
+                saveDian(devType,voltage,originalData,timestamp,nodeEui,payload,farmId,unitId,deviceCode.getUnitName(),deviceCode.getRemark());
             }
         }
 
@@ -59,7 +59,8 @@ public class DataServiceImpl implements DataService {
 
 
 
-    private void saveDian(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui,String payload,Integer farmId,Integer unitId) throws ParseException {
+    private void saveDian(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui,String payload
+            ,Integer farmId,Integer unitId,String unitName,String farmName) throws ParseException {
         EnergyElectricity one = energyElectricityService.getOne(new QueryWrapper<EnergyElectricity>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
         String lastData ="0";
         if (ObjectUtil.isNotEmpty(one)){
@@ -78,6 +79,8 @@ public class DataServiceImpl implements DataService {
         envWater.setOriginalValue(originalData+"");
         envWater.setChipCode(nodeEui);
         envWater.setOriginalDate(payload);
+        envWater.setOther1(unitName);
+        envWater.setOther2(farmName);
         envWater.setDeviceType(Integer.parseInt(devType));
         if(str <0 ){
             envWater.setElectricityValue( String.format("%.1f", (double)originalData/10.0));
@@ -90,7 +93,8 @@ public class DataServiceImpl implements DataService {
         energyElectricityService.save(envWater);
     }
 
-    private void saveShui(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui,String payload,Integer farmId,Integer unitId) throws ParseException {
+    private void saveShui(String devType ,String voltage, Integer originalData, String timestamp, String nodeEui
+            ,String payload,Integer farmId,Integer unitId,String unitName,String farmName) throws ParseException {
         EnergyWater one = energyWaterService.getOne(new QueryWrapper<EnergyWater>().eq("chip_code", nodeEui).orderByDesc("id").last("limit 1"));
         String lastData ="0";
         if (ObjectUtil.isNotEmpty(one)){
@@ -109,6 +113,8 @@ public class DataServiceImpl implements DataService {
         envWater.setOriginalValue(originalData+"");
         envWater.setChipCode(nodeEui);
         envWater.setUnitId(unitId);
+        envWater.setOther1(unitName);
+        envWater.setOther2(farmName);
         envWater.setOriginalDate(payload);
         if(str <0 ){
             envWater.setWaterValue( String.format("%.1f", (double)originalData/10.0));