浇水记录
This commit is contained in:
parent
c85c489f89
commit
77b6cc8175
|
|
@ -108,6 +108,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|||
return DateFormatUtils.format(now, "yyyyMMdd");
|
||||
}
|
||||
|
||||
/**
|
||||
* 日期路径 即年/月/日 如20180808
|
||||
*/
|
||||
public static final String getYYYY_MM_DD(Date date)
|
||||
{
|
||||
return DateFormatUtils.format(date, YYYY_MM_DD);
|
||||
}
|
||||
|
||||
/**
|
||||
* 日期型字符串转化为日期 格式
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package com.ruoyi.device.domain;
|
|||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
|
|
@ -25,18 +24,20 @@ public class AsWateringRecord extends BaseEntity
|
|||
/** 设备id */
|
||||
private Long deviceId;
|
||||
|
||||
/** id */
|
||||
private Long id;
|
||||
|
||||
/** 浇水时间（开始时间） */
|
||||
@Excel(name = "浇水时间", readConverterExp = "开=始时间")
|
||||
@Excel(name = "浇水时间", readConverterExp = "开始时间",dateFormat = "yyyy-MM-dd")
|
||||
private Date waterTime;
|
||||
|
||||
/** 启动模式:0-手动模式；1-定时模式；2-土壤湿度低启动 */
|
||||
@Excel(name = "启动模式:0-手动模式；1-定时模式；2-土壤湿度低启动")
|
||||
private String startMode;
|
||||
|
||||
/** 喷洒时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "喷洒时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date sprayingTime;
|
||||
/** 喷洒时间 （秒）*/
|
||||
@Excel(name = "喷洒时间")
|
||||
private Integer sprayingTime;
|
||||
|
||||
/** 脉冲模式：false-关；true-开 */
|
||||
@Excel(name = "脉冲模式：false-关；true-开")
|
||||
|
|
@ -61,4 +62,8 @@ public class AsWateringRecord extends BaseEntity
|
|||
/** 用户账号 */
|
||||
@Excel(name = "用户账号")
|
||||
private String userName;
|
||||
|
||||
/** 浇水情况 */
|
||||
@Excel(name = "浇水情况")
|
||||
private String wateringDesc;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
package com.ruoyi.device.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.device.domain.AsDevice;
|
||||
import com.ruoyi.device.mapper.AsDeviceMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.device.mapper.AsWateringRecordMapper;
|
||||
import com.ruoyi.common.utils.DictUtils;
|
||||
import com.ruoyi.device.domain.AsWateringRecord;
|
||||
import com.ruoyi.device.mapper.AsWateringRecordMapper;
|
||||
import com.ruoyi.device.service.IAsWateringRecordService;
|
||||
import com.ruoyi.system.mapper.SysDictDataMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 浇水记录Service业务层处理
|
||||
|
|
@ -25,6 +23,9 @@ public class AsWateringRecordServiceImpl extends ServiceImpl<AsWateringRecordMap
|
|||
@Resource
|
||||
private AsWateringRecordMapper asWateringRecordMapper;
|
||||
|
||||
@Resource
|
||||
private SysDictDataMapper dictDataMapper;
|
||||
|
||||
/**
|
||||
* 查询浇水记录
|
||||
*
|
||||
|
|
@ -46,7 +47,21 @@ public class AsWateringRecordServiceImpl extends ServiceImpl<AsWateringRecordMap
|
|||
@Override
|
||||
public List<AsWateringRecord> selectAsWateringRecordList(AsWateringRecord asWateringRecord)
|
||||
{
|
||||
return asWateringRecordMapper.selectAsWateringRecordList(asWateringRecord);
|
||||
List<AsWateringRecord> asWateringRecords = asWateringRecordMapper.selectAsWateringRecordList(asWateringRecord);
|
||||
for (AsWateringRecord record :asWateringRecords) {
|
||||
record.setStartMode(DictUtils.getDictLabel("as_start_mode", record.getStartMode()));
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
if("1".equals(record.getPulseMode())){//脉冲模式
|
||||
stringBuilder.append("脉冲模式浇水");
|
||||
}else {
|
||||
stringBuilder.append("普通模式浇水");
|
||||
}
|
||||
Integer sprayingTime = record.getSprayingTime() / 60;
|
||||
stringBuilder.append(sprayingTime+"分钟");
|
||||
record.setWateringDesc(stringBuilder.toString());
|
||||
// record.setWaterTimeStr(DateUtils.getYYYY_MM_DD(record.getWaterTime()));//时间格式化
|
||||
}
|
||||
return asWateringRecords;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<resultMap type="AsWateringRecord" id="AsWateringRecordResult">
|
||||
<result property="deviceId" column="device_id" />
|
||||
<result property="id" column="id" />
|
||||
<result property="waterTime" column="water_time" />
|
||||
<result property="pulseMode" column="pulse_mode" />
|
||||
<result property="pulseModeParam" column="pulse_mode_param" />
|
||||
|
|
@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectAsWateringRecordVo">
|
||||
select device_id, water_time, start_mode, spraying_time, pulse_mode, pulse_mode_param, water_intensity, start_moisture, end_moisture, user_name, create_time from as_watering_record
|
||||
select id,device_id, water_time, start_mode, spraying_time, pulse_mode, pulse_mode_param, water_intensity, start_moisture, end_moisture, user_name, create_time from as_watering_record
|
||||
</sql>
|
||||
|
||||
<select id="selectAsWateringRecordList" parameterType="AsWateringRecord" resultMap="AsWateringRecordResult">
|
||||
|
|
@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<insert id="insertAsWateringRecord" parameterType="AsWateringRecord" useGeneratedKeys="true" keyProperty="deviceId">
|
||||
insert into as_watering_record
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceId != null">device_id,</if>
|
||||
<if test="waterTime != null">water_time,</if>
|
||||
<if test="startMode != null">start_mode,</if>
|
||||
<if test="sprayingTime != null">spraying_time,</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user