【feat】添加查询注册器接口

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/SysAccountMultilevelController.java

@@ -124,5 +124,26 @@ public class SysAccountMultilevelController {
         return  accountMultilevelService.getLastFarmId(userId);
     }
 
+    /**
+     * @description: 【查询】 根据账号查询所有牧场
+     * @author: 鱼余
+     * @param:
+     **/
+    @GetMapping("/listById")
+    public Result listById(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return accountMultilevelService.listById(userId);
+    }
+
+    /**
+     * @description: 【修改】 账号绑定牧场
+     * @author: 鱼余
+     * @param: paramsMap
+     **/
+    @PostMapping("/boundFarm")
+    public Result boundFarm(@RequestBody Map<String,String> paramsMap){
+
+        return accountMultilevelService.boundFarm(paramsMap);
+    }
 
 }

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/entity/BaseFarm.java

@@ -0,0 +1,50 @@
+package com.huimv.eartag2.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFarm implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    private String farmName;
+
+    private String location;
+
+    private String leader;
+
+    private String phone;
+
+    private String remark;
+
+    private String areaCode;
+
+    private String code1;
+
+    private String code2;
+
+    private String ip;
+
+    private String port;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/mapper/BaseFarmMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.admin.entity.BaseFarm;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+public interface BaseFarmMapper extends BaseMapper<BaseFarm> {
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/BaseFarmService.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.admin.entity.BaseFarm;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+public interface BaseFarmService extends IService<BaseFarm> {
+
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/ISysAccountMultilevelService.java

@@ -7,6 +7,7 @@ import com.huimv.eartag2.admin.entity.SysAccountMultilevel;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -31,4 +32,8 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     Result getLastFarmId(Integer userId);
 
+    Result listById(Integer userId);
+
+    Result boundFarm(Map<String, String> paramsMap);
+
 }

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/BaseFarmServiceImpl.java

@@ -0,0 +1,24 @@
+package com.huimv.eartag2.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.admin.entity.BaseFarm;
+import com.huimv.eartag2.admin.mapper.BaseFarmMapper;
+import com.huimv.eartag2.admin.service.BaseFarmService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+@Service
+public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> implements BaseFarmService {
+
+
+
+
+}

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.admin.entity.BaseFarm;
 import com.huimv.eartag2.admin.entity.SysOrg;
 import com.huimv.eartag2.admin.entity.dto.SysAccountMultilevelDto;
+import com.huimv.eartag2.admin.mapper.BaseFarmMapper;
 import com.huimv.eartag2.admin.mapper.SysOrgMapper;
 import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -168,7 +171,28 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         }
         return new Result(ResultCode.SUCCESS,lastFarmId);
     }
+    @Autowired
+    private BaseFarmMapper baseFarmMapper;
 
+    @Override
+    public Result listById(Integer userId) {
+        if (userId== 1){
+            return new Result(ResultCode.SUCCESS,baseFarmMapper.selectList(null));
+        }
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String[] farmIds = sysAccountMultilevel.getFarmIds().split(",");
+        return new Result(ResultCode.SUCCESS,baseFarmMapper.selectList(new QueryWrapper<BaseFarm>().in("farm_code",farmIds)));
+    }
+
+    @Override
+    public Result boundFarm(Map<String, String> paramsMap) {
+        String farmCodes = paramsMap.get("farmCodes");
+        String userId = paramsMap.get("userId");
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        sysAccountMultilevel.setFarmIds(farmCodes);
+        accountMultilevelMapper.updateById(sysAccountMultilevel);
+        return new Result(10000,"绑定成功",true);
+    }
 
 
 

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

@@ -65,27 +65,6 @@ public class BaseFarmController {
         return baseFarmService.list(paramsMap);
     }
 
-    /**
-     * @description: 【查询】 根据账号查询所有牧场
-     * @author: 鱼余
-     * @param:
-     **/
-    @GetMapping("/listById")
-    public Result listById(HttpServletRequest request){
-        Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        return baseFarmService.listById(userId);
-    }
-
-    /**
-     * @description: 【修改】 账号绑定牧场
-     * @author: 鱼余
-     * @param: paramsMap
-     **/
-    @PostMapping("/boundFarm")
-    public Result boundFarm(@RequestBody Map<String,String> paramsMap){
-
-        return baseFarmService.boundFarm(paramsMap);
-    }
 
 }
 

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

