2021/6/18 转栏管理

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/entity/PeriodEntity.java

@@ -34,7 +34,7 @@ public class PeriodEntity implements Serializable {
     /**
      * 牧场id
      */
-    private Integer pastureId;
+    private Integer farmId;
     /**
      * 删除状态 0.正常 1.已删除
      */

huimv-smart-apiservice/src/main/resources/mapper/apiservice/FarmDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.huimv.apiservice.dao.FarmDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.huimv.apiservice.entity.FarmEntity" id="pastureMap">
+    <resultMap type="com.huimv.apiservice.entity.FarmEntity" id="farmMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="location" column="location"/>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/PeriodDao.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="number" column="number"/>
         <result property="pigstyId" column="pigsty_id"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/PigstyDao.xml

@@ -7,7 +7,7 @@
     <resultMap type="com.huimv.apiservice.entity.PigstyEntity" id="pigstyMap">
         <result property="id" column="id"/>
         <result property="number" column="number"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="feederId" column="feeder_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/UnitDao.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="number" column="number"/>
         <result property="pigstyId" column="pigsty_id"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-apiservice/src/main/resources/mapper/apiservice/YearPigBaseDao.xml

@@ -67,7 +67,7 @@
         SELECT mc.name
         FROM mgt_pigsty zs
         JOIN mgt_farm mc
-        ON zs.pasture_id = mc.id
+        ON zs.farm_id = mc.id
         WHERE zs.id = #{pigstyId}
     </select>
 

huimv-smart-management/src/main/java/com/huimv/management/controller/TransferPeriodLogController.java

@@ -0,0 +1,84 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.TransferPeriodLogEntity;
+import com.huimv.management.service.TransferPeriodLogService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 转栏记录表
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-18 18:18:52
+ */
+@RestController
+@RequestMapping("management/transferPeriodLog")
+public class TransferPeriodLogController {
+    @Autowired
+    private TransferPeriodLogService transferPeriodLogService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = transferPeriodLogService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		TransferPeriodLogEntity transferPeriodLog = transferPeriodLogService.getById(id);
+
+        return R.ok().put("transferPeriodLog", transferPeriodLog);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody TransferPeriodLogEntity transferPeriodLog){
+		transferPeriodLogService.save(transferPeriodLog);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody TransferPeriodLogEntity transferPeriodLog){
+		transferPeriodLogService.updateById(transferPeriodLog);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		transferPeriodLogService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java

@@ -9,20 +9,17 @@ import java.util.Map;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.huimv.management.entity.YearPigBaseEntity;
 import com.huimv.management.service.YearPigBaseService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 
+import javax.servlet.http.HttpServletRequest;
 
 
-/**
+ /**
  * 年猪基本
  *
  * @author yinhao
@@ -165,4 +162,12 @@ public class YearPigBaseController {
 
         return R.ok();
     }
+
+
+    @PostMapping("/transferPeriod")
+    public R transferPeriod(@RequestBody HashMap<String,Object> map, HttpServletRequest request) {
+        yearPigBaseService.transferPeriod(map,request);
+        return R.ok();
+    }
 }
+

huimv-smart-management/src/main/java/com/huimv/management/dao/PeriodDao.java

@@ -3,6 +3,7 @@ package com.huimv.management.dao;
 import com.huimv.management.entity.PeriodEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * 栏期信息表
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2021-05-07 15:32:42
  */
 @Mapper
+@Repository
 public interface PeriodDao extends BaseMapper<PeriodEntity> {
 
 

huimv-smart-management/src/main/java/com/huimv/management/dao/TransferPeriodLogDao.java

@@ -0,0 +1,17 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.TransferPeriodLogEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 转栏记录表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-18 18:18:52
+ */
+@Mapper
+public interface TransferPeriodLogDao extends BaseMapper<TransferPeriodLogEntity> {
+	
+}

huimv-smart-management/src/main/java/com/huimv/management/entity/PeriodEntity.java

@@ -34,7 +34,7 @@ public class PeriodEntity implements Serializable {
     /**
      * 牧场id
      */
-    private Integer pastureId;
+    private Integer farmId;
     /**
      * 删除状态 0.正常 1.已删除
      */

huimv-smart-management/src/main/java/com/huimv/management/entity/SysUserEntity.java

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.huimv.management.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 系统用户
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Data
+public class SysUserEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 盐
+     */
+    private String salt;
+
+    /**
+     * 性别
+     */
+    private Short sex;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GTM+8")
+    private Date birthday;
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 状态  0：禁用   1：正常
+     */
+    private Integer status;
+
+    /**
+     * 角色ID列表
+     */
+    private List<Long> roleIdList;
+
+    /**
+     * 部门code
+     */
+    private String departmentCode;
+
+    /**
+     * 岗位code
+     */
+    private String jobCode;
+
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 创建者ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

huimv-smart-management/src/main/java/com/huimv/management/entity/TransferPeriodLogEntity.java

@@ -0,0 +1,60 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 转栏记录表
+ * 
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-18 18:18:52
+ */
+@Data
+@TableName("mgt_transfer_period_log")
+public class TransferPeriodLogEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标
+	 */
+	private String earTag;
+	/**
+	 * 旧栏期
+	 */
+	private String oldPeriod;
+	/**
+	 * 新栏期
+	 */
+	private String newPeriod;
+	/**
+	 * 旧单元
+	 */
+	private String oldUnit;
+	/**
+	 * 新单元
+	 */
+	private String newUnit;
+	/**
+	 * 创建时间
+	 */
+	private Date gmtCreate;
+	/**
+	 * 修改时间
+	 */
+	private Date gmtModified;
+	/**
+	 * 操作人
+	 */
+	private String operatorUsername;
+
+}

huimv-smart-management/src/main/java/com/huimv/management/service/TransferPeriodLogService.java

@@ -0,0 +1,20 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.TransferPeriodLogEntity;
+
+import java.util.Map;
+
+/**
+ * 转栏记录表
+ *
+ * @author yinhao
+ * @email yinhao@163.com
+ * @date 2021-06-18 18:18:52
+ */
+public interface TransferPeriodLogService extends IService<TransferPeriodLogEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.YearPigBaseEntity;
 
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 import java.rmi.MarshalledObject;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,5 +44,7 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
     Integer findByoutFenceStatus(int i, Integer farmId);
 
     void suchStatistics(String startTime, String endTime, Integer farmId);
+
+    void transferPeriod(HashMap<String, Object> map, HttpServletRequest request);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/EmployeeServiceImpl.java

@@ -69,8 +69,8 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
             lambdaQuery.eq(EmployeeEntity::getFarmId,formFarmId);
         }
 
-        List<EmployeeEntity> pastureEntities = employeeDao.selectList(lambdaQuery);
-        return pastureEntities;
+        List<EmployeeEntity> farmEntities = employeeDao.selectList(lambdaQuery);
+        return farmEntities;
     }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PeriodServiceImpl.java

@@ -58,9 +58,9 @@ public class PeriodServiceImpl extends ServiceImpl<PeriodDao, PeriodEntity> impl
     @Override
     public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PeriodEntity> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(PeriodEntity::getPastureId,formFarmId);
-        List<PeriodEntity> pastureEntities = periodDao.selectList(lambdaQuery);
-        return pastureEntities;
+        lambdaQuery.eq(PeriodEntity::getFarmId,formFarmId);
+        List<PeriodEntity> farmEntities = periodDao.selectList(lambdaQuery);
+        return farmEntities;
     }
 
     @Override

