大屏修改

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseScreenCameraAccountController.java

@@ -0,0 +1,20 @@
+package com.huimv.guowei.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-30
+ */
+@RestController
+@RequestMapping("/base-screen-camera-account")
+public class BaseScreenCameraAccountController {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDataController.java

@@ -38,6 +38,6 @@ public class EnvDataController {
     }
     @PostMapping("/listDetail")
     public Result listDetail(@RequestBody Map<String ,String> paramsMap){
-        return envDataService.getOneData(paramsMap);
+        return envDataService.listDetail(paramsMap);
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/BaseScreenCameraAccount.java

@@ -0,0 +1,37 @@
+package com.huimv.guowei.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_screen_camera_account")
+public class BaseScreenCameraAccount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private Integer cameraId;
+
+    private Integer accountId;
+
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/BaseScreenCameraAccountMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.mapper;
+
+import com.huimv.guowei.admin.entity.BaseScreenCameraAccount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-30
+ */
+public interface BaseScreenCameraAccountMapper extends BaseMapper<BaseScreenCameraAccount> {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBaseScreenCameraAccountService.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.service;
+
+import com.huimv.guowei.admin.entity.BaseScreenCameraAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-30
+ */
+public interface IBaseScreenCameraAccountService extends IService<BaseScreenCameraAccount> {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseScreenCameraAccountServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.guowei.admin.service.impl;
+
+import com.huimv.guowei.admin.entity.BaseScreenCameraAccount;
+import com.huimv.guowei.admin.mapper.BaseScreenCameraAccountMapper;
+import com.huimv.guowei.admin.service.IBaseScreenCameraAccountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-11-30
+ */
+@Service
+public class BaseScreenCameraAccountServiceImpl extends ServiceImpl<BaseScreenCameraAccountMapper, BaseScreenCameraAccount> implements IBaseScreenCameraAccountService {
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDataServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.BaseBuilding;
@@ -20,6 +21,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -127,8 +130,11 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
     public Result listDetail(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
+        Date timesmorning = DataUill.getTimesmorning();
         QueryWrapper<EnvData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).orderByAsc("create_time");
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+                .ge("create_time", timesmorning)
+                .orderByAsc("create_time");
         List<EnvData> dataList = envDataMapper.selectList(queryWrapper);
         return new Result(ResultCode.SUCCESS, dataList);
     }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraServiceImpl.java

@@ -209,13 +209,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         BaseScreenCameraAccount cameraAccount = cameraAccountMapper.selectOne(new QueryWrapper<BaseScreenCameraAccount>().eq("farm_id", farmId).eq("account_id", userId));
         Integer cameraId;
         if (ObjectUtil.isEmpty(cameraAccount)) {
-            SysCamera one = this.getOne(new QueryWrapper<SysCamera>().eq("run_status", 1).eq("farm_id", farmId).last("limit 1"));
-            if (ObjectUtil.isNotEmpty(one)){
-                cameraId = one.getId();
-            }else {
-                return new Result(10001,"改牧场无耳标", false);
-            }
-
+            cameraId = this.getOne(new QueryWrapper<SysCamera>().eq("run_status", 1).eq("farm_id", farmId).last("limit 1")).getId();
         } else {
             cameraId = cameraAccount.getCameraId();
         }

huimv-admin/src/main/resources/mapper/BaseScreenCameraAccountMapper.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.guowei.admin.mapper.BaseScreenCameraAccountMapper">
+
+</mapper>