众测技术部分的更多

site/src/main/java/com/mooctest/crowd/site/controller/TechnicalArticlesController.java

@@ -52,6 +52,13 @@ public class TechnicalArticlesController extends BaseSearchController{
         return  new PageRequest(0,10,sort);
     }
 
+    Pageable getMore(SearchConditionVO searchConditionVO){
+        int activePage = searchConditionVO.getActivePage() == 0?1:searchConditionVO.getActivePage();
+        Sort sort = new Sort(Sort.Direction.DESC,"reading");
+        return new PageRequest(activePage-1, CommonConstant.TECHNOLOGY_ROWS_ON_PAGE, sort);
+    }
+
+
     @RequestMapping(value = "/ranking", method = RequestMethod.GET)
     public ResponseVO<TechnicalArticlesDTO> ranking(){
         Pageable pageable = this.getRanking();
@@ -62,4 +69,12 @@ public class TechnicalArticlesController extends BaseSearchController{
     public  TechnicalArticlesDTO updateRanking(@PathVariable("id") long id){
         return  technical.updateRanking(id);
     }
+
+    @RequestMapping(value = "/morearticles", method = RequestMethod.POST)
+    public ResponseVO<TechnicalArticlesDTO> moreArticles(@RequestBody SearchConditionVO searchConditionVO){
+        Map<String, String> extraCondition = searchConditionVO.getColumnFilters()==null? new HashMap<>() :super.getExtraCondition(searchConditionVO);
+        Pageable pageable = this.getMore(searchConditionVO);
+        String keyword = searchConditionVO.getKeyword();
+        return new ResponseVO<>(ServerCode.SUCCESS, technical.getArticles(pageable, keyword,extraCondition));
+    }
 }

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -28,11 +28,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.awt.*;
+import java.io.File;
 import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -801,6 +801,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public UserDTO updateInformation(long userId, UserVO userVO) {
         Optional<UserPO> userPO = userDao.findById(userId);
+        if(userVO.getUnit()==null||userVO.getUnit().length()<=0){
+            throw new HttpBadRequestException("请输入企业简称");
+        }
         userPO.get().setUnit(userVO.getUnit());
         userPO.get().setGender(userVO.getGender());
         userPO.get().setBirthday(userVO.getBirthday());
@@ -897,17 +900,11 @@ public class WebMediatorImpl implements ViewMediator {
             throw new HttpBadRequestException("请输入正确的卡号");
         }
         String bank = String.valueOf(json.get("bank"));
-        String url1="https://apimg.alipay.com/combo.png?d=cashier&t=bank"+bank;
-        //MultipartFile result1 = restTemplate
-        //System.out.println(result1);
-        //MultipartFile result1=restTemplate.exchange(url1,);
-        //String photo=uploadService.uploadImage(result1,userId);
-        //System.out.println(photo.toString());
         bankCardPO.setUser(bankCardVO.getUser());
         bankCardPO.setNumber(bankCardVO.getNumber());
         bankCardPO.setCode(bank);
         bankCardPO.setUserId(userId);
-        //bankCardDao.save(bankCardPO);
+        bankCardDao.save(bankCardPO);
         return this.getBankCard(userId);
     }