场站新增归属地区名称属性

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationBasicDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 
@@ -17,10 +18,10 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="StationBasicDto", description="场站基础信息表")
-public class StationBasicDto  extends BaseDto {
+@ApiModel(value = "StationBasicDto", description = "场站基础信息表")
+public class StationBasicDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "场站名称")
@@ -71,8 +72,9 @@ public class StationBasicDto  extends BaseDto {
     @ApiModelProperty(value = "所属片区")
     private String area;
 
+    @ApiModelProperty(value = "所属地区名称")
+    private String belongAreaName;
     private List<StationCoordinateDto> stationCoordinate;
 
 
-
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java

@@ -95,7 +95,11 @@ public class StationBasic extends BaseEntity {
      */
 	@TableField("belong_area")
     private String belongArea;
-
+    /**
+     * 所属地区名称
+     */
+    @TableField("belong_area_name")
+    private String belongAreaName;
 
     @TableField(exist =false)
     private List<Integer> belongArealist;

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -315,7 +315,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         }
         return departmentModel;
     }
-    private CompanyModel getCompanyModel(Long projectId) {
+    public CompanyModel getCompanyModel(Long projectId) {
         FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
         CompanyModel companyModel=new CompanyModel();
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IStationBasicService;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,6 +31,9 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     @Autowired
     StationCoordinateServiceImpl stationCoordinateServiceImpl;
+
+    @Autowired
+    PersonBasicServiceImpl personBasicServiceImpl;
     @Autowired
     StationBasicMapper stationBasicMapper;
     /**
@@ -77,7 +81,10 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         if(stationBasic.getBelongArealist()!=null){
             stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
         }
-
+        CompanyModel companyModel=new CompanyModel();
+        //单位
+        companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getBelongArea()));
+        stationBasic.setBelongAreaName(companyModel.getCompanyName());
         //场站基本信息
         this.save(stationBasic);
 
@@ -100,6 +107,10 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         if(stationBasic.getBelongArealist()!=null){
             stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
         }
+        CompanyModel companyModel=new CompanyModel();
+        //单位
+        companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getBelongArea()));
+        stationBasic.setBelongAreaName(companyModel.getCompanyName());
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);