增加生物资产接口

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/server/EartagServerHandler2.java

@@ -53,8 +53,8 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
     private int num = 0;
 
     //
-    public void appendClientAsk(String text){
-        if(this.askTextSb == null){
+    public void appendClientAsk(String text) {
+        if (this.askTextSb == null) {
             askTextSb = new StringBuilder();
         }
         askTextSb.append(text);
@@ -73,48 +73,39 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
 
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
-//        ctx.writeAndFlush("111");
-//        System.out.println("EchoServerHandle channelReadComplete");
-        if(askTextSb.toString().indexOf("end") != -1){
-//            System.out.println("askTextSb.内容()>>"+askTextSb.toString());
-//            System.out.println("askTextSb.内容长度>>"+askTextSb.length());
-//            System.out.println("输入完成.");
+        if (askTextSb.toString().indexOf("end") != -1) {
             // 处理客户端消息
-            handleClientEartagMessage(askTextSb.toString(),ctx);
+            handleClientEartagMessage(askTextSb.toString(), ctx);
             //清空重置;
-            askTextSb.delete(0,askTextSb.length());
+            askTextSb.delete(0, askTextSb.length());
             num = 0;
-//            System.out.println("清空sb实例. 长度>>"+askTextSb.length());
         }
     }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-//        System.out.println("cause.getMessage()>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+cause.getMessage());
-        if(cause.getMessage().indexOf("Connection reset") != -1){
-            log.info("相关采集器设备正在重启:"+cause.toString());
+        if (cause.getMessage().indexOf("Connection reset") != -1) {
+            log.info("相关采集器设备正在重启:" + cause.toString());
         }
-//        cause.printStackTrace();
         ctx.close();
     }
 
     /**
-     * @Method      : handleClientMessage
+     * @Method : handleClientMessage
      * @Description : 处理请求小心
-     * @Params      : [clientAskText, ctx]
-     * @Return      : void
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/3/28       
-     * @Time        : 17:36
+     * @Params : [clientAskText, ctx]
+     * @Return : void
+     * @Author : ZhuoNing
+     * @Date : 2022/3/28
+     * @Time : 17:36
      */
-    private void handleClientEartagMessage(String clientAskText,ChannelHandlerContext ctx) throws ParseException, IOException {
-        clientAskText = clientAskText.replaceAll("\r","").replaceAll("\n","");
+    private void handleClientEartagMessage(String clientAskText, ChannelHandlerContext ctx) throws ParseException, IOException {
+        clientAskText = clientAskText.replaceAll("\r", "").replaceAll("\n", "");
         System.out.println("### 服务端接收数据 >>" + clientAskText);
         //TEST-saveRawData()
-        if(dataTestInput == 1){
-            deviceService.saveRawData(clientAskText);
-        }
+//        if(dataTestInput == 1){
+//            deviceService.saveRawData(clientAskText);
+//        }
 
         //{}
         int countPlus = regexUtil.countPlus(clientAskText);
@@ -126,13 +117,8 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
             JSONArray askJa = getPerData(clientAskText);
             for (int a = 0; a < askJa.size(); a++) {
                 String askText = askJa.getString(a);
-//                if (dataInputFlow == 1) {
-//                    //{处理请求内容}
-//                    handleAskText(askText, ctx);
-//                } else {
-                    //{处理请求内容2}
-                    handleAskText2(askText, ctx);
-//                }
+                //{处理请求内容2}
+                handleAskText2(askText, ctx);
             }
         }
     }
@@ -179,7 +165,7 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
                     String answer = "hm+2+" + dateUtil.getNowText() + "+4+end";
                     log.info(">>命令2服务器时间-应答数据>>" + answer);
                     ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
-                }else {
+                } else {
                     System.out.println("##获取服务器时间-无效设备编码 idCode=" + idCode);
                 }
             } else if (cmd.trim().equalsIgnoreCase("3")) {
@@ -193,9 +179,9 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
 
                     //{发送到设备处理消息队列}
                     dataService.sendDeviceMQ(map);
-                    log.info(">>发送设备心跳数据消息到MQ."+map);
+                    log.info(">>发送设备心跳数据消息到MQ." + map);
                 } else {
-                    System.out.println("##心跳包-无效设备编码(" + idCode+")，请求拒绝。");
+                    System.out.println("##心跳包-无效设备编码(" + idCode + ")，请求拒绝。");
                 }
             } else if (cmd.trim().equalsIgnoreCase("4")) {
                 System.out.println("==>命令4环境温度请求 askText>>" + askText);
@@ -208,16 +194,16 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
 
                     //{发送到设备处理消息队列}
                     dataService.sendDeviceMQ(map);
-                    log.info(">>发送设备环境温度数据消息到MQ."+map);
+                    log.info(">>发送设备环境温度数据消息到MQ." + map);
                 } else {
-                    System.out.println("##环境温度-无效设备编码(" + idCode+")，请求拒绝。");
+                    System.out.println("##环境温度-无效设备编码(" + idCode + ")，请求拒绝。");
                 }
             } else {
                 System.out.println("==>未知命令");
                 log.error(">>当前数据为非法数据>>" + askText);
             }
         } else if (cmdHeader.trim().equalsIgnoreCase("zj")) {
-            System.out.println("==>耳标命令请求 askText>>"+askText);
+            System.out.println("==>耳标命令请求 askText>>" + askText);
             //测试-临时写入耳标数据到文件
 //            if(askText.trim().indexOf("330110002000002") != -1){
 //                writeTxt(askText,"input");
@@ -226,15 +212,15 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
 //            if (checkValidEarmark(cmd)) {
 //                log.error(">>舍弃掉未配置耳标号的耳标，" + askText + "");
 //            } else {
-                //{检查设备是否在处于工作状态或待机状态}
+            //{检查设备是否在处于工作状态或待机状态}
 //                if (dataService.isWorkStatusDevice(idCode)) {
-                if (dataService.isEffectiveDevice(idCode)) {
-                    //{发送到耳标处理消息队列}
-                    dataService.sendEartagMQ(map);
-                    log.info(">>发送耳标数据消息到MQ."+map);
-                }else{
-                    System.out.println("无效设备编码 idCode="+idCode);
-                }
+            if (dataService.isEffectiveDevice(idCode)) {
+                //{发送到耳标处理消息队列}
+                dataService.sendEartagMQ(map);
+                log.info(">>发送耳标数据消息到MQ." + map);
+            } else {
+                System.out.println("无效设备编码 idCode=" + idCode);
+            }
 //            }
         } else {
             System.out.println("==>未知命令");
@@ -242,14 +228,14 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
         }
     }
 
