水电表平台修改6

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

@@ -0,0 +1,113 @@
+package com.huimv.env.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.env.admin.entity.ArrangeList;
+import com.huimv.env.admin.service.IArrangeListService;
+import com.huimv.env.common.utils.Result;
+import com.huimv.env.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@RestController
+@RequestMapping("/arrange-list")
+@CrossOrigin
+public class ArrangeListController {
+
+    @Autowired
+    private IArrangeListService arrangeListService;
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String mac = paramsMap.get("macAddress");
+        String disk = paramsMap.get("diskAddress");
+        String ipAddr = paramsMap.get("ipAddress");
+
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+
+        QueryWrapper<ArrangeList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(mac), "mac_address", mac);
+        queryWrapper.like(StringUtils.isNotBlank(disk), "disk_address", disk);
+        queryWrapper.like(StringUtils.isNotBlank(ipAddr), "ip_address", ipAddr);
+
+        if (null == pageNum || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (null == pageSize || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+
+        Page<ArrangeList> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<ArrangeList> listPage = arrangeListService.page(page, queryWrapper);
+
+        return new Result(ResultCode.SUCCESS, listPage);
+    }
+
+    @RequestMapping("/delete")
+    public Result delete(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        arrangeListService.removeById(id);
+        return new Result(10000, "删除成功！", true);
+    }
+
+    @RequestMapping("/edit")
+    public Result edit(@RequestBody ArrangeList arrangeList) {
+        QueryWrapper<ArrangeList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mac_address", arrangeList.getMacAddress()).ne("id", arrangeList.getId());
+        ArrangeList one = arrangeListService.getOne(queryWrapper);
+        if (ObjectUtil.isNotEmpty(one)) {
+            return new Result(10001, "修改失败，mac地址已存在", false);
+        }
+        QueryWrapper<ArrangeList> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("disk_address", arrangeList.getDiskAddress()).ne("id", arrangeList.getId());
+        ArrangeList one1 = arrangeListService.getOne(queryWrapper1);
+        if (ObjectUtil.isNotEmpty(one1)) {
+            return new Result(10001, "修改失败，硬盘地址已存在", false);
+        }
+        arrangeListService.updateById(arrangeList);
+        return new Result(10000, "修改成功！", true);
+    }
+
+    @RequestMapping("/add")
+    public Result add(@RequestBody ArrangeList arrangeList) {
+        QueryWrapper<ArrangeList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mac_address", arrangeList.getMacAddress()).or().eq("disk_address", arrangeList.getDiskAddress());
+        ArrangeList one = arrangeListService.getOne(queryWrapper);
+        if (ObjectUtil.isNotEmpty(one)) {
+            return new Result(10001, "添加失败，mac地址或者硬盘已存在", false);
+        }
+        arrangeListService.save(arrangeList);
+        return new Result(10000, "添加成功！", true);
+    }
+
+    @RequestMapping("/find")
+    public Result find(@RequestBody Map<String, String> paramsMap) {
+        String mac = paramsMap.get("macAddress");
+        String disk = paramsMap.get("diskAddress");
+        String ipAddr = paramsMap.get("ipAddress");
+        QueryWrapper<ArrangeList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(mac), "mac_address", mac)
+                .or().like(StringUtils.isNotBlank(disk), "disk_address", disk)
+                .or().like(StringUtils.isNotBlank(ipAddr), "ip_address", ipAddr);
+        ArrangeList arrangeList = arrangeListService.getOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS, arrangeList);
+    }
+}

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

