生成农户领养、农户资产、日龄体重对应基础代码

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -92,7 +92,6 @@ public class EartagServiceImpl implements IEartagService {
     private BasePigpenEntityRepo basePigpenRepo;
     @Autowired
     private BizBaseStageEntityRepo bizBaseStageRepo;
-
     @Override
     public void handleEartag(JSONObject dataJo) throws ParseException {
         //设备编码
@@ -593,12 +592,12 @@ public class EartagServiceImpl implements IEartagService {
         Integer unitId = eartagEartagRegister2Entity.getUnitId();
         Optional<EartagOnlineStatusEntity> optionEartagStatus = eartagOnlineStatusEntityRepo.findLastOne(farmId, unitId);
         if (!optionEartagStatus.isPresent()) {
-            System.out.println("该记录不存在");
+            log.error("该记录不存在");
             return;
         }
         EartagOnlineStatusEntity eartagOnlineStatusEntity = optionEartagStatus.get();
-        System.out.println("onlineEarmark=" + eartagOnlineStatusEntity.getOnlineEarmark());
-        System.out.println("offlineEarmark=" + eartagOnlineStatusEntity.getOfflineEarmark());
+//        System.out.println("onlineEarmark=" + eartagOnlineStatusEntity.getOnlineEarmark());
+//        System.out.println("offlineEarmark=" + eartagOnlineStatusEntity.getOfflineEarmark());
         if (eartagOnlineStatusEntity.getOnlineEarmark().indexOf(earmark) == -1 && eartagOnlineStatusEntity.getOfflineEarmark().indexOf(earmark) == -1) {
             //新耳标（在线，离线都不包含该耳标）
             log.info("耳标连线状态统计:增加新耳标[" + earmark + "]");

huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/server/EartagServerHandler2.java

@@ -219,9 +219,9 @@ public class EartagServerHandler2 extends ChannelInboundHandlerAdapter {
         } else if (cmdHeader.trim().equalsIgnoreCase("zj")) {
             System.out.println("==>耳标命令请求 askText>>"+askText);
             //测试-临时写入耳标数据到文件
-            if(askText.trim().indexOf("330110002000002") != -1){
-                writeTxt(askText,"input");
-            }
+//            if(askText.trim().indexOf("330110002000002") != -1){
+//                writeTxt(askText,"input");
+//            }
             //耳标应答数据（不需要应答）
 //            if (checkValidEarmark(cmd)) {
 //                log.error(">>舍弃掉未配置耳标号的耳标，" + askText + "");

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

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/farmer-adopt")
+public class FarmerAdoptController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/farmer-asset")
+public class FarmerAssetController {
+
+}
+

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

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/farmer-dayage-weight")
+public class FarmerDayageWeightController {
+
+}
+

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

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

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

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

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

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

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

@@ -0,0 +1,24 @@
+<?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.FarmerAdoptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerAdopt">
+        <id column="id" property="id" />
+        <result column="batch_code" property="batchCode" />
+        <result column="adopt_date" property="adoptDate" />
+        <result column="adopt_age" property="adoptAge" />
+        <result column="days" property="days" />
+        <result column="quantity" property="quantity" />
+        <result column="pig_price" property="pigPrice" />
+        <result column="weight" property="weight" />
+        <result column="plan_incomde" property="planIncomde" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, batch_code, adopt_date, adopt_age, days, quantity, meat_price, plan_incomde, farm_code
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?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.FarmerAssetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerAsset">
+        <id column="id" property="id" />
+        <result column="farm_code" property="farmCode" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="avail_asset" property="availAsset" />
+        <result column="unavail_asset" property="unavailAsset" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_code, year, month, avail_asset, unavail_asset
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?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.FarmerDayageWeightMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.FarmerDayageWeight">
+        <id column="id" property="id" />
+        <result column="start_dayage" property="startDayage" />
+        <result column="end_dayage" property="endDayage" />
+        <result column="weight" property="weight" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, start_dayage, end_dayage, weight
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,48 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FarmerAdopt implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String batchCode;
+
+    private Date adoptDate;
+
+    private Integer adoptAge;
+
+    private Integer days;
+
+    private Integer quantity;
+
+    private BigDecimal pigPrice;
+
+    private BigDecimal weight;
+
+    private BigDecimal planIncomde;
+
+    private String farmCode;
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FarmerAsset implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    private Integer year;
+
+    private Integer month;
+
+    private BigDecimal availAsset;
+
+    private BigDecimal unavailAsset;
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FarmerDayageWeight implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer startDayage;
+
+    private Integer endDayage;
+
+    private BigDecimal weight;
+
+
+}

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

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

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

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

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

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

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

@@ -29,7 +29,7 @@ public class EartagAbnormalCountServiceImpl extends ServiceImpl<EartagAbnormalCo
 
     @Override
     public Result listAbnormalCount(Map<String, String> map) {
-        String farmCode = map.get("farmCode")+"";
+        String farmCode = map.get("farmId")+"";
         String addDate = map.get("addDate")+"";
         QueryWrapper<EartagAbnormalCount> wrapper = new QueryWrapper();
         wrapper.eq("farm_code",farmCode).eq("add_date",addDate);

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

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

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

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

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

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