【fix】删除栋舍报错

huimv-eartag2-platform/huimv-eartag2-common/pom.xml

@@ -13,7 +13,18 @@
 
     <groupId>com.huimv</groupId>
     <artifactId>huimv-eartag2-common</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.3</version>
+
+    <distributionManagement>
+        <repository>
+            <id>rdc-releases</id>
+            <url>https://repo.rdc.aliyun.com/repository/136471-release-drEU5y/</url>
+        </repository>
+        <snapshotRepository>
+            <id>rdc-snapshots</id>
+            <url>https://repo.rdc.aliyun.com/repository/136471-snapshot-WhviYl/</url>
+        </snapshotRepository>
+    </distributionManagement>
 
     <dependencies>
 

huimv-eartag2-platform/huimv-eartag2-eartag/pom.xml

@@ -50,6 +50,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-eartag2-common</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -35,7 +35,7 @@ import java.util.Map;
 @Slf4j
 public class EartagServiceImpl implements IEartagService {
     @Resource
-    private static EartagDataRepo2 eartagDataRepo2;
+    private EartagDataRepo2 eartagDataRepo2;
     @Autowired
     private RedisTemplate redisTemplate;
     @Autowired

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/BasePigpenMapper.xml

@@ -8,7 +8,7 @@
         <result column="pigpen_name" property="pigpenName" />
         <result column="pigpen_code" property="pigpenCode" />
         <result column="parent_id" property="parentId" />
-        <result column="type" property="type" />
+        <result column="f_type" property="fType" />
         <result column="farm_code" property="farmCode" />
         <result column="sort" property="sort" />
         <result column="stage_code" property="stageCode" />
@@ -16,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, pigpen_name, parent_id, type, farm_code
+        id, pigpen_name, parent_id, f_type, farm_code
     </sql>
 
 </mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/BasePigpen.java

@@ -30,7 +30,7 @@ public class BasePigpen implements Serializable {
 
     private Integer parentId;
 
-    private Integer type;
+    private Integer fType;
 
     private String farmCode;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/BasePigpenServiceImpl.java

@@ -56,7 +56,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         newBasePigpen.setPigpenName(buildingName);
         newBasePigpen.setStageCode(stageCode);
         newBasePigpen.setSort(sort);
-        newBasePigpen.setType(type);
+        newBasePigpen.setFType(type);
         return resultUtil.result(basePigpenMapper.insert(newBasePigpen));
     }
 
@@ -93,10 +93,18 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             basePigpens1.addAll(basePigpens);
         }
         List<Integer> childIdList = basePigpens1.stream().map(BasePigpen::getId).collect(Collectors.toList());
-        //删除子数据
-        basePigpenMapper.deleteBatchIds(childIdList);
+        System.out.println("___________________"+childIdList);
+
+        //childIdList如果是空的、就说明直接删除单元吧
+        if (null == childIdList || childIdList.size() == 0){
+            basePigpenMapper.deleteBatchIds(idList);
+        }else {
+            //删除子数据
+            basePigpenMapper.deleteBatchIds(childIdList);
+            basePigpenMapper.deleteBatchIds(idList);
+        }
         //删除当前id的数据
-        return resultUtil.result(basePigpenMapper.deleteBatchIds(idList));
+        return resultUtil.result(1);
     }
 
     @Override
@@ -107,7 +115,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         newBasePigpen.setPigpenName(unitName);
         newBasePigpen.setParentId(Integer.parseInt(parentId));
         newBasePigpen.setSort(sort);
-        newBasePigpen.setType(type);
+        newBasePigpen.setFType(type);
         newBasePigpen.setStageCode(stageCode);
         return resultUtil.result(basePigpenMapper.insert(newBasePigpen));
     }
@@ -122,7 +130,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             basePigpen.setPigpenName(unitName);
             basePigpen.setParentId(Integer.parseInt(parentId));
             basePigpen.setSort(sort);
-            basePigpen.setType(type);
+            basePigpen.setFType(type);
             basePigpen.setStageCode(stageCode);
             return resultUtil.result(basePigpenMapper.updateById(basePigpen));
         }
@@ -162,7 +170,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             baseVo.setSort(basePigpen.getSort());
             baseVo.setPigpenName(basePigpen.getPigpenName());
             baseVo.setStageCode(basePigpen.getStageCode());
-            baseVo.setType(basePigpen.getType());
+            baseVo.setType(basePigpen.getFType());
             baseVo.setChildNode(new ArrayList<>());
             return baseVo;
         }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b,(k1, k2)->k1));