Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ryanxhl
spring-mvc-mini
提交
24c7716d
S
spring-mvc-mini
项目概览
Ryanxhl
/
spring-mvc-mini
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-mvc-mini
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
24c7716d
编写于
5月 24, 2016
作者:
J
Jerry Zhang
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5 from DevFactory/release/string-literals-should-not-be-duplicated-fix-1
squid:S1192 - String literals should not be duplicated
上级
43134de2
49f126c1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
26 deletion
+32
-26
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
...va/com/spring/mvc/mini/web/ObjectClassFormController.java
+6
-5
src/main/java/com/spring/mvc/mini/web/ObjectClassesController.java
...java/com/spring/mvc/mini/web/ObjectClassesController.java
+6
-5
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
...java/com/spring/mvc/mini/web/RequestStatusController.java
+14
-12
src/main/java/com/spring/mvc/mini/web/UserInfoFormController.java
.../java/com/spring/mvc/mini/web/UserInfoFormController.java
+6
-4
未找到文件。
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
浏览文件 @
24c7716d
...
...
@@ -36,6 +36,7 @@ import com.spring.mvc.mini.validation.ObjectClassDataValidator;
public
class
ObjectClassFormController
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassFormController
.
class
);
private
static
final
String
MESSAGE
=
"message"
;
@Value
(
"${mail.to}"
)
private
String
mailto
;
...
...
@@ -98,7 +99,7 @@ public class ObjectClassFormController {
Model
model
,
RedirectAttributes
redirectAttrs
)
{
if
(
userinfo
.
getUsername
()
==
null
)
{
model
.
addAttribute
(
"message"
,
"Sorry, Please submit UserInfoForm at first. "
);
model
.
addAttribute
(
MESSAGE
,
"Sorry, Please submit UserInfoForm at first. "
);
return
null
;
}
...
...
@@ -109,7 +110,7 @@ public class ObjectClassFormController {
objectClassDataValidator
.
checkmocrid
(
mocrid
,
requestStatusJsonParser
.
getLatestmocrid
());
}
catch
(
Exception
e
)
{
model
.
addAttribute
(
"message"
,
e
.
toString
());
model
.
addAttribute
(
MESSAGE
,
e
.
toString
());
return
null
;
}
...
...
@@ -135,17 +136,17 @@ public class ObjectClassFormController {
this
.
commitAndSendMail
(
userinfo
,
constructMailSubject
(
mocrid
,
objectClasses
),
constructMailText
(
userinfo
,
mocrid
));
}
catch
(
Exception
e
)
{
model
.
addAttribute
(
"message"
,
e
.
toString
());
model
.
addAttribute
(
MESSAGE
,
e
.
toString
());
return
null
;
}
String
message
=
"MO CR:"
+
mocrid
+
" committed. System will send mail to reviewers."
;
if
(
ajaxRequest
)
{
model
.
addAttribute
(
"message"
,
message
);
model
.
addAttribute
(
MESSAGE
,
message
);
return
null
;
}
else
{
redirectAttrs
.
addFlashAttribute
(
"message"
,
message
);
redirectAttrs
.
addFlashAttribute
(
MESSAGE
,
message
);
return
"redirect:/objectclassform"
;
}
}
...
...
src/main/java/com/spring/mvc/mini/web/ObjectClassesController.java
浏览文件 @
24c7716d
...
...
@@ -26,6 +26,7 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
public
class
ObjectClassesController
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassesController
.
class
);
private
static
final
String
PRODUCT_LIST
=
"productList"
;
@Autowired
private
ObjectClassXMLPaser
objectClassXMLPaser
;
...
...
@@ -45,7 +46,7 @@ public class ObjectClassesController {
PagedListHolder
productList
=
new
PagedListHolder
(
ojbclslist
);
productList
.
setPageSize
(
100
);
model
.
addAttribute
(
"productList"
,
productList
);
model
.
addAttribute
(
PRODUCT_LIST
,
productList
);
return
null
;
}
...
...
@@ -61,7 +62,7 @@ public class ObjectClassesController {
}
@RequestMapping
(
params
=
{
"jumppage"
},
method
=
RequestMethod
.
GET
)
public
String
handleObjectClassPagination
(
Model
model
,
@ModelAttribute
(
"jumppage"
)
String
jumppage
,
@ModelAttribute
(
"productList"
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
)
{
public
String
handleObjectClassPagination
(
Model
model
,
@ModelAttribute
(
"jumppage"
)
String
jumppage
,
@ModelAttribute
(
PRODUCT_LIST
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
)
{
LOG
.
info
(
"@RequestMapping(params={\"jumppage\"}, method = RequestMethod.GET)"
);
if
(
jumppage
!=
null
)
{
...
...
@@ -75,7 +76,7 @@ public class ObjectClassesController {
}
}
model
.
addAttribute
(
"productList"
,
productList
);
model
.
addAttribute
(
PRODUCT_LIST
,
productList
);
return
null
;
}
...
...
@@ -99,13 +100,13 @@ public class ObjectClassesController {
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
=
new
PagedListHolder
(
searchOjbclslist
);
productList
.
setPageSize
(
50
);
model
.
addAttribute
(
"productList"
,
productList
);
model
.
addAttribute
(
PRODUCT_LIST
,
productList
);
return
null
;
}
@RequestMapping
(
method
=
RequestMethod
.
POST
)
public
String
submit
(
Model
model
,
@ModelAttribute
(
"page"
)
String
page
,
@ModelAttribute
(
"productList"
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
,
@ModelAttribute
(
PRODUCT_LIST
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
,
@ModelAttribute
(
"ajaxRequest"
)
boolean
ajaxRequest
,
RedirectAttributes
redirectAttrs
)
{
LOG
.
info
(
"@RequestMapping(method=RequestMethod.POST)"
);
...
...
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
浏览文件 @
24c7716d
...
...
@@ -29,6 +29,8 @@ import com.spring.mvc.mini.pojo.UserInfo;
public
class
RequestStatusController
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
RequestStatusController
.
class
);
private
static
final
String
REQUEST_STATUS
=
"requestStatus"
;
private
static
final
String
MESSAGE
=
"message"
;
@Autowired
private
RequestStatusJsonParser
requestStatusJsonParser
;
...
...
@@ -43,7 +45,7 @@ public class RequestStatusController {
@RequestMapping
(
method
=
RequestMethod
.
GET
)
public
void
handleObjectClassForm
(
Model
model
)
{
model
.
addAttribute
(
"requestStatus"
,
new
RequestStatus
());
model
.
addAttribute
(
REQUEST_STATUS
,
new
RequestStatus
());
}
@RequestMapping
(
params
={
"mocrid"
},
method
=
RequestMethod
.
GET
)
...
...
@@ -55,14 +57,14 @@ public class RequestStatusController {
if
(
mrs
.
getmocrid
()
==
Integer
.
parseInt
(
mocrid
)){
LOGGER
.
debug
(
"mrs.getmocrid() is:"
+
mrs
.
getmocrid
());
model
.
addAttribute
(
"requestStatus"
,
mrs
);
model
.
addAttribute
(
REQUEST_STATUS
,
mrs
);
}
}
}
@RequestMapping
(
method
=
RequestMethod
.
POST
)
public
String
submit
(
@ModelAttribute
(
"requestStatus"
)
RequestStatus
requestStatus
,
public
String
submit
(
@ModelAttribute
(
REQUEST_STATUS
)
RequestStatus
requestStatus
,
@ModelAttribute
(
"ajaxRequest"
)
boolean
ajaxRequest
,
Model
model
,
RedirectAttributes
redirectAttrs
)
{
...
...
@@ -70,11 +72,11 @@ public class RequestStatusController {
ArrayList
<
RequestStatus
>
mrsList
=
requestStatusJsonParser
.
readStatus
();
if
(
isMocridEquals
(
requestStatus
,
model
,
mrsList
)){
model
.
addAttribute
(
"message"
,
"SUCCESS:MO CR ID:"
+
requestStatus
.
getmocrid
()+
" is presenting."
);
model
.
addAttribute
(
MESSAGE
,
"SUCCESS:MO CR ID:"
+
requestStatus
.
getmocrid
()+
" is presenting."
);
return
null
;
}
else
{
model
.
addAttribute
(
"requestStatus"
,
new
RequestStatus
());
model
.
addAttribute
(
"message"
,
"FAILED:MO CR ID:"
+
requestStatus
.
getmocrid
()+
" is not existing."
);
model
.
addAttribute
(
REQUEST_STATUS
,
new
RequestStatus
());
model
.
addAttribute
(
MESSAGE
,
"FAILED:MO CR ID:"
+
requestStatus
.
getmocrid
()+
" is not existing."
);
}
}
...
...
@@ -101,21 +103,21 @@ public class RequestStatusController {
try
{
this
.
commentAndSendMail
(
requestStatuses
.
get
(
index
).
getUserinfo
(),
constructMailSubject
(
requestStatus
),
constructMailText
(
requestStatus
,
requestStatuses
,
index
));
}
catch
(
Exception
e
)
{
model
.
addAttribute
(
"message"
,
e
.
toString
());
model
.
addAttribute
(
MESSAGE
,
e
.
toString
());
return
null
;
}
String
message
=
"Your update was submitted."
;
if
(
ajaxRequest
)
{
model
.
addAttribute
(
"message"
,
message
);
model
.
addAttribute
(
MESSAGE
,
message
);
return
null
;
}
else
{
return
"redirect:/requeststatus"
;
}
}
private
String
constructMailText
(
@ModelAttribute
(
"requestStatus"
)
RequestStatus
requestStatus
,
ArrayList
<
RequestStatus
>
requestStatuses
,
int
index
)
{
private
String
constructMailText
(
@ModelAttribute
(
REQUEST_STATUS
)
RequestStatus
requestStatus
,
ArrayList
<
RequestStatus
>
requestStatuses
,
int
index
)
{
StringBuffer
textsb
=
new
StringBuffer
();
textsb
.
append
(
"New Comments: \r\n"
);
textsb
.
append
(
requestStatus
.
getComments
());
...
...
@@ -133,7 +135,7 @@ public class RequestStatusController {
return
textsb
.
toString
();
}
private
String
constructMailSubject
(
@ModelAttribute
(
"requestStatus"
)
RequestStatus
requestStatus
)
{
private
String
constructMailSubject
(
@ModelAttribute
(
REQUEST_STATUS
)
RequestStatus
requestStatus
)
{
StringBuffer
subjectsb
=
new
StringBuffer
();
subjectsb
.
append
(
"MO CR:"
);
subjectsb
.
append
(
requestStatus
.
getmocrid
());
...
...
@@ -141,13 +143,13 @@ public class RequestStatusController {
return
subjectsb
.
toString
();
}
private
boolean
isMocridEquals
(
@ModelAttribute
(
"requestStatus"
)
RequestStatus
requestStatus
,
Model
model
,
ArrayList
<
RequestStatus
>
mrsList
)
{
private
boolean
isMocridEquals
(
@ModelAttribute
(
REQUEST_STATUS
)
RequestStatus
requestStatus
,
Model
model
,
ArrayList
<
RequestStatus
>
mrsList
)
{
boolean
boo
=
false
;
for
(
RequestStatus
mrs:
mrsList
){
if
(
mrs
.
getmocrid
()
==
requestStatus
.
getmocrid
()){
model
.
addAttribute
(
"requestStatus"
,
mrs
);
model
.
addAttribute
(
REQUEST_STATUS
,
mrs
);
boo
=
true
;
}
}
...
...
src/main/java/com/spring/mvc/mini/web/UserInfoFormController.java
浏览文件 @
24c7716d
...
...
@@ -23,7 +23,9 @@ import com.spring.mvc.mini.pojo.UserInfo;
@RequestMapping
(
"/userinfoform"
)
@SessionAttributes
(
"userinfo"
)
public
class
UserInfoFormController
{
private
static
final
String
MESSAGE
=
"message"
;
@Autowired
private
MailSender
ms
;
...
...
@@ -49,7 +51,7 @@ public class UserInfoFormController {
try
{
loginAndSendMail
(
userinfo
);
}
catch
(
Exception
e
)
{
model
.
addAttribute
(
"message"
,
"Login Failed:"
+
e
.
toString
());
model
.
addAttribute
(
MESSAGE
,
"Login Failed:"
+
e
.
toString
());
return
null
;
}
...
...
@@ -59,11 +61,11 @@ public class UserInfoFormController {
if
(
ajaxRequest
)
{
model
.
addAttribute
(
"message"
,
message
);
model
.
addAttribute
(
MESSAGE
,
message
);
return
null
;
}
else
{
redirectAttrs
.
addFlashAttribute
(
"message"
,
message
);
redirectAttrs
.
addFlashAttribute
(
MESSAGE
,
message
);
return
"redirect:/"
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录