Procházet zdrojové kódy

添加处理温度和湿度功能

zhuoning před 4 roky
rodič
revize
58ab96a8f4

+ 129 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/controller/EartagDampnessController.java

@@ -0,0 +1,129 @@
+package com.huimv.eartag.manager.controller;
+
+
+import com.github.pagehelper.PageInfo;
+
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.EartagDampness;
+import com.huimv.eartag.manager.service.EartagDampnessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/eartagDampness")
+@CrossOrigin
+public class EartagDampnessController {
+
+    @Autowired
+    private EartagDampnessService eartagDampnessService;
+
+    /***
+     * EartagDampness分页条件搜索实现
+     * @param eartagDampness
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) EartagDampness eartagDampness, @PathVariable  int page, @PathVariable  int size){
+        //调用EartagDampnessService实现分页条件查询EartagDampness
+        PageInfo<EartagDampness> pageInfo = eartagDampnessService.findPage(eartagDampness, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * EartagDampness分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用EartagDampnessService实现分页查询EartagDampness
+        PageInfo<EartagDampness> pageInfo = eartagDampnessService.findPage(page, size);
+        return new Result<PageInfo>(true,StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * 多条件搜索品牌数据
+     * @param eartagDampness
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<EartagDampness>> findList(@RequestBody(required = false)  EartagDampness eartagDampness){
+        //调用EartagDampnessService实现条件查询EartagDampness
+        List<EartagDampness> list = eartagDampnessService.findList(eartagDampness);
+        return new Result<List<EartagDampness>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用EartagDampnessService实现根据主键删除
+        eartagDampnessService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改EartagDampness数据
+     * @param eartagDampness
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  EartagDampness eartagDampness,@PathVariable Integer id){
+        //设置主键值
+        eartagDampness.setId(id);
+        //调用EartagDampnessService实现修改EartagDampness
+        eartagDampnessService.update(eartagDampness);
+        return new Result(true,StatusCode.OK,"修改成功");
+    }
+
+    /***
+     * 新增EartagDampness数据
+     * @param eartagDampness
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   EartagDampness eartagDampness){
+        //调用EartagDampnessService实现添加EartagDampness
+        eartagDampnessService.add(eartagDampness);
+        return new Result(true,StatusCode.OK,"添加成功");
+    }
+
+    /***
+     * 根据ID查询EartagDampness数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<EartagDampness> findById(@PathVariable Integer id){
+        //调用EartagDampnessService实现根据主键查询EartagDampness
+        EartagDampness eartagDampness = eartagDampnessService.findById(id);
+        return new Result<EartagDampness>(true,StatusCode.OK,"查询成功",eartagDampness);
+    }
+
+    /***
+     * 查询EartagDampness全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<EartagDampness>> findAll(){
+        //调用EartagDampnessService实现查询所有EartagDampness
+        List<EartagDampness> list = eartagDampnessService.findAll();
+        return new Result<List<EartagDampness>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

+ 128 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/controller/EartagTemperatureController.java

@@ -0,0 +1,128 @@
+package com.huimv.eartag.manager.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.EartagTemperature;
+import com.huimv.eartag.manager.service.EartagTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/eartagTemperature")
+@CrossOrigin
+public class EartagTemperatureController {
+
+    @Autowired
+    private EartagTemperatureService eartagTemperatureService;
+
+    /***
+     * EartagTemperature分页条件搜索实现
+     * @param eartagTemperature
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) EartagTemperature eartagTemperature, @PathVariable  int page, @PathVariable  int size){
+        //调用EartagTemperatureService实现分页条件查询EartagTemperature
+        PageInfo<EartagTemperature> pageInfo = eartagTemperatureService.findPage(eartagTemperature, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * EartagTemperature分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用EartagTemperatureService实现分页查询EartagTemperature
+        PageInfo<EartagTemperature> pageInfo = eartagTemperatureService.findPage(page, size);
+        return new Result<PageInfo>(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * 多条件搜索品牌数据
+     * @param eartagTemperature
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<EartagTemperature>> findList(@RequestBody(required = false)  EartagTemperature eartagTemperature){
+        //调用EartagTemperatureService实现条件查询EartagTemperature
+        List<EartagTemperature> list = eartagTemperatureService.findList(eartagTemperature);
+        return new Result<List<EartagTemperature>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用EartagTemperatureService实现根据主键删除
+        eartagTemperatureService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改EartagTemperature数据
+     * @param eartagTemperature
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  EartagTemperature eartagTemperature,@PathVariable Integer id){
+        //设置主键值
+        eartagTemperature.setId(id);
+        //调用EartagTemperatureService实现修改EartagTemperature
+        eartagTemperatureService.update(eartagTemperature);
+        return new Result(true,StatusCode.OK,"修改成功");
+    }
+
+    /***
+     * 新增EartagTemperature数据
+     * @param eartagTemperature
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   EartagTemperature eartagTemperature){
+        //调用EartagTemperatureService实现添加EartagTemperature
+        eartagTemperatureService.add(eartagTemperature);
+        return new Result(true,StatusCode.OK,"添加成功");
+    }
+
+    /***
+     * 根据ID查询EartagTemperature数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<EartagTemperature> findById(@PathVariable Integer id){
+        //调用EartagTemperatureService实现根据主键查询EartagTemperature
+        EartagTemperature eartagTemperature = eartagTemperatureService.findById(id);
+        return new Result<EartagTemperature>(true,StatusCode.OK,"查询成功",eartagTemperature);
+    }
+
+    /***
+     * 查询EartagTemperature全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<EartagTemperature>> findAll(){
+        //调用EartagTemperatureService实现查询所有EartagTemperature
+        List<EartagTemperature> list = eartagTemperatureService.findAll();
+        return new Result<List<EartagTemperature>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

+ 12 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/dao/EartagDampnessMapper.java

@@ -0,0 +1,12 @@
+package com.huimv.eartag.manager.dao;
+
+import com.huimv.eartag.manager.pojo.EartagDampness;
+import tk.mybatis.mapper.common.Mapper;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagDampness的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+public interface EartagDampnessMapper extends Mapper<EartagDampness> {
+}

+ 12 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/dao/EartagTemperatureMapper.java

@@ -0,0 +1,12 @@
+package com.huimv.eartag.manager.dao;
+
+import com.huimv.eartag.manager.pojo.EartagTemperature;
+import tk.mybatis.mapper.common.Mapper;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagTemperature的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+public interface EartagTemperatureMapper extends Mapper<EartagTemperature> {
+}

+ 129 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/pojo/EartagDampness.java

@@ -0,0 +1,129 @@
+package com.huimv.eartag.manager.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagDampness构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="eartag_dampness")
+public class EartagDampness implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//
+
+    @Column(name = "header")
+	private String header;//
+
+    @Column(name = "device_id")
+	private Integer deviceId;//
+
+    @Column(name = "cmd")
+	private Integer cmd;//
+
+    @Column(name = "serial_no")
+	private Integer serialNo;//
+
+    @Column(name = "value")
+	private Double value;//
+
+    @Column(name = "create_date")
+	private Date createDate;//
+
+    @Column(name = "check_number")
+	private Integer checkNumber;//
+
+    @Column(name = "tail")
+	private String tail;//
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public String getHeader() {
+		return header;
+	}
+
+	//set方法
+	public void setHeader(String header) {
+		this.header = header;
+	}
+	//get方法
+	public Integer getDeviceId() {
+		return deviceId;
+	}
+
+	//set方法
+	public void setDeviceId(Integer deviceId) {
+		this.deviceId = deviceId;
+	}
+	//get方法
+	public Integer getCmd() {
+		return cmd;
+	}
+
+	//set方法
+	public void setCmd(Integer cmd) {
+		this.cmd = cmd;
+	}
+	//get方法
+	public Integer getSerialNo() {
+		return serialNo;
+	}
+
+	//set方法
+	public void setSerialNo(Integer serialNo) {
+		this.serialNo = serialNo;
+	}
+	//get方法
+	public Double getValue() {
+		return value;
+	}
+
+	//set方法
+	public void setValue(Double value) {
+		this.value = value;
+	}
+	//get方法
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	//set方法
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	//get方法
+	public Integer getCheckNumber() {
+		return checkNumber;
+	}
+
+	//set方法
+	public void setCheckNumber(Integer checkNumber) {
+		this.checkNumber = checkNumber;
+	}
+	//get方法
+	public String getTail() {
+		return tail;
+	}
+
+	//set方法
+	public void setTail(String tail) {
+		this.tail = tail;
+	}
+
+
+}

+ 129 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/pojo/EartagTemperature.java

@@ -0,0 +1,129 @@
+package com.huimv.eartag.manager.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagTemperature构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="eartag_temperature")
+public class EartagTemperature implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//id
+
+    @Column(name = "header")
+	private String header;//
+
+    @Column(name = "device_id")
+	private Integer deviceId;//
+
+    @Column(name = "cmd")
+	private Integer cmd;//
+
+    @Column(name = "serial_no")
+	private Integer serialNo;//
+
+    @Column(name = "value")
+	private Double value;//
+
+    @Column(name = "create_date")
+	private Date createDate;//
+
+    @Column(name = "check_number")
+	private Integer checkNumber;//
+
+    @Column(name = "tail")
+	private String tail;//
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public String getHeader() {
+		return header;
+	}
+
+	//set方法
+	public void setHeader(String header) {
+		this.header = header;
+	}
+	//get方法
+	public Integer getDeviceId() {
+		return deviceId;
+	}
+
+	//set方法
+	public void setDeviceId(Integer deviceId) {
+		this.deviceId = deviceId;
+	}
+	//get方法
+	public Integer getCmd() {
+		return cmd;
+	}
+
+	//set方法
+	public void setCmd(Integer cmd) {
+		this.cmd = cmd;
+	}
+	//get方法
+	public Integer getSerialNo() {
+		return serialNo;
+	}
+
+	//set方法
+	public void setSerialNo(Integer serialNo) {
+		this.serialNo = serialNo;
+	}
+	//get方法
+	public Double getValue() {
+		return value;
+	}
+
+	//set方法
+	public void setValue(Double value) {
+		this.value = value;
+	}
+	//get方法
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	//set方法
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	//get方法
+	public Integer getCheckNumber() {
+		return checkNumber;
+	}
+
+	//set方法
+	public void setCheckNumber(Integer checkNumber) {
+		this.checkNumber = checkNumber;
+	}
+	//get方法
+	public String getTail() {
+		return tail;
+	}
+
+	//set方法
+	public void setTail(String tail) {
+		this.tail = tail;
+	}
+
+
+}

+ 70 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/EartagDampnessService.java

@@ -0,0 +1,70 @@
+package com.huimv.eartag.manager.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.manager.pojo.EartagDampness;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagDampness业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface EartagDampnessService {
+
+    /***
+     * EartagDampness多条件分页查询
+     * @param eartagDampness
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagDampness> findPage(EartagDampness eartagDampness, int page, int size);
+
+    /***
+     * EartagDampness分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagDampness> findPage(int page, int size);
+
+    /***
+     * EartagDampness多条件搜索方法
+     * @param eartagDampness
+     * @return
+     */
+    List<EartagDampness> findList(EartagDampness eartagDampness);
+
+    /***
+     * 删除EartagDampness
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改EartagDampness数据
+     * @param eartagDampness
+     */
+    void update(EartagDampness eartagDampness);
+
+    /***
+     * 新增EartagDampness
+     * @param eartagDampness
+     */
+    void add(EartagDampness eartagDampness);
+
+    /**
+     * 根据ID查询EartagDampness
+     * @param id
+     * @return
+     */
+     EartagDampness findById(Integer id);
+
+    /***
+     * 查询所有EartagDampness
+     * @return
+     */
+    List<EartagDampness> findAll();
+}

