Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
13887d77
Commit
13887d77
authored
Nov 28, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构部分功能模块
parent
40e59985
Pipeline
#2345
canceled with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
fill-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
...er/src/main/java/com/mortals/xhx/common/key/Constant.java
+2
-9
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
.../java/com/mortals/xhx/module/home/web/HomeController.java
+4
-0
No files found.
fill-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
View file @
13887d77
...
@@ -20,17 +20,10 @@ public final class Constant {
...
@@ -20,17 +20,10 @@ public final class Constant {
/** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */
/** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */
public
final
static
String
BASEMANAGER_VERSION
=
"Z-BASE.MANAGER-S1.0.0"
;
public
final
static
String
BASEMANAGER_VERSION
=
"Z-BASE.MANAGER-S1.0.0"
;
public
final
static
String
Param_materialProperty
=
"materialProperty"
;
public
final
static
String
Param_materialType
=
"materialType"
;
public
final
static
String
Param_isMust
=
"isMust"
;
public
final
static
String
Param_electronicgs
=
"electronicgs"
;
public
final
static
String
Param_materialSource
=
"materialSource"
;
public
final
static
String
Param_paperGg
=
"paperGg"
;
public
final
static
String
Param_jianmMs
=
"jianmMs"
;
public
final
static
String
Param_sealWay
=
"sealWay"
;
public
final
static
String
Param_typeOptions
=
"typeOptions"
;
/** 数字样表机名称 */
/** 数字样表机名称 */
public
final
static
String
PARAMS_PRODUCT_NAME
=
"productName"
;
public
final
static
String
PARAMS_PRODUCT_NAME
=
"productName"
;
public
final
static
String
PARAMS_BLANK_COUNT
=
"blank_count"
;
}
}
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
View file @
13887d77
...
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
...
@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.service.IUser
;
import
com.mortals.framework.service.IUser
;
...
@@ -12,6 +13,7 @@ import com.mortals.framework.util.StringUtils;
...
@@ -12,6 +13,7 @@ import com.mortals.framework.util.StringUtils;
import
com.mortals.framework.web.BaseJsonBodyController
;
import
com.mortals.framework.web.BaseJsonBodyController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.common.key.Constant
;
import
com.mortals.xhx.feign.base.IApiBaseManagerFeign
;
import
com.mortals.xhx.feign.base.IApiBaseManagerFeign
;
import
com.mortals.xhx.feign.base.pdu.DeptPdu
;
import
com.mortals.xhx.feign.base.pdu.DeptPdu
;
import
com.mortals.xhx.feign.base.pdu.SitePdu
;
import
com.mortals.xhx.feign.base.pdu.SitePdu
;
...
@@ -210,6 +212,8 @@ public class HomeController extends BaseJsonBodyController {
...
@@ -210,6 +212,8 @@ public class HomeController extends BaseJsonBodyController {
model
.
put
(
"totalThrift"
,
996
);
//累计节约
model
.
put
(
"totalThrift"
,
996
);
//累计节约
Rest
<
com
.
mortals
.
xhx
.
common
.
pdu
.
site
.
SitePdu
>
info
=
siteFeign
.
info
(
homeQueryPdu
.
getSiteId
());
Rest
<
com
.
mortals
.
xhx
.
common
.
pdu
.
site
.
SitePdu
>
info
=
siteFeign
.
info
(
homeQueryPdu
.
getSiteId
());
model
.
put
(
"title"
,
info
.
getData
().
getSiteName
());
//标题
model
.
put
(
"title"
,
info
.
getData
().
getSiteName
());
//标题
model
.
put
(
"blankCount"
,
GlobalSysInfo
.
getParamIntValue
(
Constant
.
PARAMS_BLANK_COUNT
,
20
));
//空白样表数量
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
model
.
put
(
"message_info"
,
busiDesc
+
"成功"
);
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
this
.
recordSysLog
(
this
.
request
,
busiDesc
+
" 【成功】"
);
}
catch
(
Exception
var9
)
{
}
catch
(
Exception
var9
)
{
...
...
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