Commit 26c69007 authored by zhuangzhuang's avatar zhuangzhuang

3.14--修改bug(导包错误)

parent d20727dd
...@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean; ...@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
@ConfigurationProperties(prefix = "witium.influxdb") @ConfigurationProperties(prefix = "tdl.influxdb")
public class Influxdbconfig { public class Influxdbconfig {
private String user; private String user;
......
...@@ -4,7 +4,7 @@ import com.example.tdl.domain.dto.CommFeedback; ...@@ -4,7 +4,7 @@ import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.*; import com.example.tdl.domain.vo.*;
import com.example.tdl.service.GatewayService; import com.example.tdl.service.GatewayService;
import com.example.tdl.service.ProbesService; import com.example.tdl.service.ProbesService;
import com.example.tdl.service.TokenRedisService; import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory; ...@@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
@RestController @RestController
......
...@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject; ...@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.example.tdl.domain.dto.CommFeedback; import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.AddTopicConfigVo; import com.example.tdl.domain.vo.AddTopicConfigVo;
import com.example.tdl.domain.vo.ResultTopicConfigVo; import com.example.tdl.domain.vo.ResultTopicConfigVo;
import com.example.tdl.service.TokenRedisService;
import com.example.tdl.service.TopicConfigService; import com.example.tdl.service.TopicConfigService;
import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
@RestController @RestController
......
...@@ -6,8 +6,9 @@ import com.example.tdl.domain.vo.DelTopicVo; ...@@ -6,8 +6,9 @@ import com.example.tdl.domain.vo.DelTopicVo;
import com.example.tdl.domain.vo.GatewaySNAndTypeVo; import com.example.tdl.domain.vo.GatewaySNAndTypeVo;
import com.example.tdl.domain.vo.UpdateTopicVo; import com.example.tdl.domain.vo.UpdateTopicVo;
import com.example.tdl.service.GatewayService; import com.example.tdl.service.GatewayService;
import com.example.tdl.service.TokenRedisService;
import com.example.tdl.service.TopicService; import com.example.tdl.service.TopicService;
import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -21,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -21,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
@RestController @RestController
......
...@@ -50,3 +50,10 @@ tdl.mqtt.clientkey = witcd.pem ...@@ -50,3 +50,10 @@ tdl.mqtt.clientkey = witcd.pem
tdl.mqtt.clientcrt = witcd.crt tdl.mqtt.clientcrt = witcd.crt
# InfluxDB
tdl.influxdb.user = admin
tdl.influxdb.password = Witium37774020
tdl.influxdb.host = http://192.168.1.11:8086
tdl.influxdb.database = original
...@@ -22,15 +22,15 @@ ...@@ -22,15 +22,15 @@
</select> </select>
<!-- 绑定回复--> <!-- 绑定回复-->
<update id="bindiSuccess" parameterType="String"> <update id="bindiSuccess">
update config set resp=#{resp,jdbcTpye=INTEGER},flag=true update config set resp=#{resp,jdbcType=INTEGER},flag=true
where gSN= #{gSN,jdbcType=VARCHAR} where gSN= #{gSN,jdbcType=VARCHAR}
and gType=#{gType,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR}
and state = 1; and state = 1;
</update> </update>
<update id="updateConfig"> <update id="updateConfig">
update config set untie=#{untie,jdbcTpye=INTEGER} update config set untie=#{untie,jdbcType=INTEGER}
where gSN= #{gSN,jdbcType=VARCHAR} where gSN= #{gSN,jdbcType=VARCHAR}
and gType=#{gType,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR}
and state = 1; and state = 1;
......
...@@ -46,6 +46,5 @@ ...@@ -46,6 +46,5 @@
<mapper resource="mapper/ProbesMapper.xml"/> <mapper resource="mapper/ProbesMapper.xml"/>
<mapper resource="mapper/TopicMapper.xml"/> <mapper resource="mapper/TopicMapper.xml"/>
<mapper resource="mapper/TopicConfigMapper.xml"/> <mapper resource="mapper/TopicConfigMapper.xml"/>
</mappers> </mappers>
</configuration> </configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment