diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ILngStationClient.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ILngStationClient.java new file mode 100644 index 0000000..6b325a6 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/client/ILngStationClient.java @@ -0,0 +1,24 @@ +package com.xjrsoft.module.mdm.client; + +import java.util.Map; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.xjrsoft.common.constant.GlobalConstant; + +/** + * @author: ksy + * @since: 2025/11/5 + */ +@FeignClient(value = GlobalConstant.CLIENT_PCITC_MDM_NAME, path = GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/tran/lngStation") +public interface ILngStationClient { + + @GetMapping("/getAllTranData") + Map getAllTranData(); + + @GetMapping("/getTranById") + String getTranById(@RequestParam("id")String id); + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java index 13bc007..f826945 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPngLinePageVo.java @@ -44,6 +44,7 @@ public class LngBPngLinePageVo { * 自有接收站(惠州/阳江) */ @ApiModelProperty("自有接收站(惠州/阳江)") + @Trans(type = TransType.LNG_STATION) private String staCodeLng; /** * 显示顺序 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java index 787cf18..20407ef 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java @@ -63,7 +63,7 @@ public class AddLngFileUploadDto implements Serializable { */ @ApiModelProperty("") @LogField(name="",index=0) - private Long filesize; + private Long fileSize; /** * */ @@ -82,5 +82,9 @@ public class AddLngFileUploadDto implements Serializable { @ApiModelProperty("") @LogField(name="",index=0) private Long tenantId; + + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java index e230d7a..c2c7bd7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java @@ -80,7 +80,7 @@ public class UpdateLngFileUploadDto implements Serializable { */ @LogField(name="",index=6) @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** * @@ -103,5 +103,7 @@ public class UpdateLngFileUploadDto implements Serializable { @ApiModelProperty("") private Long tenantId; - + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java index f05f4df..bee7962 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.TableField; +import com.pictc.annotations.datalog.LogField; /** * @title: 表单出参 @@ -65,7 +66,7 @@ public class LngFileUploadVo { * */ @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** @@ -134,5 +135,9 @@ public class LngFileUploadVo { @ApiModelProperty("") private String presignedUrl; + + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/LngStationClientImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/LngStationClientImpl.java new file mode 100644 index 0000000..69e9479 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/client/LngStationClientImpl.java @@ -0,0 +1,50 @@ +package com.xjrsoft.module.mdm.client; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.xjrsoft.common.constant.GlobalConstant; +import com.xjrsoft.common.utils.TenantUtil; +import com.xjrsoft.module.mdm.entity.LngBStationLng; +import com.xjrsoft.module.mdm.service.ILNGStationService; + +import lombok.AllArgsConstructor; + +/** + * @author: yjw + * @since: 2025/3/5 + */ +//@Api(hidden = true) +@RestController +@RequestMapping(GlobalConstant.CLIENT_API_PRE + GlobalConstant.MDM_MODULE_PREFIX + "/tran/lngStation") +@AllArgsConstructor +public class LngStationClientImpl implements ILngStationClient { + + private final ILNGStationService lngStationService; + + @GetMapping("/getAllTranData") + @Override + public Map getAllTranData() { + try { + TenantUtil.ignore(true); + List list = lngStationService.list(); + return list.stream().collect(Collectors.toMap(LngBStationLng::getCode,LngBStationLng::getFullName)); + }finally { + TenantUtil.clear(); + } + } + + @GetMapping("/getTranById") + @Override + public String getTranById(@RequestParam("id")String code) { + LngBStationLng region = lngStationService.getByCode(code); + return region!=null?region.getFullName():null; + } + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ILNGStationService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ILNGStationService.java index 3ef055f..a7a2e46 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ILNGStationService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ILNGStationService.java @@ -23,4 +23,6 @@ public interface ILNGStationService extends IService { boolean enable(@Valid List ids); boolean disable(@Valid List ids); + + LngBStationLng getByCode(String code); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index 6bc2297..d88d4f2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -17,7 +17,6 @@ import com.pictc.utils.CollectionUtils; import com.xjrsoft.common.constant.GlobalConstant; import com.xjrsoft.common.utils.TreeUtil; import com.xjrsoft.module.mdm.entity.LngBRegion; -import com.xjrsoft.module.mdm.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.mapper.LngBRegionMapper; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo; @@ -60,7 +59,8 @@ public class CountryRegionServiceImpl extends ServiceImpl tempQw = Wrappers.query().lambda() - .notIn(StringUtils.isNotBlank(excludeType),LngBRegion::getRegionTypeCode, excludeTypeList); + .notIn(StringUtils.isNotBlank(excludeType),LngBRegion::getRegionTypeCode, excludeTypeList) + .orderByAsc(LngBRegion::getCode); //.eq(StringUtils.isNotBlank(startPCode),LngBRegion::getCode, startPCode); List allList = this.list(tempQw); Map map = allList.stream().collect(Collectors.toMap(LngBRegion::getId, @@ -145,7 +145,7 @@ public class CountryRegionServiceImpl extends ServiceImpl { x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); - })); + }).orderByAsc(LngBRegion::getCode)); List voList = CollectionUtils.newArrayList(); if(regionList != null && regionList.size() > 0) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/LNGStationServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/LNGStationServiceImpl.java index b2a73e2..75e2680 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/LNGStationServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/LNGStationServiceImpl.java @@ -1,5 +1,12 @@ package com.xjrsoft.module.mdm.service.impl; +import java.util.List; +import java.util.Objects; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pictc.constant.FieldNameConstants; @@ -7,6 +14,8 @@ import com.pictc.constant.TableNameConstants; import com.pictc.enums.BusinessCode; import com.pictc.enums.ExceptionCommonCode; import com.pictc.utils.DataLogTools; +import com.xjrsoft.common.advice.tran.LngStationDataProvider; +import com.xjrsoft.common.advice.tran.RegionDataProvider; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.common.db.service.CommonCallService; import com.xjrsoft.module.mdm.dto.UpdateLngBStationLngDto; @@ -14,13 +23,8 @@ import com.xjrsoft.module.mdm.entity.LngBStationLng; import com.xjrsoft.module.mdm.mapper.LngBStationLngMapper; import com.xjrsoft.module.mdm.service.ILNGStationService; import com.xjrsoft.module.system.client.ICodeRuleClient; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; +import lombok.AllArgsConstructor; /** * @title: service @@ -37,6 +41,8 @@ public class LNGStationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(LngBStationLng::getCode,code); + return baseMapper.selectOne(queryWrapper); + } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java index effac17..97cc2b2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java @@ -71,7 +71,7 @@ public class LngFileUpload implements Serializable { * */ @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** * @@ -136,5 +136,8 @@ public class LngFileUpload implements Serializable { @ApiModelProperty("") @TableField(exist = false) private String presignedUrl; + + //@ApiModelProperty("") + //private Long xjrFileId; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 75f92a9..a1b57c7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -84,10 +84,10 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl