diff --git a/agri-generator/src/main/resources/generator.yml b/agri-generator/src/main/resources/generator.yml index f45011c..5698cd2 100644 --- a/agri-generator/src/main/resources/generator.yml +++ b/agri-generator/src/main/resources/generator.yml @@ -1,7 +1,7 @@ # 代码生成 gen: # 作者 - author: agri + author: lld # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool packageName: com.agri.system # 自动去除表前缀，默认是false 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 946c469..ca81fde 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 @@ -1,25 +1,26 @@ 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.SysAgriLimit; import com.agri.system.service.ISysAgriLimitService; -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 @@ -101,4 +102,14 @@ public class SysAgriLimitController extends BaseController { return toAjax(sysAgriLimitService.deleteSysAgriLimitByIds(ids)); } + + @Log(title = "大棚运行时间限位查询", businessType = BusinessType.SELECT) + @GetMapping("/getAgriByImei/{imei}") + public AjaxResult getAgriByImei(@PathVariable String imei) + { + SysAgriLimit agriLimit = sysAgriLimitService.lambdaQuery().eq(SysAgriLimit::getImei, imei).one(); + + return success(agriLimit); + } + } 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 dca25b9..eeed665 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 @@ -27,6 +27,7 @@ public class SysAgriAlarmRelation extends BaseEntity /** 关联大棚设备表ID（sys_agri_info.id） */ @Excel(name = "关联大棚设备表ID", readConverterExp = "s=ys_agri_info.id") + @JsonSerialize(using = ToStringSerializer.class) private Long agriId; /** imei */ 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 9fabc60..b06b14f 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 @@ -31,6 +31,7 @@ public class SysAgriLimit extends BaseEntity /** 大棚ID（如IMEI/自定义编号） */ @Excel(name = "大棚ID", readConverterExp = "如=IMEI/自定义编号") + @JsonSerialize(using = ToStringSerializer.class) private Long agriId; /** 大棚名称（冗余字段） */ diff --git a/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java b/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java index f92afb1..751eb9a 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java +++ b/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java @@ -1,12 +1,15 @@ package com.agri.system.domain; +import com.agri.common.annotation.Excel; +import com.agri.common.core.domain.BaseEntity; +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; -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; /** * DTU温湿度上报数据对象 sys_dtu_data @@ -27,6 +30,7 @@ public class SysDtuData extends BaseEntity /** 设备上报时间戳(ms或s，建议统一ms) */ @Excel(name = "设备上报时间戳(ms或s，建议统一ms)") + @JsonSerialize(using = ToStringSerializer.class) private Long ts; /** ts转换后的正常时间(由服务端转换入库) */ diff --git a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml index d621310..4d741fe 100644 --- a/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysAgriLimitMapper.xml @@ -72,13 +72,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" jm3g_limit, remark, version, - create_by, - create_time, - update_by, - update_time, + create_by, + create_time, + update_by, + update_time, deleted, delete_time, - + #{agriId}, #{agriName}, @@ -93,10 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jm3gLimit}, #{remark}, #{version}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, #{deleted}, #{deleteTime},