Merge remote-tracking branch 'origin/master'

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

@@ -106,6 +106,10 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/config/WebSocket.java

@@ -0,0 +1,61 @@
+package com.huimv.eartag2.manage2.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+//注册成组件
+@Component
+//定义websocket服务器端，它的功能主要是将目前的类定义成一个websocket服务器端。注解的值将被用于监听用户连接的终端访问URL地址
+@ServerEndpoint("/websocket")
+//如果不想每次都写private  final Logger logger = LoggerFactory.getLogger(当前类名.class); 可以用注解@Slf4j;可以直接调用log.info
+@Slf4j
+public class WebSocket {
+ 
+    //实例一个session，这个session是websocket的session
+    private Session session;
+ 
+    //存放websocket的集合（本次demo不会用到，聊天室的demo会用到）
+    private static CopyOnWriteArraySet<WebSocket> webSocketSet = new CopyOnWriteArraySet<>();
+ 
+    //前端请求时一个websocket时
+    @OnOpen
+    public void onOpen(Session session) {
+        this.session = session;
+        webSocketSet.add(this);
+        log.info("【websocket消息】有新的连接, 总数:{}", webSocketSet.size());
+    }
+ 
+    //前端关闭时一个websocket时
+    @OnClose
+    public void onClose() {
+        webSocketSet.remove(this);
+        log.info("【websocket消息】连接断开, 总数:{}", webSocketSet.size());
+    }
+ 
+    //前端向后端发送消息
+    @OnMessage
+    public void onMessage(String message) {
+        log.info("【websocket消息】收到客户端发来的消息:{}", message);
+    }
+
+    //新增一个方法用于主动向客户端发送消息
+    public static void sendMessage(String message) {
+        for (WebSocket webSocket: webSocketSet) {
+            log.info("【websocket消息】广播消息, message={}", message);
+            try {
+                webSocket.session.getBasicRemote().sendText(message);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/config/WebSocketConfig.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag2.manage2.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * websocket
+ * 的配置信息
+ */
+@Configuration
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+
+        return new ServerEndpointExporter();
+    }
+}

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

@@ -60,6 +60,7 @@ public class BasePigpenController {
         String farmCode = paramsMap.get("farmId")+"";
         // 栋名称
         String buildingName = paramsMap.get("buildingName")+"";
+
         // 栋编码
         String buildingCode = paramsMap.get("buildingCode")+"";
         // 阶段

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

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@RestController
+@RequestMapping("/pliers-demo")
+public class PliersDemoController {
+
+}

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

@@ -0,0 +1,34 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.huimv.eartag2.manage2.service.IPliersDemoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@RestController
+@RequestMapping("/stationLib")
+public class StationLibController {
+    @Autowired
+    private IPliersDemoService pliersDemoService;
+    @PostMapping("/listByPliersId")
+    public Result getPlierDemo(@RequestBody Map<String,String> map)   {
+
+        return pliersDemoService.listByPliersId(map);
+
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.mapper;
+
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface PliersDemoMapper extends BaseMapper<PliersDemo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.mapper;
+
+import com.huimv.eartag2.manage2.pojo.StationLib;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface StationLibMapper extends BaseMapper<StationLib> {
+
+}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.manage2.mapper.PliersDemoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.PliersDemo">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="pliers_id" property="pliersId" />
+        <result column="update_time" property="updateTime" />
+        <result column="usege_times" property="usegeTimes" />
+        <result column="lat" property="lat" />
+        <result column="lon" property="lon" />
+        <result column="address" property="address" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.manage2.mapper.StationLibMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.StationLib">
+        <id column="id" property="id" />
+        <result column="errcode" property="errcode" />
+        <result column="lat" property="lat" />
+        <result column="lon" property="lon" />
+        <result column="radius" property="radius" />
+        <result column="address" property="address" />
+        <result column="lac" property="lac" />
+        <result column="ci" property="ci" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/netty/EartagServerHandler2.java

@@ -5,10 +5,15 @@ import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huimv.eartag2.manage2.config.WebSocket;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.huimv.eartag2.manage2.pojo.StationLib;
 import com.huimv.eartag2.manage2.service.IEartagDeviceRegisterService;
 import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
+import com.huimv.eartag2.manage2.service.IPliersDemoService;
+import com.huimv.eartag2.manage2.service.IStationLibService;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandler;
@@ -44,6 +49,12 @@ private IEartagEartagRegisterService eartagRegisterService;
     private IEartagDeviceRegisterService deviceRegisterService;
 
     @Autowired
+    private IStationLibService stationLibService;
+
+    @Autowired
+    private IPliersDemoService pliersDemoService;
+
+    @Autowired
     private RestTemplate restTemplate ;
     //
     public void appendClientAsk(String text){
@@ -121,6 +132,88 @@ private IEartagEartagRegisterService eartagRegisterService;
                 eartagEartagRegister.setCreateDate(new Date());
 
                 eartagRegisterService.save(eartagEartagRegister);
+                //耳标记录，加上webSoket
+                //hm+7+868977051335099+122083123610011+22450+184902913+0+end
+                String lac = split[4];
+                String ci = split[5];
+                String pliersId = split[2];
+                StationLib stationLib = stationLibService.getOne(new QueryWrapper<StationLib>().eq("ci", ci).eq("lac", lac));
+                String lat ="";
+                String lon ="";
+                String address ="";
+
+                Boolean isNew =false;
+
+
+                if (ObjectUtil.isEmpty(stationLib)){
+                    try {
+                        ResponseEntity<JSONObject>  forEntity = restTemplate.getForEntity("http://api.cellocation.com:82/cell/?mcc=460&mnc=1&lac="+lac+"&ci="+ci+"&output=json", JSONObject.class);
+                        System.out.println("forEntity"+forEntity);
+                        JSONObject body = forEntity.getBody();
+                        lat = (String)body.get("lat");
+                        lon =  (String)body.get("lon");
+                        address = (String)body.get("address");
+                        String    radius = (String)body.get("radius");
+                        Integer  errcode = (Integer)body.get("errcode");
+                        if (errcode == 0){
+                            StationLib stationLib1 = new StationLib();
+                            stationLib1.setAddress(address);
+                            stationLib1.setCi(ci);
+                            stationLib1.setErrcode(errcode+"");
+                            stationLib1.setLac(lac);
+                            stationLib1.setLat(lat);
+                            stationLib1.setLon(lon);
+                            stationLib1.setRadius(Integer.parseInt(radius));
+
+                            stationLibService.save(stationLib1);
+                            isNew = true;
+
+
+                        }
+                        if (errcode == 10001){
+                            StationLib id = stationLibService.getOne(new QueryWrapper<StationLib>().orderByDesc("id").last("limit 1"));
+                            lat = id.getLat();
+                            lon = id.getLon();
+                            address = id.getAddress();
+                            isNew = true;
+
+                        }
+
+
+                    }catch (Exception e){
+                        System.out.println(e);
+                    }
+
+                }else {
+                    lat = stationLib.getLat();
+                    lon = stationLib.getLon();
+                    address = stationLib.getAddress();
+                    isNew = true;
+                }
+
+
+                if (isNew ){
+                    int countEarmark = (int)pliersDemoService.count(new QueryWrapper<PliersDemo>().eq("earmark", eartag));
+                    PliersDemo pliersDemo = new PliersDemo();
+                    pliersDemo.setEarmark(eartag);
+                    pliersDemo.setPliersId(pliersId);
+                    pliersDemo.setUpdateTime(new Date());
+                    pliersDemo.setUsegeTimes(1+countEarmark);
+
+
+                    pliersDemo.setLat(lat);
+                    pliersDemo.setLon(lon);
+                    pliersDemo.setAddress(address);
+                    pliersDemoService.save(pliersDemo);
+                }
+
+//                List<PliersDemo> id = pliersDemoService.list(new QueryWrapper<PliersDemo>().eq("pliers_id",pliersId).orderByDesc("id").last("limit 50"));
+//                String resultJson= new ObjectMapper().writeValueAsString(true);
+                WebSocket.sendMessage("true");
+
+
+
+
                 ctx.writeAndFlush(Unpooled.copiedBuffer("hm+7+8+end".getBytes()));
             }
 

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

@@ -0,0 +1,48 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pliers_demo")
+public class PliersDemo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    private String pliersId;
+
+    private Date updateTime;
+
+    private Integer usegeTimes;
+
+    private String lat;
+
+    private String lon;
+
+    private String address;
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("station_lib")
+public class StationLib implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String errcode;
+
+    private String lat;
+
+    private String lon;
+
+    private Integer radius;
+
+    private String address;
+
+    private String lac;
+
+    private String ci;
+
+
+}

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

@@ -57,6 +57,8 @@ public class EartagEartagRegisterVo {
     //信号强度
     private Integer signal;
     private Integer stage;
+    //芯片编码
+    private String chipId;
 
 
 

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

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface IPliersDemoService extends IService<PliersDemo> {
+
+    Result listByPliersId(Map<String,String> map);
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.huimv.eartag2.manage2.pojo.StationLib;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface IStationLibService extends IService<StationLib> {
+
+}

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

@@ -57,6 +57,10 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         newBasePigpen.setStageCode(stageCode);
         newBasePigpen.setSort(sort);
         newBasePigpen.setFType(type);
+        long pigpen_code = this.count(new QueryWrapper<BasePigpen>().eq("pigpen_code", buildingCode));
+        if (pigpen_code>1){
+            return  new Result(10001,"栋舍编码重复",false);
+        }
         return resultUtil.result(basePigpenMapper.insert(newBasePigpen));
     }
 

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

@@ -127,7 +127,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
         }else {
             wrapper.eq("unit_id",unitId);
         }
-        wrapper.like(StringUtils.isNotBlank(deviceCode),"device_code",deviceCode);
+        wrapper.like(StringUtils.isNotBlank(deviceCode),"chip_id",deviceCode);
         wrapper.like(StringUtils.isNotBlank(deviceAlias),"device_alias",deviceAlias);
         wrapper.like(StringUtils.isNotBlank(deviceStatus),"device_status",deviceStatus);
         wrapper.like(StringUtils.isNotBlank(activeStatus),"active_status",activeStatus);

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

@@ -51,6 +51,7 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         String unitId = params.get("unitId");
         String deviceCode = params.get("deviceCode");
         String farmId = params.get("farmId");
+        String earmark = params.get("earmark");
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
@@ -62,6 +63,7 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
         wrapper.like(StringUtils.isNotBlank(deviceCode),"belong_device",deviceCode);
         wrapper.eq("farm_id",farmId);
         wrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
+        wrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
         Page<EartagEartagRegister> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
 
 
@@ -81,10 +83,10 @@ public class EartagEartagRegisterServiceImpl extends ServiceImpl<EartagEartagReg
             eartagDeviceRegisterVo.setEarTemp(earTemp1);
             eartagDeviceRegisterVo.setEnvTemp(eartagData.getEnvTemp1());
             eartagDeviceRegisterVo.setSignal(eartagData.getSignal1());
-            EartagDeviceRegister deviceRegister = eartagDeviceRegisterMapper.selectOne(new QueryWrapper<EartagDeviceRegister>().eq("device_code", record.getBelongDevice()));
-
+            EartagDeviceRegister deviceRegister = eartagDeviceRegisterMapper.selectOne(new QueryWrapper<EartagDeviceRegister>().eq("chip_id", record.getBelongDevice()));
 
             eartagDeviceRegisterVo.setStage(deviceRegister.getStage());
+            eartagDeviceRegisterVo.setChipId(deviceRegister.getChipId());
 
             maxEarTemp = Math.max(earTemp1,maxEarTemp);
             minEarTemp = Math.min(earTemp1,minEarTemp);

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

@@ -0,0 +1,40 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.huimv.eartag2.manage2.mapper.PliersDemoMapper;
+import com.huimv.eartag2.manage2.service.IPliersDemoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@Service
+public class PliersDemoServiceImpl extends ServiceImpl<PliersDemoMapper, PliersDemo> implements IPliersDemoService {
+
+    @Override
+    public Result listByPliersId(Map<String,String> map) {
+        String pageSize = map.get("pageSize");
+        String pageNo = map.get("pageNo");
+        String deviceCode = map.get("deviceCode");
+        String earmark = map.get("earmark");
+        QueryWrapper<PliersDemo> wrapper = new QueryWrapper<>();
+        wrapper.eq("pliers_id",deviceCode).orderByDesc("id");
+        wrapper.eq(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        Page<PliersDemo> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+
+        return new Result(ResultCode.SUCCESS,page);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.huimv.eartag2.manage2.pojo.StationLib;
+import com.huimv.eartag2.manage2.mapper.StationLibMapper;
+import com.huimv.eartag2.manage2.service.IStationLibService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@Service
+public class StationLibServiceImpl extends ServiceImpl<StationLibMapper, StationLib> implements IStationLibService {
+
+}