工服调整20260126

1、创建订单时的区域的先隐藏,先默认为空;
2、所有的类别属性移除;
3、设备配置调整,部件不再绑定机型,改为绑定产品线;
4、修改解决方案添加组件字段
This commit is contained in:
曹鹏飞 2026-01-27 17:46:03 +08:00
parent 04d2482850
commit 381b9ec5f8
2 changed files with 39 additions and 4 deletions

View File

@ -1,14 +1,22 @@
package com.nflg.mobilebroken.admin.controller;
import cn.hutool.core.util.StrUtil;
import com.nflg.mobilebroken.common.pojo.ApiResult;
import com.nflg.mobilebroken.common.pojo.request.TranslateWordRequest;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.Language;
import com.nflg.mobilebroken.repository.service.IDictionaryItemService;
import com.nflg.mobilebroken.repository.service.ILanguageService;
import com.nflg.mobilebroken.starter.service.ITranslate;
import com.nflg.mobilebroken.starter.service.impl.DeepSeekTranslate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Objects;
/**
* 翻译相关
@ -23,6 +31,9 @@ public class TranslateController extends ControllerBase{
@Resource
private DeepSeekTranslate deepSeekTranslate;
@Resource
private ILanguageService languageService;
/**
* 文字翻译
* @param request 请求参数
@ -39,8 +50,16 @@ public class TranslateController extends ControllerBase{
* @return 翻译结果
*/
@PostMapping("deepseek")
public ApiResult<String> deepseek(@RequestParam String text) {
public ApiResult<String> deepseek(HttpServletRequest request, @RequestParam String text) {
String languageCode = request.getHeader("language");
if (StrUtil.isBlank(languageCode)) {
return ApiResult.success("");
}
Language language = languageService.lambdaQuery().eq(Language::getCode, languageCode).one();
if (Objects.isNull(language)) {
return ApiResult.success("");
}
text = text.replaceAll("<br>", ",");
return ApiResult.success(deepSeekTranslate.translateWord(text, "auto", AdminUserUtil.getLanguageName(), "text"));
return ApiResult.success(deepSeekTranslate.translateWord(text, "auto", language.getName(), "text"));
}
}

View File

@ -1,7 +1,10 @@
package com.nflg.mobilebroken.cfs.controller;
import cn.hutool.core.util.StrUtil;
import com.nflg.mobilebroken.common.pojo.ApiResult;
import com.nflg.mobilebroken.common.util.AppUserUtil;
import com.nflg.mobilebroken.repository.entity.Language;
import com.nflg.mobilebroken.repository.service.ILanguageService;
import com.nflg.mobilebroken.starter.service.impl.DeepSeekTranslate;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -9,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Objects;
/**
* 翻译相关
@ -20,13 +25,24 @@ public class TranslateController extends ControllerBase {
@Resource
private DeepSeekTranslate deepSeekTranslate;
@Resource
private ILanguageService languageService;
/**
* deepseek翻译
* @param text 要翻译的文本
* @return 翻译结果
*/
@PostMapping("deepseek")
public ApiResult<String> deepseek(@RequestParam String text) {
return ApiResult.success(deepSeekTranslate.translateWord(text, "auto", AppUserUtil.getLanguageName(), "text"));
public ApiResult<String> deepseek(HttpServletRequest request, @RequestParam String text) {
String languageCode = request.getHeader("language");
if (StrUtil.isBlank(languageCode)) {
return ApiResult.success("");
}
Language language = languageService.lambdaQuery().eq(Language::getCode, languageCode).one();
if (Objects.isNull(language)) {
return ApiResult.success("");
}
return ApiResult.success(deepSeekTranslate.translateWord(text, "auto", language.getName(), "text"));
}
}