@@ -72,7 +72,7 @@ public class EartagDeviceRegisterController {
      * @author: 静静
      * @param: maps
      **/
-    @PostMapping("/setPigpen")
+    @PostMapping("/addPigpen")
     public Result add(@RequestBody Map<String, String> maps){
         return eartagDeviceRegisterService.add(maps);
     }

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

@@ -6,6 +6,8 @@ import java.time.LocalDate;
 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;
@@ -49,13 +51,13 @@ public class EartagDeviceRegister implements Serializable {
 
     private Integer unitId;
 
-    private LocalDateTime registerTime;
+    private Date registerTime;
 
-    private LocalDateTime lastTime;
+    private Date lastTime;
 
     private Integer activeStatus;
 
-    private LocalDateTime activeTime;
+    private Date activeTime;
 
     private Integer deviceStatus;
 
@@ -65,11 +67,11 @@ public class EartagDeviceRegister implements Serializable {
 
     private String remark;
 
-    private LocalDate createDate;
+    private Date createDate;
 
     private String updateType;
 
-    private LocalDateTime syncTime;
+    private Date syncTime;
 
 
 }

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

@@ -24,7 +24,5 @@ public interface BaseFarmService extends IService<BaseFarm> {
 
     Result list(Map<String,String> paramsMap);
 
-    Result listById(Integer userId);
 
-    Result boundFarm(Map<String, String> paramsMap);
 }

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

@@ -149,23 +149,5 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
         return new Result(ResultCode.SUCCESS, bizBaseStagePage);
     }
 
-    @Override
-    public Result listById(Integer userId) {
-        if (userId== 1){
-            return new Result(ResultCode.SUCCESS,this.list());
-        }
-        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
-        String[] farmIds = sysAccountMultilevel.getFarmIds().split(",");
-        return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<BaseFarm>().in("farm_code",farmIds)));
-    }
 
-    @Override
-    public Result boundFarm(Map<String, String> paramsMap) {
-        String farmCodes = paramsMap.get("farmCodes");
-        String userId = paramsMap.get("userId");
-        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
-        sysAccountMultilevel.setFarmIds(farmCodes);
-        accountMultilevelMapper.updateById(sysAccountMultilevel);
-        return new Result(10000,"绑定成功",true);
-    }
 }

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

@@ -1,8 +1,12 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.mapper.BasePigpenMapper;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
@@ -106,11 +110,50 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
 
     @Override
     public Result list(Map<String, String> paramsMap) {
+        //编码，栋舍，单元，别名，生存状态，活动状态
+        String deviceCode = paramsMap.get("deviceCode");
+        String pigpenId = paramsMap.get("pigpenId");
+        String unitId = paramsMap.get("unitId");
+        String deviceAlias = paramsMap.get("deviceAlias");
+        String deviceStatus = paramsMap.get("deviceStatus");
+        String activeStatus = paramsMap.get("activeStatus");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNo = paramsMap.get("pageNo");
+
+        if (StringUtils.isBlank(pageNo)){
+            pageNo="1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize="20";
+        }
+        QueryWrapper<EartagDeviceRegister> wrapper = new QueryWrapper<>();
 
+        if (StringUtils.isBlank(unitId)){
+            wrapper.eq(StringUtils.isNotBlank(pigpenId),"pigpen_id",pigpenId);
+        }else {
+            wrapper.eq("unit_id",unitId);
+        }
+        wrapper.like(StringUtils.isNotBlank(deviceCode),"device_code",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);
+
+        Page<EartagDeviceRegister> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+        Page<EartagDeviceRegisterVo> eartagDeviceRegisterVoPage = new Page<>();
+        //复制
+        List<EartagDeviceRegisterVo> listVo = new ArrayList();
+        BeanUtil.copyProperties(page,eartagDeviceRegisterVoPage);
+        for (EartagDeviceRegister record : page.getRecords()) {
+            EartagDeviceRegisterVo eartagDeviceRegisterVo = new EartagDeviceRegisterVo();
+            BeanUtil.copyProperties(record,eartagDeviceRegisterVo);
+            eartagDeviceRegisterVo.setPigpenName(basePigpenMapper.selectById(record.getPigpenId()).getPigpenName());
+            eartagDeviceRegisterVo.setUnitName(basePigpenMapper.selectById(record.getUnitId()).getPigpenName());
+            listVo.add(eartagDeviceRegisterVo);
+        }
 
-        EartagDeviceRegisterVo eartagDeviceRegisterVo = new EartagDeviceRegisterVo();
+        eartagDeviceRegisterVoPage.setRecords(listVo);
 
-        return null;
+        return new Result(ResultCode.SUCCESS,eartagDeviceRegisterVoPage);
     }
 
     @Override

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

@@ -0,0 +1,11 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
+import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
+import com.huimv.eartag2.manage2.service.IEartagDeviceRegisterService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IEartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceRegisterMapper, EartagDeviceRegister> implements IEartagDeviceRegisterService {
+}