提交 a72a45aa 编写于 作者: 街头小贩's avatar 街头小贩

删除EnumArchitecture的转换

上级 74252289
...@@ -78,17 +78,17 @@ public class MemberSessionBeanBuilder { ...@@ -78,17 +78,17 @@ public class MemberSessionBeanBuilder {
return this; return this;
} }
public MemberSessionBeanBuilder setStatus(int memberStatusEnumSymbol){ public MemberSessionBeanBuilder setStatus(int memberStatusEnumSymbol){
this.status = (MemberStatusEnum) EnumArchitecture.getInstance(memberStatusEnumSymbol, MemberStatusEnum.class).orElse((EnumArchitecture)MemberStatusEnum.GROUND); this.status = EnumArchitecture.getInstance(memberStatusEnumSymbol, MemberStatusEnum.class).orElse(MemberStatusEnum.GROUND);
return this; return this;
} }
public MemberSessionBeanBuilder setGroup(int memberGroupEnumSymbol){ public MemberSessionBeanBuilder setGroup(int memberGroupEnumSymbol){
this.group = (MemberGroupEnum) EnumArchitecture.getInstance(memberGroupEnumSymbol, MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.GUEST); this.group = EnumArchitecture.getInstance(memberGroupEnumSymbol, MemberGroupEnum.class).orElse(MemberGroupEnum.GUEST);
return this; return this;
} }
public MemberSessionBeanBuilder setRole(int memberRoleEnumSymbol){ public MemberSessionBeanBuilder setRole(int memberRoleEnumSymbol){
this.role = (MemberRoleEnum) EnumArchitecture.getInstance(memberRoleEnumSymbol, MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); this.role = EnumArchitecture.getInstance(memberRoleEnumSymbol, MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
return this; return this;
} }
} }
...@@ -380,18 +380,18 @@ public class BoardController { ...@@ -380,18 +380,18 @@ public class BoardController {
config.setIpFilter(form.getBooleanIpFileter()); config.setIpFilter(form.getBooleanIpFileter());
//读 //读
config.setReadMinScore(form.getIntegerReadMinScore()); config.setReadMinScore(form.getIntegerReadMinScore());
MemberGroupEnum rmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.GUEST); MemberGroupEnum rmg = EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.GUEST);
config.setReadLowMemberGroup(rmg); config.setReadLowMemberGroup(rmg);
MemberRoleEnum rmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum rmr = EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setReadLowMemberRole(rmr); config.setReadLowMemberRole(rmr);
config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel()); config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel());
//写 //写
config.setEditMinute(form.getIntegerEditMinute()); config.setEditMinute(form.getIntegerEditMinute());
config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt()); config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt());
config.setWriteMinScore(form.getIntegerWriteMinScore()); config.setWriteMinScore(form.getIntegerWriteMinScore());
MemberGroupEnum wmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.CARD); MemberGroupEnum wmg = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.CARD);
config.setWriteLowMemberGroup(wmg); config.setWriteLowMemberGroup(wmg);
MemberRoleEnum wmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum wmr = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setWriteLowMemberRole(wmr); config.setWriteLowMemberRole(wmr);
config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel()); config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel());
// //
......
...@@ -118,7 +118,7 @@ public class MessageController { ...@@ -118,7 +118,7 @@ public class MessageController {
MemberSessionBean mbean, MemberSessionBean mbean,
HttpServletRequest request, HttpServletRequest request,
Model model){ Model model){
ForumLetterTypeEnum label = (ForumLetterTypeEnum) EnumArchitecture.getInstance(typeEnumSymbol, ForumLetterTypeEnum.class).orElse((EnumArchitecture)ForumLetterTypeEnum.ALL); ForumLetterTypeEnum label = EnumArchitecture.getInstance(typeEnumSymbol, ForumLetterTypeEnum.class).orElse(ForumLetterTypeEnum.ALL);
long count = (ForumLetterTypeEnum.ALL == label)?outboxService.countSentByMember(mbean.getMid()):outboxService.countSentByMember(mbean.getMid(), label); long count = (ForumLetterTypeEnum.ALL == label)?outboxService.countSentByMember(mbean.getMid()):outboxService.countSentByMember(mbean.getMid(), label);
model.addAttribute("total", Commons.optional(count, 0L)); model.addAttribute("total", Commons.optional(count, 0L));
return "default/message/sent"; return "default/message/sent";
...@@ -132,7 +132,7 @@ public class MessageController { ...@@ -132,7 +132,7 @@ public class MessageController {
MemberSessionBean mbean, MemberSessionBean mbean,
HttpServletRequest request, HttpServletRequest request,
Model model){ Model model){
ForumLetterTypeEnum label = (ForumLetterTypeEnum) EnumArchitecture.getInstance(typeEnumSymbol, ForumLetterTypeEnum.class).orElse((EnumArchitecture)ForumLetterTypeEnum.ALL); ForumLetterTypeEnum label = EnumArchitecture.getInstance(typeEnumSymbol, ForumLetterTypeEnum.class).orElse(ForumLetterTypeEnum.ALL);
Pageable pr = new PageRequest(page, pageSize); Pageable pr = new PageRequest(page, pageSize);
Page<ForumLetter> rs = (ForumLetterTypeEnum.ALL == label)?outboxService.getSent(mbean.getMid(), pr):outboxService.getSent(mbean.getMid(), label, pr); Page<ForumLetter> rs = (ForumLetterTypeEnum.ALL == label)?outboxService.getSent(mbean.getMid(), pr):outboxService.getSent(mbean.getMid(), label, pr);
// //
......
...@@ -665,16 +665,16 @@ public class TopicController { ...@@ -665,16 +665,16 @@ public class TopicController {
config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt()); config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt());
//r //r
config.setReadMinScore(form.getIntegerReadMinScore()); config.setReadMinScore(form.getIntegerReadMinScore());
MemberGroupEnum rmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.GUEST); MemberGroupEnum rmg = EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.GUEST);
config.setReadLowMemberGroup(rmg); config.setReadLowMemberGroup(rmg);
MemberRoleEnum rmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum rmr = EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setReadLowMemberRole(rmr); config.setReadLowMemberRole(rmr);
config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel()); config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel());
//w //w
config.setWriteMinScore(form.getIntegerWriteMinScore()); config.setWriteMinScore(form.getIntegerWriteMinScore());
MemberGroupEnum wmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.CARD); MemberGroupEnum wmg = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.CARD);
config.setWriteLowMemberGroup(wmg); config.setWriteLowMemberGroup(wmg);
MemberRoleEnum wmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum wmr = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setWriteLowMemberRole(wmr); config.setWriteLowMemberRole(wmr);
config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel()); config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel());
......
...@@ -202,18 +202,18 @@ public class AdminBoardController { ...@@ -202,18 +202,18 @@ public class AdminBoardController {
config.setIpFilter(form.getBooleanIpFileter()); config.setIpFilter(form.getBooleanIpFileter());
//读 //读
config.setReadMinScore(form.getIntegerReadMinScore()); config.setReadMinScore(form.getIntegerReadMinScore());
MemberGroupEnum rmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.GUEST); MemberGroupEnum rmg = EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.GUEST);
config.setReadLowMemberGroup(rmg); config.setReadLowMemberGroup(rmg);
MemberRoleEnum rmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum rmr = EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setReadLowMemberRole(rmr); config.setReadLowMemberRole(rmr);
config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel()); config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel());
//写 //写
config.setEditMinute(form.getIntegerEditMinute()); config.setEditMinute(form.getIntegerEditMinute());
config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt()); config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt());
config.setWriteMinScore(form.getIntegerWriteMinScore()); config.setWriteMinScore(form.getIntegerWriteMinScore());
MemberGroupEnum wmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.CARD); MemberGroupEnum wmg = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.CARD);
config.setWriteLowMemberGroup(wmg); config.setWriteLowMemberGroup(wmg);
MemberRoleEnum wmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum wmr = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setWriteLowMemberRole(wmr); config.setWriteLowMemberRole(wmr);
config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel()); config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel());
......
...@@ -254,16 +254,16 @@ public class AdminTopicController { ...@@ -254,16 +254,16 @@ public class AdminTopicController {
config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt()); config.setWriteMinInterrupt(form.getIntegerWriteMinInterrupt());
//r //r
config.setReadMinScore(form.getIntegerReadMinScore()); config.setReadMinScore(form.getIntegerReadMinScore());
MemberGroupEnum rmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.GUEST); MemberGroupEnum rmg = EnumArchitecture.getInstance(form.getIntegerReadLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.GUEST);
config.setReadLowMemberGroup(rmg); config.setReadLowMemberGroup(rmg);
MemberRoleEnum rmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum rmr = EnumArchitecture.getInstance(form.getIntegerReadLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setReadLowMemberRole(rmr); config.setReadLowMemberRole(rmr);
config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel()); config.setReadLowMemberLevel(form.getIntegerReadLowMemberLevel());
//w //w
config.setWriteMinScore(form.getIntegerWriteMinScore()); config.setWriteMinScore(form.getIntegerWriteMinScore());
MemberGroupEnum wmg = (MemberGroupEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse((EnumArchitecture)MemberGroupEnum.CARD); MemberGroupEnum wmg = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberGroup(), MemberGroupEnum.class).orElse(MemberGroupEnum.CARD);
config.setWriteLowMemberGroup(wmg); config.setWriteLowMemberGroup(wmg);
MemberRoleEnum wmr = (MemberRoleEnum)EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); MemberRoleEnum wmr = EnumArchitecture.getInstance(form.getIntegerWriteLowMemberRole(), MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
config.setWriteLowMemberRole(wmr); config.setWriteLowMemberRole(wmr);
config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel()); config.setWriteLowMemberLevel(form.getIntegerWriteLowMemberLevel());
//editTopicConfig(long id, TopicConfig updateConfig, long configId, ActionEventCulpritor culpritor) { //editTopicConfig(long id, TopicConfig updateConfig, long configId, ActionEventCulpritor culpritor) {
......
...@@ -61,7 +61,7 @@ public class BoardCarouselForm extends ActionForm{ ...@@ -61,7 +61,7 @@ public class BoardCarouselForm extends ActionForm{
} }
public ForumCalendarUnitEnum getEnumUnit(){ public ForumCalendarUnitEnum getEnumUnit(){
Integer unitEnumSymbol = covertStringToInteger(getUnit(), 0); Integer unitEnumSymbol = covertStringToInteger(getUnit(), 0);
return (ForumCalendarUnitEnum) EnumArchitecture.getInstance(unitEnumSymbol, ForumCalendarUnitEnum.class).orElse((EnumArchitecture)ForumCalendarUnitEnum.DAY); return EnumArchitecture.getInstance(unitEnumSymbol, ForumCalendarUnitEnum.class).orElse(ForumCalendarUnitEnum.DAY);
} }
public LocalDateTime getDateTimeExpireDate() { public LocalDateTime getDateTimeExpireDate() {
Integer limit = getIntegerLimit(); Integer limit = getIntegerLimit();
......
...@@ -48,7 +48,7 @@ public class BoardForm extends ActionForm{ ...@@ -48,7 +48,7 @@ public class BoardForm extends ActionForm{
} }
public ForumEntityStatusEnum getEnumEntityStatus(){ public ForumEntityStatusEnum getEnumEntityStatus(){
Integer d = covertStringToInteger(getEntityStatus(), 4); Integer d = covertStringToInteger(getEntityStatus(), 4);
return (ForumEntityStatusEnum)EnumArchitecture.getInstance(d, ForumEntityStatusEnum.class).orElse((EnumArchitecture)ForumEntityStatusEnum.ACTIVE); return EnumArchitecture.getInstance(d, ForumEntityStatusEnum.class).orElse(ForumEntityStatusEnum.ACTIVE);
} }
public String getEntityStatus() { public String getEntityStatus() {
return entityStatus; return entityStatus;
......
...@@ -31,7 +31,7 @@ public class BoardModeratorForm extends ActionForm{ ...@@ -31,7 +31,7 @@ public class BoardModeratorForm extends ActionForm{
} }
public ModeratorLevelEnum getEnumLevel(){ public ModeratorLevelEnum getEnumLevel(){
Integer d = covertStringToInteger(getLevel(), 0); Integer d = covertStringToInteger(getLevel(), 0);
return (ModeratorLevelEnum)EnumArchitecture.getInstance(d, ModeratorLevelEnum.class).orElse((EnumArchitecture)ModeratorLevelEnum.INTERN); return EnumArchitecture.getInstance(d, ModeratorLevelEnum.class).orElse(ModeratorLevelEnum.INTERN);
} }
public String getLevel() { public String getLevel() {
return level; return level;
......
...@@ -36,7 +36,7 @@ public class ForumMessageFullForm extends ActionForm{ ...@@ -36,7 +36,7 @@ public class ForumMessageFullForm extends ActionForm{
return covertStringToInteger(getLabel(), -1); return covertStringToInteger(getLabel(), -1);
} }
public ForumLetterTypeEnum getEnumLabel(){ public ForumLetterTypeEnum getEnumLabel(){
return (ForumLetterTypeEnum) EnumArchitecture.getInstance(getIntegerLabel(), ForumLetterTypeEnum.class).orElse((EnumArchitecture)ForumLetterTypeEnum.LETTER); return EnumArchitecture.getInstance(getIntegerLabel(), ForumLetterTypeEnum.class).orElse(ForumLetterTypeEnum.LETTER);
} }
public String getLabel() { public String getLabel() {
return label; return label;
......
...@@ -40,7 +40,7 @@ public class MemberLeaderForm extends ActionForm { ...@@ -40,7 +40,7 @@ public class MemberLeaderForm extends ActionForm {
} }
public MemberRoleEnum getEnumRole(){ public MemberRoleEnum getEnumRole(){
int roleEnumSymbol=covertStringToInteger(getRole(), 0); int roleEnumSymbol=covertStringToInteger(getRole(), 0);
return (MemberRoleEnum) EnumArchitecture.getInstance(roleEnumSymbol, MemberRoleEnum.class).orElse((EnumArchitecture)MemberRoleEnum.NO); return EnumArchitecture.getInstance(roleEnumSymbol, MemberRoleEnum.class).orElse(MemberRoleEnum.NO);
} }
public String getRole() { public String getRole() {
return role; return role;
......
...@@ -35,7 +35,7 @@ public class MemberPenalizeForm extends ActionForm{ ...@@ -35,7 +35,7 @@ public class MemberPenalizeForm extends ActionForm{
} }
public MemberStatusEnum getEnumArrive(){ public MemberStatusEnum getEnumArrive(){
int arriveEnumSymbol= covertStringToInteger(getArrive(), -1); int arriveEnumSymbol= covertStringToInteger(getArrive(), -1);
return (MemberStatusEnum) EnumArchitecture.getInstance(arriveEnumSymbol, MemberStatusEnum.class).orElse((EnumArchitecture)MemberStatusEnum.DELETE); return EnumArchitecture.getInstance(arriveEnumSymbol, MemberStatusEnum.class).orElse(MemberStatusEnum.DELETE);
} }
public String getArrive() { public String getArrive() {
return arrive; return arrive;
...@@ -54,7 +54,7 @@ public class MemberPenalizeForm extends ActionForm{ ...@@ -54,7 +54,7 @@ public class MemberPenalizeForm extends ActionForm{
} }
public ForumCalendarUnitEnum getEnumUnit(){ public ForumCalendarUnitEnum getEnumUnit(){
int unitEnumSymbol=covertStringToInteger(getUnit(), 0); int unitEnumSymbol=covertStringToInteger(getUnit(), 0);
return (ForumCalendarUnitEnum) EnumArchitecture.getInstance(unitEnumSymbol, ForumCalendarUnitEnum.class).orElse((EnumArchitecture)ForumCalendarUnitEnum.DAY); return EnumArchitecture.getInstance(unitEnumSymbol, ForumCalendarUnitEnum.class).orElse(ForumCalendarUnitEnum.DAY);
} }
public String getUnit() { public String getUnit() {
return unit; return unit;
......
...@@ -41,7 +41,7 @@ public class SectionTermForm extends ActionForm{ ...@@ -41,7 +41,7 @@ public class SectionTermForm extends ActionForm{
} }
public ForumEntityStatusEnum getEnumEntityStatus(){ public ForumEntityStatusEnum getEnumEntityStatus(){
int d = covertStringToInteger(getEntityStatus(), 4); int d = covertStringToInteger(getEntityStatus(), 4);
return (ForumEntityStatusEnum)EnumArchitecture.getInstance(d, ForumEntityStatusEnum.class).orElse((EnumArchitecture)ForumEntityStatusEnum.ACTIVE); return EnumArchitecture.getInstance(d, ForumEntityStatusEnum.class).orElse(ForumEntityStatusEnum.ACTIVE);
} }
public String getEntityStatus() { public String getEntityStatus() {
return entityStatus; return entityStatus;
......
...@@ -45,7 +45,7 @@ public class ReportPlugTopic extends AbstractPlugTopic { ...@@ -45,7 +45,7 @@ public class ReportPlugTopic extends AbstractPlugTopic {
super(action, culpritor); super(action, culpritor);
this.posts = reportPosts; this.posts = reportPosts;
this.reportReason = reportReason; this.reportReason = reportReason;
this.reportType = (ForumReportTypeEnum) EnumArchitecture.getInstance(reportTypeEnumSymbol, ForumReportTypeEnum.class).orElse(ForumReportTypeEnum.ETC); this.reportType = EnumArchitecture.getInstance(reportTypeEnumSymbol, ForumReportTypeEnum.class).orElse(ForumReportTypeEnum.ETC);
try { try {
topicBoard = targetBoardIds.getBoardId(); topicBoard = targetBoardIds.getBoardId();
topicVolumes = targetBoardIds.getVolumesId(); topicVolumes = targetBoardIds.getVolumesId();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册