体尺

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

@@ -50,6 +50,7 @@ public class DuckBodySizeInfoController {
     public Result getById(@RequestBody Map<String, String> paramsMap){
         DuckBodySizeInfo duckBodySizeInfo = duckBodySizeInfoService.getById(paramsMap.get("id"));
         if (ObjectUtil.isEmpty(duckBodySizeInfo)){
+            duckBodySizeInfo = new DuckBodySizeInfo();
             duckBodySizeInfo.setBodyLength("");
             duckBodySizeInfo.setChestDeep("");
             duckBodySizeInfo.setChestWide("");
@@ -62,6 +63,11 @@ public class DuckBodySizeInfoController {
         return new Result(ResultCode.SUCCESS,duckBodySizeInfo);
     }
 
+    @PostMapping("/getLastInfo")
+    public Result getLastInfo(@RequestBody Map<String, String> paramsMap) {
+        return duckBodySizeInfoService.getLastInfo(paramsMap);
+    }
+
     @PostMapping("/listInfo")
     public Result listInfo(@RequestBody Map<String, String> paramsMap){
         return duckBodySizeInfoService.listLimitInfo(paramsMap);

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

@@ -20,4 +20,6 @@ public interface DuckBodySizeInfoMapper extends BaseMapper<DuckBodySizeInfo> {
     List<DuckBodySizeInfoVo> listLimitInfo(String num, String farmId);
 
     Page<DuckBodySizeInfoVo> listPageInfo(Page<DuckBodySizeInfoVo> page, String unitName, String farmId);
+
+    DuckBodySizeInfo getLastInfo(String duckNum);
 }

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

@@ -19,4 +19,6 @@ public interface IDuckBodySizeInfoService extends IService<DuckBodySizeInfo> {
     Result listLimitInfo(Map<String, String> paramsMap);
 
     Result listPageInfo(Map<String, String> paramsMap);
+
+    Result getLastInfo(Map<String, String> paramsMap);
 }

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

@@ -1,11 +1,14 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckBodySizeInfo;
 import com.huimv.guowei.admin.entity.vo.DuckBodySizeInfoVo;
+import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.DuckBodySizeInfoMapper;
 import com.huimv.guowei.admin.service.IDuckBodySizeInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,6 +31,8 @@ import java.util.Map;
 public class DuckBodySizeInfoServiceImpl extends ServiceImpl<DuckBodySizeInfoMapper, DuckBodySizeInfo> implements IDuckBodySizeInfoService {
     @Resource
     private DuckBodySizeInfoMapper duckBodySizeInfoMapper;
+    @Resource
+    private BaseDuckInfoMapper baseDuckInfoMapper;
 
     @Override
     public Result listLimitInfo(Map<String, String> paramsMap) {
@@ -47,4 +52,22 @@ public class DuckBodySizeInfoServiceImpl extends ServiceImpl<DuckBodySizeInfoMap
         Page<DuckBodySizeInfoVo> duckBodySizeInfoPage = duckBodySizeInfoMapper.listPageInfo(page,unitName,farmId);
         return new Result(ResultCode.SUCCESS,duckBodySizeInfoPage);
     }
+
+    @Override
+    public Result getLastInfo(Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        DuckBodySizeInfo duckBodySizeInfo = duckBodySizeInfoMapper.getLastInfo(baseDuckInfoMapper.selectById(id).getDuckNum());
+        if (ObjectUtil.isEmpty(duckBodySizeInfo)){
+            duckBodySizeInfo = new DuckBodySizeInfo();
+            duckBodySizeInfo.setBodyLength("");
+            duckBodySizeInfo.setChestDeep("");
+            duckBodySizeInfo.setChestWide("");
+            duckBodySizeInfo.setHalfWaterLength("");
+            duckBodySizeInfo.setKeelLength("");
+            duckBodySizeInfo.setPelvicWide("");
+            duckBodySizeInfo.setShinPerimeter("");
+            duckBodySizeInfo.setShinWide("");
+        }
+        return new Result(ResultCode.SUCCESS,duckBodySizeInfo);
+    }
 }

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

@@ -40,7 +40,7 @@ public class EnergyWaterPressureServiceImpl extends ServiceImpl<EnergyWaterPress
     public Result getWaterPressure(Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
-        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 3));
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 5));
         List<String> chipCodeList = new ArrayList<>();
         for (EnvDeviceChip envDeviceChip : deviceChipList) {
             chipCodeList.add(envDeviceChip.getChipCode());
@@ -63,7 +63,7 @@ public class EnergyWaterPressureServiceImpl extends ServiceImpl<EnergyWaterPress
         String farmId = paramsMap.get("farmId");
         String unitId = paramsMap.get("unitId");
         String type = paramsMap.get("type");
-        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 3));
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id",unitId).eq("chip_type", 5));
         List<String> chipCodeList = new ArrayList<>();
         for (EnvDeviceChip envDeviceChip : deviceChipList) {
             chipCodeList.add(envDeviceChip.getChipCode());

huimv-admin/src/main/resources/mapper/DuckBodySizeInfoMapper.xml

@@ -33,4 +33,8 @@
         WHERE s.farm_id = #{farmId} AND s.unit_name Like '%${unitName}%' ORDER BY s.measure_date DESC
     </select>
 
+    <select id="getLastInfo" resultType="com.huimv.guowei.admin.entity.DuckBodySizeInfo">
+        select * from `duck_body_size_info` where id = (SELECT MAX(id) FROM `duck_body_size_info` where duck_num = #{duckNum})
+    </select>
+
 </mapper>