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
7b4f8f79
Commit
7b4f8f79
authored
Mar 06, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部署资源添加分辨率字典
parent
6c3f3781
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
device-manager-ui/admin/vue.config.js
device-manager-ui/admin/vue.config.js
+9
-1
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java
...x/module/device/web/DeviceModuleDistributeController.java
+1
-2
No files found.
device-manager-ui/admin/vue.config.js
View file @
7b4f8f79
...
...
@@ -15,10 +15,18 @@ module.exports = {
secure
:
false
},
"
/file
"
:
{
target
:
"
http://192.168.0.98:110
78
"
,
target
:
"
http://192.168.0.98:110
91
"
,
//target: 'http://127.0.0.1:18222',
changeOrigin
:
true
,
},
"
/moudle
"
:
{
target
:
"
http://192.168.0.98:11091
"
,
changeOrigin
:
true
,
logLevel
:
'
debug
'
,
pathRewrite
:{
'
^
'
:
''
}
}
},
},
};
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java
View file @
7b4f8f79
...
...
@@ -11,7 +11,6 @@ import com.mortals.framework.model.OrderCol;
import
com.mortals.framework.util.DataUtil
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.ImageReEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.feign.skin.ISkinBaseFeign
;
import
com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity
;
...
...
@@ -146,7 +145,7 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
ProductEntity
productEntity
=
productService
.
get
(
entity
.
getProductId
(),
context
);
entity
.
setProductCode
(
productEntity
.
getProductCode
());
entity
.
setProductName
(
productEntity
.
getProductName
());
entity
.
setImageResolutionValue
(
ImageReEnum
.
getByValue
(
Integer
.
parseInt
(
entity
.
getImageResolution
())).
getDesc
());
//
entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
//查询新增的是否存在,如果存在 则更新,标准为分辨率+产品
...
...
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