fix: 修复一个错误

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

@@ -643,6 +643,9 @@ public class ProductModelController extends ControllerBase{
                     indexName=dto.getIndexName();
                 }
                 Cell cell1=row.getCell(1);
+                if ((Objects.isNull(cell1) || StrUtil.isBlank(cell1.getStringCellValue()))){
+                    break;
+                }
                 dto.setName(StrUtil.trim(cell1.getStringCellValue()));
                 Cell cell2=row.getCell(2);
                 dto.setValue(StrUtil.trim(dataFormatter.formatCellValue(cell2)));
@@ -680,13 +683,20 @@ public class ProductModelController extends ControllerBase{
                                 .setModelParamsId(finalResultId)
                                 .setLanguageCode(language.getCode())
                                 .setBatchNumber(batchNumber)
-                                .setIndexName(translate.translateWord(dto.getIndexName(),language.getTranslateCode()))
-                                .setName(translate.translateWord(dto.getName(),language.getTranslateCode()))
-                                .setValue(translate.translateWord(dto.getValue(),language.getTranslateCode()))
                                 .setMain(dto.getMain())
                                 .setCompare(dto.getCompare())
                                 .setCreateBy(AdminUserUtil.getUserName())
                                 .setCreateTime(LocalDateTime.now());
+                        if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) {
+                            ProductModelParamsItem en = items.stream().filter(it -> StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
+                            item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode()));
+                            item.setName(translate.translateWord(en.getName(), language.getTranslateCode()));
+                            item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));
+                        } else {
+                            item.setIndexName(translate.translateWord(dto.getIndexName(), language.getTranslateCode()));
+                            item.setName(translate.translateWord(dto.getName(), language.getTranslateCode()));
+                            item.setValue(translate.translateWord(dto.getValue(), language.getTranslateCode()));
+                        }
                         items.add(item);
                     });
                 });
@@ -731,6 +741,16 @@ public class ProductModelController extends ControllerBase{
                                     .setCompare(dto.getCompare())
                                     .setCreateBy(AdminUserUtil.getUserName())
                                     .setCreateTime(LocalDateTime.now());
+                            if (StrUtil.equals(language.getCode(), "sa") || StrUtil.equals(language.getCode(), "de")) {
+                                ProductModelParamsItem en = items.stream().filter(it ->StrUtil.equals(it.getBatchNumber(), cn.getBatchNumber()) && StrUtil.equals(it.getLanguageCode(), "us")).findFirst().get();
+                                item.setIndexName(translate.translateWord(en.getIndexName(), language.getTranslateCode()));
+                                item.setName(translate.translateWord(en.getName(), language.getTranslateCode()));
+                                item.setValue(translate.translateWord(en.getValue(), language.getTranslateCode()));
+                            } else {
+                                item.setIndexName(translate.translateWord(dto.getIndexName(), language.getTranslateCode()));
+                                item.setName(translate.translateWord(dto.getName(), language.getTranslateCode()));
+                                item.setValue(translate.translateWord(dto.getValue(), language.getTranslateCode()));
+                            }
                             items.add(item);
                         });
                     }

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/impl/AliYunTranslate.java

@@ -65,8 +65,6 @@ public class AliYunTranslate implements ITranslate {
                 .setFormatType(formatType)
                 .setSourceText(text);
         log.info("翻译,请求参数:{}", JSONUtil.toJsonStr(request));
-        System.out.println("Key serializer: " + stringRedisTemplate.getKeySerializer());
-        System.out.println("Value serializer: " + stringRedisTemplate.getValueSerializer());
         String key = "translate:" + SecureUtil.md5(text) + ":" + targetLanguage;
         String result = stringRedisTemplate.opsForValue().get(key);
         if (StrUtil.isNotBlank(result)) {

nflg-mobilebroken-admin/src/main/resources/bootstrap-sit.properties

@@ -0,0 +1,15 @@
+# Nacos 地址
+nacos.server-addr=${NACOS_SERVER_ADDR:192.168.0.194:8848}
+#nacos.server-addr=192.168.0.194:8848
+#spring.cloud.nacos.discovery.username=nacos
+#spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
+#spring.config.activate.on-profile=dev
+logging.level.com.nflg=DEBUG
+logging.level.com.alibaba.cloud.nacos.config=DEBUG
+
+#spring.datasource.url=jdbc:mysql://112.74.186.154:13151/mobilebroken?useUnicode=true&characterEncoding=utf8mb4&tinyInt1isBit=false&useSSL=false&rewriteBatchedStatements=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+#spring.datasource.username=nflg
+#spring.datasource.password=Aciga@2022
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+logging.config=classpath:logback-sit.xml

nflg-mobilebroken-admin/src/main/resources/bootstrap.properties

@@ -1,10 +1,11 @@
 spring.application.name=admin
 spring.profiles.active=dev
 server.port=8082
-# 设置最大文件大小 (默认为1MB)
+spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-file-size=1024MB
-# 设置所有文件总大小 (默认为10MB)
+spring.servlet.multipart.max-request-size=1024MB
-spring.servlet.multipart.max-request-size=500MB
+spring.servlet.multipart.file-size-threshold=10MB
+spring.servlet.multipart.location=/tmp
 #spring.config.import=classpath:application-${spring.profiles.active}.properties,nacos:
 #spring.config.import=nacos:
 logging.level.root=info

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

@@ -10,7 +10,7 @@
     </select>
 
     <select id="getListByDictionaryCode" resultType="com.nflg.mobilebroken.repository.entity.DictionaryItem">
-        SELECT ifnull(dit.value,di.`name`) as 'name',di.*
+        SELECT fun_isBlank(dit.value,di.`name`) as 'name',di.*
         FROM dictionary d
                  INNER JOIN dictionary_item di ON d.id=di.dictionary_id
             LEFT JOIN dictionary_item_translate dit ON dit.dictionary_item_id=di.id and dit.language_code=#{language}

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

@@ -27,21 +27,21 @@
           AND pmp.state = 1
           AND pmpi.main = 1
           AND pmpi.language_code = #{language}
-        ORDER BY pmpi.main_sort
+        ORDER BY pmpi.main_sort,pmpi.id
     </select>
 
     <select id="getMainListForSort" resultType="com.nflg.mobilebroken.common.pojo.vo.ParamsSortListVO">
         select batch_number,name,main_sort as 'sort'
         from product_model_params_item
         where main and model_params_id=#{paramId} and language_code=#{language}
-        order by main_sort
+        order by main_sort,id
     </select>
 
     <select id="getImportantParamsListForSort" resultType="com.nflg.mobilebroken.common.pojo.vo.ParamsSortListVO">
         select batch_number,name,important_sort as 'sort'
         from product_model_params_item
         where important and model_params_id=#{paramId} and language_code=#{language}
-        order by important_sort
+        order by important_sort,id
     </select>
 
     <select id="getImportantListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductParamsItemVO">
@@ -52,7 +52,7 @@
           AND pmp.state = 1
           AND pmpi.important = 1
           AND pmpi.language_code = #{language}
-        ORDER BY pmpi.important_sort
+        ORDER BY pmpi.important_sort,pmpi.id
     </select>
 
     <select id="getCompareListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO">