于紫祥_1901
2020-11-10 eb9668cfd9e05e06d6571eac389d7a4968354c14
标准公式显示
1 files added
5 files modified
96 ■■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 38 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/entity/DeviceAdjustValueTiming.java 23 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/DeviceAdjustValueTimingService.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java 11 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml 12 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java
@@ -2612,10 +2612,46 @@
        return deviceList;
    }
    @RequestMapping("/getBiaoZhun")
    @ResponseBody
    public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
        List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
        for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
            int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
            String hour = String.valueOf(seconds/3600);
            int millAndSeconds = seconds%3600;
            String mill = String.valueOf(millAndSeconds/60);
            String second = String.valueOf(millAndSeconds%60);
            if (hour.length()<2){
                hour="0"+hour;
            }
            if (mill.length()<2){
                mill="0"+mill;
            }
            if (second.length()<2){
                second="0"+second;
            }
            String time = hour+":"+mill+":"+second;
            Map<String, String> value = deviceAdjustValueTiming.getValue();
            Collection<String> values = value.values();
            deviceAdjustValueTiming.setSeconds(time);
        }
        return dataByDeviceid;
    }
    @RequestMapping("/getSensor")
    @ResponseBody
    public  List<Map<String, Object>> getSensor(String id){
        List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
        return allSensors;
    }
}
    @RequestMapping("/deleteBiaoZhun")
    @ResponseBody
    public int deleteBiaoZhun(String id){
        int i= deviceAdjustValueTimingService.delete(id);
        return i;
    }
}
src/main/java/com/moral/entity/DeviceAdjustValueTiming.java
New file
@@ -0,0 +1,23 @@
package com.moral.entity;
import lombok.Data;
import javax.persistence.Id;
import java.util.Date;
import java.util.Map;
@Data
public class DeviceAdjustValueTiming {
    @Id
    private Integer id;
    private Integer deviceId;
    private String seconds;
    private Map<String,String> value;
    private Date createTime;
    private Date updateTime;
}
src/main/java/com/moral/mapper/DeviceAdjustValueTimingMapper.java
@@ -2,16 +2,20 @@
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.DeviceAdjustValueTiming;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface DeviceAdjustValueTimingMapper{
    Map<String, Object> selectAllByDeviceid(@Param("device_id")Integer device_id);
    List<DeviceAdjustValueTiming> selectAllByDeviceid(@Param("device_id")Integer device_id);
    Map<String, Object> selectAllByDeviceidAndSeconds(@Param("device_id")Integer device_id,@Param("seconds")Integer seconds);
    void insertData(@Param("device_id")Integer device_id,@Param("seconds")Integer seconds,@Param("value")String value,@Param("create_time")String create_time);
    void upDataByDeviceid(@Param("value")String value,@Param("update_time")String update_time,@Param("device_id")Integer device_id);
    int delete(@Param("id")String id);
}
src/main/java/com/moral/service/DeviceAdjustValueTimingService.java
@@ -2,11 +2,15 @@
import com.moral.common.bean.PageBean;
import com.moral.entity.DeviceAdjustValue;
import com.moral.entity.DeviceAdjustValueTiming;
import java.util.List;
import java.util.Map;
public interface DeviceAdjustValueTimingService {
    Map<String, Object> getDataByDeviceid(Integer device_id);
    List<DeviceAdjustValueTiming> getDataByDeviceid(Integer device_id);
    void insertData(int device_id,int seconds,String value);
    int delete(String id);
}
src/main/java/com/moral/service/impl/DeviceAdjustValueTimingServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
import com.moral.entity.DeviceAdjustValueTiming;
import com.moral.mapper.DeviceAdjustValueTimingMapper;
import com.moral.service.DeviceAdjustValueTimingService;
import org.springframework.stereotype.Service;
@@ -7,6 +8,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@Service
public class DeviceAdjustValueTimingServiceImpl implements DeviceAdjustValueTimingService {
@@ -15,8 +17,8 @@
    private DeviceAdjustValueTimingMapper deviceAdjustValueTimingMapper;
    @Override
    public Map<String, Object> getDataByDeviceid(Integer device_id) {
        Map<String, Object> result = deviceAdjustValueTimingMapper.selectAllByDeviceid(device_id);
    public List<DeviceAdjustValueTiming> getDataByDeviceid(Integer device_id) {
        List<DeviceAdjustValueTiming> result = deviceAdjustValueTimingMapper.selectAllByDeviceid(device_id);
        return result;
    }
@@ -35,4 +37,9 @@
            deviceAdjustValueTimingMapper.upDataByDeviceid(value,nowTime,device_id);
        }
    }
    @Override
    public int delete(String id) {
        return deviceAdjustValueTimingMapper.delete(id);
    }
}
src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.DeviceAdjustValueTimingMapper">
    <select id="selectAllByDeviceid" resultType="java.util.Map">
    <resultMap id="BaseResultMap" type="com.moral.entity.DeviceAdjustValueTiming" >
        <id column="id" property="id" jdbcType="INTEGER" />
        <result column="device_id" property="deviceId" jdbcType="INTEGER" />
        <result column="value" jdbcType="OTHER" property="value" javaType="java.util.Map" typeHandler="AdjustValueTypeHandle" />
        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
    </resultMap>
    <delete id="delete">
        delete  from device_adjust_value_timing where id=#{id}
    </delete>
    <select id="selectAllByDeviceid" resultType="com.moral.entity.DeviceAdjustValueTiming" resultMap="BaseResultMap">
        SELECT * FROM device_adjust_value_timing
        WHERE device_id = #{device_id}
    </select>