Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sample-form-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
赵啸非
sample-form-platform
Commits
4e6670e5
Commit
4e6670e5
authored
Nov 14, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分权限
parent
597cce4f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
sample-form-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinServiceImpl.java
...mortals/xhx/module/skin/service/impl/SkinServiceImpl.java
+15
-6
sample-form-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinController.java
.../java/com/mortals/xhx/module/skin/web/SkinController.java
+1
-1
No files found.
sample-form-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinServiceImpl.java
View file @
4e6670e5
...
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.fasterxml.jackson.annotation.JsonAlias
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.xhx.common.code.SourceType
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.pdu.RespData
;
import
com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu
;
...
...
@@ -74,8 +75,8 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
SkinEntity
skinEntity
=
new
SkinEntity
();
skinEntity
.
initAttrValue
();
//存相对地址
newSkin
.
setCssFilePath
(
"/
"
+
StrUtil
.
subAfter
(
newSkin
.
getCssFilePath
(),
"/"
,
tru
e
));
newSkin
.
setPreviewImagePath
(
"/
"
+
StrUtil
.
subAfter
(
newSkin
.
getPreviewImagePath
(),
"/"
,
tru
e
));
newSkin
.
setCssFilePath
(
"/
file"
+
StrUtil
.
subAfter
(
newSkin
.
getCssFilePath
(),
"/file"
,
fals
e
));
newSkin
.
setPreviewImagePath
(
"/
file"
+
StrUtil
.
subAfter
(
newSkin
.
getPreviewImagePath
(),
"/file"
,
fals
e
));
BeanUtils
.
copyProperties
(
newSkin
,
skinEntity
,
BeanUtil
.
getNullPropertyNames
(
newSkin
));
return
skinEntity
;
}).
collect
(
Collectors
.
toList
());
...
...
@@ -113,10 +114,10 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
}).
filter
(
f
->
f
!=
null
).
collect
(
Collectors
.
toList
());
//
if (!ObjectUtils.isEmpty(updateSkinLsit)) {
//
log.info("皮肤更新,size:{}", updateSkinLsit.size());
// skinService
.update(updateSkinLsit);
//
}
if
(!
ObjectUtils
.
isEmpty
(
updateSkinLsit
))
{
log
.
info
(
"皮肤更新,size:{}"
,
updateSkinLsit
.
size
());
this
.
update
(
updateSkinLsit
);
}
if
(!
ObjectUtils
.
isEmpty
(
saveSkinList
))
{
log
.
info
(
"皮肤新增,size:{}"
,
saveSkinList
.
size
());
...
...
@@ -131,4 +132,12 @@ public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity
}
}
}
public
static
void
main
(
String
[]
args
)
{
// boolean b = StrUtil.subPre("http://192.168.0.98:11078/file/fileupload/1699947376437.png", "/file");
// System.out.println(b);
String
subAfter
=
StrUtil
.
subAfter
(
"http://192.168.0.98:11078/file/fileupload/1699947376437.png"
,
"/file"
,
false
);
System
.
out
.
println
(
subAfter
);
}
}
\ No newline at end of file
sample-form-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinController.java
View file @
4e6670e5
...
...
@@ -72,7 +72,7 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic
//推送皮肤更新消息
DeviceMsgReqPdu
deviceMsgReqPdu
=
new
DeviceMsgReqPdu
();
deviceMsgReqPdu
.
setSiteid
(
entity
.
getSiteId
());
deviceMsgReqPdu
.
setProductCode
(
"
td
j"
);
deviceMsgReqPdu
.
setProductCode
(
"
yb
j"
);
deviceMsgReqPdu
.
setMessageType
(
"edition"
);
deviceMsgReqPdu
.
setData
(
"W10="
);
deviceMsgReqPdu
.
setTimestamp
(
System
.
currentTimeMillis
());
...
...
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