+ 70 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/EartagTemperatureService.java

@@ -0,0 +1,70 @@
+package com.huimv.eartag.manager.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.manager.pojo.EartagTemperature;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagTemperature业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface EartagTemperatureService {
+
+    /***
+     * EartagTemperature多条件分页查询
+     * @param eartagTemperature
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagTemperature> findPage(EartagTemperature eartagTemperature, int page, int size);
+
+    /***
+     * EartagTemperature分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagTemperature> findPage(int page, int size);
+
+    /***
+     * EartagTemperature多条件搜索方法
+     * @param eartagTemperature
+     * @return
+     */
+    List<EartagTemperature> findList(EartagTemperature eartagTemperature);
+
+    /***
+     * 删除EartagTemperature
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改EartagTemperature数据
+     * @param eartagTemperature
+     */
+    void update(EartagTemperature eartagTemperature);
+
+    /***
+     * 新增EartagTemperature
+     * @param eartagTemperature
+     */
+    void add(EartagTemperature eartagTemperature);
+
+    /**
+     * 根据ID查询EartagTemperature
+     * @param id
+     * @return
+     */
+     EartagTemperature findById(Integer id);
+
+    /***
+     * 查询所有EartagTemperature
+     * @return
+     */
+    List<EartagTemperature> findAll();
+}

