耳标、羊只档案、栋舍

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/EartagController.java

@@ -4,6 +4,13 @@ package com.huimv.admin.controller;
 import cn.hutool.http.HttpUtil;
 
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.SheepEarmark;
+import com.huimv.admin.service.ISheepEarmarkService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +24,9 @@ import java.util.Map;
 @RequestMapping("/admin/earmark")
 public class EartagController {
 
+    @Autowired
+    private ISheepEarmarkService earmarkService;
+
     //耳标总数量
     @RequestMapping("/earmarkCount")
     public JSONObject earmarkCount(@RequestBody Map<String, String> paramsMap) {
@@ -75,4 +85,24 @@ public class EartagController {
         JSONObject jsonObject = new JSONObject(result);
         return jsonObject;
     }
+
+    @RequestMapping("/add")
+    public void add() {
+        for (int i = 0; i < 180; i++) {
+            SheepEarmark sheepEarmark = new SheepEarmark();
+            sheepEarmark.setFarmId(1);
+            sheepEarmark.setIsUse(0);
+            sheepEarmark.setEarmark(String.valueOf(1010021 + i));
+            earmarkService.save(sheepEarmark);
+        }
+    }
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String isUser =paramsMap.get("isUser");
+        QueryWrapper<SheepEarmark> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(isUser), "is_user", isUser);
+        return new Result(ResultCode.SUCCESS,earmarkService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/ProtSheepInfoController.java

@@ -1,7 +1,11 @@
 package com.huimv.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.ProtSheepInfo;
 import com.huimv.admin.service.IProtSheepInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -32,4 +36,13 @@ public class ProtSheepInfoController {
     public Result listPage(@RequestBody Map<String, String> paramsMap) {
         return sheepInfoService.listPage(paramsMap);
     }
+
+    @RequestMapping("/list")
+    public Result list(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String sheepType = paramsMap.get("sheepType");
+        QueryWrapper<ProtSheepInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(sheepType), "sheep_type", sheepType);
+        return new Result(ResultCode.SUCCESS,sheepInfoService.list(queryWrapper));
+    }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/SheepEarmark.java

@@ -0,0 +1,43 @@
+package com.huimv.admin.entity;
+
+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 2024-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sheep_earmark")
+public class SheepEarmark implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 耳标编码
+     */
+    private String earmark;
+
+    /**
+     * 是否绑定 0未绑定 1以绑定
+     */
+    private Integer isUse;
+
+    private Integer farmId;
+
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/mapper/SheepEarmarkMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.SheepEarmark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保存耳标平台的耳标 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-16
+ */
+public interface SheepEarmarkMapper extends BaseMapper<SheepEarmark> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/ISheepEarmarkService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.SheepEarmark;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 保存耳标平台的耳标 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-16
+ */
+public interface ISheepEarmarkService extends IService<SheepEarmark> {
+
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/BaseBuildingServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -41,8 +41,8 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     @Override
     @Transactional
     public Result addBuilding(BaseBuilding baseBuilding) {
-        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name",baseBuilding.getBuildName())) != 0) {
-            return new Result(10001,"栋舍名已存在",false);
+        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name", baseBuilding.getBuildName())) != 0) {
+            return new Result(10001, "栋舍名已存在", false);
         }
         baseBuilding.setParentId(0);
         baseBuilding.setFType(1);
@@ -53,8 +53,8 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     @Override
     @Transactional
     public Result updateBuilding(BaseBuilding baseBuilding) {
-        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name",baseBuilding.getBuildName()).ne("id",baseBuilding.getId())) != 0) {
-            return new Result(10001,"栋舍名已存在",false);
+        if (this.count(new QueryWrapper<BaseBuilding>().eq("build_name", baseBuilding.getBuildName()).ne("id", baseBuilding.getId())) != 0) {
+            return new Result(10001, "栋舍名已存在", false);
         }
         //TODO:后面补充羊只和设备的名称修改
         baseBuildingMapper.updateById(baseBuilding);
@@ -65,7 +65,6 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     @Transactional
     public Result deleteBuilding(Map<String, Integer> map) {
         Integer id = map.get("id");
-        List<Integer> cageIds = baseBuildingMapper.getCageById(id);
         //TODO:后面再进行补充羊只和设备情况
 //        if (ObjectUtil.isNotEmpty(cageIds)){
 //            if (ObjectUtil.isNotEmpty(baseDuckInfoMapper.selectList(new QueryWrapper<BaseDuckInfo>().in("unit_id",cageIds)))) {
@@ -78,11 +77,9 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
 //        if (ObjectUtil.isNotEmpty(envDeviceMapper.selectList(new QueryWrapper<EnvDevice>().eq("unit_id",id)))) {
 //            return new Result(10001,"删除失败，该栋舍存在设备",false);
 //        }
-        if (this.removeById(id) && this.removeByIds(cageIds)){
-            return new Result(10000, "删除成功", true);
-        }else {
-            return new Result(10001, "删除失败", true);
-        }
+        this.removeById(id);
+        return new Result(10000, "删除成功", true);
+
     }
 
     @Override
@@ -91,7 +88,7 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         QueryWrapper<BaseBuilding> queryWrapper = new QueryWrapper<BaseBuilding>()
                 .eq("farm_id", farmId)
                 .eq("f_type", 1);
-        return new Result(ResultCode.SUCCESS,baseBuildingMapper.selectList(queryWrapper));
+        return new Result(ResultCode.SUCCESS, baseBuildingMapper.selectList(queryWrapper));
     }
 
     @Override
@@ -100,7 +97,7 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
         List<BaseBuilding> baseBuildings = this.list(new QueryWrapper<BaseBuilding>()
                 .eq("farm_id", farmId)
                 .orderByAsc("id"));
-        return new Result(ResultCode.SUCCESS,baseBuildings);
+        return new Result(ResultCode.SUCCESS, baseBuildings);
     }
 
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/ProtSheepInfoServiceImpl.java

@@ -34,13 +34,15 @@ public class ProtSheepInfoServiceImpl extends ServiceImpl<ProtSheepInfoMapper, P
         String pageSize = paramsMap.get("pageSize");
         String farmId = paramsMap.get("farmId");
         String sheepId = paramsMap.get("sheepId");
+        String sheepType = paramsMap.get("sheepType");
         if ("".equals(pageNum) || null == pageNum) {
             pageNum = "1";
             pageSize = "20";
         }
         Page<ProtSheepInfo> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<ProtSheepInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(sheepId), "sheep_id", sheepId);
+        queryWrapper.eq("farm_id", farmId).like(StringUtils.isNotBlank(sheepId), "sheep_id", sheepId)
+                .eq(StringUtils.isNotBlank(sheepType), "sheep_type", sheepType);
         return new Result(ResultCode.SUCCESS, sheepInfoMapper.selectPage(page, queryWrapper));
     }
 }

huimv-huyang-admin/src/main/java/com/huimv/admin/service/impl/SheepEarmarkServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.SheepEarmark;
+import com.huimv.admin.mapper.SheepEarmarkMapper;
+import com.huimv.admin.service.ISheepEarmarkService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 保存耳标平台的耳标 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-08-16
+ */
+@Service
+public class SheepEarmarkServiceImpl extends ServiceImpl<SheepEarmarkMapper, SheepEarmark> implements ISheepEarmarkService {
+
+}

huimv-huyang-admin/src/main/resources/mapper/SheepEarmarkMapper.xml

@@ -0,0 +1,5 @@
+<?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.admin.mapper.SheepEarmarkMapper">
+
+</mapper>