wwh 2 سال پیش
والد
کامیت
5890b07c6e

+ 2 - 2
src/main/java/com/huimv/admin/entity/EnvDevice.java

@@ -67,9 +67,9 @@ public class EnvDevice implements Serializable {
 
     private Integer farmId;
 
-    private String ohter1;
+    private String fengJiNum;
 
-    private String ohter2;
+    private String xiaoChuangNum;
 
     private String ohter3;
 

+ 4 - 2
src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -132,6 +132,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         envDevice.setRemark(envDevice1.getRemark());
         envDevice.setDeviceStatus(0);
         envDevice.setDayAge(envDevice1.getDayAge());
+        envDevice.setFengJiNum(envDevice1.getFengJiNum());
+        envDevice.setXiaoChuangNum(envDevice1.getXiaoChuangNum());
 
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
         basePigpenQueryWrapper.eq("farm_id", envDevice1.getFarmId()).eq("id", envDevice1.getUnitId());
@@ -275,7 +277,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         pressureMapper.insert(pressure);
 
 
-        for (int i = 1; i < 21; i++) {
+        for (int i = 1; i < Integer.parseInt(envDevice1.getFengJiNum())+1; i++) {
             EnvDeviceFan fan = new EnvDeviceFan();
             fan.setDeviceCode(envDevice1.getDeviceSortCode());
             fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
@@ -285,7 +287,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             fan.setOther1(String.valueOf(i));
             fanMapper.insert(fan);
         }
-        for (int i = 1; i < 9; i++) {
+        for (int i = 1; i < Integer.parseInt(envDevice1.getXiaoChuangNum())+1; i++) {
             EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
             fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
             fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);

+ 2 - 2
src/main/resources/mapper/EnvDeviceMapper.xml

@@ -13,8 +13,8 @@
         <result column="device_brand" property="deviceBrand" />
         <result column="device_status" property="deviceStatus" />
         <result column="farm_id" property="farmId" />
-        <result column="ohter1" property="ohter1" />
-        <result column="ohter2" property="ohter2" />
+        <result column="fengJiNum" property="fengJiNum" />
+        <result column="xiaoChuangNum" property="xiaoChuangNum" />
         <result column="ohter3" property="ohter3" />
         <result column="remark" property="remark" />
     </resultMap>