管道气管线名称

itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/TableNameConstants.java

@@ -59,7 +59,7 @@ public interface TableNameConstants {
 	String LNG_B_TAX = "lng_b_tax";
 	
 	/**
-	 * 管道气路线表
+	 * 管道气管线表
 	 */
 	String LNG_B_PNG_LINE = "lng_b_png_line";
 	

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBStationPngVo.java

@@ -185,7 +185,8 @@ public class LngBStationPngVo {
     private Long ruleUserId;
     
     
-
+    @ApiModelProperty("")
+    private String staNameLng;
 
 
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java

@@ -23,8 +23,10 @@ import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.mdm.dto.LngBStationPngPageDto;
 import com.xjrsoft.module.mdm.dto.UpdateLngBStationPngDto;
+import com.xjrsoft.module.mdm.entity.LngBPngLine;
 import com.xjrsoft.module.mdm.entity.LngBStationPng;
 import com.xjrsoft.module.mdm.service.IPipeGasDownloadPointService;
+import com.xjrsoft.module.mdm.service.IPipelineGgasLineService;
 import com.xjrsoft.module.mdm.vo.LngBStationPngPageVo;
 import com.xjrsoft.module.mdm.vo.LngBStationPngVo;
 
@@ -50,6 +52,8 @@ public class PipeGasDownloadPointController {
 
     private final IPipeGasDownloadPointService pipeGasDownloadPointService;
 	private final DatalogService dataService;
+	
+	private final IPipelineGgasLineService pipelineGgasLineService ;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="LngBStationPng列表(分页)")
@@ -84,7 +88,13 @@ public class PipeGasDownloadPointController {
         if (lngBStationPng == null) {
            return R.error("找不到此数据！");
         }
-        return R.ok(BeanUtil.toBean(lngBStationPng, LngBStationPngVo.class));
+        LngBStationPngVo vo = new LngBStationPngVo();
+        BeanUtil.copyProperties(lngBStationPng,vo);
+        LngBPngLine bl = pipelineGgasLineService.getByCode(vo.getCode());
+        if(bl != null) {
+        	   vo.setStaNameLng(bl.getFullName());
+        }
+        return R.ok(vo);
     }
 
 

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IPipelineGgasLineService.java

@@ -22,4 +22,6 @@ public interface IPipelineGgasLineService extends IService<LngBPngLine> {
 	Long add(UpdateLngBPngLineDto dto);
 
 	Long update(UpdateLngBPngLineDto dto);
+
+	LngBPngLine getByCode(String code);
 }

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java

@@ -1,7 +1,13 @@
 package com.xjrsoft.module.mdm.service.impl;
 
+import java.util.List;
+
+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.github.yulichang.base.MPJBaseServiceImpl;
 import com.pictc.constant.FieldNameConstants;
 import com.pictc.constant.TableNameConstants;
 import com.pictc.enums.BusinessCode;
@@ -10,8 +16,6 @@ import com.pictc.utils.DataLogTools;
 import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.module.common.db.service.CommonCallService;
 import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto;
-import com.xjrsoft.module.mdm.dto.UpdateLngBPngLineDto;
-import com.xjrsoft.module.mdm.entity.LngBPngLine;
 import com.xjrsoft.module.mdm.entity.LngBPngLine;
 import com.xjrsoft.module.mdm.mapper.LngBPngLineMapper;
 import com.xjrsoft.module.mdm.service.IPipelineGgasLineService;
@@ -19,16 +23,6 @@ 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 java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
 /**
 * @title: service
 * @Author 管理员
@@ -78,6 +72,13 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl<LngBPngLineMapper,
 	    }
 		return true;
 	}
+	 
+	@Override
+	public LngBPngLine getByCode(String code) {
+		LngBPngLine bl = this.baseMapper.selectOne(new LambdaQueryWrapper<LngBPngLine>()
+		            .eq(LngBPngLine::getCode, code));
+		return bl;
+	}
 	
 	
 	@Override