添加

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/CollectorRegisterVo.java

@@ -0,0 +1,86 @@
+package com.huimv.manager.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.manager.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/7/24 0024 17:46
+ **/
+@Data
+public class CollectorRegisterVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录id(主键)
+     */
+    private Integer id;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 地县编码
+     */
+    private String countyCode;
+    /**
+     * 区县名
+     */
+    private String countyName;
+    /**
+     * 牧场编码
+     */
+    private String farmCode;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 动物种类
+     */
+    private Integer typeF;
+    /**
+     * 阶段
+     */
+    private Integer stage;
+    /**
+     * 猪舍id
+     */
+    private Integer pigpenId;
+
+    private String pigpenName;
+
+    private String unitName;
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+    /**
+     * 上传服务器地址
+     */
+    private String serverIp;
+    /**
+     * 端口
+     */
+    private Integer port;
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date registerTime;
+    /**
+     * 最后上传时间
+     */
+    private Date lastTime;
+
+    /**
+     * 状态 默认值 1  1.正常 2.异常
+     */
+    private Integer state;
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/CollectorRegisterDao.java

@@ -1,8 +1,13 @@
 package com.huimv.manager.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.manager.entity.CollectorRegisterEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.manager.entity.vo.CollectorRegisterVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 
@@ -13,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CollectorRegisterDao extends BaseMapper<CollectorRegisterEntity> {
-	
+
+    IPage<CollectorRegisterVo> page(IPage<Object> page,@Param(Constants.WRAPPER) QueryWrapper<CollectorRegisterEntity> wrapper);
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/CollectorRegisterServiceImpl.java

@@ -1,6 +1,9 @@
 package com.huimv.manager.service.impl;
 
+import com.huimv.manager.entity.vo.CollectorRegisterVo;
 import com.huimv.manager.mapper.CollectorRegisterDao;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,12 +25,32 @@ import com.huimv.manager.service.CollectorRegisterService;
 @Service("collectorRegisterService")
 public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterDao, CollectorRegisterEntity> implements CollectorRegisterService {
 
+
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        IPage<CollectorRegisterEntity> page = this.page(
-                new Query<CollectorRegisterEntity>().getPage(params),
-                new QueryWrapper<CollectorRegisterEntity>()
-        );
+        QueryWrapper<CollectorRegisterEntity> wrapper = new QueryWrapper<>();
+        String registerStartTime = (String)params.get("registerStartTime");
+        String registerEndTime = (String)params.get("registerEndTime");
+        String deviceCode = (String)params.get("deviceCode");
+        String countyName = (String)params.get("countyName");
+        String farmName = (String)params.get("farmName");
+        String state = (String)params.get("state");
+
+        wrapper.like(StringUtils.isNotBlank(deviceCode),"device_code",deviceCode)
+        .or().like(StringUtils.isNotBlank(countyName),"county_name",countyName)
+        .or().like(StringUtils.isNotBlank(farmName),"farm_name",farmName);
+
+        if (StringUtils.isNotBlank(state)){
+            wrapper.eq("state",Integer.parseInt(state));
+        }
+        wrapper.le(StringUtils.isNotBlank(registerEndTime),"register_time",registerEndTime);
+        wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register_time",registerStartTime);
+
+        IPage<CollectorRegisterVo> page = baseMapper.page(new Query<>().getPage(params),wrapper);
+
+
+
 
         return new PageUtils(page);
     }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/BasePigpenDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.BasePigpenDao">
+<mapper namespace="com.huimv.manager.mapper.BasePigpenDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.BasePigpenEntity" id="basePigpenMap">

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CollectorRegisterDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.CollectorRegisterDao">
+<mapper namespace="com.huimv.manager.mapper.CollectorRegisterDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.CollectorRegisterEntity" id="collectorRegisterMap">
@@ -21,6 +21,31 @@
         <result property="lastTime" column="last_time"/>
         <result property="state" column="state"/>
     </resultMap>
+    <select id="page" resultType="com.huimv.manager.entity.vo.CollectorRegisterVo">
+
+        select
+            register.id,
+            register.device_code,
+            register.county_code,
+            pigpen.pigpen_name pigpenName,
+            unit.pigpen_name unitName,
+            register.county_name,
+            register.farm_code,
+            register.farm_name,
+            register.type_f,
+            register.stage,
+            register.pigpen_id,
+            register.unit_id,
+            register.server_ip,
+            register.port,
+            register.register_time,
+            register.last_time,
+            register.state
+        from collector_register register
+        join base_pigpen pigpen on pigpen.id = register.pigpen_id and  pigpen.type = 1
+        join base_pigpen unit on unit.id = register.unit_id and unit.type = 2
+      ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CompanyRegisterDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.CompanyRegisterDao">
+<mapper namespace="com.huimv.manager.mapper.CompanyRegisterDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.CompanyRegisterEntity" id="companyRegisterMap">

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/DailyTabulateDataDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.DailyTabulateDataDao">
+<mapper namespace="com.huimv.manager.mapper.DailyTabulateDataDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.DailyTabulateDataEntity" id="dailyTabulateDataMap">

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/EartagDataDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.EartagDataDao">
+<mapper namespace="com.huimv.manager.mapper.EartagDataDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.EartagDataEntity" id="eartagDataMap">

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/EnvironmentDataDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.EnvironmentDataDao">
+<mapper namespace="com.huimv.manager.mapper.EnvironmentDataDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.EnvironmentDataEntity" id="environmentDataMap">

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/InterfaceRegisterDao.xml

@@ -1,7 +1,7 @@
 <?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.manager.dao.InterfaceRegisterDao">
+<mapper namespace="com.huimv.manager.mapper.InterfaceRegisterDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.huimv.manager.entity.InterfaceRegisterEntity" id="interfaceRegisterMap">