Merge branch 'feature/product' into test

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java

@@ -995,7 +995,7 @@ public class ProductModelController extends ControllerBase{
      * @param request 请求参数
      */
     @PostMapping("/saveFileSort")
-    public ApiResult<Void> saveFileSort(@Valid @RequestBody SortSaveRequest request){
+    public ApiResult<Void> saveFileSort(@Valid @RequestBody SortSaveRequest request) {
         productModelFileService.saveSort(request);
         return ApiResult.success();
     }

nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java

@@ -62,8 +62,8 @@ public class AppController extends ControllerBase {
     public ApiResult<AppLoginVO> login(String userName, String password) {
         AppUser user = appUserService.getUser(userName, password);
         if (Objects.nonNull(user)) {
-            VUtils.trueThrowBusinessError(!PASSWORDENCODER.matches(password, user.getPassword()))
+            VUtils.trueThrow(!PASSWORDENCODER.matches(password, user.getPassword()))
-                    .throwMessage(dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.Disabled.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, user.getLanguageCode()));
             VUtils.trueThrow(Objects.equals(user.getState(), UserState.ToBeActivated.getState()))
@@ -89,6 +89,8 @@ public class AppController extends ControllerBase {
                     .setPlatform(Constant.FROM_APP));
         } else {
             AdminUser adminUser = adminUserService.getUser(userName, password);
+            VUtils.trueThrow(Objects.isNull(adminUser))
+                    .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_INCORRECTUSERNAMEORPASSWORD, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.Disabled.getState()))
                     .throwMessage(STATE.PassportErr, dictionaryItemTranslateService.getValueByCode(Constant.DICTIONARY_SYSTEMERROR, Constant.DICTIONARY_ITEM_ACCOUNT_DISABLED, MultilingualUtil.getLanguage()));
             VUtils.trueThrow(Objects.equals(adminUser.getState(), UserState.ToBeActivated.getState()))

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SortSaveNewRequest.java

@@ -0,0 +1,23 @@
+package com.nflg.mobilebroken.common.pojo.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SortSaveNewRequest {
+
+    /**
+     * 机型id
+     */
+    @NotNull
+    private Integer modelId;
+
+    /**
+     * 调整后的顺序
+     */
+    @NotEmpty
+    private List<Integer> ids;
+}

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -72,10 +73,12 @@ public class ProductModelFileItemServiceImpl extends ServiceImpl<ProductModelFil
                 .eq(ProductModelFileItem::getModelId, request.getModelId())
                 .update();
         request.getItems().forEach(item -> {
-            lambdaUpdate()
+            if (Objects.nonNull(item.getFileItemId())) {
-                    .set(ProductModelFileItem::getShowInList, true)
+                lambdaUpdate()
-                    .eq(ProductModelFileItem::getId, item.getFileItemId())
+                        .set(ProductModelFileItem::getShowInList, true)
-                    .update();
+                        .eq(ProductModelFileItem::getId, item.getFileItemId())
+                        .update();
+            }
         });
     }
 

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java

@@ -29,7 +29,6 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -240,25 +239,20 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
 
     @Override
     public List<FileDefaultConfigVO> getDefaultConfig(Integer modelId) {
-        List<Language> languages = languageService.getAllLanguages();
-//        List<ProductModelFileItem> list = productModelFileItemService.lambdaQuery()
-//                .eq(ProductModelFileItem::getModelId, modelId)
-//                .orderByAsc(ProductModelFileItem::getLanguageCode)
-//                .orderByDesc(ProductModelFileItem::getShowInList)
-//                .list();
-        List<ProductModelFileItem> list =productModelFileItemService.getPublishedByLanguage(modelId);
         List<FileDefaultConfigVO> vos=new ArrayList<>();
-        Map<String, List<ProductModelFileItem>> maps=list.stream().collect(Collectors.groupingBy(ProductModelFileItem::getLanguageCode));
+        List<Language> languages = languageService.getLanguages();
-        maps.forEach((languageCode,data)->{
+        List<ProductModelFileItem> list = productModelFileItemService.getPublishedByLanguage(modelId);
-            FileDefaultConfigVO vo=new FileDefaultConfigVO()
+        languages.forEach(language -> {
-                    .setLanguageCode(languageCode)
+            FileDefaultConfigVO vo = new FileDefaultConfigVO()
-                    .setLanguageName(languages.stream().filter(lang->lang.getCode().equals(languageCode)).findFirst().get().getName())
+                    .setLanguageCode(language.getCode())
-                    .setItems(data.stream().map(item->new FileDefaultConfigItemVO()
+                    .setLanguageName(language.getName())
-                            .setId(item.getId())
+                    .setItems(list.stream().filter(item -> StrUtil.equals(language.getCode(), item.getLanguageCode()))
-                            .setName(item.getName())
+                            .map(item -> {
-                            .setSelected(item.getShowInList()))
+                                return new FileDefaultConfigItemVO()
-                            .collect(Collectors.toList())
+                                        .setId(item.getId())
-                    );
+                                        .setName(item.getName())
+                                        .setSelected(item.getShowInList());
+                            }).collect(Collectors.toList()));
             vos.add(vo);
         });
         return vos;

nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml

@@ -25,5 +25,6 @@
         FROM product_model_file pmf
                  INNER JOIN product_model_file_item pmfi ON pmf.id = pmfi.model_file_id
         WHERE pmf.`enable` = 1 AND pmf.state = 1 AND pmf.model_id = #{modelId} AND pmfi.language_code = #{language}
+        ORDER BY pmf.sort
     </select>
 </mapper>