+ 168 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/EartagDampnessServiceImpl.java

@@ -0,0 +1,168 @@
+package com.huimv.eartag.manager.service.impl;
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import com.huimv.eartag.manager.dao.EartagDampnessMapper;
+import com.huimv.eartag.manager.pojo.EartagDampness;
+import com.huimv.eartag.manager.service.EartagDampnessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagDampness业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+public class EartagDampnessServiceImpl implements EartagDampnessService {
+
+    @Autowired
+    private EartagDampnessMapper eartagDampnessMapper;
+
+
+    /**
+     * EartagDampness条件+分页查询
+     * @param eartagDampness 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<EartagDampness> findPage(EartagDampness eartagDampness, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(eartagDampness);
+        //执行搜索
+        return new PageInfo<EartagDampness>(eartagDampnessMapper.selectByExample(example));
+    }
+
+    /**
+     * EartagDampness分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<EartagDampness> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<EartagDampness>(eartagDampnessMapper.selectAll());
+    }
+
+    /**
+     * EartagDampness条件查询
+     * @param eartagDampness
+     * @return
+     */
+    @Override
+    public List<EartagDampness> findList(EartagDampness eartagDampness){
+        //构建查询条件
+        Example example = createExample(eartagDampness);
+        //根据构建的条件查询数据
+        return eartagDampnessMapper.selectByExample(example);
+    }
+
+
+    /**
+     * EartagDampness构建查询对象
+     * @param eartagDampness
+     * @return
+     */
+    public Example createExample(EartagDampness eartagDampness){
+        Example example=new Example(EartagDampness.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(eartagDampness!=null){
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getId())){
+                    criteria.andEqualTo("id",eartagDampness.getId());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getHeader())){
+                    criteria.andEqualTo("header",eartagDampness.getHeader());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getDeviceId())){
+                    criteria.andEqualTo("deviceId",eartagDampness.getDeviceId());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getCmd())){
+                    criteria.andEqualTo("cmd",eartagDampness.getCmd());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getSerialNo())){
+                    criteria.andEqualTo("serialNo",eartagDampness.getSerialNo());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getValue())){
+                    criteria.andEqualTo("value",eartagDampness.getValue());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getCreateDate())){
+                    criteria.andEqualTo("createDate",eartagDampness.getCreateDate());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getCheckNumber())){
+                    criteria.andEqualTo("checkNumber",eartagDampness.getCheckNumber());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagDampness.getTail())){
+                    criteria.andEqualTo("tail",eartagDampness.getTail());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        eartagDampnessMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改EartagDampness
+     * @param eartagDampness
+     */
+    @Override
+    public void update(EartagDampness eartagDampness){
+        eartagDampnessMapper.updateByPrimaryKey(eartagDampness);
+    }
+
+    /**
+     * 增加EartagDampness
+     * @param eartagDampness
+     */
+    @Override
+    public void add(EartagDampness eartagDampness){
+        eartagDampnessMapper.insert(eartagDampness);
+    }
+
+    /**
+     * 根据ID查询EartagDampness
+     * @param id
+     * @return
+     */
+    @Override
+    public EartagDampness findById(Integer id){
+        return  eartagDampnessMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询EartagDampness全部数据
+     * @return
+     */
+    @Override
+    public List<EartagDampness> findAll() {
+        return eartagDampnessMapper.selectAll();
+    }
+}

+ 168 - 0
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/EartagTemperatureServiceImpl.java

@@ -0,0 +1,168 @@
+package com.huimv.eartag.manager.service.impl;
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import com.huimv.eartag.manager.dao.EartagTemperatureMapper;
+import com.huimv.eartag.manager.pojo.EartagTemperature;
+import com.huimv.eartag.manager.service.EartagTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagTemperature业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+public class EartagTemperatureServiceImpl implements EartagTemperatureService {
+
+    @Autowired
+    private EartagTemperatureMapper eartagTemperatureMapper;
+
+
+    /**
+     * EartagTemperature条件+分页查询
+     * @param eartagTemperature 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<EartagTemperature> findPage(EartagTemperature eartagTemperature, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(eartagTemperature);
+        //执行搜索
+        return new PageInfo<EartagTemperature>(eartagTemperatureMapper.selectByExample(example));
+    }
+
+    /**
+     * EartagTemperature分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<EartagTemperature> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<EartagTemperature>(eartagTemperatureMapper.selectAll());
+    }
+
+    /**
+     * EartagTemperature条件查询
+     * @param eartagTemperature
+     * @return
+     */
+    @Override
+    public List<EartagTemperature> findList(EartagTemperature eartagTemperature){
+        //构建查询条件
+        Example example = createExample(eartagTemperature);
+        //根据构建的条件查询数据
+        return eartagTemperatureMapper.selectByExample(example);
+    }
+
+
+    /**
+     * EartagTemperature构建查询对象
+     * @param eartagTemperature
+     * @return
+     */
+    public Example createExample(EartagTemperature eartagTemperature){
+        Example example=new Example(EartagTemperature.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(eartagTemperature!=null){
+            // id
+            if(!StringUtils.isEmpty(eartagTemperature.getId())){
+                    criteria.andEqualTo("id",eartagTemperature.getId());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getHeader())){
+                    criteria.andEqualTo("header",eartagTemperature.getHeader());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getDeviceId())){
+                    criteria.andEqualTo("deviceId",eartagTemperature.getDeviceId());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getCmd())){
+                    criteria.andEqualTo("cmd",eartagTemperature.getCmd());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getSerialNo())){
+                    criteria.andEqualTo("serialNo",eartagTemperature.getSerialNo());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getValue())){
+                    criteria.andEqualTo("value",eartagTemperature.getValue());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getCreateDate())){
+                    criteria.andEqualTo("createDate",eartagTemperature.getCreateDate());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getCheckNumber())){
+                    criteria.andEqualTo("checkNumber",eartagTemperature.getCheckNumber());
+            }
+            // 
+            if(!StringUtils.isEmpty(eartagTemperature.getTail())){
+                    criteria.andEqualTo("tail",eartagTemperature.getTail());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        eartagTemperatureMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改EartagTemperature
+     * @param eartagTemperature
+     */
+    @Override
+    public void update(EartagTemperature eartagTemperature){
+        eartagTemperatureMapper.updateByPrimaryKey(eartagTemperature);
+    }
+
+    /**
+     * 增加EartagTemperature
+     * @param eartagTemperature
+     */
+    @Override
+    public void add(EartagTemperature eartagTemperature){
+        eartagTemperatureMapper.insert(eartagTemperature);
+    }
+
+    /**
+     * 根据ID查询EartagTemperature
+     * @param id
+     * @return
+     */
+    @Override
+    public EartagTemperature findById(Integer id){
+        return  eartagTemperatureMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询EartagTemperature全部数据
+     * @return
+     */
+    @Override
+    public List<EartagTemperature> findAll() {
+        return eartagTemperatureMapper.selectAll();
+    }
+}

+ 62 - 9
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/ReceivePackageSerivce.java

@@ -1,9 +1,15 @@
 package com.huimv.eartag.manager.service.impl;
 
 import com.huimv.common.date.DateUtil;
+import com.huimv.eartag.manager.dao.EartagDampnessMapper;
+import com.huimv.eartag.manager.dao.EartagTemperatureMapper;
+import com.huimv.eartag.manager.pojo.EartagDampness;
 import com.huimv.eartag.manager.pojo.EartagData;
+import com.huimv.eartag.manager.pojo.EartagTemperature;
+import com.huimv.eartag.manager.service.EartagDampnessService;
 import com.huimv.eartag.manager.service.EartagDataService;
 
+import com.huimv.eartag.manager.service.EartagTemperatureService;
 import com.huimv.eartag.manager.utils.Const;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +31,15 @@ public class ReceivePackageSerivce {
 
     @Autowired
     private EartagDataService eartagDataService;
+    @Autowired
+    private EartagTemperatureMapper temperatureMapper;
+    @Autowired
+    private EartagTemperatureService temperatureService;
+    @Autowired
+    private EartagDampnessMapper dampnessMapper;
+    @Autowired
+    private EartagDampnessService dampnessService;
+
     /**
      * @Method      : handleEartagData
      * @Description : 处理耳标数据
@@ -74,7 +89,7 @@ public class ReceivePackageSerivce {
         eartagData.setMLW(commandTail);
         // 保存耳标数据
         eartagDataService.add(eartagData);
-        log.info(Const.EARTAG_SAVE_SUCCESS);
+        log.info(Const.SAVE_EARTAG_SUCCESS);
         StringBuilder returnSb = new StringBuilder();
 //        return returnSb.append("hm").append("+").append(6).append("+").append(0).append("+").append(6).append("+").append("end").toString();
         return "hm+6+0+6+end";
@@ -82,7 +97,7 @@ public class ReceivePackageSerivce {
 
     /**
      * @Method      : _handleEartagDampness
-     * @Description : 处理耳标湿度
+     * @Description : 处理网关湿度
      * @Params      : [clientMessageArray]
      * @Return      : java.lang.String
      *
@@ -90,14 +105,33 @@ public class ReceivePackageSerivce {
      * @Date        : 2021/1/15
      * @Time        : 17:47
      */
-    public String handleEartagDampness(String[] clientMessageArray) {
-
-        return null;
+    public String handleEartagDampness(String[] clientMessageArray) throws ParseException {
+        String header = clientMessageArray[0];
+        String deviceId = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String serialNo = clientMessageArray[3];
+        String value = clientMessageArray[4];
+        String timestamp = clientMessageArray[5];
+        String checkCode = clientMessageArray[6];
+        String tail = clientMessageArray[7];
+        EartagDampness eartagDampnessPojo = new EartagDampness();
+        eartagDampnessPojo.setHeader(header);
+        eartagDampnessPojo.setDeviceId(Integer.parseInt(deviceId));
+        eartagDampnessPojo.setCmd(Integer.parseInt(cmd));
+        eartagDampnessPojo.setSerialNo(Integer.parseInt(serialNo));
+        eartagDampnessPojo.setValue(Double.parseDouble(value));
+        eartagDampnessPojo.setCreateDate(DateUtil.parseDateTime(DateUtil.buildDateTimeString(timestamp)));
+        eartagDampnessPojo.setCheckNumber(Integer.parseInt(checkCode));
+        eartagDampnessPojo.setTail(tail);
+        dampnessMapper.insert(eartagDampnessPojo);
+//        dampnessService.add(eartagDampnessPojo);
+        log.info(Const.SAVE_DAMPNESS_SUCCESS);
+        return "hm+5+0+8+end";
     }
 
     /**
      * @Method      : _handleEartagTemperature
-     * @Description : 处理耳标温度
+     * @Description : 处理网关温度
      * @Params      : [clientMessageArray]
      * @Return      : java.lang.String
      *
@@ -105,8 +139,27 @@ public class ReceivePackageSerivce {
      * @Date        : 2021/1/15
      * @Time        : 17:46
      */
-    public String handleEartagTemperature(String[] clientMessageArray) {
-
-        return null;
+    public String handleEartagTemperature(String[] clientMessageArray) throws ParseException {
+        String header = clientMessageArray[0];
+        String deviceId = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String serialNo = clientMessageArray[3];
+        String value = clientMessageArray[4];
+        String timestamp = clientMessageArray[5];
+        String checkCode = clientMessageArray[6];
+        String tail = clientMessageArray[7];
+        EartagTemperature EartagTemperaturePojo = new EartagTemperature();
+        EartagTemperaturePojo.setHeader(header);
+        EartagTemperaturePojo.setDeviceId(Integer.parseInt(deviceId));
+        EartagTemperaturePojo.setCmd(Integer.parseInt(cmd));
+        EartagTemperaturePojo.setSerialNo(Integer.parseInt(serialNo));
+        EartagTemperaturePojo.setValue(Double.parseDouble(value));
+        EartagTemperaturePojo.setCreateDate(DateUtil.parseDateTime(DateUtil.buildDateTimeString(timestamp)));
+        EartagTemperaturePojo.setCheckNumber(Integer.parseInt(checkCode));
+        EartagTemperaturePojo.setTail(tail);
+        temperatureMapper.insert(EartagTemperaturePojo);
+//        temperatureService.add(EartagTemperaturePojo);
+        log.info(Const.SAVE_TEMPERATURE_SUCCESS);
+        return "hm+4+0+7+end";
     }
 }

+ 3 - 1
ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/utils/Const.java

@@ -4,5 +4,7 @@ import org.springframework.stereotype.Component;
 
 //@Component
 public class Const {
-    public static final String EARTAG_SAVE_SUCCESS = "保存耳标数据成功";
+    public static final String SAVE_EARTAG_SUCCESS = "保存耳标数据成功";
+    public static final String SAVE_TEMPERATURE_SUCCESS = "保存温度数据成功";
+    public static final String SAVE_DAMPNESS_SUCCESS = "保存湿度数据成功";
 }