导入修改2

huimv-admin/src/main/java/com/huimv/guowei/admin/mqtt/EnvControll/PushCallback.java

@@ -176,6 +176,8 @@ public class PushCallback implements MqttCallbackExtended {
                 envData.setEnvTemp(temp2.toString());
                 envData.setEnvHum(humi2.toString());
                 //ph 值
+                //除了9号舍有真实数据外 其他舍生成7.8-8
+
                 envData.setOther1(ph2.toString());
 
                 envData.setUnitId(device.getUnitId());

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

@@ -34,7 +34,7 @@ public interface IBaseDuckInfoService extends IService<BaseDuckInfo> {
 
     void updateDayAge();
 
-    Result importData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap, MultipartFile files);
+    Result importData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap, MultipartFile files) throws Exception;
 
 
     //大屏

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

@@ -434,8 +434,9 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
 
     @Transactional
     @Override
-    public Result importData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, MultipartFile files) {
+    public Result importData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap, MultipartFile files)throws Exception {
         String farmId = paramsMap.get("farmId");
+
         Map<String, String> map = new HashMap<>();
         //表头与键值对的映射关系
         map.put("翅号", "chiNum");
@@ -447,7 +448,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
         map.put("基因型", "genotype");
         map.put("出生日期", "duckBirthday");
         map.put("位置", "unitName");
-        map.put("当前体重", "nowWeight");
+        map.put("出生体重", "nowWeight");
         map.put("饲养环境", "breedingEnv");
         map.put("特殊需求", "specialNeeds");
         map.put("父亲翅号", "fatherChiNum");
@@ -480,9 +481,11 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                     breed.setUnitList(baseBuilding.getParentId() + "," + baseBuilding.getId());
                 }
 
-                Batch batch = batchMapper.selectOne(new QueryWrapper<Batch>().lambda().eq(Batch::getBatchNum, breed.getBatchNum()).eq(Batch::getFarmId, farmId).eq(Batch::getIsEnable, 0));
-                if (ObjectUtil.isEmpty(batch)) {
-                    return new Result(10001, "批次号" + breed.getBatchNum() + "不存在或未启用!", false);
+                if (StringUtils.isNotBlank(breed.getBatchNum())) {
+                    Batch batch = batchMapper.selectOne(new QueryWrapper<Batch>().lambda().eq(Batch::getBatchNum, breed.getBatchNum()).eq(Batch::getFarmId, farmId).eq(Batch::getIsEnable, 0));
+                    if (ObjectUtil.isEmpty(batch)) {
+                        return new Result(10001, "代次号" + breed.getBatchNum() + "不存在或未启用!", false);
+                    }
                 }
 
                 breed.setFarmId(Integer.parseInt(farmId));
@@ -549,6 +552,9 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 } else {
                     breed.setDuckNum("20231124");
                 }
+
+
+
                 BaseDuckInfo baseDuckInfo = new BaseDuckInfo();
                 BeanUtil.copyProperties(breed, baseDuckInfo);
 
@@ -560,14 +566,17 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
                 if (StringUtils.isNotBlank(breed.getDuckSex())) {
                     baseDuckInfo.setDuckSex(Integer.parseInt(breed.getDuckSex()));
                 }
+                if ("".equals(breed.getJiaoNum()) || null == breed.getJiaoNum()) {
+                    baseDuckInfo.setJiaoNum(null);
+                }
                 baseDuckInfo.setDuckBreed(Integer.parseInt(breed.getDuckBreed()));
                 baseDuckInfo.setIsCage(0);
                 //翅号存在就更新
-                BaseDuckInfo baseDuckInfo1 = baseMapper.selectOne(new QueryWrapper<BaseDuckInfo>().lambda().eq(BaseDuckInfo::getChiNum, breed.getChiNum()).eq(BaseDuckInfo::getFarmId, farmId));
+                BaseDuckInfo baseDuckInfo1 = duckInfoMapper.selectOne(new QueryWrapper<BaseDuckInfo>().lambda().eq(BaseDuckInfo::getChiNum, breed.getChiNum()).eq(BaseDuckInfo::getFarmId, farmId));
                 if (ObjectUtil.isNotEmpty(baseDuckInfo1)) {
-                    baseMapper.update(baseDuckInfo, new UpdateWrapper<BaseDuckInfo>().lambda().eq(BaseDuckInfo::getChiNum, baseDuckInfo.getChiNum()).eq(BaseDuckInfo::getFarmId, farmId));
+                    duckInfoMapper.update(baseDuckInfo, new UpdateWrapper<BaseDuckInfo>().lambda().eq(BaseDuckInfo::getChiNum, baseDuckInfo.getChiNum()).eq(BaseDuckInfo::getFarmId, farmId));
                 } else {
-                    baseMapper.insert(baseDuckInfo);
+                    duckInfoMapper.insert(baseDuckInfo);
                 }
                 System.out.println(breed.toString());
             }

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/NewEnvTimer.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.NumberUtils;
 import com.huimv.guowei.admin.entity.EnvData;
 import com.huimv.guowei.admin.entity.EnvDevice;
 import com.huimv.guowei.admin.entity.EnvWarningInfo;
@@ -105,10 +106,12 @@ public class NewEnvTimer {
                         DecimalFormat decimalFormat = new DecimalFormat("#.#");
                         temp = decimalFormat.format(fluctuatedValue);
                     }
+                    String numFloat = NumberUtils.getNumFloat(7.8, 8.0);
                     EnvData envData = new EnvData();
                     envData.setUnitId(envDevice.getUnitId());
                     envData.setEnvTemp(temp);
                     envData.setEnvHum(humi);
+                    envData.setOther1(numFloat);
                     envData.setFarmId(envDevice.getFarmId());
                     envData.setCreateTime(date);
                     envData.setDeviceId(envDevice.getDeviceCode());

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/ExcelImportSheet.java

@@ -158,12 +158,7 @@ public class ExcelImportSheet {
      * @return java.lang.Object
      **/
     public static Object getValueFromType(Cell cell , Class cs) {
-        //字符串类型
-        if (String.class.equals(cs)) {
-            //设置对应的类型
-            cell.setCellType(CellType.STRING);
-            return cell.getStringCellValue();
-        } else if(boolean.class.equals(cs)){
+        if(boolean.class.equals(cs)){
             //boolean类型
             cell.setCellType(CellType.BOOLEAN);
             return cell.getBooleanCellValue();
@@ -182,6 +177,11 @@ public class ExcelImportSheet {
             //bigdecimal类型
             cell.setCellType(CellType.NUMERIC);
             return cell.getNumericCellValue();
+        }  //字符串类型
+        if (cs.equals(String.class)) {
+            //设置对应的类型
+            cell.setCellType(CellType.STRING);
+            return cell.getStringCellValue();
         }
         //这里还可以填充其他类型
         else {

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

@@ -22,6 +22,7 @@
         <result column="is_cage" property="isCage" />
         <result column="farm_id" property="farmId" />
         <result column="unit_list" property="unitList"/>
+        <result column="jiao_num" property="jiaoNum"/>
     </resultMap>
     <update id="updateDayAge">
         UPDATE base_duck_info SET day_age = day_age + 1 WHERE is_cage = 0;