1.代码自动生成引入mybatisplus

2.mybatisplus自动填充在mybatis  xml之后  vm修复
3.新增成功 判断去掉单引号  因为后端返回是int型  vm修复

agri-common/src/main/java/com/agri/common/core/domain/BaseEntity.java

@@ -1,12 +1,15 @@
 package com.agri.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * Entity基类
@@ -15,23 +18,29 @@ import com.fasterxml.jackson.annotation.JsonInclude;
  */
 public class BaseEntity implements Serializable
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
     @JsonIgnore
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /** 更新者 */
+    @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
     /** 更新时间 */
+    @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
@@ -39,6 +48,7 @@ public class BaseEntity implements Serializable
     private String remark;
 
     /** 请求参数 */
+    @TableField(exist = false)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 

agri-framework/src/main/java/com/agri/framework/config/MybatisPlusHandler.java

@@ -0,0 +1,45 @@
+package com.agri.framework.config;
+
+import com.agri.common.core.domain.model.LoginUser;
+import com.agri.common.utils.SecurityUtils;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Auther: jone
+ * @Date: 2026/1/8 - 01 - 08 - 0:49
+ * @Description: com.agri.framework.config
+ * @version: 1.0
+ */
+@Component
+public class MybatisPlusHandler implements MetaObjectHandler {
+
+    /**
+     * 获取用户缓存信息
+     */
+    public LoginUser getLoginUser()
+    {
+        return SecurityUtils.getLoginUser();
+    }
+
+    // 插入操作时自动填充
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        // 填充创建时间（字段名：createTime，值：当前时间）
+        this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
+        // 示例：填充创建人（假设从上下文获取当前用户ID）
+        this.strictInsertFill(metaObject, "createBy", String.class, getLoginUser().getUsername());
+    }
+
+    // 更新操作时自动填充
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        // 填充更新时间（字段名：updateTime，值：当前时间）
+        this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
+        // 示例：填充更新人
+        this.strictUpdateFill(metaObject, "updateBy", String.class, getLoginUser().getUsername());
+    }
+}

agri-generator/src/main/resources/vm/java/domain.java.vm

@@ -3,8 +3,11 @@ package ${packageName}.domain;
 #foreach ($import in $importList)
 import ${import};
 #end
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.agri.common.annotation.Excel;
 #if($table.crud || $table.sub)
 import com.agri.common.core.domain.BaseEntity;
@@ -23,8 +26,10 @@ import com.agri.common.core.domain.TreeEntity;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
+@TableName("${tableName}")
 public class ${ClassName} extends ${Entity}
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
@@ -40,11 +45,14 @@ public class ${ClassName} extends ${Entity}
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
     @Excel(name = "${comment}")
 #end
+#end
+    #if($column.javaField == 'version')
+    @Version
     #end
     private $column.javaType $column.javaField;
 

agri-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import ${packageName}.domain.${ClassName};
 #if($table.sub)
 import ${packageName}.domain.${subClassName};
@@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
 {
     /**
      * 查询${functionName}

agri-generator/src/main/resources/vm/java/service.java.vm

@@ -1,6 +1,7 @@
 package ${packageName}.service;
 
 import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import ${packageName}.domain.${ClassName};
 
 /**
@@ -9,8 +10,7 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
+public interface I${ClassName}Service  extends IService<${ClassName}> {
-{
     /**
      * 查询${functionName}
      * 

agri-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 #if($table.sub)
 import java.util.ArrayList;
 import com.agri.common.utils.StringUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 import ${packageName}.domain.${subClassName};
 #end
@@ -26,10 +27,8 @@ import ${packageName}.service.I${ClassName}Service;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
+public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service 
 {
-    @Autowired
-    private ${ClassName}Mapper ${className}Mapper;
 
     /**
      * 查询${functionName}
@@ -40,7 +39,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Override
     public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
     {
-        return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return baseMapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 
     /**
@@ -52,7 +51,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Override
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
     {
-        return ${className}Mapper.select${ClassName}List(${className});
+        return baseMapper.select${ClassName}List(${className});
     }
 
     /**
@@ -73,11 +72,11 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 #end
 #end
 #if($table.sub)
-        int rows = ${className}Mapper.insert${ClassName}(${className});
+        int rows = baseMapper.insert${ClassName}(${className});
         insert${subClassName}(${className});
         return rows;
 #else
-        return ${className}Mapper.insert${ClassName}(${className});
+        return baseMapper.insert${ClassName}(${className});
 #end
     }
 
@@ -99,10 +98,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 #end
 #end
 #if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        baseMapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
         insert${subClassName}(${className});
 #end
-        return ${className}Mapper.update${ClassName}(${className});
+        return baseMapper.update${ClassName}(${className});
     }
 
     /**
@@ -118,9 +117,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
 #if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
+        baseMapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
+        return baseMapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
     }
 
     /**
@@ -136,9 +135,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
     {
 #if($table.sub)
-        ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
+        baseMapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
-        return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return baseMapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 #if($table.sub)
 
@@ -161,7 +160,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
             }
             if (list.size() > 0)
             {
-                ${className}Mapper.batch${subClassName}(list);
+                baseMapper.batch${subClassName}(list);
             }
         }
     }

agri-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -14,8 +14,10 @@ import com.agri.common.core.domain.BaseEntity;
  * @author ${author}
  * @date ${datetime}
  */
+@TableName("${subTableName}")
 public class ${subClassName} extends BaseEntity
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $subTable.columns)
@@ -31,11 +33,14 @@ public class ${subClassName} extends BaseEntity
 #if($parentheseIndex != -1)
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
 #else
     @Excel(name = "${comment}")
 #end
