Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
f987bf7e
Commit
f987bf7e
authored
Feb 13, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改远程ip地址
parent
ef0d21c2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
19 deletions
+91
-19
device-manager/db/base.sql
device-manager/db/base.sql
+6
-8
device-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java
...om/mortals/xhx/base/system/param/web/ParamController.java
+84
-10
device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java
...r/src/main/java/com/mortals/xhx/common/key/ErrorCode.java
+1
-1
No files found.
device-manager/db/base.sql
View file @
f987bf7e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
device-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java
View file @
f987bf7e
...
@@ -2,28 +2,26 @@ package com.mortals.xhx.base.system.param.web;
...
@@ -2,28 +2,26 @@ package com.mortals.xhx.base.system.param.web;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.RepeatSubmit
;
import
com.alibaba.nacos.common.utils.IpUtils
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.common.code.PageDisplayType
;
import
com.mortals.framework.common.code.PageDisplayType
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.util.FileUtil
;
import
com.mortals.framework.util.FileUtil
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.mortals.framework.web.BaseCRUDJsonMappingController
;
import
com.mortals.xhx.base.system.param.model.ParamEntity
;
import
com.mortals.xhx.base.system.param.model.ParamEntity
;
import
com.mortals.xhx.base.system.param.model.ParamQuery
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.DataSatusEnum
;
import
com.mortals.xhx.common.code.DataSatusEnum
;
import
com.mortals.xhx.common.code.ModStatusEnum
;
import
com.mortals.xhx.common.code.ModStatusEnum
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
Constant
.
PARAM_SERVER_HTTP_URL
;
/**
/**
* 参数信息
* 参数信息
*
*
...
@@ -49,6 +47,82 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
...
@@ -49,6 +47,82 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
model
.
put
(
KEY_RESULT_DICT
,
status
);
model
.
put
(
KEY_RESULT_DICT
,
status
);
}
}
@RequestMapping
(
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
},
value
=
"key"
)
@UnAuth
public
String
getValueByKey
(
@RequestParam
(
name
=
"key"
)
String
key
)
{
JSONObject
jsonObject
=
new
JSONObject
();
String
busiDesc
=
"通过key查询参数值"
+
this
.
getModuleDesc
();
try
{
String
value
=
this
.
service
.
getValueByKey
(
key
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
value
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
busiDesc
+
"成功!"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"获取异常"
,
e
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
super
.
convertException
(
e
));
}
return
jsonObject
.
toJSONString
();
}
@RequestMapping
(
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
},
value
=
"dict"
)
@UnAuth
public
String
getDict
(
@RequestParam
(
name
=
"first"
)
String
first
,
@RequestParam
(
name
=
"second"
)
String
second
)
{
JSONObject
jsonObject
=
new
JSONObject
();
String
busiDesc
=
"通过key查询字典参数值"
+
this
.
getModuleDesc
();
try
{
Map
<
String
,
String
>
dict
=
this
.
service
.
getParamBySecondOrganize
(
first
,
second
);
// String value = this.service.getValueByKey(key);
jsonObject
.
put
(
KEY_RESULT_DATA
,
dict
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
busiDesc
+
"成功!"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"获取异常"
,
e
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
super
.
convertException
(
e
));
}
return
jsonObject
.
toJSONString
();
}
/**
* 更新终端访问服务器应用ip地址
*/
@GetMapping
(
value
=
"updateServerIp"
)
@UnAuth
public
String
updateServerip
(
String
serverIp
)
{
JSONObject
jsonObject
=
new
JSONObject
();
try
{
//校验ip地址
boolean
ipv4
=
IpUtils
.
isIpv4
(
serverIp
);
if
(!
ipv4
)
{
throw
new
AppException
(
"请输入正确的ip地址"
);
}
ParamQuery
paramQuery
=
new
ParamQuery
();
paramQuery
.
setParamKey
(
PARAM_SERVER_HTTP_URL
);
ParamEntity
paramEntity
=
this
.
service
.
selectOne
(
paramQuery
);
if
(!
ObjectUtils
.
isEmpty
(
paramEntity
))
{
String
value
=
"http://"
+
serverIp
+
":11078"
;
paramEntity
.
setParamValue
(
value
);
this
.
service
.
update
(
paramEntity
);
}
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
"更新终端访问服务端ip成功!"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"获取异常"
,
e
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
jsonObject
.
put
(
KEY_RESULT_MSG
,
super
.
convertException
(
e
));
}
return
jsonObject
.
toJSONString
();
}
private
Map
<
String
,
Object
>
getPageDisplayType
()
{
private
Map
<
String
,
Object
>
getPageDisplayType
()
{
PageDisplayType
[]
pageDisplayTypes
=
PageDisplayType
.
values
();
PageDisplayType
[]
pageDisplayTypes
=
PageDisplayType
.
values
();
...
...
device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java
View file @
f987bf7e
...
@@ -91,7 +91,7 @@ public interface ErrorCode {
...
@@ -91,7 +91,7 @@ public interface ErrorCode {
public
static
final
String
DEVICE_UNACTIVE_CONTENT
=
"当前设备未激活,请在后台配置后再激活!"
;
public
static
final
String
DEVICE_UNACTIVE_CONTENT
=
"当前设备未激活,请在后台配置后再激活!"
;
public
static
final
int
PLATFORM_IS_EMPTY
=
1005
;
public
static
final
int
PLATFORM_IS_EMPTY
=
1005
;
public
static
final
String
PLATFORM_IS_EMPTY_CONTENT
=
"当前
设备
编码不存在!"
;
public
static
final
String
PLATFORM_IS_EMPTY_CONTENT
=
"当前
平台
编码不存在!"
;
public
static
final
int
PLATFORM_UNEXIST
=
1006
;
public
static
final
int
PLATFORM_UNEXIST
=
1006
;
public
static
final
String
PLATFORM_UNEXIST_CONTENT
=
"当前设备所属产品平台未配置,请在后台配置后再激活!"
;
public
static
final
String
PLATFORM_UNEXIST_CONTENT
=
"当前设备所属产品平台未配置,请在后台配置后再激活!"
;
...
...
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