浏览代码

新增:
读取最新ph值接口;

zhuoning 2 年之前
父节点
当前提交
33f09debed

+ 2 - 0
huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/utils/Const.java

@@ -65,4 +65,6 @@ public class Const {
     public final static Integer ERR_TODAY_ELECTRICITY_CODE = 10051;
     public final static String ERR_TODAY_ELECTRICITY_INFO = "今天电量数据不存在";
 
+    public final static Integer ERR_EMPTY_CODE = 10052;
+    public final static String ERR_EMPTY_INFO = "数据为空";
 }

+ 8 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java

@@ -7,10 +7,14 @@ import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
 import org.springframework.context.annotation.Import;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 
@@ -25,6 +29,10 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableScheduling
 @MapperScan("com.huimv.env.*.mapper")
+@ComponentScans({@ComponentScan("com.huimv.env.common.service")})
+@ComponentScan(basePackages = {"com.huimv.env.common.utils"})
+@EntityScan(value = "com.huimv.env.common.dao.entity")
+@EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
 public class HuimvEnvManageApplication {
     public static void main(String[] args)   {
 

+ 0 - 1
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvElectricityDayController.java

@@ -4,7 +4,6 @@ package com.huimv.env.manage.controller;
 import com.huimv.common.utils.Result;
 import com.huimv.env.common.service.EnvElectricityDayService;
 import com.huimv.env.common.service.EnvElectricityMonthService;
-import com.huimv.env.common.service.EnvWaterDayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 44 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvPhController.java

@@ -0,0 +1,44 @@
+package com.huimv.env.manage.controller;
+
+
+import com.huimv.common.utils.Result;
+import com.huimv.env.manage.service.EnvPhService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-26
+ */
+@RestController
+@RequestMapping("/envPh")
+public class EnvPhController {
+    @Resource
+    public EnvPhService envPhService;
+
+    /**
+     * @Method      : getPh
+     * @Description : 读取最新ph数值
+     * @Params      : [paramsMap]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/26       
+     * @Time        : 13:56
+     */
+    @PostMapping("/getPh")
+    public Result getPh(@RequestBody Map<String,String> paramsMap){
+        return envPhService.getPh(paramsMap);
+    }
+}
+

+ 50 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/EnvPh.java

@@ -0,0 +1,50 @@
+package com.huimv.env.manage.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EnvPh implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer sensorSn;
+
+    private BigDecimal ph;
+
+    private String askTime;
+
+    private Date addTime;
+
+    private Date addDate;
+
+    private String pigpenId;
+
+    private String unitId;
+
+    private String farmCode;
+
+    private String dataUnit;
+
+
+}

+ 16 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvPhMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.mapper;
+
+import com.huimv.env.manage.entity.EnvPh;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-26
+ */
+public interface EnvPhMapper extends BaseMapper<EnvPh> {
+
+}

+ 25 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/xml/EnvPhMapper.xml

@@ -0,0 +1,25 @@
+<?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.manage.mapper.EnvPhMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvPh">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="sensor_sn" property="sensorSn" />
+        <result column="ph" property="ph" />
+        <result column="ask_time" property="askTime" />
+        <result column="add_time" property="addTime" />
+        <result column="add_date" property="addDate" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="unit_id" property="unitId" />
+        <result column="farm_code" property="farmCode" />
+        <result column="data_unit" property="dataUnit" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, device_code, sensor_sn, ph, ask_time, add_time, add_date, pigpen_id, unit_id, farm_code, data_unit
+    </sql>
+
+</mapper>

+ 20 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/EnvPhService.java

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.service;
+
+import com.huimv.common.utils.Result;
+import com.huimv.env.manage.entity.EnvPh;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-26
+ */
+public interface EnvPhService extends IService<EnvPh> {
+
+    Result getPh(Map<String, String> paramsMap);
+}

+ 41 - 0
huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvPhServiceImpl.java

@@ -0,0 +1,41 @@
+package com.huimv.env.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.env.common.utils.Const;
+import com.huimv.env.manage.entity.EnvPh;
+import com.huimv.env.manage.mapper.EnvPhMapper;
+import com.huimv.env.manage.service.EnvPhService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-26
+ */
+@Service
+public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements EnvPhService {
+    @Resource
+    private EnvPhMapper envPhMapper;
+
+    @Override
+    public Result getPh(Map<String, String> paramsMap) {
+        QueryWrapper<EnvPh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("add_time");
+        queryWrapper.last("LIMIT 1");
+        EnvPh envPh = envPhMapper.selectOne(queryWrapper);
+        if (envPh == null) {
+            return new Result(Const.ERR_EMPTY_CODE, Const.ERR_EMPTY_INFO, false);
+        } else {
+            return new Result(ResultCode.SUCCESS, envPh);
+        }
+    }
+}