huimv-smart-management/src/main/java/com/huimv/management/service/impl/PigstyServiceImpl.java

@@ -57,8 +57,8 @@ public class PigstyServiceImpl extends ServiceImpl<PigstyDao, PigstyEntity> impl
     public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<PigstyEntity> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(PigstyEntity::getFarmId,formFarmId);
-        List<PigstyEntity> pastureEntities = pigstyDao.selectList(lambdaQuery);
-        return pastureEntities;
+        List<PigstyEntity> farmEntities = pigstyDao.selectList(lambdaQuery);
+        return farmEntities;
     }
 
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/TransferPeriodLogServiceImpl.java

@@ -0,0 +1,29 @@
+package com.huimv.management.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.Query;
+
+import com.huimv.management.dao.TransferPeriodLogDao;
+import com.huimv.management.entity.TransferPeriodLogEntity;
+import com.huimv.management.service.TransferPeriodLogService;
+
+
+@Service("transferPeriodLogService")
+public class TransferPeriodLogServiceImpl extends ServiceImpl<TransferPeriodLogDao, TransferPeriodLogEntity> implements TransferPeriodLogService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<TransferPeriodLogEntity> page = this.page(
+                new Query<TransferPeriodLogEntity>().getPage(params),
+                new QueryWrapper<TransferPeriodLogEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/service/impl/UnitServiceImpl.java

@@ -54,16 +54,16 @@ public class UnitServiceImpl extends ServiceImpl<UnitDao, UnitEntity> implements
     public List findAll(Integer formFarmId) {
         LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(UnitEntity::getFarmId, formFarmId);
-        List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
-        return pastureEntities;
+        List<UnitEntity> farmEntities = unitDao.selectList(lambdaQuery);
+        return farmEntities;
     }
 
     @Override
     public List findAllByFarmId(Integer id) {
         LambdaQueryWrapper<UnitEntity> lambdaQuery = Wrappers.lambdaQuery();
         lambdaQuery.eq(UnitEntity::getPigstyId, id);
-        List<UnitEntity> pastureEntities = unitDao.selectList(lambdaQuery);
-        return pastureEntities;
+        List<UnitEntity> farmEntities = unitDao.selectList(lambdaQuery);
+        return farmEntities;
     }
 
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

@@ -1,15 +1,25 @@
 package com.huimv.management.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.common.utils.R;
+import com.huimv.management.dao.PeriodDao;
+import com.huimv.management.dao.UnitDao;
+import com.huimv.management.entity.SysUserEntity;
 import com.huimv.management.entity.YearPigBaseEntity;
 import com.huimv.management.entity.vo.CountOut;
 import com.huimv.management.entity.vo.DrinkingWaterVo;
 import com.huimv.management.entity.vo.PigBaseVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.apache.commons.beanutils.BeanUtils;
 
@@ -23,8 +33,10 @@ import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.Query;
 import com.huimv.management.dao.YearPigBaseDao;
 import com.huimv.management.service.YearPigBaseService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 
-
+import javax.servlet.http.HttpServletRequest;
 
 
 @Service("yearPigBaseService")
@@ -230,4 +242,57 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         List<CountOut> endList  = pigBaseDao.suchStatistics(farmId,wrapper);
         System.out.println(endList);
     }
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value("${user.info.url}")
+    private String url;
+
+    @Autowired
+    private PeriodDao periodDao;
+
+    @Autowired
+    private UnitDao unitDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void transferPeriod(HashMap<String, Object> map, HttpServletRequest request) {
+
+        String token = request.getHeader("token");
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token",token);
+        HttpEntity httpEntity = new HttpEntity<>(null,headers);
+
+        ResponseEntity<R> responseEntity = restTemplate.exchange(url, HttpMethod.GET,httpEntity, R.class);
+        R sysUserEntity = responseEntity.getBody();
+        String jsonString = JSONObject.toJSONString(sysUserEntity.get("user"));
+        SysUserEntity user = JSONObject.parseObject(jsonString,SysUserEntity.class);
+
+        String username = user.getUsername();
+        System.out.println(username);
+
+        List<String> earTagList = (List<String>) map.get("earTagList");
+        Integer periodId = (Integer) map.get("periodId");
+        System.out.println(earTagList);
+        System.out.println(periodId);
+        LambdaQueryWrapper<YearPigBaseEntity> queryWrapper = Wrappers.lambdaQuery();
+        UpdateWrapper updateWrapper = new UpdateWrapper();
+        for (String earTag : earTagList) {
+
+            queryWrapper.eq(YearPigBaseEntity::getEartag,earTag);
+            YearPigBaseEntity oldEntity = baseMapper.selectOne(queryWrapper);
+            queryWrapper.clear();
+
+            Integer oldPeriodId = oldEntity.getPeriodId();
+            String oldPeroidName = periodDao.selectById(oldPeriodId).getNumber();
+            Integer oldUnitId = oldEntity.getUnitId();
+            String oldUnitName = unitDao.selectById(oldUnitId).getNumber();
+
+
+//            update()
+        }
+
+    }
 }