-    public void writeTxt(String conent,String file) throws ParseException, IOException {
+    public void writeTxt(String conent, String file) throws ParseException, IOException {
         String todayText = new DateUtil2().getTodayDateText();
-        File f = new File("/opt/log/log_"+file+"_"+todayText+".txt");
+        File f = new File("/opt/log/log_" + file + "_" + todayText + ".txt");
         if (f.exists()) {
         } else {
             f.createNewFile();// 不存在则创建
         }
-        BufferedWriter output = new BufferedWriter(new FileWriter(f,true));//true,则追加写入text文本
+        BufferedWriter output = new BufferedWriter(new FileWriter(f, true));//true,则追加写入text文本
         output.write(conent);
         output.write("\r\n");//换行
         output.flush();

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalAlarmController.java

@@ -3,6 +3,7 @@ package com.huimv.eartag2.manage2.controller;
 
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.EartagAbnormalAlarmService;
+import com.huimv.eartag2.manage2.service.FarmerAssetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,21 +27,23 @@ import java.util.Map;
 public class EartagAbnormalAlarmController {
     @Autowired
     private EartagAbnormalAlarmService eartagAbnormalAlarmService;
+    @Autowired
+    private FarmerAssetService farmerAssetService;
 
     @PostMapping("/getEarTemWarning")
     public Result getEarTemWarning(@RequestBody Map<String, Object> paramsMap) throws ParseException {
         return eartagAbnormalAlarmService.getEarTemWarning(paramsMap);
     }
 
-
     @PostMapping("/getNewPig")
-    public Result getNewPig(@RequestBody Map<String, String> paramsMap) {
+    public Result getNewPig(@RequestBody Map<String, String> paramsMap) throws ParseException {
         return eartagAbnormalAlarmService.getNewPig(paramsMap);
     }
 
-    @PostMapping("/listFarmer")
-    public Result listFarmer(@RequestBody Map<String, String> paramsMap) {
-        return eartagAbnormalAlarmService.listFarmer(paramsMap);
+    @PostMapping("/getAssetStatistics")
+    public Result getAssetStatistics(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAssetService.getAssetStatistics(paramsMap);
     }
+
 }
 

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

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EartagDeviceRegisterMapper extends BaseMapper<EartagDeviceRegister> {
 
+    String getDeviceIdByFarmerId(@Param("farmerId") String farmerId);
 }

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

@@ -2,6 +2,10 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegister2> {
 
+    Date getLastBatchCreateDate(@Param("deviceCode") String deviceCode);
+
+    List<EartagEartagRegister2> getLastBatchPig(@Param("deviceCode") String deviceCode, @Param("createDate") Date createDate);
 }

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

@@ -27,6 +27,13 @@
         <result column="update_type" property="updateType" />
         <result column="sync_time" property="syncTime" />
         <result column="device_type" property="deviceType" />
+        <result column="imei" property="imei" />
+        <result column="upgrade" property="upgrade" />
+        <result column="farmer_id" property="farmerId" />
+        <result column="farmer_name" property="farmerName" />
     </resultMap>
+    <select id="getDeviceIdByFarmerId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT device_code FROM eartag_device_register WHERE farmer_id=#{farmerId}
+    </select>
 
 </mapper>

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

@@ -41,5 +41,12 @@
         <result column="view_code" property="viewCode" />
         <result column="rfid_id" property="rfidId" />
     </resultMap>
+    <select id="getLastBatchCreateDate" resultType="java.util.Date"
+            parameterType="java.lang.String">
+        SELECT create_date FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} ORDER BY register_time DESC LIMIT 1
+    </select>
+    <select id="getLastBatchPig" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
+        SELECT * FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} AND create_date=#{createDate} ORDER BY register_time DESC
+    </select>
 
 </mapper>

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

@@ -75,7 +75,7 @@ public class EartagDeviceRegister implements Serializable {
 
     private Integer deviceType;
 
-
+    private String imei;
     private Integer upgrade;
     private Integer farmerId;
     private String farmerName;

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

@@ -0,0 +1,5 @@
+package com.huimv.eartag2.manage2.service;
+
+public interface ICacheService {
+    void setDeviceCodeByChipId(String chipId, String deviceCode);
+}

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

@@ -0,0 +1,25 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.huimv.eartag2.common.utils.BizConst;
+import com.huimv.eartag2.manage2.service.ICacheService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class CacheServiceImpl implements ICacheService {
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Override
+    public void setDeviceCodeByChipId(String chipId,String deviceCode) {
+        String  hashKey = BizConst.CHIP_DEVICE_PREFIX;
+        redisTemplate.opsForHash().put(hashKey,chipId,deviceCode);
+    }
+}

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

@@ -15,6 +15,7 @@ import com.huimv.eartag2.manage2.pojo.BasePigpen;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
 import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
+import com.huimv.eartag2.manage2.service.ICacheService;
 import com.huimv.eartag2.manage2.service.IEartagDeviceRegisterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.eartag2.manage2.utils.IDUtil;
@@ -42,18 +43,16 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Resource
     private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
-
     @Resource
     private BaseFarmerMapper baseFarmerMapper;
     @Resource
     private BasePigpenMapper basePigpenMapper;
-
     @Autowired
     private ResultUtil resultUtil;
-
     @Autowired
     private IDUtil idUtil;
-
+    @Autowired
+    private ICacheService cacheService;
 
 
     @Override
@@ -202,9 +201,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             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);
@@ -216,6 +213,8 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setFarmId(farmId);
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
             eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+            //{设置芯片ID和设备编码}
+            cacheService.setDeviceCodeByChipId(chipId,deviceCode);
         }else {
             //配标器
             String farmId = mapList.get("farmId");
@@ -229,6 +228,8 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             eartagDeviceRegister.setRemark(remark);
             eartagDeviceRegister.setChipId(chipId);
             eartagDeviceRegisterMapper.insert(eartagDeviceRegister);
+            //{设置芯片ID和设备编码}
+            cacheService.setDeviceCodeByChipId(chipId,deviceCode);
         }
         return resultUtil.result(1);
     }

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

