新增农户管理模块

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

@@ -0,0 +1,55 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.BaseFarmerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@RestController
+@RequestMapping("/base-farmer")
+public class BaseFarmerController {
+    @Autowired
+    private BaseFarmerService baseFarmerService;
+    
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.add(paramsMap);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.edit(paramsMap);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.remove(paramsMap);
+    }
+
+    @PostMapping("/list")
+    public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.list(paramsMap);
+    }
+
+//    @PostMapping("/getLastAdoptByFarmCode")
+//    public Result getLastAdoptByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+//        return baseFarmerService.getLastAdoptByFarmCode(paramsMap);
+//    }
+}
+

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

@@ -1,10 +1,18 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.FarmerAdoptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +24,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/farmer-adopt")
 public class FarmerAdoptController {
+    @Autowired
+    private FarmerAdoptService farmerAdoptService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.add(paramsMap);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.edit(paramsMap);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.remove(paramsMap);
+    }
+
+    @PostMapping("/listByFarmCode")
+    public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.listByFarmCode(paramsMap);
+    }
 
+    @PostMapping("/getLastAdoptByFarmCode")
+    public Result getLastAdoptByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.getLastAdoptByFarmCode(paramsMap);
+    }
 }
 

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

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

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

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.huimv.eartag2.manage2.pojo.FarmerAdopt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FarmerAdoptMapper extends BaseMapper<FarmerAdopt> {
 
+    FarmerAdopt getLastAdoptByFarmCode(@Param("farmCode") String farmCode);
 }

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

@@ -2,6 +2,9 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FarmerAssetMapper extends BaseMapper<FarmerAsset> {
 
+    List<FarmerAsset> getLastManyMonthAssets(@Param("farmCode") String farmCode,@Param("manyMonth") String manyMonth);
 }

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

@@ -0,0 +1,19 @@
+<?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.BaseFarmerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.manage2.pojo.BaseFarmer">
+        <id column="id" property="id" />
+        <result column="farmer" property="farmer" />
+        <result column="phone" property="phone" />
+        <result column="address" property="address" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farmer, phone, address,farm_code
+    </sql>
+
+</mapper>

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

@@ -12,7 +12,7 @@
         <result column="quantity" property="quantity" />
         <result column="pig_price" property="pigPrice" />
         <result column="weight" property="weight" />
-        <result column="plan_incomde" property="planIncomde" />
+        <result column="plan_incomde" property="planIncome" />
         <result column="farm_code" property="farmCode" />
     </resultMap>
 
@@ -20,5 +20,9 @@
     <sql id="Base_Column_List">
         id, batch_code, adopt_date, adopt_age, days, quantity, meat_price, plan_incomde, farm_code
     </sql>
+    <select id="getLastAdoptByFarmCode" resultType="com.huimv.eartag2.manage2.pojo.FarmerAdopt"
+            parameterType="java.lang.String">
+        SELECT * FROM farmer_adopt WHERE farm_code = #{farmCode} ORDER BY batch_code DESC LIMIT 1
+    </select>
 
 </mapper>

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

@@ -16,5 +16,8 @@
     <sql id="Base_Column_List">
         id, farm_code, year, month, avail_asset, unavail_asset
     </sql>
+    <select id="getLastManyMonthAssets" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset">
+        SELECT * FROM farmer_asset WHERE farm_code = #{farmCode} ORDER BY year desc,month desc;
+    </select>
 
 </mapper>

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

@@ -0,0 +1,35 @@
+package com.huimv.eartag2.manage2.pojo;
+
+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-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFarmer implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmer;
+
+    private String phone;
+
+    private String address;
+
+    private String farmCode;
+
+}

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

