Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import lombok.Data;
+
+import java.util.Collection;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/4/25
+ */
+@Data
+public class ListCompanyModel {
+
+    private String companyName;
+    private String companyCode;
+    private Long parentId;
+    private String orgCode;
+    private String companyType;
+    private Boolean disabled;
+    private Collection<ListCompanyModel> children;
+    private Long sequenceNbr;
+
+
+}

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

@@ -80,6 +80,9 @@ public class StationBasicDto extends BaseDto {
 
     @ApiModelProperty(value = "岗位")
     private String postName;
+
+    @ApiModelProperty(value = "平台关联场站id")
+    private String platformStationId;
     private List<StationCoordinateDto> stationCoordinate;
 
 

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

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 场站基础信息表
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel(value = "StationBasicDto", description = "场站基础信息表")
+public class StationInfoDto  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "场站名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "场站类型")
+    private String stationType;
+
+
+    @ApiModelProperty(value = "设备管控指标")
+    private String deviceControlIndicators;
+
+    @ApiModelProperty(value = "人员管控指标")
+    private String personControlIndicators;
+
+    @ApiModelProperty(value = "任务管控指标")
+    private String taskControlIndicators;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String laitude;
+
+
+}

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

@@ -126,6 +126,10 @@ public class StationBasic extends BaseEntity {
     
     @TableField("project_org_code")
     private String projectOrgCode;
+
+    @TableField("platform_station_id")
+    private String platformStationId;
+
     @TableField(exist =false)
     private List<StationCoordinate> stationCoordinate;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,5 +37,8 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
                                                   @Param("stationType")String stationType,
                                                   @Param("orgCode")String orgCode);
 
+    //获取场站列表信息
+    List<StationInfoDto> getStationList(@Param("orgCode")String orgCode);
+
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -102,6 +102,24 @@
         </where>
         ORDER BY  station_basic.rec_date DESC
     </select>
