diff --git a/nflg-mobilebroken-admin/pom.xml b/nflg-mobilebroken-admin/pom.xml index df5d99ac..933a0681 100644 --- a/nflg-mobilebroken-admin/pom.xml +++ b/nflg-mobilebroken-admin/pom.xml @@ -25,10 +25,10 @@ org.springframework.boot spring-boot-starter - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config @@ -67,7 +67,7 @@ ognl ognl - 3.1.26 + 3.4.3 @@ -84,6 +84,12 @@ org.xhtmlrenderer flying-saucer-pdf 9.3.1 + + + bcprov-jdk14 + org.bouncycastle + + @@ -122,12 +128,18 @@ com.aliyun alimt20181012 - 1.4.0 + 1.5.0 com.aliyun tea-openapi - 0.3.8 + 0.3.9 + + + dom4j + org.dom4j + + diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdvertisementController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdvertisementController.java index 5487c5c1..f6a63b3f 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdvertisementController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdvertisementController.java @@ -9,6 +9,7 @@ import com.nflg.mobilebroken.common.pojo.request.AdvertisementSaveRequest; import com.nflg.mobilebroken.common.pojo.request.PageRequest; import com.nflg.mobilebroken.common.pojo.vo.AdvertisementListVO; import com.nflg.mobilebroken.common.pojo.vo.AdvertisementVO; +import com.nflg.mobilebroken.common.util.MultilingualUtil; import com.nflg.mobilebroken.repository.entity.DictionaryItem; import com.nflg.mobilebroken.repository.service.IAdvertisementService; import com.nflg.mobilebroken.repository.service.IDictionaryItemService; @@ -43,7 +44,7 @@ public class AdvertisementController extends ControllerBase{ @GetMapping("getType") @ApiMark(moduleName = "广告", apiName = "获取广告类型",isPublic = true) public ApiResult> getType(){ - return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_TYPE)); + return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_TYPE, MultilingualUtil.getLanguage())); } /** @@ -53,7 +54,7 @@ public class AdvertisementController extends ControllerBase{ @GetMapping("getPosition") @ApiMark(moduleName = "广告", apiName = "获取广告位置",isPublic = true) public ApiResult> getPosition(){ - return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_POSITION)); + return ApiResult.success(dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_AD_POSITION, MultilingualUtil.getLanguage())); } /** diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java index d73560c8..7c90bdf0 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/PositionController.java @@ -4,7 +4,7 @@ package com.nflg.mobilebroken.admin.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.admin.annotation.ApiMark; import com.nflg.mobilebroken.admin.constant.Constant; @@ -79,7 +79,7 @@ public class PositionController extends ControllerBase { List allLanguage = languageService.lambdaQuery().eq(Language::getEnable, true).list(); Map positionLanguageMp=new HashMap<>(); if(StrUtil.isNotBlank(ent.getPositionLanguage())) { - List positionLanguage = JSON.parseArray(ent.getPositionLanguage(), PositionLanguageVO.class); + List positionLanguage = JSONUtil.toList(ent.getPositionLanguage(), PositionLanguageVO.class); positionLanguageMp = positionLanguage.stream().filter(u->StrUtil.isNotBlank(u.getLanguageValue()) ) .collect(Collectors.toMap(PositionLanguageVO::getCode, PositionLanguageVO::getLanguageValue)); } @@ -113,7 +113,7 @@ public class PositionController extends ControllerBase { @ApiMark(moduleName = "职位管理", apiName = "新增") public ApiResult add(@Valid @RequestBody PositionDetailDTO positionDetailDto) { TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto); - ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage())); + ent.setPositionLanguage(JSONUtil.toJsonStr(positionDetailDto.getLanguage())); ent.setPositionCode(UniqueSequenceGenerator.generateCode(Constant.JobCodePrefix)); ent.setDataCreateUserNo(AdminUserUtil.getUserNo()); ent.setDataCreateUserName(AdminUserUtil.getUserName()); @@ -132,7 +132,7 @@ public class PositionController extends ControllerBase { VUtils.trueThrow(positionDetailDto.getId()<=0).throwMessage(STATE.ParamErr,"编辑时ID不能等于0"); TBasePosition ent = Convert.convert(TBasePosition.class, positionDetailDto); ent.setPositionCode(null); - ent.setPositionLanguage(JSON.toJSONString(positionDetailDto.getLanguage())); + ent.setPositionLanguage(JSONUtil.toJsonStr(positionDetailDto.getLanguage())); ent.setDataModifyUserNo(AdminUserUtil.getUserNo()); ent.setDataModifyUserName(AdminUserUtil.getUserName()); ent.setDataModifyTime(LocalDateTime.now()); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java index 2424f709..bcbc3b23 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java @@ -837,10 +837,11 @@ public class ProductModelController extends ControllerBase{ /** * 获取图册列表用于排序 + * @param modelId 机型ID */ @GetMapping("/getImageListForSort") - public ApiResult> getImageListForSort(){ - return ApiResult.success(productModelImageService.getListForSort()); + public ApiResult> getImageListForSort(@Valid @RequestParam @NotNull Integer modelId){ + return ApiResult.success(productModelImageService.getListForSort(modelId)); } /** @@ -922,10 +923,11 @@ public class ProductModelController extends ControllerBase{ /** * 获取视频列表用于排序 + * @param modelId 机型ID */ @GetMapping("/getVideoListForSort") - public ApiResult> getVideoListForSort(){ - return ApiResult.success(productModelVideoService.getListForSort()); + public ApiResult> getVideoListForSort(@Valid @RequestParam @NotNull Integer modelId){ + return ApiResult.success(productModelVideoService.getListForSort(modelId)); } /** @@ -1031,10 +1033,11 @@ public class ProductModelController extends ControllerBase{ /** * 获取资料列表用于排序 + * @param modelId 机型ID */ @GetMapping("/getFileListForSort") - public ApiResult> getFileListForSort(){ - return ApiResult.success(productModelFileService.getListForSort()); + public ApiResult> getFileListForSort(@Valid @RequestParam @NotNull Integer modelId){ + return ApiResult.success(productModelFileService.getListForSort(modelId)); } /** diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java index 28ed3c21..0c7ec629 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java @@ -3,7 +3,8 @@ package com.nflg.mobilebroken.admin.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.google.common.collect.ImmutableList; import com.nflg.mobilebroken.admin.constant.DeviceSourceFromEnum; import com.nflg.mobilebroken.admin.pojo.dto.DeviceDTO; @@ -145,8 +146,8 @@ public class AdminDeviceService { ent.setDeviceTypeSub(u.getAssetProductLine4__c()); ent.setModelNo(u.getProductLine5__c()); if (StrUtil.isNotBlank(u.getAccount())) { - JSONObject jsonObject = JSONObject.parseObject(u.getAccount()); - String cname = jsonObject.getString("Name"); + JSONObject jsonObject = JSONUtil.parseObj(u.getAccount()); + String cname = jsonObject.getStr("Name"); ent.setCustomerName(cname); } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/CrmService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/CrmService.java index be48f7ef..cdf94e12 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/CrmService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/CrmService.java @@ -3,8 +3,8 @@ package com.nflg.mobilebroken.admin.service; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.nflg.mobilebroken.admin.pojo.dto.CrmGetTokenResultDTO; import com.nflg.mobilebroken.admin.pojo.dto.SyncFromCrmDTO; import com.nflg.mobilebroken.admin.pojo.vo.CmrAgentResultVO; @@ -74,7 +74,7 @@ public class CrmService { paramMp.put("password", password); paramMp.put("client_secret", clientSecret); String s = httpUtils.doformPost(tokenUrl, paramMp); - CrmGetTokenResultDTO result = JSONObject.parseObject(s, CrmGetTokenResultDTO.class); + CrmGetTokenResultDTO result = JSONUtil.toBean(s, CrmGetTokenResultDTO.class); if (Objects.nonNull(result) && StrUtil.isNotBlank(result.getAccess_token())) { crmTokenCache.put(tokenCacheKey, result.getAccess_token()); @@ -101,12 +101,12 @@ public class CrmService { // Map reBody = new HashMap<>(); // reBody.put("CrLsDate", date); String token = StrUtil.join(" ", "Bearer", getToken()); - String orderResult = httpUtils.doPost(getAgentUrl, JSON.toJSONString(dateParam), token); - JSONObject jsonObject = JSONObject.parseObject(orderResult); - String code = jsonObject.getString("code"); + String orderResult = httpUtils.doPost(getAgentUrl, JSONUtil.toJsonStr(dateParam), token); + JSONObject jsonObject = JSONUtil.parseObj(orderResult); + String code = jsonObject.getStr("code"); if (Objects.equals(code, "0")) { - String dataResult = jsonObject.getString("jsonData"); - return JSON.parseArray(dataResult, CmrAgentResultVO.class); + String dataResult = jsonObject.getStr("jsonData"); + return JSONUtil.toList(dataResult, CmrAgentResultVO.class); } } catch (Exception ex) { throw new NflgException(STATE.BusinessError, ex.getMessage()); @@ -125,12 +125,12 @@ public class CrmService { Map reBody = new HashMap<>(); // reBody.put("CrLsDate", startDate); String token = StrUtil.join(" ", "Bearer", getToken()); - String orderResult = httpUtils.doPost(getDeviceUrl, JSON.toJSONString(dateParam), token); - JSONObject jsonObject = JSONObject.parseObject(orderResult); - String code = jsonObject.getString("code"); + String orderResult = httpUtils.doPost(getDeviceUrl, JSONUtil.toJsonStr(dateParam), token); + JSONObject jsonObject = JSONUtil.parseObj(orderResult); + String code = jsonObject.getStr("code"); if (Objects.equals(code, "0")) { - String dataResult = jsonObject.getString("jsonData"); - return JSON.parseArray(dataResult, CmrDeviceResultVO.class); + String dataResult = jsonObject.getStr("jsonData"); + return JSONUtil.toList(dataResult, CmrDeviceResultVO.class); } } catch (Exception ex) { throw new NflgException(STATE.BusinessError, ex.getMessage()); diff --git a/nflg-mobilebroken-auth/pom.xml b/nflg-mobilebroken-auth/pom.xml index 1c747f4e..9aa22e75 100644 --- a/nflg-mobilebroken-auth/pom.xml +++ b/nflg-mobilebroken-auth/pom.xml @@ -16,10 +16,10 @@ com.nflg nflg-mobilebroken-repository - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java index b40b8e58..4d27c111 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductIntroInfoAddRequest.java @@ -21,13 +21,11 @@ public class ProductIntroInfoAddRequest { /** * 标题 */ - @NotBlank private String name; /** * 内容 */ - @NotBlank private String desc; /** diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java index 26854bb2..61930841 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/FrontendProductModelSearchVO.java @@ -26,6 +26,16 @@ public class FrontendProductModelSearchVO { */ private String typeName; + /** + * 系列批次号 + */ + private String seriesNumber; + + /** + * 类型批次号 + */ + private String typeNumber; + /** * 名称 */ diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSimpleVO.java index 0027264f..d2ea31f5 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSimpleVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductSeriesSimpleVO.java @@ -2,6 +2,8 @@ package com.nflg.mobilebroken.common.pojo.vo; import lombok.Data; +import java.util.List; + @Data public class ProductSeriesSimpleVO { @@ -14,4 +16,9 @@ public class ProductSeriesSimpleVO { * 批次号 */ private String batchNumber; + + /** + * 类型列表 + */ + private List types; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeSimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeSimpleVO.java new file mode 100644 index 00000000..1a2dcb66 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductTypeSimpleVO.java @@ -0,0 +1,17 @@ +package com.nflg.mobilebroken.common.pojo.vo; + +import lombok.Data; + +@Data +public class ProductTypeSimpleVO { + + /** + * 名称 + */ + private String name; + + /** + * 批次号 + */ + private String batchNumber; +} diff --git a/nflg-mobilebroken-gateway/pom.xml b/nflg-mobilebroken-gateway/pom.xml index 5a2300dc..e5db8082 100644 --- a/nflg-mobilebroken-gateway/pom.xml +++ b/nflg-mobilebroken-gateway/pom.xml @@ -25,10 +25,10 @@ org.springframework.cloud spring-cloud-starter-gateway - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/nflg-mobilebroken-product/pom.xml b/nflg-mobilebroken-product/pom.xml index 610bf619..0846f229 100644 --- a/nflg-mobilebroken-product/pom.xml +++ b/nflg-mobilebroken-product/pom.xml @@ -25,10 +25,10 @@ org.springframework.boot spring-boot-starter - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java b/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java index b47ce6f0..0453d932 100644 --- a/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java +++ b/nflg-mobilebroken-product/src/main/java/com/nflg/mobilebroken/product/controller/InfoController.java @@ -74,7 +74,7 @@ public class InfoController extends BaseController{ */ @GetMapping("/getModuleList") public ApiResult> getModuleList(){ - List items = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_PRODUCT_MODULE); + List items = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_PRODUCT_MODULE, MultilingualUtil.getLanguage()); return ApiResult.success(items.stream().map(it -> new ModuleVO() .setId(it.getId()) .setName(it.getName()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java index 6072d447..66c31981 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java @@ -22,7 +22,7 @@ public interface DictionaryItemMapper extends BaseMapper { String getName(String dictionaryCode, String itemCode); - List getListByDictionaryCode(String code); + List getListByDictionaryCode(String code,String language); DictionaryItem getByCode(String dictionaryCode, String dictionaryItemCode); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java index 3414c39e..8c9ffd52 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java @@ -27,4 +27,6 @@ public interface ProductModelMapper extends BaseMapper { Page search(String name, String language, Page page); List getSimpleList(String typeNumber); + + List getListForSort(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java index e2d3dfa9..4502ee1e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java @@ -30,4 +30,8 @@ public interface ProductTypeMapper extends BaseMapper { List getFilesByLanguage(Integer moduleId, String seriesNumber, String language); List getSimpleList(String seriesNumber); + + List getSimpleListByLanguage(String batchNumber, String language); + + List getListForSort(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java index 68d1be13..2232c1c1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java @@ -26,5 +26,7 @@ public interface IDictionaryItemService extends IService { List getListByDictionaryCode(String code); + List getListByDictionaryCode(String code,String language); + DictionaryItem getByCode(String dictionaryCode, String DictionaryItemCode); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java index 1fe2d9ea..312b7ca1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileService.java @@ -39,7 +39,7 @@ public interface IProductModelFileService extends IService { void deleteByModel(@NotEmpty List ids); - List getListForSort(); + List getListForSort(Integer modelId); void saveSort(SortSaveRequest request); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java index 5a580277..eceaf174 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageService.java @@ -39,7 +39,7 @@ public interface IProductModelImageService extends IService { void deleteByModel(@NotEmpty List ids); - List getListForSort(); + List getListForSort(Integer modelId); void saveSort(SortSaveRequest request); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java index 62e4117f..92ab1d11 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoService.java @@ -39,7 +39,7 @@ public interface IProductModelVideoService extends IService { void deleteByModel(@NotEmpty List ids); - List getListForSort(); + List getListForSort(Integer modelId); void saveSort(SortSaveRequest request); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java index fdc1e8a7..373de917 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductSeriesService.java @@ -36,7 +36,7 @@ public interface IProductSeriesService extends IService { List getSimpleList(Integer moduleId); - List getSimpleList(Integer moduleId,String language); + List getSimpleList(Integer moduleId, String language); ProductSeriesInfoVO getInfo(@Valid @NotNull Integer seriesId); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java index 07627e23..f6568db2 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java @@ -49,4 +49,6 @@ public interface IProductTypeService extends IService { List getFilesByLanguage(@Valid @NotNull Integer moduleId, String seriesNumber, String language); ProductTypeLanguageInfoVO getInfoByLanguage(@Valid @NotNull String typeNumber, String language); + + List getSimpleListByLanguage(String batchNumber, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java index 949571f7..0ee9bf1b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.pojo.request.DictionaryItemSearchRequest; import com.nflg.mobilebroken.common.pojo.request.SaveDictionaryItemRequest; import com.nflg.mobilebroken.common.pojo.request.TranslateMap; @@ -133,7 +134,12 @@ public class DictionaryItemServiceImpl extends ServiceImpl getListByDictionaryCode(String code) { - return baseMapper.getListByDictionaryCode(code); + return getListByDictionaryCode(code, Constant.DEFAULT_LANGUAGE_CODE); + } + + @Override + public List getListByDictionaryCode(String code,String language) { + return baseMapper.getListByDictionaryCode(code,language); } @Override diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java index 675f04f0..a561a4b3 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java @@ -189,10 +189,11 @@ public class ProductModelFileServiceImpl extends ServiceImpl getListForSort() { + public List getListForSort(Integer modelId) { return lambdaQuery() .eq(ProductModelFile::getEnable, true) .eq(ProductModelFile::getState, PublishState.Published.getState()) + .eq(ProductModelFile::getModelId, modelId) .orderByAsc(ProductModelFile::getSort) .list(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java index c8e70790..2285dfa1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java @@ -178,10 +178,11 @@ public class ProductModelImageServiceImpl extends ServiceImpl getListForSort() { + public List getListForSort(Integer modelId) { return lambdaQuery() .eq(ProductModelImage::getEnable, true) .eq(ProductModelImage::getState, PublishState.Published.getState()) + .eq(ProductModelImage::getModelId, modelId) .orderByAsc(ProductModelImage::getSort) .list(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java index d9e6b9a1..b759410e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java @@ -353,13 +353,15 @@ public class ProductModelServiceImpl extends ServiceImpl getListForSort() { - return Convert.toList(ProductModelSearchVO.class, - lambdaQuery() - .eq(ProductModel::getEnable, true) - .eq(ProductModel::getState, PublishState.Published.getState()) - .orderByAsc(ProductModel::getSort) - .list() - ); +// return Convert.toList(ProductModelSearchVO.class, +// lambdaQuery() +// .eq(ProductModel::getEnable, true) +// .eq(ProductModel::getState, PublishState.Published.getState()) +// .eq(ProductModel::getTypeNumber, typeNumber) +// .orderByAsc(ProductModel::getSort) +// .list() +// ); + return baseMapper.getListForSort(); } @Transactional diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java index 76dc8edb..698a18df 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java @@ -178,10 +178,11 @@ public class ProductModelVideoServiceImpl extends ServiceImpl getListForSort() { + public List getListForSort(Integer modelId) { return lambdaQuery() .eq(ProductModelVideo::getEnable, true) .eq(ProductModelVideo::getState, PublishState.Published.getState()) + .eq(ProductModelVideo::getModelId, modelId) .orderByAsc(ProductModelVideo::getSort) .list(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java index fcbbbf0e..372fa57e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java @@ -205,7 +205,11 @@ public class ProductSeriesServiceImpl extends ServiceImpl getSimpleList(Integer moduleId, String language) { - return baseMapper.getSimpleListByLanguage(moduleId,language); + List list = baseMapper.getSimpleListByLanguage(moduleId,language); + list.forEach(item->{ + item.setTypes(productTypeService.getSimpleListByLanguage(item.getBatchNumber(),language)); + }); + return list; } @Override diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java index 58b59cc3..4d284b89 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java @@ -1,7 +1,6 @@ package com.nflg.mobilebroken.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -264,13 +263,7 @@ public class ProductTypeServiceImpl extends ServiceImpl getListForSort() { - return Convert.toList(ProductTypeSearchVO.class, - lambdaQuery() - .eq(ProductType::getEnable, true) - .eq(ProductType::getState, PublishState.Published.getState()) - .orderByAsc(ProductType::getSort) - .list() - ); + return baseMapper.getListForSort(); } @Transactional @@ -314,6 +307,11 @@ public class ProductTypeServiceImpl extends ServiceImpl getSimpleListByLanguage(String batchNumber, String language) { + return baseMapper.getSimpleListByLanguage(batchNumber,language); + } + private void delete(Integer typeId){ ProductType info=getById(typeId); removeById(typeId); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java index 76a7db3a..24819740 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionAuditServiceImpl.java @@ -53,7 +53,7 @@ public class TicketSolutionAuditServiceImpl extends ServiceImpl getByTicket(Integer ticketId) { - List items=dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_REVIEW_DEPARTMENT); + List items=dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_REVIEW_DEPARTMENT,Constant.DEFAULT_LANGUAGE_CODE); List vos=baseMapper.getByTicket(ticketId); items.forEach(item->{ if (vos.stream().noneMatch(vo->vo.getDeptName().equals(item.getName()))){ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java index 0dfbcfb4..aa1730c7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java @@ -56,7 +56,7 @@ public class TicketSolutionServiceImpl extends ServiceImpl initial= new ArrayList<>(); if (Objects.equals(ticket.getState(), TicketState.Processing.getState()) || Objects.equals(ticket.getState(), TicketState.ProcessingCompleted.getState())) { - initial = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_MEASURES); + initial = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SOLUTION_MEASURES,Constant.DEFAULT_LANGUAGE_CODE); } List solutions = lambdaQuery().eq(TicketSolution::getTicketId, ticketId).orderByAsc(TicketSolution::getId).list(); Map> groupedSolutions = solutions.stream().collect(Collectors.groupingBy(TicketSolution::getDictionaryItemName, LinkedHashMap::new, Collectors.toList())); diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml index 232e8898..c593bbca 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml @@ -10,9 +10,10 @@ diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml index 2eb79f69..c6a2f242 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml @@ -83,4 +83,12 @@ ORDER BY recommend DESC,sort,id DESC LIMIT 8 + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml index 8cacad16..3ba47f01 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml @@ -82,4 +82,22 @@ from product_type where enable=1 and state!=2 + + + + diff --git a/nflg-mobilebroken-starter/pom.xml b/nflg-mobilebroken-starter/pom.xml index c212fa1d..2a9da921 100644 --- a/nflg-mobilebroken-starter/pom.xml +++ b/nflg-mobilebroken-starter/pom.xml @@ -99,11 +99,11 @@ org.springframework.boot spring-boot-starter-aop - - com.alibaba - fastjson - 1.2.83 - + + + + + cn.dev33 sa-token-jwt diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/LoggingAspect.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/LoggingAspect.java index 3455bb73..b1a63c68 100644 --- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/LoggingAspect.java +++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/LoggingAspect.java @@ -1,6 +1,6 @@ package com.nflg.mobilebroken.starter.advice; -import com.alibaba.fastjson.JSON; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.pojo.ApiResult; @@ -67,9 +67,9 @@ public class LoggingAspect { //日志明细 logDetail.setRowId(requestId); - logDetail.setRequestParam(JSON.toJSONString(joinPoint.getArgs())); + logDetail.setRequestParam(JSONUtil.toJsonStr(joinPoint.getArgs())); Object result = joinPoint.proceed(); - logDetail.setRequestReturn(JSON.toJSONString(result)); + logDetail.setRequestReturn(JSONUtil.toJsonStr(result)); return result; } catch (Throwable ex) { diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/service/impl/DefaultRequestLogService.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/service/impl/DefaultRequestLogService.java index 1b41a874..a9b707c6 100644 --- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/service/impl/DefaultRequestLogService.java +++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/service/impl/DefaultRequestLogService.java @@ -1,6 +1,6 @@ package com.nflg.mobilebroken.starter.service.impl; -import com.alibaba.fastjson.JSON; +import cn.hutool.json.JSONUtil; import com.nflg.mobilebroken.repository.entity.TBaseRequestLog; import com.nflg.mobilebroken.repository.entity.TBaseRequestLogDetail; import com.nflg.mobilebroken.starter.service.IRequestLog; @@ -17,6 +17,6 @@ public class DefaultRequestLogService implements IRequestLog { @Override public void addLog(TBaseRequestLog log, TBaseRequestLogDetail logDetail) { - logger.info(JSON.toJSONString(log)); + logger.info(JSONUtil.toJsonStr(log)); } }