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
7b38bd56
Commit
7b38bd56
authored
Jan 04, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加巴中经开区windows shell
parent
c9537f15
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
21 deletions
+27
-21
common-lib/pom.xml
common-lib/pom.xml
+5
-0
common-lib/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java
...b/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java
+1
-0
device-manager/db/base.sql
device-manager/db/base.sql
+18
-15
device-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java
...java/com/mortals/xhx/busiz/web/TestSendMsgController.java
+2
-5
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+1
-1
No files found.
common-lib/pom.xml
View file @
7b38bd56
...
...
@@ -105,6 +105,11 @@
<groupId>
io.micrometer
</groupId>
<artifactId>
micrometer-registry-prometheus
</artifactId>
</dependency>
<dependency>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<scope>
provided
</scope>
</dependency>
</dependencies>
...
...
common-lib/src/main/java/com/mortals/xhx/common/pdu/DeviceReq.java
View file @
7b38bd56
package
com.mortals.xhx.common.pdu
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
device-manager/db/base.sql
View file @
7b38bd56
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/busiz/web/TestSendMsgController.java
View file @
7b38bd56
package
com.mortals.xhx.busiz.web
;
import
cn.hutool.core.codec.Base64
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.http.HttpUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.UnAuth
;
...
...
@@ -17,7 +14,6 @@ import com.mortals.xhx.busiz.rsp.DeviceResp;
import
com.mortals.xhx.common.code.ApiRespCodeEnum
;
import
com.mortals.xhx.common.code.DeviceMethodEnum
;
import
com.mortals.xhx.common.utils.ControllerScanUtil
;
import
com.mortals.xhx.common.utils.ImgUtils
;
import
com.mortals.xhx.module.device.model.DeviceEntity
;
import
com.mortals.xhx.module.device.model.DeviceQuery
;
import
com.mortals.xhx.module.device.service.DeviceService
;
...
...
@@ -30,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.*
;
import
java.io.File
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -215,6 +210,7 @@ public class TestSendMsgController {
public
static
void
main
(
String
[]
args
)
{
/*
String resp = HttpUtil.get("http://59.225.206.13:8331/oauth-pro/admin-pro/sys/randomImage/1675827431800?_t=1675827431");
JSONObject jsonObject = JSON.parseObject(resp);
...
...
@@ -224,6 +220,7 @@ public class TestSendMsgController {
String ocrResult = "F:\\pics\\2-1.jpg";
Base64.decodeToFile(StrUtil.replace(jsonObject.get("result").toString(), "data:image/jpg;base64,", ""), new File(OriginalImg));
ImgUtils.removeBackground(OriginalImg, ocrResult);
*/
// log.info(code);
/*
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
7b38bd56
...
...
@@ -116,7 +116,7 @@ POST {{baseUrl}}/api/register
Content-Type: application/json
{
"deviceCode": "
56-53-54-79-20-wq
"
"deviceCode": "
3C-4E-56-51-7E-72
"
}
###获取产品与
...
...
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