+    <select id="getStationList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto">
+        select
+        station_basic.station_name stationName	,
+        station_basic.station_type stationType,
+        station_basic.station_flag stationFlag,
+        station_coordinate.longitude,
+        station_coordinate.laitude ,
+        station_coordinate.is_main_coordinate
+        from station_basic
+        left join station_coordinate
+        on station_basic.sequence_nbr = station_coordinate.station_id
+        WHERE station_coordinate.is_main_coordinate = 0  LIMIT 1
+        <where>
+            <if test="orgCode != null and orgCode != ''">
+                AND station_basic.project_org_code like concat('%',#{orgCode},'%')
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.ListCompanyModel;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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 org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/4/25
+ */
+@RestController
+@Api(tags = "平台单位部门树")
+@RequestMapping(value = "/companyClient")
+public class PrivilegeController extends BaseController{
+    @Autowired
+    private RedisUtils redisUtils;
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryOrgTree")
+    @ApiOperation(httpMethod = "GET",value = "查询单位、子单位、部门树",  notes = "查询单位、子单位、部门树")
+    public FeignClientResult<Collection<UserOrgTreeModel>> queryOrgTree() {
+        //获取当前登录人单位
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+
+        Long  companyId=reginParams.getCompany().getSequenceNbr();
+
+        FeignClientResult<Collection<UserOrgTreeModel>> de =Privilege.companyClient.queryOrgTree(companyId);
+
+     return de;
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/subcompany")
+    @ApiOperation(httpMethod = "GET",value = "查询单位、子单位",  notes = "查询单位、子单位")
+    public ResponseModel< List<ListCompanyModel>> subcompany() {
+        //获取当前登录人单位
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        Long  companyId=reginParams.getCompany().getSequenceNbr();
+        List<ListCompanyModel >  date=new ArrayList();
+        if("area".equals(reginParams.getCompany().getLevel())){
+            ListCompanyModel companyModel=new ListCompanyModel();
+            companyModel.setSequenceNbr(companyId);
+            companyModel.setCompanyName(reginParams.getCompany().getCompanyName());
+            date.add(companyModel);
+        }else if("headquarter".equals(reginParams.getCompany().getLevel())){
+            FeignClientResult<Collection<CompanyModel>> de =Privilege.companyClient.querySubAgencyTree(companyId);
+            Collection<CompanyModel> dated= de.getResult();
+
+            for (CompanyModel companyModel : dated) {
+                if("area".equals(companyModel.getLevel())){
+                    ListCompanyModel companyModeld=new ListCompanyModel();
+                    companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
+                    companyModeld.setCompanyName(companyModel.getCompanyName());
+                    date.add(companyModeld);
+                }
+            }
+        }
+        return ResponseHelper.buildResponse(date);
+    }
+
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationCoordinateServiceImpl;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -41,10 +44,22 @@ public class StationBasicController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增场站基础信息表", notes = "新增场站基础信息表")
 	public ResponseModel<Object> save(@RequestBody StationBasic model) {
-	    stationBasicServiceImpl.add(model);
-	    return ResponseHelper.buildResponse(null);
+	    try {
+            stationBasicServiceImpl.add(model);
+            return ResponseHelper.buildResponse(null);
+        }catch (InnerInvokException e){
+            return  this.buildResponseFalse(e.getMessage());
+        }
 	}
-
+    public  ResponseModel buildResponseFalse(String message) {
+        ResponseModel response = new ResponseModel();
+        response.setResult(null);
+        response.setDevMessage("FAILURE");
+        response.setStatus(HttpStatus.BAD_REQUEST.value());
+        response.setMessage(message);
+        response.setDevMessage(message);
+        return response;
+    }
 	/**
      * 根据sequenceNbr更新
      *
@@ -55,15 +70,19 @@ public class StationBasicController extends BaseController {
 	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新场站基础信息表", notes = "根据sequenceNbr更新场站基础信息表")
 	public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-        stationBasicServiceImpl.update(model);
-	    return ResponseHelper.buildResponse(null);
+	    try {
+            model.setSequenceNbr(sequenceNbr);
+            stationBasicServiceImpl.update(model);
+            return ResponseHelper.buildResponse(null);
+        }catch (InnerInvokException e){
+            return  this.buildResponseFalse(e.getMessage());
+        }
 	}
 
 	/**
      * 根据sequenceNbr删除
      *
-     * @param sequenceNbr 主键
+     * @param ids 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -71,10 +90,13 @@ public class StationBasicController extends BaseController {
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除场站基础信息表", notes = "根据sequenceNbr删除场站基础信息表")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids){
 
-        String[] idss=ids.split(",");
+        try {  String[] idss=ids.split(",");
        int num= stationBasicServiceImpl.deleteList(idss);
 
        return ResponseHelper.buildResponse(num>0?true:false);
+    }catch (InnerInvokException e){
+        return  this.buildResponseFalse(e.getMessage());
+    }
     }
 
     /**
@@ -120,7 +142,7 @@ public class StationBasicController extends BaseController {
 	}
 
 	/**
-	 * 列表全部数据查询
+	 * 场站地图接口
      *
 	 * @return
 	 */
@@ -130,4 +152,16 @@ public class StationBasicController extends BaseController {
 	public ResponseModel<List<StationBasicDto>> selectForList() {
 	    return ResponseHelper.buildResponse(stationBasicServiceImpl.queryForStationBasicList());
 	}
+
+	/**
+	 * 列表全部数据查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@ApiOperation(httpMethod = "GET",value = "场站地图数据",   notes = "场站地图数据")
+	@GetMapping(value = "/listforMap")
+	public ResponseModel<List<StationInfoDto>> getStationList( @RequestParam(value = "orgCode",required = false)String orgCode) {
+		return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(orgCode));
+	}
 }

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.excel.DataSources;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.ListCompanyModel;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.UserOrgTreeModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.util.*;
 
 /**
  * @description:
@@ -23,6 +32,10 @@ import java.util.List;
 @Service
 public class ExDataSourcesImpl implements DataSources {
 
+    @Autowired
+    private RedisUtils redisUtils;
+
+
     @Override
     public String[] selectList(String type, String method) throws Exception {
         String[] str = {};
@@ -40,32 +53,67 @@ public class ExDataSourcesImpl implements DataSources {
 
 
     private String[] getArea() {
-        FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.queryAgencyTree(null);
-        Collection<CompanyModel> listco = new ArrayList<>();
-        String[] str = null;
-        if (!ObjectUtils.isEmpty(de)) {
-            if (de.getStatus() == 200) {
-                listco = de.getResult();
-                List<String> collect = this.getCompanyModel(listco);
-                str = collect.toArray(new String[collect.size()]);
-            } else {
-                throw new RuntimeException(de.getMessage());
+
+
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        Long  companyId=reginParams.getCompany().getSequenceNbr();
+        List<ListCompanyModel >  date=new ArrayList();
+        if("area".equals(reginParams.getCompany().getLevel())){
+            ListCompanyModel companyModel=new ListCompanyModel();
+            companyModel.setSequenceNbr(companyId);
+            companyModel.setCompanyName(reginParams.getCompany().getCompanyName());
+            date.add(companyModel);
+        }else if("headquarter".equals(reginParams.getCompany().getLevel())){
+            FeignClientResult<Collection<CompanyModel>> de =Privilege.companyClient.querySubAgencyTree(companyId);
+            Collection<CompanyModel> dated= de.getResult();
+
+            for (CompanyModel companyModel : dated) {
+                if("area".equals(companyModel.getLevel())){
+                    ListCompanyModel companyModeld=new ListCompanyModel();
+                    companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
+                    companyModeld.setCompanyName(companyModel.getCompanyName());
+                    date.add(companyModeld);
+                }
             }
         }
+        String[] str = null;
+        List<String> collect=new ArrayList<>();
+        this.getCompanyModel(date,collect);
+        str = collect.toArray(new String[collect.size()]);
+
+//        //获取当前登录人单位
+//        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+//
+//        Long  companyId=reginParams.getCompany().getSequenceNbr();
+//
+//        FeignClientResult<Collection<UserOrgTreeModel>> de =Privilege.companyClient.queryOrgTree(companyId);
+//
+//        Collection<UserOrgTreeModel> listco = new ArrayList<>();
+//        String[] str = null;
+//        if (!ObjectUtils.isEmpty(de)) {
+//            if (de.getStatus() == 200) {
+//                listco = de.getResult();
+//                List<String> collect=new ArrayList<>();
+//                this.getCompanyModel(listco,collect);
+//                str = collect.toArray(new String[collect.size()]);
+//            } else {
+//                throw new RuntimeException(de.getMessage());
+//            }
+//        }
         return str;
     }
 
 
 
-    public List<String> getCompanyModel(Collection<CompanyModel> data) {
-        List<String> datas = new ArrayList<>();
+    public List<String> getCompanyModel( List<ListCompanyModel>  data,List<String> datas) {
+
 
         if (!data.isEmpty()) {
-            for (CompanyModel datum : data) {
+            for (ListCompanyModel datum : data) {
                 datas.add(datum.getCompanyName() + "@" + datum.getSequenceNbr());
-                if (datum.getChildren() != null) {
-                    this.getCompanyModelchildren((List<LinkedHashMap<String,Object>> ) datum.getChildren(),datas);
-                }
+//                if (datum.getChildren() != null) {
+//                    this.getCompanyModel(datum.getChildren(),datas);
+//                }
             }
 
         }
@@ -74,19 +122,7 @@ public class ExDataSourcesImpl implements DataSources {
     }
 
 
-    public void getCompanyModelchildren(List<LinkedHashMap<String,Object>> data, List<String> datas) {
 
-        if (!data.isEmpty()) {
-            for (LinkedHashMap<String,Object> datum : data) {
-                datas.add(datum.get("companyName") + "@" + datum.get("sequenceNbr"));
-                if (datum.get("children")!= null) {
-                    this.getCompanyModelchildren((List<LinkedHashMap<String,Object>> ) datum.get("children"),datas);
-                }
-            }
-
-        }
-
-    }
 
     private String[] getDataDictionary(String type) {
         List<String> collect =new ArrayList<>();

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

@@ -8,7 +8,10 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -130,7 +133,15 @@ public class ExcelServiceImpl {
                fireChemical.setProjectOrgCode(companyModel.getOrgCode());
            }
 
-
+           //平台增加场站
+           CompanyModel companyModeldata=new CompanyModel();
+           companyModeldata.setCompanyName(fireChemical.getStationName());
+           companyModeldata.setCompanyType("company");
+           companyModeldata.setLevel("station");
+           companyModeldata.setParentId(Long.valueOf(fireChemical.getArea()));
+           companyModeldata.setCompanyCode(fireChemical.getStationCode());
+           companyModeldata= this.addCompanyModel(companyModeldata);
+           fireChemical.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
            excelEntityList.add(fireChemical);
        });
        stationBasicServiceImpl.saveBatch(excelEntityList);
@@ -158,6 +169,20 @@ public class ExcelServiceImpl {
         return listdata;
     }
 
+    private CompanyModel addCompanyModel( CompanyModel companyModel) {
+        FeignClientResult<CompanyModel> Model = Privilege.companyClient.create(companyModel);
+        CompanyModel user=new CompanyModel();
+
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()==200){
+                user = Model.getResult();
+            }else{
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+        return user;
+    }
+
 //人员导入更新
 private void updateEXPersonUser(MultipartFile multipartFile) throws Exception {
     List<EXPersonUser> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, EXPersonUser.class, 1);

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

@@ -3,14 +3,23 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationCoordinateDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccount;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 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.component.feign.config.InnerInvokException;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -78,6 +87,16 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     @Transactional
     public void add(StationBasic  stationBasic)   {
+
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.addCompanyModel(companyModeldata);
+
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -88,7 +107,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         //单位
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
-        stationBasic.setProjectOrgCode(companyModel.getOrgCode());
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //场站基本信息
         this.save(stationBasic);
 
@@ -104,7 +124,68 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
 
 
+    private CompanyModel addCompanyModel( CompanyModel companyModel) {
+        FeignClientResult<CompanyModel> Model =Privilege.companyClient.create(companyModel);
+        CompanyModel user=new CompanyModel();
+
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()==200){
+                user = Model.getResult();
+            }else{
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+        return user;
+    }
+
+    private void deleteCompany( String ids) {
+        FeignClientResult Model =Privilege.companyClient.deleteCompany(ids);
+
+        CompanyModel user=new CompanyModel();
+
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()!=200){
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+
+    }
+
+
+
+
+
+
+    private CompanyModel updateCompanyModel( CompanyModel companyModel,Long sequenceNbr) {
+        FeignClientResult<CompanyModel> Model =Privilege.companyClient.update(companyModel,sequenceNbr);
+        CompanyModel user=new CompanyModel();
+
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()==200){
+                user = Model.getResult();
+            }else{
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+        return user;
+    }
+
+
+
+
     public void update(StationBasic  stationBasic)   {
+
+
+        //平台增加场站
+        CompanyModel companyModeldata=new CompanyModel();
+        companyModeldata.setCompanyName(stationBasic.getStationName());
+        companyModeldata.setCompanyType("company");
+        companyModeldata.setLevel("station");
+        companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
+        companyModeldata.setCompanyCode(stationBasic.getStationCode());
+        companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
+
+
         //场站坐标信息
         List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
         List<StationCoordinate>  listdate=new ArrayList<>();
@@ -116,6 +197,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
         stationBasic.setProjectOrgCode(companyModel.getOrgCode());
+        stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);
 
@@ -131,6 +213,17 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     public   int deleteList(String[] ids){
 
+
+        QueryWrapper<StationBasic> wrapper = new QueryWrapper();
+        wrapper.in("sequence_nbr",ids);
+        List<StationBasic>  list=this.list(wrapper);
+        List<String> idscom=new ArrayList<>();
+        for (StationBasic personAccount : list) {
+            idscom.add(personAccount.getPlatformStationId());
+        }
+        //删除平台
+        this.deleteCompany(String.join(",",idscom));
+
            return stationBasicMapper.deleteList(ids);
          }
 
@@ -153,5 +246,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
 
     }
 
+    public List<StationInfoDto> getStationList(String orgCode){
+        return stationBasicMapper.getStationList(orgCode);
+    }
 
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application.properties

@@ -30,6 +30,8 @@ spring.liquibase.enabled=true
 
 
 ## eureka properties:
+eureka.instance.prefer-ip-address=true
+eureka.instance.ip-address=172.16.3.41
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10