小程序修改

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

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

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/EnvDataGetOneVo.java

@@ -0,0 +1,16 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnvDataGetOneVo {
+    private String deviceCode;
+    private String envTemp;
+    private String envHum;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+}

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

@@ -2,6 +2,7 @@ package com.huimv.guowei.admin.mapper;
 
 import com.huimv.guowei.admin.entity.EnvData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.guowei.admin.entity.vo.EnvDataGetOneVo;
 import com.huimv.guowei.admin.entity.vo.EnvDataScreenVo;
 import com.huimv.guowei.admin.entity.vo.EnvDataVo;
 
@@ -30,4 +31,6 @@ public interface EnvDataMapper extends BaseMapper<EnvData> {
     EnvDataVo getLastFlowByUnitId(String farmId, String unitId);
 
     List<EnvDataScreenVo> getLastFlowScreen(String farmId);
+
+    List<EnvDataGetOneVo> getOneData(String farmId);
 }

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

@@ -19,4 +19,8 @@ public interface IEnvDataService extends IService<EnvData> {
     Result getLastFlow(Map<String, String> paramsMap);
 
     Result listByBuild(Map<String, String> paramsMap);
+
+    Result getOneData(Map<String, String> paramsMap);
+
+    Result listDetail(Map<String, String> paramsMap);
 }

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

@@ -120,7 +120,9 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
             pageSize = "10";
         }
         QueryWrapper<DuckHealthInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank("unit_name"),"unit_name", unitName)
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(unitName),"unit_name", unitName)
+                .or().like(StringUtils.isNotBlank(unitName),"chi_num", unitName).or()
+                .like(StringUtils.isNotBlank(unitName),"jiao_num", unitName)
                 .orderByDesc("health_date");
         Page<DuckHealthInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));

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

@@ -1,15 +1,20 @@
 package com.huimv.guowei.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+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.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.BaseBuilding;
 import com.huimv.guowei.admin.entity.EnvData;
+import com.huimv.guowei.admin.entity.EnvDevice;
+import com.huimv.guowei.admin.entity.vo.EnvDataGetOneVo;
 import com.huimv.guowei.admin.entity.vo.EnvDataVo;
 import com.huimv.guowei.admin.mapper.BaseBuildingMapper;
 import com.huimv.guowei.admin.mapper.EnvDataMapper;
+import com.huimv.guowei.admin.mapper.EnvDeviceMapper;
 import com.huimv.guowei.admin.service.IEnvDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -34,6 +39,8 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
 
     @Resource
     private BaseBuildingMapper baseBuildingMapper;
+    @Resource
+    private EnvDeviceMapper deviceMapper;
 
     @Override
     public Result getLastFlow(Map<String, String> paramsMap) {
@@ -80,4 +87,50 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
         return new Result(ResultCode.SUCCESS,envDataList);
     }
 
+    @Override
+    public Result getOneData(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        QueryWrapper<EnvData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).orderByDesc("create_time")
+                .last(" limit 1");
+        EnvData envData = envDataMapper.selectOne(queryWrapper);
+        QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).eq("device_code", envData.getDeviceId());
+        EnvDevice device = deviceMapper.selectOne(queryWrapper1);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("deviceCode", envData.getDeviceId());
+        jsonObject.put("createTime", envData.getCreateTime());
+        jsonObject.put("envHum", envData.getEnvHum());
+        jsonObject.put("envTemp", envData.getEnvTemp());
+        jsonObject.put("unitName", device.getUnitName());
+        jsonObject.put("unitId", device.getUnitId());
+/*        JSONArray jsonArray = new JSONArray();
+        List<EnvDataGetOneVo> data = envDataMapper.getOneData(farmId);
+        for (EnvDataGetOneVo datum : data) {
+            QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("device_code", datum.getDeviceCode());
+            EnvDevice device = deviceMapper.selectOne(queryWrapper);
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("deviceCode", datum.getDeviceCode());
+            jsonObject.put("createTime", datum.getCreateTime());
+            jsonObject.put("envHum", datum.getEnvHum());
+            jsonObject.put("envTemp", datum.getEnvTemp());
+            jsonObject.put("unitName", device.getUnitName());
+            jsonObject.put("unitId", device.getUnitId());
+            jsonArray.add(jsonObject);
+        }*/
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result listDetail(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        QueryWrapper<EnvData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).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/EnvMoveCallServiceImpl.java

@@ -118,7 +118,10 @@ public class EnvMoveCallServiceImpl extends ServiceImpl<EnvMoveCallMapper, EnvMo
         }
         QueryWrapper<EnvMoveCall> queryWrapper = new QueryWrapper<>();
         if ("1".equals(type)) {
-            queryWrapper.like(StringUtils.isNotBlank(unitName), "unit_name", unitName).orderByDesc("call_date").eq("farm_id", farmId);
+            queryWrapper.like(StringUtils.isNotBlank(unitName), "unit_name", unitName).or()
+                    .like(StringUtils.isNotBlank(unitName), "chi_num", unitName).or()
+                    .like(StringUtils.isNotBlank(unitName), "jiao_num", unitName)
+                    .orderByDesc("call_date").eq("farm_id", farmId);
             Page<EnvMoveCall> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             return new Result(ResultCode.SUCCESS, moveCallMapper.selectPage(page, queryWrapper));
         } else {

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvDataMapper.xml

@@ -4,18 +4,18 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.EnvData">
-        <id column="id" property="id" />
-        <result column="device_id" property="deviceId" />
-        <result column="env_temp" property="envTemp" />
-        <result column="env_hum" property="envHum" />
-        <result column="original_data" property="originalData" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_id" property="farmId" />
-        <result column="create_time" property="createTime" />
-        <result column="receive_date" property="receiveDate" />
-        <result column="other1" property="other1" />
-        <result column="other2" property="other2" />
-        <result column="other3" property="other3" />
+        <id column="id" property="id"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="env_temp" property="envTemp"/>
+        <result column="env_hum" property="envHum"/>
+        <result column="original_data" property="originalData"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="farm_id" property="farmId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="receive_date" property="receiveDate"/>
+        <result column="other1" property="other1"/>
+        <result column="other2" property="other2"/>
+        <result column="other3" property="other3"/>
     </resultMap>
 
     <select id="getLastFlow" resultType="com.huimv.guowei.admin.entity.vo.EnvDataVo">
@@ -83,4 +83,12 @@
         ) d ON b.id = d.unit_id
         WHERE b.parent_id = 0 AND b.farm_id = #{farmId}
     </select>
+
+    <select id="getOneData" resultType="com.huimv.guowei.admin.entity.vo.EnvDataGetOneVo">
+        SELECT
+	b.device_id deviceCode,b.create_time createTime,b.env_temp envTemp,b.env_hum envHum
+FROM
+	( SELECT create_time, max( id ) id,device_id FROM env_data GROUP BY device_id  ) a
+	JOIN env_data b ON a.device_id = b.device_id AND a.id = b.id WHERE b.farm_id=#{farmId}
+    </select>
 </mapper>