+#end
+    #if($column.javaField == 'version')
+    @Version
     #end
     private $column.javaType $column.javaField;
 

agri-generator/src/main/resources/vm/vue/index.vue.vm

@@ -556,7 +556,7 @@ export default {
             })
           } else {
             add${BusinessName}(this.form).then(response => {
-                if (response.code==='200') {
+                if (response.code===200) {
                   this.#[[$modal]]#.msgSuccess("新增成功")
                 } else {
                   this.#[[$modal]]#.msgError("新增失败")

agri-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -81,14 +81,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+#if($column.columnName=="create_by" || $column.columnName=="create_time" ||
+    $column.columnName=="update_by" || $column.columnName=="update_time")
+    $column.columnName,
+#elseif($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
             <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
 #end
 #end
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
+    #if($column.columnName=="create_by" || $column.columnName=="create_time" ||
+        $column.columnName=="update_by" || $column.columnName=="update_time")
+        #{$column.javaField},
+    #elseif($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
             <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
 #end
 #end

agri-system/src/main/java/com/agri/system/controller/SysAgriAlarmRelationController.java

@@ -1,31 +1,32 @@
 package com.agri.system.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
 import com.agri.common.annotation.Log;
 import com.agri.common.core.controller.BaseController;
 import com.agri.common.core.domain.AjaxResult;
+import com.agri.common.core.page.TableDataInfo;
 import com.agri.common.enums.BusinessType;
+import com.agri.common.utils.poi.ExcelUtil;
 import com.agri.system.domain.SysAgriAlarmRelation;
 import com.agri.system.service.ISysAgriAlarmRelationService;
-import com.agri.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.agri.common.core.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 告警方式设置Controller
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @RestController
 @RequestMapping("/assets/alarm")

agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java

@@ -26,7 +26,7 @@ import java.util.List;
  * 大棚管理Controller
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @RestController
 @RequestMapping("/assets/agri")

agri-system/src/main/java/com/agri/system/controller/SysAgriLimitController.java

@@ -25,7 +25,7 @@ import com.agri.common.core.page.TableDataInfo;
  * 执行时间限位管理Controller
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @RestController
 @RequestMapping("/assets/limit")

agri-system/src/main/java/com/agri/system/domain/SysAgriAlarmRelation.java

@@ -1,21 +1,28 @@
 package com.agri.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.agri.common.annotation.Excel;
 import com.agri.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 告警方式设置对象 sys_agri_alarm_relation
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
+@TableName("sys_agri_alarm_relation")
 public class SysAgriAlarmRelation extends BaseEntity
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
+    @JsonSerialize(using = ToStringSerializer.class) // 一键转字符串
     private Long id;
 
     /** 关联大棚设备表ID（sys_agri_info.id） */

agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java

@@ -1,25 +1,32 @@
 package com.agri.system.domain;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.agri.common.annotation.Excel;
 import com.agri.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 大棚管理对象 sys_agri_info
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
+@TableName("sys_agri_info")
 public class SysAgriInfo extends BaseEntity
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 设备IMEI */
@@ -59,7 +66,7 @@ public class SysAgriInfo extends BaseEntity
     private Integer deviceStatus;
 
     /** 安装时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date installTime;
 
@@ -71,9 +78,6 @@ public class SysAgriInfo extends BaseEntity
     @Excel(name = "逻辑删除(0-未删，1-已删)")
     private Integer isDeleted;
 
-    /** 执行时间限位管理信息 */
-    private List<SysAgriLimit> sysAgriLimitList;
-
     public void setId(Long id) 
     {
         this.id = id;
@@ -204,16 +208,6 @@ public class SysAgriInfo extends BaseEntity
         return isDeleted;
     }
 
-    public List<SysAgriLimit> getSysAgriLimitList()
-    {
-        return sysAgriLimitList;
-    }
-
-    public void setSysAgriLimitList(List<SysAgriLimit> sysAgriLimitList)
-    {
-        this.sysAgriLimitList = sysAgriLimitList;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -235,7 +229,6 @@ public class SysAgriInfo extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("updateBy", getUpdateBy())
             .append("isDeleted", getIsDeleted())
-            .append("sysAgriLimitList", getSysAgriLimitList())
             .toString();
     }
 }

agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java

@@ -1,23 +1,32 @@
 package com.agri.system.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.agri.common.annotation.Excel;
 import com.agri.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 执行时间限位管理对象 sys_agri_limit
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
+@TableName("sys_agri_limit")
 public class SysAgriLimit extends BaseEntity
 {
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private String id;
 
     /** 大棚ID（如IMEI/自定义编号） */
@@ -66,18 +75,15 @@ public class SysAgriLimit extends BaseEntity
 
     /** 数据版本号（乐观锁） */
     @Excel(name = "数据版本号", readConverterExp = "乐=观锁")
+    @Version
     private String version;
 
-    /** 修改人ID */
-    @Excel(name = "修改人ID")
-    private String updateId;
-
     /** 删除标识：0-未删 1-已删 */
     @Excel(name = "删除标识：0-未删 1-已删")
     private String deleted;
 
     /** 删除时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deleteTime;
 
@@ -90,7 +96,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return id;
     }
-
     public void setAgriId(Long agriId) 
     {
         this.agriId = agriId;
@@ -100,7 +105,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return agriId;
     }
-
     public void setAgriName(String agriName) 
     {
         this.agriName = agriName;
@@ -110,7 +114,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return agriName;
     }
-
     public void setImei(String imei) 
     {
         this.imei = imei;
@@ -120,7 +123,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return imei;
     }
-
     public void setJbkLimit(String jbkLimit) 
     {
         this.jbkLimit = jbkLimit;
@@ -130,7 +132,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jbkLimit;
     }
-
     public void setJbgLimit(String jbgLimit) 
     {
         this.jbgLimit = jbgLimit;
@@ -140,7 +141,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jbgLimit;
     }
-
     public void setJm1kLimit(String jm1kLimit) 
     {
         this.jm1kLimit = jm1kLimit;
@@ -150,7 +150,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm1kLimit;
     }
-
     public void setJm1gLimit(String jm1gLimit) 
     {
         this.jm1gLimit = jm1gLimit;
@@ -160,7 +159,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm1gLimit;
     }
-
     public void setJm2kLimit(String jm2kLimit) 
     {
         this.jm2kLimit = jm2kLimit;
@@ -170,7 +168,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm2kLimit;
     }
-
     public void setJm2gLimit(String jm2gLimit) 
     {
         this.jm2gLimit = jm2gLimit;
@@ -180,7 +177,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm2gLimit;
     }
-
     public void setJm3kLimit(String jm3kLimit) 
     {
         this.jm3kLimit = jm3kLimit;
@@ -190,7 +186,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm3kLimit;
     }
-
     public void setJm3gLimit(String jm3gLimit) 
     {
         this.jm3gLimit = jm3gLimit;
@@ -200,7 +195,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return jm3gLimit;
     }
-
     public void setVersion(String version) 
     {
         this.version = version;
@@ -210,17 +204,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return version;
     }
-
-    public void setUpdateId(String updateId) 
-    {
-        this.updateId = updateId;
-    }
-
-    public String getUpdateId() 
-    {
-        return updateId;
-    }
-
     public void setDeleted(String deleted) 
     {
         this.deleted = deleted;
@@ -230,7 +213,6 @@ public class SysAgriLimit extends BaseEntity
     {
         return deleted;
     }
-
     public void setDeleteTime(Date deleteTime) 
     {
         this.deleteTime = deleteTime;
@@ -260,7 +242,7 @@ public class SysAgriLimit extends BaseEntity
             .append("version", getVersion())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
-            .append("updateId", getUpdateId())
+            .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("deleted", getDeleted())
             .append("deleteTime", getDeleteTime())

agri-system/src/main/java/com/agri/system/mapper/SysAgriAlarmRelationMapper.java

@@ -1,15 +1,16 @@
 package com.agri.system.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.agri.system.domain.SysAgriAlarmRelation;
 
 /**
  * 告警方式设置Mapper接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface SysAgriAlarmRelationMapper 
+public interface SysAgriAlarmRelationMapper extends BaseMapper<SysAgriAlarmRelation>
 {
     /**
      * 查询告警方式设置

agri-system/src/main/java/com/agri/system/mapper/SysAgriInfoMapper.java

@@ -1,16 +1,17 @@
 package com.agri.system.mapper;
 
-import java.util.List;
 import com.agri.system.domain.SysAgriInfo;
-import com.agri.system.domain.SysAgriLimit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * 大棚管理Mapper接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface SysAgriInfoMapper 
+public interface SysAgriInfoMapper extends BaseMapper<SysAgriInfo>
 {
     /**
      * 查询大棚管理
@@ -59,29 +60,4 @@ public interface SysAgriInfoMapper
      * @return 结果
      */
     public int deleteSysAgriInfoByIds(Long[] ids);
-
-    /**
-     * 批量删除执行时间限位管理
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteSysAgriLimitByAgriIds(Long[] ids);
-    
-    /**
-     * 批量新增执行时间限位管理
-     * 
-     * @param sysAgriLimitList 执行时间限位管理列表
-     * @return 结果
-     */
-    public int batchSysAgriLimit(List<SysAgriLimit> sysAgriLimitList);
-    
-
-    /**
-     * 通过大棚管理主键删除执行时间限位管理信息
-     * 
-     * @param id 大棚管理ID
-     * @return 结果
-     */
-    public int deleteSysAgriLimitByAgriId(Long id);
 }

agri-system/src/main/java/com/agri/system/mapper/SysAgriLimitMapper.java

@@ -1,15 +1,16 @@
 package com.agri.system.mapper;
 
 import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.agri.system.domain.SysAgriLimit;
 
 /**
  * 执行时间限位管理Mapper接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface SysAgriLimitMapper 
+public interface SysAgriLimitMapper extends BaseMapper<SysAgriLimit>
 {
     /**
      * 查询执行时间限位管理

agri-system/src/main/java/com/agri/system/service/ISysAgriAlarmRelationService.java

@@ -1,16 +1,17 @@
 package com.agri.system.service;
 
-import java.util.List;
 import com.agri.system.domain.SysAgriAlarmRelation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
  * 告警方式设置Service接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface ISysAgriAlarmRelationService 
+public interface ISysAgriAlarmRelationService  extends IService<SysAgriAlarmRelation> {
-{
     /**
      * 查询告警方式设置
      * 

agri-system/src/main/java/com/agri/system/service/ISysAgriInfoService.java

@@ -1,16 +1,17 @@
 package com.agri.system.service;
 
-import java.util.List;
 import com.agri.system.domain.SysAgriInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
  * 大棚管理Service接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface ISysAgriInfoService 
+public interface ISysAgriInfoService  extends IService<SysAgriInfo> {
-{
     /**
      * 查询大棚管理
      * 

agri-system/src/main/java/com/agri/system/service/ISysAgriLimitService.java

@@ -1,16 +1,16 @@
 package com.agri.system.service;
 
 import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.agri.system.domain.SysAgriLimit;
 
 /**
  * 执行时间限位管理Service接口
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
-public interface ISysAgriLimitService 
+public interface ISysAgriLimitService  extends IService<SysAgriLimit> {
-{
     /**
      * 查询执行时间限位管理
      * 

agri-system/src/main/java/com/agri/system/service/impl/SysAgriAlarmRelationServiceImpl.java

@@ -1,24 +1,23 @@
 package com.agri.system.service.impl;
 
-import java.util.List;
 import com.agri.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.agri.system.mapper.SysAgriAlarmRelationMapper;
 import com.agri.system.domain.SysAgriAlarmRelation;
+import com.agri.system.mapper.SysAgriAlarmRelationMapper;
 import com.agri.system.service.ISysAgriAlarmRelationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 告警方式设置Service业务层处理
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @Service
-public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationService 
+public class SysAgriAlarmRelationServiceImpl extends ServiceImpl<SysAgriAlarmRelationMapper, SysAgriAlarmRelation> implements ISysAgriAlarmRelationService
 {
-    @Autowired
-    private SysAgriAlarmRelationMapper sysAgriAlarmRelationMapper;
 
     /**
      * 查询告警方式设置
@@ -29,7 +28,7 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     @Override
     public SysAgriAlarmRelation selectSysAgriAlarmRelationById(Long id)
     {
-        return sysAgriAlarmRelationMapper.selectSysAgriAlarmRelationById(id);
+        return baseMapper.selectSysAgriAlarmRelationById(id);
     }
 
     /**
@@ -41,7 +40,7 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     @Override
     public List<SysAgriAlarmRelation> selectSysAgriAlarmRelationList(SysAgriAlarmRelation sysAgriAlarmRelation)
     {
-        return sysAgriAlarmRelationMapper.selectSysAgriAlarmRelationList(sysAgriAlarmRelation);
+        return baseMapper.selectSysAgriAlarmRelationList(sysAgriAlarmRelation);
     }
 
     /**
@@ -54,7 +53,7 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     public int insertSysAgriAlarmRelation(SysAgriAlarmRelation sysAgriAlarmRelation)
     {
         sysAgriAlarmRelation.setCreateTime(DateUtils.getNowDate());
-        return sysAgriAlarmRelationMapper.insertSysAgriAlarmRelation(sysAgriAlarmRelation);
+        return baseMapper.insertSysAgriAlarmRelation(sysAgriAlarmRelation);
     }
 
     /**
@@ -67,7 +66,7 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     public int updateSysAgriAlarmRelation(SysAgriAlarmRelation sysAgriAlarmRelation)
     {
         sysAgriAlarmRelation.setUpdateTime(DateUtils.getNowDate());
-        return sysAgriAlarmRelationMapper.updateSysAgriAlarmRelation(sysAgriAlarmRelation);
+        return baseMapper.updateSysAgriAlarmRelation(sysAgriAlarmRelation);
     }
 
     /**
@@ -79,7 +78,7 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     @Override
     public int deleteSysAgriAlarmRelationByIds(Long[] ids)
     {
-        return sysAgriAlarmRelationMapper.deleteSysAgriAlarmRelationByIds(ids);
+        return baseMapper.deleteSysAgriAlarmRelationByIds(ids);
     }
 
     /**
@@ -91,6 +90,6 @@ public class SysAgriAlarmRelationServiceImpl implements ISysAgriAlarmRelationSer
     @Override
     public int deleteSysAgriAlarmRelationById(Long id)
     {
-        return sysAgriAlarmRelationMapper.deleteSysAgriAlarmRelationById(id);
+        return baseMapper.deleteSysAgriAlarmRelationById(id);
     }
 }

agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java

@@ -1,28 +1,23 @@
 package com.agri.system.service.impl;
 
-import java.util.List;
 import com.agri.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import com.agri.common.utils.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
-import com.agri.system.domain.SysAgriLimit;
-import com.agri.system.mapper.SysAgriInfoMapper;
 import com.agri.system.domain.SysAgriInfo;
+import com.agri.system.mapper.SysAgriInfoMapper;
 import com.agri.system.service.ISysAgriInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 大棚管理Service业务层处理
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @Service
-public class SysAgriInfoServiceImpl implements ISysAgriInfoService 
+public class SysAgriInfoServiceImpl extends ServiceImpl<SysAgriInfoMapper, SysAgriInfo> implements ISysAgriInfoService
 {
-    @Autowired
-    private SysAgriInfoMapper sysAgriInfoMapper;
 
     /**
      * 查询大棚管理
@@ -33,7 +28,7 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
     @Override
     public SysAgriInfo selectSysAgriInfoById(Long id)
     {
-        return sysAgriInfoMapper.selectSysAgriInfoById(id);
+        return baseMapper.selectSysAgriInfoById(id);
     }
 
     /**
@@ -45,7 +40,7 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
     @Override
     public List<SysAgriInfo> selectSysAgriInfoList(SysAgriInfo sysAgriInfo)
     {
-        return sysAgriInfoMapper.selectSysAgriInfoList(sysAgriInfo);
+        return baseMapper.selectSysAgriInfoList(sysAgriInfo);
     }
 
     /**
@@ -54,14 +49,10 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
      * @param sysAgriInfo 大棚管理
      * @return 结果
      */
-    @Transactional
     @Override
     public int insertSysAgriInfo(SysAgriInfo sysAgriInfo)
     {
-        sysAgriInfo.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insertSysAgriInfo(sysAgriInfo);
-        int rows = sysAgriInfoMapper.insertSysAgriInfo(sysAgriInfo);
-        insertSysAgriLimit(sysAgriInfo);
-        return rows;
     }
 
     /**
@@ -70,14 +61,11 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
      * @param sysAgriInfo 大棚管理
      * @return 结果
      */
-    @Transactional
     @Override
     public int updateSysAgriInfo(SysAgriInfo sysAgriInfo)
     {
         sysAgriInfo.setUpdateTime(DateUtils.getNowDate());
-        sysAgriInfoMapper.deleteSysAgriLimitByAgriId(sysAgriInfo.getId());
+        return baseMapper.updateSysAgriInfo(sysAgriInfo);
-        insertSysAgriLimit(sysAgriInfo);
-        return sysAgriInfoMapper.updateSysAgriInfo(sysAgriInfo);
     }
 
     /**
@@ -86,12 +74,10 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
      * @param ids 需要删除的大棚管理主键
      * @return 结果
      */
-    @Transactional
     @Override
     public int deleteSysAgriInfoByIds(Long[] ids)
     {
-        sysAgriInfoMapper.deleteSysAgriLimitByAgriIds(ids);
+        return baseMapper.deleteSysAgriInfoByIds(ids);
-        return sysAgriInfoMapper.deleteSysAgriInfoByIds(ids);
     }
 
     /**
@@ -100,35 +86,9 @@ public class SysAgriInfoServiceImpl implements ISysAgriInfoService
      * @param id 大棚管理主键
      * @return 结果
      */
-    @Transactional
     @Override
     public int deleteSysAgriInfoById(Long id)
     {
-        sysAgriInfoMapper.deleteSysAgriLimitByAgriId(id);
+        return baseMapper.deleteSysAgriInfoById(id);
-        return sysAgriInfoMapper.deleteSysAgriInfoById(id);
-    }
-
-    /**
-     * 新增执行时间限位管理信息
-     * 
-     * @param sysAgriInfo 大棚管理对象
-     */
-    public void insertSysAgriLimit(SysAgriInfo sysAgriInfo)
-    {
-        List<SysAgriLimit> sysAgriLimitList = sysAgriInfo.getSysAgriLimitList();
-        Long id = sysAgriInfo.getId();
-        if (StringUtils.isNotNull(sysAgriLimitList))
-        {
-            List<SysAgriLimit> list = new ArrayList<SysAgriLimit>();
-            for (SysAgriLimit sysAgriLimit : sysAgriLimitList)
-            {
-                sysAgriLimit.setAgriId(id);
-                list.add(sysAgriLimit);
-            }
-            if (list.size() > 0)
-            {
-                sysAgriInfoMapper.batchSysAgriLimit(list);
-            }
-        }
     }
 }

agri-system/src/main/java/com/agri/system/service/impl/SysAgriLimitServiceImpl.java

@@ -1,24 +1,23 @@
 package com.agri.system.service.impl;
 
-import java.util.List;
 import com.agri.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.agri.system.mapper.SysAgriLimitMapper;
 import com.agri.system.domain.SysAgriLimit;
+import com.agri.system.mapper.SysAgriLimitMapper;
 import com.agri.system.service.ISysAgriLimitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 执行时间限位管理Service业务层处理
  * 
  * @author agri
- * @date 2026-01-07
+ * @date 2026-01-08
  */
 @Service
-public class SysAgriLimitServiceImpl implements ISysAgriLimitService 
+public class SysAgriLimitServiceImpl extends ServiceImpl<SysAgriLimitMapper, SysAgriLimit> implements ISysAgriLimitService
 {
-    @Autowired
-    private SysAgriLimitMapper sysAgriLimitMapper;
 
     /**
      * 查询执行时间限位管理
@@ -29,7 +28,7 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     @Override
     public SysAgriLimit selectSysAgriLimitById(String id)
     {
-        return sysAgriLimitMapper.selectSysAgriLimitById(id);
+        return baseMapper.selectSysAgriLimitById(id);
     }
 
     /**
@@ -41,7 +40,7 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     @Override
     public List<SysAgriLimit> selectSysAgriLimitList(SysAgriLimit sysAgriLimit)
     {
-        return sysAgriLimitMapper.selectSysAgriLimitList(sysAgriLimit);
+        return baseMapper.selectSysAgriLimitList(sysAgriLimit);
     }
 
     /**
@@ -54,7 +53,7 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     public int insertSysAgriLimit(SysAgriLimit sysAgriLimit)
     {
         sysAgriLimit.setCreateTime(DateUtils.getNowDate());
-        return sysAgriLimitMapper.insertSysAgriLimit(sysAgriLimit);
+        return baseMapper.insertSysAgriLimit(sysAgriLimit);
     }
 
     /**
@@ -67,7 +66,7 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     public int updateSysAgriLimit(SysAgriLimit sysAgriLimit)
     {
         sysAgriLimit.setUpdateTime(DateUtils.getNowDate());
-        return sysAgriLimitMapper.updateSysAgriLimit(sysAgriLimit);
+        return baseMapper.updateSysAgriLimit(sysAgriLimit);
     }
 
     /**
@@ -79,7 +78,7 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     @Override
     public int deleteSysAgriLimitByIds(String[] ids)
     {
-        return sysAgriLimitMapper.deleteSysAgriLimitByIds(ids);
+        return baseMapper.deleteSysAgriLimitByIds(ids);
     }
 
     /**
@@ -91,6 +90,6 @@ public class SysAgriLimitServiceImpl implements ISysAgriLimitService
     @Override
     public int deleteSysAgriLimitById(String id)
     {
-        return sysAgriLimitMapper.deleteSysAgriLimitById(id);
+        return baseMapper.deleteSysAgriLimitById(id);
     }
 }

agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml

@@ -25,33 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDeleted"    column="is_deleted"    />
     </resultMap>
 
-    <resultMap id="SysAgriInfoSysAgriLimitResult" type="SysAgriInfo" extends="SysAgriInfoResult">
-        <collection property="sysAgriLimitList" ofType="SysAgriLimit" column="id" select="selectSysAgriLimitList" />
-    </resultMap>
-
-    <resultMap type="SysAgriLimit" id="SysAgriLimitResult">
-        <result property="id"    column="id"    />
-        <result property="agriId"    column="agri_id"    />
-        <result property="agriName"    column="agri_name"    />
-        <result property="imei"    column="imei"    />
-        <result property="jbkLimit"    column="jbk_limit"    />
-        <result property="jbgLimit"    column="jbg_limit"    />
-        <result property="jm1kLimit"    column="jm1k_limit"    />
-        <result property="jm1gLimit"    column="jm1g_limit"    />
-        <result property="jm2kLimit"    column="jm2k_limit"    />
-        <result property="jm2gLimit"    column="jm2g_limit"    />
-        <result property="jm3kLimit"    column="jm3k_limit"    />
-        <result property="jm3gLimit"    column="jm3g_limit"    />
-        <result property="remark"    column="remark"    />
-        <result property="version"    column="version"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateId"    column="update_id"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="deleted"    column="deleted"    />
-        <result property="deleteTime"    column="delete_time"    />
-    </resultMap>
-
     <sql id="selectSysAgriInfoVo">
         select id, imei, agri_name, user_id, temp_upper, temp_lower, humi_upper, humi_lower, alarm_status, device_status, install_time, location, remark, create_time, create_by, update_time, update_by, is_deleted from sys_agri_info
     </sql>
@@ -74,18 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectSysAgriInfoById" parameterType="Long" resultMap="SysAgriInfoSysAgriLimitResult">
+    <select id="selectSysAgriInfoById" parameterType="Long" resultMap="SysAgriInfoResult">
-        select id, imei, agri_name, user_id, temp_upper, temp_lower, humi_upper, humi_lower, alarm_status, device_status, install_time, location, remark, create_time, create_by, update_time, update_by, is_deleted
+        <include refid="selectSysAgriInfoVo"/>
-        from sys_agri_info
         where id = #{id}
     </select>
 
-    <select id="selectSysAgriLimitList" resultMap="SysAgriLimitResult">
-        select id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_id, update_time, deleted, delete_time
-        from sys_agri_limit
-        where agri_id = #{agri_id}
-    </select>
-
     <insert id="insertSysAgriInfo" parameterType="SysAgriInfo" useGeneratedKeys="true" keyProperty="id">
         insert into sys_agri_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -101,10 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="installTime != null">install_time,</if>
             <if test="location != null">location,</if>
             <if test="remark != null">remark,</if>
-            <if test="createTime != null">create_time,</if>
+            create_time,
-            <if test="createBy != null">create_by,</if>
+            create_by,
-            <if test="updateTime != null">update_time,</if>
+            update_time,
-            <if test="updateBy != null">update_by,</if>
+            update_by,
             <if test="isDeleted != null">is_deleted,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -120,10 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="installTime != null">#{installTime},</if>
             <if test="location != null">#{location},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="createTime != null">#{createTime},</if>
+            #{createTime},
-            <if test="createBy != null">#{createBy},</if>
+            #{createBy},
-            <if test="updateTime != null">#{updateTime},</if>
+            #{updateTime},
-            <if test="updateBy != null">#{updateBy},</if>
+            #{updateBy},
             <if test="isDeleted != null">#{isDeleted},</if>
          </trim>
     </insert>
@@ -162,22 +128,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-    
-    <delete id="deleteSysAgriLimitByAgriIds" parameterType="String">
-        delete from sys_agri_limit where agri_id in 
-        <foreach item="agriId" collection="array" open="(" separator="," close=")">
-            #{agriId}
-        </foreach>
-    </delete>
-
-    <delete id="deleteSysAgriLimitByAgriId" parameterType="Long">
-        delete from sys_agri_limit where agri_id = #{agriId}
-    </delete>
-
-    <insert id="batchSysAgriLimit">
-        insert into sys_agri_limit( id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_id, update_time, deleted, delete_time) values
-        <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.agriId}, #{item.agriName}, #{item.imei}, #{item.jbkLimit}, #{item.jbgLimit}, #{item.jm1kLimit}, #{item.jm1gLimit}, #{item.jm2kLimit}, #{item.jm2gLimit}, #{item.jm3kLimit}, #{item.jm3gLimit}, #{item.remark}, #{item.version}, #{item.createBy}, #{item.createTime}, #{item.updateId}, #{item.updateTime}, #{item.deleted}, #{item.deleteTime})
-        </foreach>
-    </insert>
 </mapper>

agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml

@@ -21,14 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="version"    column="version"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
-        <result property="updateId"    column="update_id"    />
+        <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deleted"    column="deleted"    />
         <result property="deleteTime"    column="delete_time"    />
     </resultMap>
 
     <sql id="selectSysAgriLimitVo">
-        select id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_id, update_time, deleted, delete_time from sys_agri_limit
+        select id, agri_id, agri_name, imei, jbk_limit, jbg_limit, jm1k_limit, jm1g_limit, jm2k_limit, jm2g_limit, jm3k_limit, jm3g_limit, remark, version, create_by, create_time, update_by, update_time, deleted, delete_time from sys_agri_limit
     </sql>
 
     <select id="selectSysAgriLimitList" parameterType="SysAgriLimit" resultMap="SysAgriLimitResult">
@@ -46,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jm3kLimit != null  and jm3kLimit != ''"> and jm3k_limit = #{jm3kLimit}</if>
             <if test="jm3gLimit != null  and jm3gLimit != ''"> and jm3g_limit = #{jm3gLimit}</if>
             <if test="version != null  and version != ''"> and version = #{version}</if>
-            <if test="updateId != null  and updateId != ''"> and update_id = #{updateId}</if>
             <if test="deleted != null  and deleted != ''"> and deleted = #{deleted}</if>
             <if test="deleteTime != null "> and delete_time = #{deleteTime}</if>
         </where>
@@ -75,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="updateId != null">update_id,</if>
+            <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="deleted != null">deleted,</if>
             <if test="deleteTime != null">delete_time,</if>
@@ -96,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">#{version},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
-            <if test="updateId != null">#{updateId},</if>
+            <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="deleted != null">#{deleted},</if>
             <if test="deleteTime != null">#{deleteTime},</if>
@@ -121,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="version != null">version = #{version},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateId != null">update_id = #{updateId},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="deleted != null">deleted = #{deleted},</if>
             <if test="deleteTime != null">delete_time = #{deleteTime},</if>