From 135e569ea5957732eb0ecd3f98c2264ee617ebe1 Mon Sep 17 00:00:00 2001 From: xce Date: Thu, 8 Jan 2026 03:58:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=BC=95=E5=85=A5mybatisplus=202.mybatisplus=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=E5=9C=A8mybatis=20=20xml=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=20=20vm=E4=BF=AE=E5=A4=8D=203.=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=90=E5=8A=9F=20=E5=88=A4=E6=96=AD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8D=95=E5=BC=95=E5=8F=B7=20=20=E5=9B=A0=E4=B8=BA=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E6=98=AFint=E5=9E=8B=20=20vm?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agri/common/core/domain/BaseEntity.java | 16 ++++- .../framework/config/MybatisPlusHandler.java | 45 ++++++++++++ .../src/main/resources/vm/java/domain.java.vm | 10 ++- .../src/main/resources/vm/java/mapper.java.vm | 3 +- .../main/resources/vm/java/service.java.vm | 4 +- .../resources/vm/java/serviceImpl.java.vm | 27 ++++--- .../main/resources/vm/java/sub-domain.java.vm | 7 +- .../src/main/resources/vm/vue/index.vue.vm | 2 +- .../src/main/resources/vm/xml/mapper.xml.vm | 10 ++- .../SysAgriAlarmRelationController.java | 31 ++++---- .../controller/SysAgriInfoController.java | 2 +- .../controller/SysAgriLimitController.java | 2 +- .../system/domain/SysAgriAlarmRelation.java | 13 +++- .../com/agri/system/domain/SysAgriInfo.java | 37 ++++------ .../com/agri/system/domain/SysAgriLimit.java | 52 +++++--------- .../mapper/SysAgriAlarmRelationMapper.java | 5 +- .../agri/system/mapper/SysAgriInfoMapper.java | 34 ++------- .../system/mapper/SysAgriLimitMapper.java | 5 +- .../service/ISysAgriAlarmRelationService.java | 9 +-- .../system/service/ISysAgriInfoService.java | 9 +-- .../system/service/ISysAgriLimitService.java | 6 +- .../impl/SysAgriAlarmRelationServiceImpl.java | 27 ++++--- .../service/impl/SysAgriInfoServiceImpl.java | 66 ++++------------- .../service/impl/SysAgriLimitServiceImpl.java | 27 ++++--- .../mapper/system/SysAgriInfoMapper.xml | 72 +++---------------- .../mapper/system/SysAgriLimitMapper.xml | 11 ++- 26 files changed, 237 insertions(+), 295 deletions(-) create mode 100644 agri-framework/src/main/java/com/agri/framework/config/MybatisPlusHandler.java diff --git a/agri-common/src/main/java/com/agri/common/core/domain/BaseEntity.java b/agri-common/src/main/java/com/agri/common/core/domain/BaseEntity.java index 0fd795e..4c7740e 100644 --- a/agri-common/src/main/java/com/agri/common/core/domain/BaseEntity.java +++ b/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 params; diff --git a/agri-framework/src/main/java/com/agri/framework/config/MybatisPlusHandler.java b/agri-framework/src/main/java/com/agri/framework/config/MybatisPlusHandler.java new file mode 100644 index 0000000..895c2e5 --- /dev/null +++ b/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()); + } +} \ No newline at end of file diff --git a/agri-generator/src/main/resources/vm/java/domain.java.vm b/agri-generator/src/main/resources/vm/java/domain.java.vm index a20e1a9..9398297 100644 --- a/agri-generator/src/main/resources/vm/java/domain.java.vm +++ b/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,12 +45,15 @@ 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; #end diff --git a/agri-generator/src/main/resources/vm/java/mapper.java.vm b/agri-generator/src/main/resources/vm/java/mapper.java.vm index 7e7d7c2..dde0962 100644 --- a/agri-generator/src/main/resources/vm/java/mapper.java.vm +++ b/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} diff --git a/agri-generator/src/main/resources/vm/java/service.java.vm b/agri-generator/src/main/resources/vm/java/service.java.vm index 264882b..0dbb45d 100644 --- a/agri-generator/src/main/resources/vm/java/service.java.vm +++ b/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} * diff --git a/agri-generator/src/main/resources/vm/java/serviceImpl.java.vm b/agri-generator/src/main/resources/vm/java/serviceImpl.java.vm index 2c5a610..5a4f377 100644 --- a/agri-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/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); } } } diff --git a/agri-generator/src/main/resources/vm/java/sub-domain.java.vm b/agri-generator/src/main/resources/vm/java/sub-domain.java.vm index 0600b60..fcea303 100644 --- a/agri-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/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,12 +33,15 @@ 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; #end diff --git a/agri-generator/src/main/resources/vm/vue/index.vue.vm b/agri-generator/src/main/resources/vm/vue/index.vue.vm index 4155400..9c89837 100644 --- a/agri-generator/src/main/resources/vm/vue/index.vue.vm +++ b/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("新增失败") diff --git a/agri-generator/src/main/resources/vm/xml/mapper.xml.vm b/agri-generator/src/main/resources/vm/xml/mapper.xml.vm index 456755b..9332023 100644 --- a/agri-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/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} #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) $column.columnName, #end #end #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) #{$column.javaField}, #end #end diff --git a/agri-system/src/main/java/com/agri/system/controller/SysAgriAlarmRelationController.java b/agri-system/src/main/java/com/agri/system/controller/SysAgriAlarmRelationController.java index b906dcb..24d5091 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysAgriAlarmRelationController.java +++ b/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 com.agri.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +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") diff --git a/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java b/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java index 4e24ecb..ef8d699 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java +++ b/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") diff --git a/agri-system/src/main/java/com/agri/system/controller/SysAgriLimitController.java b/agri-system/src/main/java/com/agri/system/controller/SysAgriLimitController.java index 28b71c7..946c469 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysAgriLimitController.java +++ b/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") diff --git a/agri-system/src/main/java/com/agri/system/domain/SysAgriAlarmRelation.java b/agri-system/src/main/java/com/agri/system/domain/SysAgriAlarmRelation.java index 7e01b64..dca25b9 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysAgriAlarmRelation.java +++ b/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） */ diff --git a/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java b/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java index 804293d..18fdf84 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java +++ b/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 sysAgriLimitList; - public void setId(Long id) { this.id = id; @@ -204,16 +208,6 @@ public class SysAgriInfo extends BaseEntity return isDeleted; } - public List getSysAgriLimitList() - { - return sysAgriLimitList; - } - - public void setSysAgriLimitList(List 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(); } } diff --git a/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java b/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java index f3fb4cf..9fabc60 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysAgriLimit.java +++ b/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()) diff --git a/agri-system/src/main/java/com/agri/system/mapper/SysAgriAlarmRelationMapper.java b/agri-system/src/main/java/com/agri/system/mapper/SysAgriAlarmRelationMapper.java index 0589d1d..30d4f68 100644 --- a/agri-system/src/main/java/com/agri/system/mapper/SysAgriAlarmRelationMapper.java +++ b/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 { /** * 查询告警方式设置 diff --git a/agri-system/src/main/java/com/agri/system/mapper/SysAgriInfoMapper.java b/agri-system/src/main/java/com/agri/system/mapper/SysAgriInfoMapper.java index 18e074e..ccb8c10 100644 --- a/agri-system/src/main/java/com/agri/system/mapper/SysAgriInfoMapper.java +++ b/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 { /** * 查询大棚管理 @@ -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 sysAgriLimitList); - - - /** - * 通过大棚管理主键删除执行时间限位管理信息 - * - * @param id 大棚管理ID - * @return 结果 - */ - public int deleteSysAgriLimitByAgriId(Long id); } diff --git a/agri-system/src/main/java/com/agri/system/mapper/SysAgriLimitMapper.java b/agri-system/src/main/java/com/agri/system/mapper/SysAgriLimitMapper.java index b52cfcf..e80f891 100644 --- a/agri-system/src/main/java/com/agri/system/mapper/SysAgriLimitMapper.java +++ b/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 { /** * 查询执行时间限位管理 diff --git a/agri-system/src/main/java/com/agri/system/service/ISysAgriAlarmRelationService.java b/agri-system/src/main/java/com/agri/system/service/ISysAgriAlarmRelationService.java index ca70975..c4a1323 100644 --- a/agri-system/src/main/java/com/agri/system/service/ISysAgriAlarmRelationService.java +++ b/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 { /** * 查询告警方式设置 * diff --git a/agri-system/src/main/java/com/agri/system/service/ISysAgriInfoService.java b/agri-system/src/main/java/com/agri/system/service/ISysAgriInfoService.java index 25e4785..8883f04 100644 --- a/agri-system/src/main/java/com/agri/system/service/ISysAgriInfoService.java +++ b/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 { /** * 查询大棚管理 * diff --git a/agri-system/src/main/java/com/agri/system/service/ISysAgriLimitService.java b/agri-system/src/main/java/com/agri/system/service/ISysAgriLimitService.java index 06829bf..4c03484 100644 --- a/agri-system/src/main/java/com/agri/system/service/ISysAgriLimitService.java +++ b/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 { /** * 查询执行时间限位管理 * diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriAlarmRelationServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysAgriAlarmRelationServiceImpl.java index a4b3734..8214e90 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriAlarmRelationServiceImpl.java +++ b/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 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 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); } } diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java index 9b0c209..4b74624 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java +++ b/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 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 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()); - int rows = sysAgriInfoMapper.insertSysAgriInfo(sysAgriInfo); - insertSysAgriLimit(sysAgriInfo); - return rows; + return baseMapper.insertSysAgriInfo(sysAgriInfo); } /** @@ -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()); - insertSysAgriLimit(sysAgriInfo); - return sysAgriInfoMapper.updateSysAgriInfo(sysAgriInfo); + return baseMapper.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 sysAgriInfoMapper.deleteSysAgriInfoByIds(ids); + return baseMapper.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 sysAgriInfoMapper.deleteSysAgriInfoById(id); - } - - /** - * 新增执行时间限位管理信息 - * - * @param sysAgriInfo 大棚管理对象 - */ - public void insertSysAgriLimit(SysAgriInfo sysAgriInfo) - { - List sysAgriLimitList = sysAgriInfo.getSysAgriLimitList(); - Long id = sysAgriInfo.getId(); - if (StringUtils.isNotNull(sysAgriLimitList)) - { - List list = new ArrayList(); - for (SysAgriLimit sysAgriLimit : sysAgriLimitList) - { - sysAgriLimit.setAgriId(id); - list.add(sysAgriLimit); - } - if (list.size() > 0) - { - sysAgriInfoMapper.batchSysAgriLimit(list); - } - } + return baseMapper.deleteSysAgriInfoById(id); } } diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriLimitServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysAgriLimitServiceImpl.java index 4d002e6..52b5239 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriLimitServiceImpl.java +++ b/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 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 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); } } diff --git a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml index 1f65540..dfd77b1 100644 --- a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml @@ -25,33 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ -74,18 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + where id = #{id} - - insert into sys_agri_info @@ -101,10 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" install_time, location, remark, - create_time, - create_by, - update_time, - update_by, + create_time, + create_by, + update_time, + update_by, is_deleted, @@ -120,10 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{installTime}, #{location}, #{remark}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, #{isDeleted}, @@ -162,22 +128,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - - - delete from sys_agri_limit where agri_id in - - #{agriId} - - - - - delete from sys_agri_limit where agri_id = #{agriId} - - - - 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 - - ( #{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}) - - \ No newline at end of file diff --git a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml index c2efede..d621310 100644 --- a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml @@ -21,14 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - 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