@@ -40,7 +40,7 @@ public class FarmerAdopt implements Serializable {
 
     private BigDecimal weight;
 
-    private BigDecimal planIncomde;
+    private BigDecimal planIncome;
 
     private String farmCode;
 

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

@@ -0,0 +1,26 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+public interface BaseFarmerService extends IService<BaseFarmer> {
+
+    Result add(Map<String, Object> paramsMap);
+
+    Result edit(Map<String, Object> paramsMap);
+
+    Result remove(Map<String, Object> paramsMap);
+
+    Result list(Map<String, Object> paramsMap);
+}

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

@@ -1,8 +1,12 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.pojo.FarmerAdopt;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface FarmerAdoptService extends IService<FarmerAdopt> {
 
+    Result add(Map<String, Object> paramsMap) throws ParseException;
+
+    Result edit(Map<String, Object> paramsMap) throws ParseException;
+
+    Result remove(Map<String, Object> paramsMap);
+
+    Result listByFarmCode(Map<String, Object> paramsMap) throws ParseException;
+
+    Result getLastAdoptByFarmCode(Map<String, Object> paramsMap);
 }

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

@@ -3,6 +3,8 @@ package com.huimv.eartag2.manage2.service;
 import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface FarmerAssetService extends IService<FarmerAsset> {
 
+    List<FarmerAsset> getLastManyMonthAssets(String farmCode, String manyMonth);
 }

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

@@ -0,0 +1,92 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.pojo.BaseFarmer;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
+import com.huimv.eartag2.manage2.service.BaseFarmerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@Service
+public class BaseFarmerServiceImpl extends ServiceImpl<BaseFarmerMapper, BaseFarmer> implements BaseFarmerService {
+    @Autowired
+    private BaseFarmerMapper baseFarmerMapper;
+
+    @Override
+    public Result add(Map<String, Object> paramsMap) {
+        BaseFarmer baseFarmer = new BaseFarmer();
+        baseFarmer.setFarmer(paramsMap.get("farmer")+"");
+        baseFarmer.setPhone(paramsMap.get("phone")+"");
+        baseFarmer.setAddress(paramsMap.get("address")+"");
+        baseFarmer.setFarmCode(paramsMap.get("farmCode")+"");
+        int rows = baseFarmerMapper.insert(baseFarmer);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result edit(Map<String, Object> paramsMap) {
+        BaseFarmer baseFarmer = new BaseFarmer();
+        baseFarmer.setId(Integer.parseInt(paramsMap.get("id")+""));
+        baseFarmer.setFarmer(paramsMap.get("farmer")+"");
+        baseFarmer.setPhone(paramsMap.get("phone")+"");
+        baseFarmer.setAddress(paramsMap.get("address")+"");
+        baseFarmer.setFarmCode(paramsMap.get("farmCode")+"");
+        int rows = baseFarmerMapper.updateById(baseFarmer);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result remove(Map<String, Object> paramsMap) {
+        String ids = paramsMap.get("ids")+"";
+        List<Integer> idList = new ArrayList<>();
+        String[] idArray = ids.split(",");
+        for(int a=0;a<idArray.length;a++){
+            idList.add(Integer.parseInt(idArray[a]));
+        }
+        int rows = baseFarmerMapper.deleteBatchIds(idList);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result list(Map<String, Object> paramsMap) {
+        //
+        String farmCode = paramsMap.get("farmCode")+"";
+        String farmer = paramsMap.get("farmer")+"";
+        Integer pageNo = Integer.parseInt(paramsMap.get("pageNo")+"");
+        Integer pageSize = Integer.parseInt(paramsMap.get("pageSize")+"");
+        QueryWrapper<BaseFarmer> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.like(StringUtils.isNotBlank(farmer),"farmer",farmer);
+        Page<BaseFarmer> page = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
+        return new Result(ResultCode.SUCCESS,baseFarmerMapper.selectPage(page,queryWrapper));
+    }
+}

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

@@ -1,11 +1,29 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.pojo.EartagReset;
 import com.huimv.eartag2.manage2.pojo.FarmerAdopt;
 import com.huimv.eartag2.manage2.mapper.FarmerAdoptMapper;
+import com.huimv.eartag2.manage2.pojo.FarmerAsset;
 import com.huimv.eartag2.manage2.service.FarmerAdoptService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.manage2.service.FarmerAssetService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +34,124 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class FarmerAdoptServiceImpl extends ServiceImpl<FarmerAdoptMapper, FarmerAdopt> implements FarmerAdoptService {
+    @Autowired
+    private FarmerAdoptMapper farmerAdoptMapper;
+//    @Autowired
+//    private DateUtil dateUtil;
+    @Autowired
+    private FarmerAssetService farmerAssetService;
+
+    @Override
+    public Result add(Map<String, Object> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        //
+        String farmCode = paramsMap.get("farmCode")+"";
+        String batchCode = paramsMap.get("batchCode")+"";
+        Date date = new Date(dateUtil.parseDate(paramsMap.get("adoptDate")+"").getTime());
+        Integer adoptAge = Integer.parseInt(paramsMap.get("adoptAge")+"");
+        Integer days = Integer.parseInt(paramsMap.get("days")+"");
+        Integer quantity = Integer.parseInt(paramsMap.get("quantity")+"");
+        BigDecimal weightBd = new BigDecimal(paramsMap.get("weight")+"");
+        BigDecimal pigPriceBd = new BigDecimal(paramsMap.get("pigPrice")+"");
+        BigDecimal planIncomeBd = new BigDecimal(paramsMap.get("planIncome")+"");
+        FarmerAdopt farmerAdopt = new FarmerAdopt();
+        farmerAdopt.setBatchCode(batchCode);
+        farmerAdopt.setAdoptDate(date);
+        farmerAdopt.setAdoptAge(adoptAge);
+        farmerAdopt.setDays(days);
+        farmerAdopt.setQuantity(quantity);
+        farmerAdopt.setWeight(weightBd);
+        farmerAdopt.setPigPrice(pigPriceBd);
+        farmerAdopt.setPlanIncome(planIncomeBd);
+        farmerAdopt.setFarmCode(farmCode);
+        int rows = farmerAdoptMapper.insert(farmerAdopt);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result edit(Map<String, Object> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        //
+        String batchCode = paramsMap.get("batchCode")+"";
+        Date date = new Date(dateUtil.parseDate(paramsMap.get("adoptDate")+"").getTime());
+        Integer id = Integer.parseInt(paramsMap.get("id")+"");
+        Integer adoptAge = Integer.parseInt(paramsMap.get("adoptAge")+"");
+        Integer days = Integer.parseInt(paramsMap.get("days")+"");
+        Integer quantity = Integer.parseInt(paramsMap.get("quantity")+"");
+        BigDecimal weightBd = new BigDecimal(paramsMap.get("weight")+"");
+        BigDecimal pigPriceBd = new BigDecimal(paramsMap.get("pigPrice")+"");
+        BigDecimal planIncomeBd = new BigDecimal(paramsMap.get("planIncome")+"");
+
+        FarmerAdopt farmerAdopt = new FarmerAdopt();
+        farmerAdopt.setId(id);
+        farmerAdopt.setBatchCode(batchCode);
+        farmerAdopt.setAdoptDate(date);
+        farmerAdopt.setAdoptAge(adoptAge);
+        farmerAdopt.setDays(days);
+        farmerAdopt.setQuantity(quantity);
+        farmerAdopt.setWeight(weightBd);
+        farmerAdopt.setPigPrice(pigPriceBd);
+        farmerAdopt.setPlanIncome(planIncomeBd);
+        int rows = farmerAdoptMapper.updateById(farmerAdopt);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result remove(Map<String, Object> paramsMap) {
+        String ids = paramsMap.get("ids")+"";
+        List<Integer> idList = new ArrayList<>();
+        String[] idArray = ids.split(",");
+        for(int a=0;a<idArray.length;a++){
+            idList.add(Integer.parseInt(idArray[a]));
+        }
+        int rows = farmerAdoptMapper.deleteBatchIds(idList);
+        if(rows > 0){
+            return new Result(ResultCode.SUCCESS);
+        }else{
+            return new Result(ResultCode.FAIL);
+        }
+    }
+
+    @Override
+    public Result listByFarmCode(Map<String, Object> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        //
+        String farmCode = paramsMap.get("farmCode")+"";
+        String batchCode = paramsMap.get("batchCode")+"";
+        Date startDate = new Date(dateUtil.parseDate(paramsMap.get("startDate")+"").getTime());
+        Date endDate = new Date(dateUtil.parseDate(paramsMap.get("endDate")+"").getTime());
+        Integer pageNo = Integer.parseInt(paramsMap.get("pageNo")+"");
+        Integer pageSize = Integer.parseInt(paramsMap.get("pageSize")+"");
+        QueryWrapper<FarmerAdopt> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(batchCode),"batch_code",batchCode);
+        queryWrapper.between("adopt_date",startDate,endDate);
+        Page<FarmerAdopt> page = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
+        return new Result(ResultCode.SUCCESS,farmerAdoptMapper.selectPage(page,queryWrapper));
+    }
+
+    @Override
+    public Result getLastAdoptByFarmCode(Map<String, Object> paramsMap) {
+        //
+        String farmCode = paramsMap.get("farmCode")+"";
+        String manyMonth = paramsMap.get("manyMonth")+"";
+        //{获取最新一个批次的数据}
+        FarmerAdopt farmerAdopt = farmerAdoptMapper.getLastAdoptByFarmCode(farmCode);
+        //{获取资产历史数据}
+        //-------------------------------------------------------
+        List<FarmerAsset> farmerAssetList = farmerAssetService.getLastManyMonthAssets(farmCode,manyMonth);
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("adopt",farmerAdopt);
+        resultJo.put("asset",farmerAssetList);
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
 
 }

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

@@ -4,8 +4,11 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +19,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, FarmerAsset> implements FarmerAssetService {
+    @Autowired
+    private FarmerAssetMapper farmerAssetMapper;
 
+    @Override
+    public List<FarmerAsset> getLastManyMonthAssets(String farmCode, String manyMonth) {
+        //{}
+        return farmerAssetMapper.getLastManyMonthAssets(farmCode,manyMonth);
+    }
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8096
+  port: 8099
 spring:
   application:
     name: huimv-eartag2-manage

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8096
+  port: 8099
 spring:
   application:
     name: huimv-eartag2-manage2

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-prod2.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8096
+  port: 8099
 spring:
   application:
     name: huimv-eartag2-manage2