Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
TDLCloud
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WitCloud
TDLCloud
Commits
26c69007
Commit
26c69007
authored
Mar 14, 2018
by
zhuangzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3.14--修改bug(导包错误)
parent
d20727dd
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
13 deletions
+15
-13
Influxdbconfig.java
src/main/java/com/example/tdl/config/Influxdbconfig.java
+1
-1
ProbesController.java
src/main/java/com/example/tdl/web/ProbesController.java
+1
-3
TopicConfigController.java
src/main/java/com/example/tdl/web/TopicConfigController.java
+1
-2
TopicController.java
src/main/java/com/example/tdl/web/TopicController.java
+2
-3
application.properties
src/main/resources/application.properties
+7
-0
ConfigMapper.xml
src/main/resources/mapper/ConfigMapper.xml
+3
-3
mybatis-config.xml
src/main/resources/mybatis-config.xml
+0
-1
No files found.
src/main/java/com/example/tdl/config/Influxdbconfig.java
View file @
26c69007
...
...
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.Configuration
;
@Configuration
@ConfigurationProperties
(
prefix
=
"
witium
.influxdb"
)
@ConfigurationProperties
(
prefix
=
"
tdl
.influxdb"
)
public
class
Influxdbconfig
{
private
String
user
;
...
...
src/main/java/com/example/tdl/web/ProbesController.java
View file @
26c69007
...
...
@@ -4,7 +4,7 @@ import com.example.tdl.domain.dto.CommFeedback;
import
com.example.tdl.domain.vo.*
;
import
com.example.tdl.service.GatewayService
;
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
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
...
...
@@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@RestController
...
...
src/main/java/com/example/tdl/web/TopicConfigController.java
View file @
26c69007
...
...
@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import
com.example.tdl.domain.dto.CommFeedback
;
import
com.example.tdl.domain.vo.AddTopicConfigVo
;
import
com.example.tdl.domain.vo.ResultTopicConfigVo
;
import
com.example.tdl.service.TokenRedisService
;
import
com.example.tdl.service.TopicConfigService
;
import
com.example.tdl.service.redis.TokenRedisService
;
import
com.google.gson.Gson
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
...
...
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
@RestController
...
...
src/main/java/com/example/tdl/web/TopicController.java
View file @
26c69007
...
...
@@ -6,8 +6,9 @@ import com.example.tdl.domain.vo.DelTopicVo;
import
com.example.tdl.domain.vo.GatewaySNAndTypeVo
;
import
com.example.tdl.domain.vo.UpdateTopicVo
;
import
com.example.tdl.service.GatewayService
;
import
com.example.tdl.service.TokenRedisService
;
import
com.example.tdl.service.TopicService
;
import
com.example.tdl.service.redis.TokenRedisService
;
import
com.google.gson.Gson
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
...
...
@@ -21,9 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@RestController
...
...
src/main/resources/application.properties
View file @
26c69007
...
...
@@ -50,3 +50,10 @@ tdl.mqtt.clientkey = witcd.pem
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
src/main/resources/mapper/ConfigMapper.xml
View file @
26c69007
...
...
@@ -22,15 +22,15 @@
</select>
<!-- 绑定回复-->
<update
id=
"bindiSuccess"
parameterType=
"String"
>
update config set resp=#{resp,jdbcT
py
e=INTEGER},flag=true
<update
id=
"bindiSuccess"
>
update config set resp=#{resp,jdbcT
yp
e=INTEGER},flag=true
where gSN= #{gSN,jdbcType=VARCHAR}
and gType=#{gType,jdbcType=VARCHAR}
and state = 1;
</update>
<update
id=
"updateConfig"
>
update config set untie=#{untie,jdbcT
py
e=INTEGER}
update config set untie=#{untie,jdbcT
yp
e=INTEGER}
where gSN= #{gSN,jdbcType=VARCHAR}
and gType=#{gType,jdbcType=VARCHAR}
and state = 1;
...
...
src/main/resources/mybatis-config.xml
View file @
26c69007
...
...
@@ -46,6 +46,5 @@
<mapper
resource=
"mapper/ProbesMapper.xml"
/>
<mapper
resource=
"mapper/TopicMapper.xml"
/>
<mapper
resource=
"mapper/TopicConfigMapper.xml"
/>
</mappers>
</configuration>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment