From fb08f21f13a21cbbc84a4c2c5fdafc3168570049 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 13 Jun 2019 15:03:49 +0800
Subject: [PATCH] 校准值 更新
---
src/main/java/com/moral/entity/DeviceAdjustValue.java | 10 +++++-----
src/main/java/com/moral/mapper/type/AdjustValueTypeHandle.java | 23 +++++++++++------------
src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java | 6 +++---
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/entity/DeviceAdjustValue.java b/src/main/java/com/moral/entity/DeviceAdjustValue.java
index 9dbbef4..1fc66db 100644
--- a/src/main/java/com/moral/entity/DeviceAdjustValue.java
+++ b/src/main/java/com/moral/entity/DeviceAdjustValue.java
@@ -1,11 +1,11 @@
package com.moral.entity;
-import lombok.Data;
-
-import javax.persistence.Id;
-import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
+
+import javax.persistence.Id;
+
+import lombok.Data;
@Data
public class DeviceAdjustValue {
@@ -14,7 +14,7 @@
private Integer deviceId;
- private Map<String,Float> value;
+ private Map<String,String> value;
private Date createTime;
diff --git a/src/main/java/com/moral/mapper/type/AdjustValueTypeHandle.java b/src/main/java/com/moral/mapper/type/AdjustValueTypeHandle.java
index d853e1c..5ba83e1 100644
--- a/src/main/java/com/moral/mapper/type/AdjustValueTypeHandle.java
+++ b/src/main/java/com/moral/mapper/type/AdjustValueTypeHandle.java
@@ -1,19 +1,18 @@
package com.moral.mapper.type;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.moral.common.json.BooleanValueFilter;
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.type.MappedJdbcTypes;
-import org.apache.ibatis.type.MappedTypes;
-
import java.sql.CallableStatement;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
/**
* @author fengxiang
@@ -31,16 +30,16 @@
@Override
public Map getNullableResult(ResultSet resultSet, String s) throws SQLException {
- return JSON.parseObject(resultSet.getString(s),new TypeReference<Map<String,Float>>(){});
+ return JSON.parseObject(resultSet.getString(s),new TypeReference<Map<String,String>>(){});
}
@Override
public Map getNullableResult(ResultSet resultSet, int i) throws SQLException {
- return JSON.parseObject(resultSet.getString(i),new TypeReference<Map<String,Float>>(){});
+ return JSON.parseObject(resultSet.getString(i),new TypeReference<Map<String,String>>(){});
}
@Override
public Map getNullableResult(CallableStatement callableStatement, int i) throws SQLException {
- return JSON.parseObject(callableStatement.getString(i),new TypeReference<Map<String,Float>>(){});
+ return JSON.parseObject(callableStatement.getString(i),new TypeReference<Map<String,String>>(){});
}
}
diff --git a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
index 6824615..df6c2f4 100644
--- a/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceAdjustValueServiceImpl.java
@@ -55,11 +55,11 @@
adjustValueMapper.updateByPrimaryKeySelective(adjustValue);
}
// ���������redis
- Map<String,Float> adjustMap = new HashMap<>();
+ Map<String,String> adjustMap = new HashMap<>();
if(adjustValue.getValue()!=null&&!adjustValue.getValue().isEmpty()){
- for(Map.Entry<String,Float> entry:adjustValue.getValue().entrySet()){
+ for(Map.Entry<String,String> entry:adjustValue.getValue().entrySet()){
+ adjustMap.put(entry.getKey(),entry.getValue());
if(entry.getValue()!=null){
- adjustMap.put(entry.getKey(),entry.getValue());
}
}
if(!adjustMap.isEmpty()){
--
Gitblit v1.8.0