@@ -0,0 +1,247 @@
+package com.huimv.env.admin.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.env.admin.entity.ArrangeList;
+import com.huimv.env.admin.entity.ArrangeRecord;
+import com.huimv.env.admin.service.IArrangeListService;
+import com.huimv.env.admin.service.IArrangeRecordService;
+import com.huimv.env.common.utils.IpUtil;
+import com.huimv.env.common.utils.Result;
+import com.huimv.env.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.crypto.SecretKey;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Base64;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@RestController
+@RequestMapping("/arrange-record")
+@CrossOrigin
+public class ArrangeRecordController {
+
+    @Autowired
+    private IArrangeRecordService arrangeRecordService;
+    @Autowired
+    private IArrangeListService arrangeListService;
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String macAddress = paramsMap.get("macAddress");
+        String ipAddress = paramsMap.get("ipAddress");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (null == pageNum || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (null == pageSize || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+        QueryWrapper<ArrangeRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(macAddress), "mac_address", macAddress);
+        queryWrapper.like(StringUtils.isNotBlank(ipAddress), "ip_address", ipAddress);
+        Page<ArrangeRecord> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+
+
+        Page<ArrangeRecord> listPage = arrangeRecordService.page(page, queryWrapper);
+
+        return new Result(ResultCode.SUCCESS, listPage);
+    }
+
+    @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);
+        String ipAddr = IpUtil.getIpAddr(request);
+        System.out.println("这里是ip地址：" + ipAddr);
+        ArrangeRecord record = new ArrangeRecord();
+//        if (StringUtils.isNotBlank(diskAddress) && !"/".equals(diskAddress.substring(0, 1))) {
+//            record.setIpAddress(ipAddr);
+//            record.setMacAddress(macAddress);
+//            record.setCreateDate(new Date());
+//            arrangeRecordService.save(record);
+//            return 1;
+//        }
+
+        if (macAddress.length() < 4 || !"@hm".equals(macAddress.substring(macAddress.length() - 3))) {
+            record.setIpAddress(ipAddr);
+            if (ObjectUtil.isNotEmpty(diskAddress)) {
+                record.setDiskAddress(diskAddress);
+            }
+            record.setMacAddress(macAddress);
+            record.setCreateDate(new Date());
+            arrangeRecordService.save(record);
+            return 1;
+        }
+        String[] split = macAddress.split("@");
+        macAddress = split[0];
+
+        if ("".equals(ipAddr)) {
+            record.setCreateDate(new Date());
+            record.setMacAddress(macAddress);
+            record.setIpAddress(ipAddr);
+            arrangeRecordService.save(record);
+            return 2;
+        }
+
+
+        try {
+            String decryptedMAC = decrypt(macAddress);
+            // 在这里，您可以验证MAC地址和硬盘地址是否匹配，以决定授予访问权限或拒绝访问。
+            // 您也可以执行其他所需的操作。
+            System.out.println("Decrypted MAC: " + decryptedMAC);
+
+            QueryWrapper<ArrangeList> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("mac_address", decryptedMAC);
+            ArrangeList arrangeList = arrangeListService.getOne(queryWrapper);
+
+
+            if (ObjectUtil.isEmpty(arrangeList)) {
+                //mac地址不存在
+                record.setCreateDate(new Date());
+                record.setIpAddress(ipAddr);
+                record.setMacAddress(decryptedMAC);
+                if (StringUtils.isNotBlank(diskAddress)) {
+                    record.setDiskAddress(diskAddress);
+                }
+                arrangeRecordService.save(record);
+                return 1;
+            }
+
+            if (null == arrangeList.getDiskAddress() || "".equals(arrangeList.getDiskAddress())) {
+                if (ipAddr.equals(arrangeList.getIpAddress())) {
+                    //mac地址和ip地址都存在
+                    Date date = new Date();
+                    int i = date.compareTo(arrangeList.getEndTime());
+                    record.setMacAddress(decryptedMAC);
+                    record.setCreateDate(date);
+                    record.setIpAddress(ipAddr);
+                    arrangeRecordService.save(record);
+                    if (i < 0) {
+                        return 0;
+                    } else {
+                        return 3;
+                    }
+                } else {
+                    return 3;
+                }
+            }
+
+            if ("".equals(diskAddress) || null == diskAddress) {
+                try {
+                    if (arrangeList.getIpAddress().equals(ipAddr)) {
+                        //mac地址和ip地址都存在
+                        Date date = new Date();
+                        int i = date.compareTo(arrangeList.getEndTime());
+                        record.setMacAddress(decryptedMAC);
+                        record.setCreateDate(date);
+                        record.setIpAddress(ipAddr);
+                        arrangeRecordService.save(record);
+                        if (i < 0) {
+                            return 0;
+                        } else {
+                            return 3;
+                        }
+                    } else {
+                        record.setMacAddress(decryptedMAC);
+                        record.setCreateDate(new Date());
+                        record.setIpAddress(ipAddr);
+                        arrangeRecordService.save(record);
+                        return 1;
+                    }
+                } catch (Exception e) {
+                    record.setMacAddress(decryptedMAC);
+                    record.setCreateDate(new Date());
+                    record.setIpAddress(ipAddr);
+                    arrangeRecordService.save(record);
+                    return 2;
+                }
+
+            } else {
+
+//                String decrypt = decrypt(diskAddress);//解密后的物理地址
+                try {
+                    if (arrangeList.getDiskAddress().equals(diskAddress)) {
+                        //mac地址和硬盘地址都存在
+                        Date date = new Date();
+                        record.setCreateDate(date);
+                        record.setIpAddress(ipAddr);
+                        record.setDiskAddress(diskAddress);
+                        record.setMacAddress(decryptedMAC);
+                        int i = date.compareTo(arrangeList.getEndTime());
+                        arrangeRecordService.save(record);
+                        if (i < 0) {
+                            return 0;
+                        } else {
+                            return 3;
+                        }
+                    } else {
+                        record.setCreateDate(new Date());
+                        record.setIpAddress(ipAddr);
+                        record.setMacAddress(decryptedMAC);
+                        record.setDiskAddress(diskAddress);
+                        arrangeRecordService.save(record);
+                        return 1;
+                    }
+                } catch (Exception e) {
+                    record.setCreateDate(new Date());
+                    record.setIpAddress(ipAddr);
+                    record.setMacAddress(decryptedMAC);
+                    record.setDiskAddress(diskAddress);
+                    arrangeRecordService.save(record);
+                    return 2;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 2;
+        }
+
+    }
+//    @GetMapping("/test")
+//    public String test(@RequestParam(value = "macAddress") String encryptedData, HttpServletRequest request   ) {
+//        System.out.println(encryptedData);
+//        String[] splitData = encryptedData.split("\\|"); // 分隔MAC地址和硬盘地址
+//
+//        if (splitData.length == 2) {
+//            try {
+//                String decryptedMAC = decrypt(splitData[0]);
+//                String decryptedDisk = decrypt(splitData[1]);
+//
+//                // 在这里，您可以验证MAC地址和硬盘地址是否匹配，以决定授予访问权限或拒绝访问。
+//                // 您也可以执行其他所需的操作。
+//
+//                System.out.println("Decrypted MAC: " + decryptedMAC);
+//                System.out.println("Decrypted Disk: " + decryptedDisk);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        } else {
+//            System.out.println("Invalid data format");
+//        }
+//        return null;
+//    }
+
+    public static String decrypt(String encryptedText) throws Exception {
+        byte[] decryptedBytes = Base64.getDecoder().decode(encryptedText.getBytes());
+        return new String(decryptedBytes);
+    }
+
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/ArrangeList.java

@@ -0,0 +1,58 @@
+package com.huimv.env.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("arrange_list")
+public class ArrangeList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String macAddress;
+
+    private String diskAddress;
+
+    /**
+     * 项目部署开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+
+
+    /**
+     * 项目部署过期时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
+    private String ipAddress;
+
+    private String projectName;
+
+    private String projectUser;
+
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/ArrangeRecord.java

@@ -0,0 +1,56 @@
+package com.huimv.env.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("arrange_record")
+public class ArrangeRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * mac地址
+     */
+    private String macAddress;
+
+    /**
+     * 硬盘地址
+     */
+    private String diskAddress;
+
+    /**
+     * 来访的ip地址
+     */
+    private String ipAddress;
+
+    /**
+     * 访问时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
+
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/mapper/ArrangeListMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.mapper;
+
+import com.huimv.env.admin.entity.ArrangeList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface ArrangeListMapper extends BaseMapper<ArrangeList> {
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/mapper/ArrangeRecordMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.mapper;
+
+import com.huimv.env.admin.entity.ArrangeRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface ArrangeRecordMapper extends BaseMapper<ArrangeRecord> {
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/IArrangeListService.java

@@ -0,0 +1,21 @@
+package com.huimv.env.admin.service;
+
+import com.huimv.env.admin.entity.ArrangeList;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.env.common.utils.Result;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface IArrangeListService extends IService<ArrangeList> {
+
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/IArrangeRecordService.java

@@ -0,0 +1,16 @@
+package com.huimv.env.admin.service;
+
+import com.huimv.env.admin.entity.ArrangeRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+public interface IArrangeRecordService extends IService<ArrangeRecord> {
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/ArrangeListServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.env.admin.service.impl;
+
+import com.huimv.env.admin.entity.ArrangeList;
+import com.huimv.env.admin.mapper.ArrangeListMapper;
+import com.huimv.env.admin.service.IArrangeListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Service
+public class ArrangeListServiceImpl extends ServiceImpl<ArrangeListMapper, ArrangeList> implements IArrangeListService {
+
+}

huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/ArrangeRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.env.admin.service.impl;
+
+import com.huimv.env.admin.entity.ArrangeRecord;
+import com.huimv.env.admin.mapper.ArrangeRecordMapper;
+import com.huimv.env.admin.service.IArrangeRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-24
+ */
+@Service
+public class ArrangeRecordServiceImpl extends ServiceImpl<ArrangeRecordMapper, ArrangeRecord> implements IArrangeRecordService {
+
+}

huimv-env-admin/src/main/resources/mapper/ArrangeListMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.admin.mapper.ArrangeListMapper">
+
+</mapper>

huimv-env-admin/src/main/resources/mapper/ArrangeRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.admin.mapper.ArrangeRecordMapper">
+
+</mapper>

huimv-env-common/src/main/java/com/huimv/env/common/utils/IpUtil.java

@@ -0,0 +1,53 @@
+package com.huimv.env.common.utils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+     * @Project : huimv.shiwan
+     * @Package : com.huimv.video.util
+     * @Description : 获取ip地址工具类
+     * @Author : yuxuexuan
+     * @Create : 2021/3/4 0006 14:28
+     **/
+    public class IpUtil {
+        public static String getIpAddr(HttpServletRequest request) {
+            String ipAddress = null;
+            try {
+                ipAddress = request.getHeader("x-forwarded-for");
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getHeader("Proxy-Client-IP");
+                }
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getHeader("WL-Proxy-Client-IP");
+                }
+                if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+                    ipAddress = request.getRemoteAddr();
+                    if (ipAddress.equals("127.0.0.1")) {
+                        // 根据网卡取本机配置的IP
+                        InetAddress inet = null;
+                        try {
+                            inet = InetAddress.getLocalHost();
+                        } catch (UnknownHostException e) {
+                            e.printStackTrace();
+                        }
+                        ipAddress = inet.getHostAddress();
+                    }
+                }
+                // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+                if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
+                    // = 15
+                    if (ipAddress.indexOf(",") > 0) {
+                        ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
+                    }
+                }
+            } catch (Exception e) {
+                ipAddress = "";
+            }
+            // ipAddress = this.getRequest().getRemoteAddr();
+
+            return ipAddress;
+        }
+
+    }