耳标添加手机号添加

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 #±¾µØÊý¾Ý¿â
 #spring.profiles.active=dev
 #Ô¶³ÌÊý¾Ý¿â
-#spring.profiles.active=prod2
-spring.profiles.active=prod3
+spring.profiles.active=prod2
+#spring.profiles.active=prod3
 
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

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

@@ -78,5 +78,6 @@ public class EartagDeviceRegister implements Serializable {
     private Integer upgrade;
     private Integer farmerId;
     private String farmerName;
+    private String iphone;
 
 }

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

@@ -111,7 +111,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             String deviceAlias = maps.get("deviceAlias");
             String activeStatus = maps.get("activeStatus");
             String deviceStatus = maps.get("deviceStatus");
-
+            String phone = maps.get("phone");
             String remark = maps.get("remark");
             EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
             eartagDeviceRegister.setChipId(chipId);
@@ -121,16 +121,23 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setRemark(remark);
             eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
+            if (phone.length()>0) {
+                eartagDeviceRegister.setIphone(phone);
+            }
             eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         }else {
             String id = maps.get("id");
             String chipId = maps.get("chipId");
             String remark = maps.get("remark");
             String deviceCode = maps.get("deviceCode");
+            String phone = maps.get("phone");
             EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisterMapper.selectById(id);
             eartagDeviceRegister.setChipId(chipId);
             eartagDeviceRegister.setRemark(remark);
             eartagDeviceRegister.setDeviceCode(deviceCode);
+            if (phone.length()>0) {
+                eartagDeviceRegister.setIphone(phone);
+            }
             eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         }
         return resultUtil.result(1);
@@ -205,6 +212,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             String activeStatus = mapList.get("activeStatus");
             String deviceStatus = mapList.get("deviceStatus");
             String remark = mapList.get("remark");
+            String phone = mapList.get("phone");
             String deviceCode = (String)getDeviceCode(farmId).getData();
             System.out.println(deviceCode);
             EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
@@ -216,6 +224,9 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setDeviceStatus(Integer.valueOf(deviceStatus));
             eartagDeviceRegister.setFarmId(farmId);
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
+            if (phone.length()>0) {
+                eartagDeviceRegister.setIphone(phone);
+            }
 
             QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("chip_id", chipId);
@@ -243,6 +254,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             String farmId = mapList.get("farmId");
             String remark = mapList.get("remark");
             String chipId = mapList.get("chipId");
+            String phone = mapList.get("phone");
             String deviceCode = (String)getDeviceCode(farmId).getData();
             EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
             eartagDeviceRegister.setFarmId(farmId);
@@ -250,6 +262,9 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
             eartagDeviceRegister.setRemark(remark);
             eartagDeviceRegister.setChipId(chipId);
+            if (phone.length()>0) {
+                eartagDeviceRegister.setIphone(phone);
+            }
             QueryWrapper<EartagDeviceRegister> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("chip_id", chipId);
             EartagDeviceRegister eartagDeviceRegister1 = eartagDeviceRegisterMapper.selectOne(queryWrapper);

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

@@ -200,8 +200,8 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             for (EartagEartagRegister2 record : page.getRecords()) {
                 Float earTemp1 = record.getEarTemp1();
                 Long act = record.getAct();
-                String earmark1 = record.getEarmark();
-                EartagData2 eartagData2 = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).orderByDesc("id").last("limit 1"));
+//                String earmark1 = record.getEarmark();
+//                EartagData2 eartagData2 = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).orderByDesc("id").last("limit 1"));
 //                EartagData2 eartagData2Temp = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).ge("ask_time",DateUtil.beginOfDay(new Date())).orderByDesc("ear_temp1").last("limit 1"));
 //                if (ObjectUtil.isNotEmpty(eartagData2Temp)){
 //                    record.setEarTemp1(eartagData2Temp.getEarTemp1());

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/vo/EartagDeviceRegisterVo.java

@@ -47,6 +47,7 @@ public class EartagDeviceRegisterVo implements Serializable {
     private String pigpenName;
     private Integer farmerId;
     private String farmerName;
+    private String iphone;
 
 
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #spring.profiles.active=dev2
-#spring.profiles.active=prod3
 spring.profiles.active=prod2
+#spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql