【fix】配标器

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

@@ -26,6 +26,7 @@
         <result column="create_date" property="createDate" />
         <result column="update_type" property="updateType" />
         <result column="sync_time" property="syncTime" />
+        <result column="device_type" property="deviceType" />
     </resultMap>
 
 </mapper>

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

@@ -73,5 +73,6 @@ public class EartagDeviceRegister implements Serializable {
 
     private Date syncTime;
 
+    private Integer deviceType;
 
 }

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

@@ -87,6 +87,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         String deviceStatus = maps.get("deviceStatus");
 
         String remark = maps.get("remark");
+        String deviceType = maps.get("deviceType");
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
         eartagDeviceRegister.setChipId(chipId);
         eartagDeviceRegister.setDeviceAlias(deviceAlias);
@@ -94,6 +95,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
         eartagDeviceRegister.setRemark(remark);
         eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
+        eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
         return resultUtil.result(eartagDeviceRegisterMapper.updateById(eartagDeviceRegister));
     }
 
@@ -110,6 +112,8 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         String pageNo = paramsMap.get("pageNo");
         String farmId = paramsMap.get("farmId");
 
+        String deviceType = paramsMap.get("deviceType");
+
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
@@ -127,6 +131,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         wrapper.like(StringUtils.isNotBlank(deviceAlias),"device_alias",deviceAlias);
         wrapper.like(StringUtils.isNotBlank(deviceStatus),"device_status",deviceStatus);
         wrapper.like(StringUtils.isNotBlank(activeStatus),"active_status",activeStatus);
+        wrapper.eq("device_type",Integer.parseInt(deviceType));
         wrapper.eq("farm_id",farmId);
         Page<EartagDeviceRegister> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         Page<EartagDeviceRegisterVo> eartagDeviceRegisterVoPage = new Page<>();
@@ -154,23 +159,43 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Override
     public Result add(Map<String, String> mapList) {
-        String farmId = mapList.get("farmId");
-        String chipId = mapList.get("chipId");
-        String deviceAlias = mapList.get("deviceAlias");
-        String activeStatus = mapList.get("activeStatus");
-        String deviceStatus = mapList.get("deviceStatus");
-        String remark = mapList.get("remark");
-
-        String deviceCode = (String)getDeviceCode(farmId).getData();
-        EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
-        eartagDeviceRegister.setChipId(chipId);
-        eartagDeviceRegister.setDeviceAlias(deviceAlias);
-        eartagDeviceRegister.setDeviceCode(deviceCode);
-        eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
-        eartagDeviceRegister.setRemark(remark);
-        eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
-        eartagDeviceRegister.setFarmId(farmId);
-        return resultUtil.result(eartagDeviceRegisterMapper.insert(eartagDeviceRegister));
+        String deviceType = mapList.get("deviceType");
+        if ("1".equals(deviceType)){
+            //采集器
+            String farmId = mapList.get("farmId");
+            String chipId = mapList.get("chipId");
+            String deviceAlias = mapList.get("deviceAlias");
+            String activeStatus = mapList.get("activeStatus");
+            String deviceStatus = mapList.get("deviceStatus");
+
+            String remark = mapList.get("remark");
+
+            String deviceCode = (String)getDeviceCode(farmId).getData();
+            EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
+            eartagDeviceRegister.setChipId(chipId);
+            eartagDeviceRegister.setDeviceAlias(deviceAlias);
+            eartagDeviceRegister.setDeviceCode(deviceCode);
+            eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
+            eartagDeviceRegister.setRemark(remark);
+            eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
+            eartagDeviceRegister.setFarmId(farmId);
+            eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
+            eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+        }else {
+            //配标器
+            String farmId = mapList.get("farmId");
+            String remark = mapList.get("remark");
+            String chipId = mapList.get("chipId");
+            String deviceCode = (String)getDeviceCode(farmId).getData();
+            EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
+            eartagDeviceRegister.setFarmId(farmId);
+            eartagDeviceRegister.setDeviceCode(deviceCode);
+            eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
+            eartagDeviceRegister.setRemark(remark);
+            eartagDeviceRegister.setChipId(chipId);
+            eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+        }
+        return resultUtil.result(1);
     }
 
     @Override