@@ -1,16 +1,24 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
 import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.huimv.eartag2.manage2.mapper.FarmerAssetMapper;
 import com.huimv.eartag2.manage2.service.FarmerAssetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -23,9 +31,17 @@ import java.util.Map;
  * @since 2022-08-29
  */
 @Service
+@Slf4j
 public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, FarmerAsset> implements FarmerAssetService {
     @Autowired
     private FarmerAssetMapper farmerAssetMapper;
+    @Autowired
+    private IEartagEartagRegister2Service eartagEartagRegister2Service;
+    @Autowired
+    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
+    @Autowired
+    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
+
 
     @Override
     public List<FarmerAsset> getLastManyMonthAssets(String farmCode, String manyMonth) {
@@ -36,10 +52,40 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
     @Override
     public Result getAssetStatistics(Map<String, Object> paramsMap) {
         DateUtil dateUtil = new DateUtil();
-        String farmCode = paramsMap.get("areaId")+"";
+//        String farmCode = paramsMap.get("areaId")+"";
         java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
-        QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("farm_code",farmCode);
+//        QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("farm_code",farmCode);
+        String farmerId = paramsMap.get("farmerId")+"";
+        System.out.println("farmerId="+farmerId);
+
+        JSONObject outJo = new JSONObject();
+
+        //{根据农户读取采集器}
+        String deviceCode = eartagDeviceRegisterMapper.getDeviceIdByFarmerId(farmerId);
+        System.out.println("deviceCode="+deviceCode);
+        //{读取最后一批猪信息}
+        JSONObject lastBatchJo = _getlastBatchAdoptPig(deviceCode);
+        System.out.println("lastBatchJo="+lastBatchJo);
+        //读取资产信息
+
+
+        return new Result(ResultCode.SUCCESS,outJo);
+    }
+
+    //{读取最后一批猪信息}
+    private JSONObject _getlastBatchAdoptPig(String deviceCode) {
+        //{获取最后一条记录create_date日期}
+        Date createDate = eartagEartagRegister2Mapper.getLastBatchCreateDate(deviceCode);
+
+        System.out.println("createDate="+createDate);
+        if(createDate == null){
+            log.error("该采集器["+deviceCode+"]没有耳标注册数据.");
+            return null;
+        }else{
+            List<EartagEartagRegister2> eartagEartagRegister2List = eartagEartagRegister2Mapper.getLastBatchPig(deviceCode,createDate);
+            System.out.println("eartagEartagRegister2List.size="+eartagEartagRegister2List.size());
+        }
 
         return null;
     }

huimv-eartag2-platform/huimv-eartag2-manage2/src/test/java/com/huimv/eartag2/manage2/service/IEartagServiceTest.java

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.service;
 
 import com.huimv.eartag2.manage2.service.impl.EartagServiceImpl;
+import com.huimv.eartag2.manage2.service.impl.FarmerAssetServiceImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -22,10 +25,19 @@ import java.text.ParseException;
 public class IEartagServiceTest {
     @Autowired
     private IEartagService eartagService;
+    @Autowired
+    private FarmerAssetService farmerAssetService;
 
     @Test
     public void test1() throws ParseException {
         eartagService.updateEartagLiveStatusAndCount();
+    }
 
+    @Test
+    public void test2(){
+        Map map = new HashMap<>();
+//        map.put("areaId","330112002");
+        map.put("farmerId","1");
+        farmerAssetService.getAssetStatistics(map);
     }
 }