更新代码

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java

@@ -118,8 +118,7 @@ public class AdminAlbumController {
         long albumId = form.getLongAlbumId();
         boolean symbol;
         if (albumId > 0) {
-            Optional<AlbumPicture> ap = albumPictureService.create(albumId, imageAddr, form.getCaption(), form.getIntegerRanking(), form.getBooleanStatus());
-            symbol = ap.isPresent();
+            symbol = albumPictureService.create(albumId, imageAddr, form.getCaption(), form.getIntegerRanking(), form.getBooleanStatus()).isPresent();
         } else {
             symbol = albumService.create(imageAddr, form.getCaption(), form.getBooleanStatus(), topic) >0;
         }

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java

@@ -224,7 +224,7 @@ public class AdminBoardController {
         } else {
             data = boardConfigService.create(config.getBoardId(), config);
         }
-        if (data.isPresent() && data.get()) {
+        if (data.orElse(false)) {
             return "redirect:/board/";
         }
         model.addAttribute("errors", "版块设置操作失败");

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java

@@ -177,7 +177,7 @@ public class AdminBoardModeratorController {
                 symbol = boardModeratorActionIndexService.grantModeratorActions(Long.valueOf(form.getModeratorId()), actions);
             }
         }
-        if (symbol.isPresent()) {
+        if (symbol.orElse(false)) {
             return "redirect:/board/moderator/";
         }
         model.addAttribute("errors", form.getActionTitle() + "版主权限操作失败");

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumScoreRoleController.java

@@ -82,9 +82,9 @@ public class AdminForumScoreRoleController {
         ForumScoreRole data = new ForumScoreRole();
         data.setStatus(form.getBooleanStatus());
         data.setAction(action.get());
-        data.setDegree(Integer.valueOf(form.getDegree()));
-        data.setLevel(Integer.valueOf(form.getLevel()));
-        data.setScore(Double.valueOf(form.getScore()));
+        data.setDegree(form.getIntegerDegree());
+        data.setLevel(form.getIntegerLevel());
+        data.setScore(form.getDoubleScore());
         
         boolean symbol;
         if (form.isUpdate()) {

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminHomeController.java

@@ -86,7 +86,6 @@ public class AdminHomeController {
         }
         Member m = rm.get();
         MemberSessionBean mbean = new MemberSessionBean(m, form.getRequestIpAddr(request));
-        
         onlineMemberStorage.store(mbean, request, response);
         return "redirect:/client";
     }

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberController.java

@@ -162,7 +162,7 @@ public class AdminMemberController {
             HttpServletRequest request,
             Model model) {
         Optional<Boolean> symbol = memberService.resetPswd(form.getLongRecord(), form.getNewpswd(), getDescriptorInstance(request, form.getToken()));
-        if (symbol.isPresent()) {
+        if (symbol.orElse(false)) {
             return "redirect:/member/";
         }
         model.addAttribute("errors", "修改会员密码操作失败");

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberLevelController.java

@@ -73,8 +73,8 @@ public class AdminMemberLevelController {
         MemberLevel ml = new MemberLevel();
         ml.setNames(form.getNames());
         ml.setStatus(form.getBooleanStatus());
-        ml.setScore(Double.valueOf(form.getScore()));
-        ml.setMinScore(Double.valueOf(form.getMinScore()));
+        ml.setScore(form.getDoubleScore());
+        ml.setMinScore(form.getDoubleMinScore());
         //------------------------------------------------------------编码图标图片的地址
         String icoImageAddr = form.getEncodeIcoAddr(imageIOMeta).orElse(null);
         if (null != icoImageAddr) {

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java

@@ -88,7 +88,6 @@ public class AdminPostsController {
             Model model) {
         Posts posts = postsService.get(postsId).orElseThrow(()->new ResourceNotFoundException("回复内容不存在或暂时无法访问"));
         model.addAttribute("posts", posts);
-        
         FrontPageURL fpbuild = new FrontPageURL(request.getContextPath() + "/topic/posts/mood").addParameter("posts", postsId).addPageSize("number", pageSize);
         Pageable pr = new PageRequest(page, fpbuild.getPageSize());
         Page<PostsMoodRecords> rs = postsMoodRecordsService.getAllByPosts(postsId, pr);

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java

@@ -103,7 +103,7 @@ public class AdminSectionArticleController {
         String directName = Commons.getAlphaNumberCharacter(form.getDirect());
         boolean symbol;
         if (form.isUpdate()) {
-            symbol = boardGroupService.editSection(form.getIntegerRecord(), form.getTitle(), form.getDescription(), directName, form.getBooleanStatus()).isPresent();
+            symbol = boardGroupService.editSection(form.getIntegerRecord(), form.getTitle(), form.getDescription(), directName, form.getBooleanStatus()).orElse(false);
         } else {
             symbol = boardGroupService.buildOrigin(form.getTitle(), form.getDescription(), directName, form.getBooleanStatus())>0;
         }
@@ -134,7 +134,7 @@ public class AdminSectionArticleController {
         String tipMessage;
         boolean symbol = false;
         Optional<Boolean> result = boardGroupService.checkOriginDirectNameUnique(directoryNames, sectionId);
-        if (result.isPresent()) {
+        if (result.orElse(false)) {
             tipMessage = result.get() ? "可以使用" : "未知的错误";
             symbol = true;
         } else {
@@ -202,7 +202,7 @@ public class AdminSectionArticleController {
         String directName = Commons.getAlphaNumberCharacter(form.getDirect());
         boolean symbol;
         if (form.isUpdate()) {
-            symbol = boardService.editTerm(form.getLongRecord(), form.getTitle(), form.getDescription(), directName, form.getEnumEntityStatus()).isPresent();
+            symbol = boardService.editTerm(form.getLongRecord(), form.getTitle(), form.getDescription(), directName, form.getEnumEntityStatus()).orElse(false);
         } else {
             symbol = boardService.buildOrigin(form.getIntegerSection(), form.getTitle(), form.getDescription(), directName, form.getEnumEntityStatus())>0;
         }
@@ -244,7 +244,7 @@ public class AdminSectionArticleController {
         String tipMessage;
         boolean symbol = false;
         Optional<Boolean> result = boardService.checkTermDirectNameUnique(termDirectoryNames, termId);
-        if (result.isPresent()) {
+        if (result.orElse(false)) {
             tipMessage = result.get() ? "可以使用" : "未知的错误";
             symbol = true;
         } else {
@@ -358,7 +358,7 @@ public class AdminSectionArticleController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, form.getToken());
-        Boolean symbol = topicService.editTermArticle(
+        boolean symbol = topicService.editTermArticle(
                 form.getLongRecord(),
                 form.getTitle(),
                 form.getContent(),

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java

@@ -111,14 +111,13 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, form.getToken());
-        Boolean symbol = topicService.edit(
+        boolean symbol = topicService.edit(
                 form.getLongRecord(),
                 form.getTitle(),
                 form.getContent(),
                 form.getWordsArray(),
                 imageIOMeta,
                 aec).orElse(false);
-        
         if (symbol) {
             return "redirect:/topic/" + form.getLongRecord() + ".xhtml";
         }
@@ -245,7 +244,7 @@ public class AdminTopicController {
                 config,
                 form.getLongRecord(),
                 aec);
-        if (symbol.isPresent()) {
+        if (symbol.orElse(false)) {
             return "redirect:/topic/" + config.getTopicId() + ".xhtml";
         }
         model.addAttribute("form", form);

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/form/ForumScoreRoleForm.java

 package com.apobates.forum.thrones.admin.controller.form;
 
 import com.apobates.forum.event.elderly.ForumActionEnum;
+import com.apobates.forum.utils.Commons;
 import com.apobates.forum.utils.lang.EnumArchitecture;
 import java.util.Optional;
 import javax.validation.constraints.DecimalMin;
@@ -48,7 +49,9 @@ public class ForumScoreRoleForm extends ActionForm {
     public void setAction(String action) {
         this.action = action;
     }
-    
+    public int getIntegerDegree(){
+        return Commons.stringToInteger(getDegree(), 1);
+    }
     public String getDegree() {
         return degree;
     }
@@ -56,7 +59,9 @@ public class ForumScoreRoleForm extends ActionForm {
     public void setDegree(String degree) {
         this.degree = degree;
     }
-    
+    public int getIntegerLevel(){
+        return Commons.stringToInteger(getLevel(), 1);
+    }
     public String getLevel() {
         return level;
     }
@@ -64,7 +69,9 @@ public class ForumScoreRoleForm extends ActionForm {
     public void setLevel(String level) {
         this.level = level;
     }
-    
+    public double getDoubleScore(){
+        return Commons.stringToDouble(()->getScore(), 1.0D);
+    }
     public String getScore() {
         return score;
     }

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/form/MemberLevelForm.java

 package com.apobates.forum.thrones.admin.controller.form;
 
 import com.apobates.forum.core.ImageIOMeta;
+import com.apobates.forum.utils.Commons;
+
 import java.util.Optional;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
@@ -46,7 +48,9 @@ public class MemberLevelForm extends ActionForm {
         }
         this.names = names;
     }
-    
+    public double getDoubleMinScore(){
+        return Commons.stringToDouble(()->getMinScore(), 1.0D);
+    }
     public String getMinScore() {
         return minScore;
     }
@@ -54,7 +58,9 @@ public class MemberLevelForm extends ActionForm {
     public void setMinScore(String minScore) {
         this.minScore = minScore;
     }
-    
+    public double getDoubleScore(){
+        return Commons.stringToDouble(()->getScore(), 1.0D);
+    }
     public String getScore() {
         return score;
     }