huimv-smart-management/src/main/resources/application.properties

@@ -1,2 +1,3 @@
 # \u73AF\u5883 dev|test|prod
-spring.profiles.active=dev
+spring.profiles.active=dev
+user.info.url=http://192.168.1.57:88/api/sys/user/info

huimv-smart-management/src/main/resources/mapper/management/FarmDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.huimv.management.dao.PastureDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.huimv.management.entity.FarmEntity" id="pastureMap">
+    <resultMap type="com.huimv.management.entity.FarmEntity" id="farmMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="location" column="location"/>

huimv-smart-management/src/main/resources/mapper/management/PeriodDao.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="number" column="number"/>
         <result property="pigstyId" column="pigsty_id"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>

huimv-smart-management/src/main/resources/mapper/management/PigstyDao.xml

@@ -7,7 +7,7 @@
     <resultMap type="com.huimv.management.entity.PigstyEntity" id="pigstyMap">
         <result property="id" column="id"/>
         <result property="number" column="number"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="feederId" column="feeder_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>

huimv-smart-management/src/main/resources/mapper/management/TransferPeriodLogDao.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.management.dao.TransferPeriodLogDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.TransferPeriodLogEntity" id="transferPeriodLogMap">
+        <result property="id" column="id"/>
+        <result property="earTag" column="ear_tag"/>
+        <result property="oldPeriod" column="old_period"/>
+        <result property="newPeriod" column="new_period"/>
+        <result property="oldUnit" column="old_unit"/>
+        <result property="newUnit" column="new_unit"/>
+        <result property="gmtCreate" column="gmt_create"/>
+        <result property="gmtModified" column="gmt_modified"/>
+        <result property="operatorUsername" column="operator_username"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-management/src/main/resources/mapper/management/UnitDao.xml

@@ -8,7 +8,7 @@
         <result property="id" column="id"/>
         <result property="number" column="number"/>
         <result property="pigstyId" column="pigsty_id"/>
-        <result property="pastureId" column="pasture_id"/>
+        <result property="farmId" column="farm_id"/>
         <result property="deleted" column="deleted"/>
         <result property="gmtCreate" column="gmt_create"/>
         <result property="gmtModified" column="gmt_modified"/>