生物安全门禁车辆修改2

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

@@ -0,0 +1,28 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyDataScreenVo {
+    private String waterValueToday;
+    private String electricityValueToday;
+
+    private String waterValueTodayUsage;
+    private String electricityValueTodayUsage;
+    private String waterValueYesterdayUsage;
+    private String electricityValueYesterdayUsage;
+
+    private String waterValueThisWeekUsage;
+    private String electricityValueThisWeekUsage;
+    private String waterValueLastWeekUsage;
+    private String electricityValueLastWeekUsage;
+
+    private String waterValueThisMonthUsage;
+    private String electricityValueThisMonthUsage;
+    private String waterValueLastMonthUsage;
+    private String electricityValueLastMonthUsage;
+
+}

huimv-receive/src/main/java/com/huimv/receive/controller/DeviceListController.java

@@ -0,0 +1,20 @@
+package com.huimv.receive.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 车辆闸机和人脸门禁设备列表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+@RestController
+@RequestMapping("/device-list")
+public class DeviceListController {
+
+}

huimv-receive/src/main/java/com/huimv/receive/controller/PeopleListController.java

@@ -0,0 +1,20 @@
+package com.huimv.receive.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 人脸门禁车辆闸机白名单 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+@RestController
+@RequestMapping("/people-list")
+public class PeopleListController {
+
+}

huimv-receive/src/main/java/com/huimv/receive/entity/DeviceList.java

@@ -0,0 +1,62 @@
+package com.huimv.receive.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 车辆闸机和人脸门禁设备列表
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("device_list")
+public class DeviceList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 安装位置
+     */
+    private Integer locationId;
+
+    /**
+     * 添加设备时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 牧场编码
+     */
+    private String farmId;
+
+    /**
+     * 设备类型 0为人脸门禁 1为车辆闸机
+     */
+    private Integer deviceType;
+
+    /**
+     * 安装位置名称
+     */
+    private String locationName;
+
+
+}

huimv-receive/src/main/java/com/huimv/receive/entity/PeopleList.java

@@ -0,0 +1,70 @@
+package com.huimv.receive.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("people_list")
+public class PeopleList implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmId;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户密码，默认123456
+     */
+    private String password;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 过期时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date outTime;
+
+
+    private Integer type;
+}

huimv-receive/src/main/java/com/huimv/receive/mapper/DeviceListMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.mapper;
+
+import com.huimv.receive.entity.DeviceList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆闸机和人脸门禁设备列表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+public interface DeviceListMapper extends BaseMapper<DeviceList> {
+
+}

huimv-receive/src/main/java/com/huimv/receive/mapper/PeopleListMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.mapper;
+
+import com.huimv.receive.entity.PeopleList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 人脸门禁车辆闸机白名单 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+public interface PeopleListMapper extends BaseMapper<PeopleList> {
+
+}

huimv-receive/src/main/java/com/huimv/receive/service/IDeviceListService.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.service;
+
+import com.huimv.receive.entity.DeviceList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆闸机和人脸门禁设备列表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+public interface IDeviceListService extends IService<DeviceList> {
+
+}

huimv-receive/src/main/java/com/huimv/receive/service/IPeopleListService.java

@@ -0,0 +1,16 @@
+package com.huimv.receive.service;
+
+import com.huimv.receive.entity.PeopleList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 人脸门禁车辆闸机白名单 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+public interface IPeopleListService extends IService<PeopleList> {
+
+}

huimv-receive/src/main/java/com/huimv/receive/service/impl/DeviceListServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.receive.service.impl;
+
+import com.huimv.receive.entity.DeviceList;
+import com.huimv.receive.mapper.DeviceListMapper;
+import com.huimv.receive.service.IDeviceListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆闸机和人脸门禁设备列表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+@Service
+public class DeviceListServiceImpl extends ServiceImpl<DeviceListMapper, DeviceList> implements IDeviceListService {
+
+}

huimv-receive/src/main/java/com/huimv/receive/service/impl/PeopleListServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.receive.service.impl;
+
+import com.huimv.receive.entity.PeopleList;
+import com.huimv.receive.mapper.PeopleListMapper;
+import com.huimv.receive.service.IPeopleListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人脸门禁车辆闸机白名单 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-10-16
+ */
+@Service
+public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleList> implements IPeopleListService {
+
+}

huimv-receive/src/main/resources/mapper/DeviceListMapper.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.receive.mapper.DeviceListMapper">
+
+</mapper>

huimv-receive/src/main/resources/mapper/PeopleListMapper.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.receive.mapper.PeopleListMapper">
+
+</mapper>