站管理

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -36,6 +37,18 @@ public class PersonAccountDto  extends BaseDto {
     @ApiModelProperty(value = "角色名称")
     private String roleName;
 
+
+    @ApiModelProperty(value = "密码")
+    private String  password;
+    @ApiModelProperty(value = "二次密码")
+    private String  secondaryPassword;
+
+    /**
+     * 应用
+     */
+    @ApiModelProperty(value = "应用")
+    private String application;
+
     @ApiModelProperty(value = "组织机构id")
     private String orgCode;
 

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

@@ -63,6 +63,8 @@ public class PersonBasicDto  extends BaseDto {
 
     @ApiModelProperty(value = "应急电话")
     private String emergencyPhone;
+    @ApiModelProperty(value = "电话")
+    private String phone;
 
     @ApiModelProperty(value = "身高（厘米）")
     private Integer height;

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

+
+
 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 /**
@@ -6,4 +8,17 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
  * @createDate: 2023/4/20
  */
 public class PersonDto {
+    //人员基本信息
+   private PersonBasicDto personBasicDto;
+    //归属信息
+    private PersonAscriptionDto personAscriptionDto;
+    //技能学历
+    private PersonSkillEducationDto personSkillEducationDto;
+    //资质信息
+    private PersonCertificateDto personCertificateDto;
+
+    //账户信息
+    private PersonAccountDto personAccountDto;
+
+
 }

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -31,6 +32,9 @@ public class PersonSkillEducationDto  extends BaseDto {
     @ApiModelProperty(value = "技能鉴定工种key")
     private String workTypeKey;
 
+    @ApiModelProperty(value = "工种名称")
+    private String workName;
+
     @ApiModelProperty(value = "专业技术资格key")
     private String professionalTechnologyKey;
 
@@ -46,6 +50,9 @@ public class PersonSkillEducationDto  extends BaseDto {
     @ApiModelProperty(value = "岗位执业鉴定证书")
     private String professionalQualificationCertificate;
 
+    @ApiModelProperty(value = " 岗位职业鉴定证书")
+    private String professionalCareerCertificate;
+
     @ApiModelProperty(value = "初始学历key")
     private String initialEducationKey;
 

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 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;
 
 /**
  * 场站基础信息表
@@ -27,6 +29,15 @@ public class StationBasicDto  extends BaseDto {
     @ApiModelProperty(value = "场站编号")
     private String stationCode;
 
+    @ApiModelProperty(value = "场站类型")
+    private String stationType;
+
+    @ApiModelProperty(value = "项目状态")
+    private String stationFlag;
+
+    @ApiModelProperty("地址")
+    private String address;
+
     @ApiModelProperty(value = "站长")
     private String stationMasterName;
 
@@ -46,7 +57,7 @@ public class StationBasicDto  extends BaseDto {
     private String devopsTime;
 
     @ApiModelProperty(value = "所属地区")
-    private String belongArea;
+    private List<Integer> belongArea;
 
     @ApiModelProperty(value = "业主单位")
     private String ownerUnit;
@@ -57,4 +68,11 @@ public class StationBasicDto  extends BaseDto {
     @ApiModelProperty(value = "场站log")
     private String stationLogo;
 
+    @ApiModelProperty(value = "所属片区")
+    private String area;
+
+    private List<StationCoordinateDto> stationCoordinate;
+
+
+
 }

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

@@ -21,9 +21,6 @@ public class StationCoordinateDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "ID")
-    private Long id;
-
     @ApiModelProperty(value = "场站id")
     private Long stationId;
 
@@ -36,13 +33,10 @@ public class StationCoordinateDto  extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String laitude;
 
-    @ApiModelProperty(value = "场站范围")
-    private String stationRange;
 
     @ApiModelProperty(value = "是否主左边（0是1否）")
-    private Integer isMainCoordinate;
+    private String isMainCoordinate;
+
 
-    @ApiModelProperty(value = "是否删除")
-    private String status;
 
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -52,6 +53,19 @@ public class PersonAccount extends BaseEntity {
 	@TableField("role_name")
     private String roleName;
 
+
+    /**
+     * 应用
+     */
+    @TableField("application")
+    private String application;
+
+    @TableField("password")
+    private String  password;
+    @TableField("secondary_password")
+    private String  secondaryPassword;
+
+
     /**
      * 组织机构id
      */
@@ -76,4 +90,8 @@ public class PersonAccount extends BaseEntity {
 	@TableField("sc_user_category")
     private String scUserCategory;
 
+
+
+
+
 }

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

@@ -41,13 +41,13 @@ public class PersonAscription extends BaseEntity {
     private Date stationWorkTime;
 
     /**
-     * 所在项目id
+     *所属场站
      */
 	@TableField("project_id")
     private Long projectId;
 
     /**
-     * 
+     * 部门班组
      */
 	@TableField("department_id")
     private Long departmentId;

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -105,7 +106,8 @@ public class PersonBasic extends BaseEntity {
      */
 	@TableField("emergency_phone")
     private String emergencyPhone;
-
+    @TableField("phone")
+    private String phone;
     /**
      * 身高（厘米）
      */

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

@@ -37,6 +37,14 @@ public class PersonSkillEducation extends BaseEntity {
     private Integer isSpecialWork;
 
     /**
+     * 工种名称
+     * */
+    @TableField("work_name")
+    private String workName;
+
+
+
+    /**
      * 技能鉴定工种key
      */
 	@TableField("work_type_key")
@@ -73,6 +81,12 @@ public class PersonSkillEducation extends BaseEntity {
     private String professionalQualificationCertificate;
 
     /**
+     * 岗位职业鉴定证书
+     */
+    @TableField("professional_career_certificate")
+    private String professionalCareerCertificate;
+
+    /**
      * 初始学历key
      */
 	@TableField("initial_education_key")

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

@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.StationCoordinateDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 场站基础信息表
@@ -34,6 +37,23 @@ public class StationBasic extends BaseEntity {
 	@TableField("station_code")
     private String stationCode;
 
+
+    /**
+     * 场站类型
+     */
+    @TableField("station_type")
+    private String stationType;
+    /**
+     * 项目状态
+     */
+    @TableField("station_flag")
+    private String stationFlag;
+
+
+
+    @TableField("address")
+    private String address;
+
     /**
      * 站长
      */
@@ -76,6 +96,9 @@ public class StationBasic extends BaseEntity {
 	@TableField("belong_area")
     private String belongArea;
 
+
+    @TableField(exist =false)
+    private List<Integer> belongArealist;
     /**
      * 业主单位
      */
@@ -94,4 +117,10 @@ public class StationBasic extends BaseEntity {
 	@TableField("station_logo")
     private String stationLogo;
 
+    @TableField("area")
+    private String area;
+
+
+    @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/entity/StationCoordinate.java

@@ -22,11 +22,7 @@ public class StationCoordinate extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-	@TableField("id")
-    private Long id;
+
 
     /**
      * 场站id
@@ -52,22 +48,12 @@ public class StationCoordinate extends BaseEntity {
 	@TableField("laitude")
     private String laitude;
 
-    /**
-     * 场站范围
-     */
-	@TableField("station_range")
-    private String stationRange;
+
 
     /**
      * 是否主左边（0是1否）
      */
 	@TableField("is_main_coordinate")
-    private Integer isMainCoordinate;
-
-    /**
-     * 是否删除
-     */
-	@TableField("status")
-    private String status;
+    private String isMainCoordinate;
 
 }

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

 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.StationBasicDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * 场站基础信息表 Mapper 接口
  *
@@ -11,4 +15,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StationBasicMapper extends BaseMapper<StationBasic> {
 
+    List<StationBasicDto> queryPage(Long current, Long size,
+                                    String stationMasterName,
+                                    String stationName,
+                                    String stationType);
+
+    List<StationBasicDto> queryPagecount(
+                                    String stationMasterName,
+                                    String stationName,
+                                    String stationType);
+
+    int deleteList(String[] ids);
+
+
+
+
 }

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

@@ -2,4 +2,63 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper">
 
+
+
+    <select id="queryPage" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto">
+
+        select
+        station_basic.sequence_nbr sequenceNbr,
+        station_basic.station_name stationName	,
+        station_basic.station_master_name stationMasterName	,
+        station_basic.mobile_phone mobilePhone	,
+        station_basic.station_type stationType	,
+        station_basic.address address	,
+        station_basic.owner_unit ownerUnit
+        from station_basic
+        <where>
+            is_delete=0
+        <if test="stationMasterName != null and stationMasterName != ''">
+            AND station_basic.station_master_name like concat(#{stationMasterName},'%')
+        </if>
+        <if test="stationName != null and stationName != ''">
+            AND station_basic.station_name like concat(#{stationName},'%')
+        </if>
+        <if test="stationType != null and stationType != ''">
+            AND station_basic.station_type = #{stationType}
+        </if>
+        </where>
+        ORDER BY  station_basic.rec_date DESC
+         limit #{current},#{size}
+    </select>
+
+    <select id="queryPagecount" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto">
+
+        select
+        station_basic.sequence_nbr sequenceNbr
+        from station_basic
+        <where>
+            is_delete=0
+            <if test="stationMasterName != null and stationMasterName != ''">
+                AND station_basic.station_master_name like concat(#{stationMasterName},'%')
+            </if>
+            <if test="stationName != null and stationName != ''">
+                AND station_basic.station_name like concat(#{stationName},'%')
+            </if>
+            <if test="stationType != null and stationType != ''">
+                AND station_basic.station_type = #{stationType}
+            </if>
+        </where>
+    </select>
+
+<delete id="deleteList"  parameterType="int">
+    delete from station_basic where sequence_nbr in
+    <foreach item="id" collection="array" open="(" separator="," close=")">
+        #{id}
+    </foreach>
+
+</delete>
+
+
+
+
 </mapper>

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.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationCoordinateServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -30,7 +32,6 @@ public class StationBasicController extends BaseController {
 
     @Autowired
     StationBasicServiceImpl stationBasicServiceImpl;
-
     /**
      * 新增场站基础信息表
      *
@@ -39,9 +40,9 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增场站基础信息表", notes = "新增场站基础信息表")
-	public ResponseModel<StationBasicDto> save(@RequestBody StationBasicDto model) {
-	    model = stationBasicServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<Object> save(@RequestBody StationBasic model) {
+	    stationBasicServiceImpl.add(model);
+	    return ResponseHelper.buildResponse(null);
 	}
 
 	/**
@@ -51,11 +52,12 @@ public class StationBasicController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
+	@PutMapping(value = "/update")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新场站基础信息表", notes = "根据sequenceNbr更新场站基础信息表")
-	public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasicDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(stationBasicServiceImpl.updateWithModel(model));
+        stationBasicServiceImpl.update(model);
+	    return ResponseHelper.buildResponse(null);
 	}
 
 	/**
@@ -65,10 +67,14 @@ public class StationBasicController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除场站基础信息表", notes = "根据sequenceNbr删除场站基础信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(stationBasicServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids){
+
+        String[] idss=ids.split(",");
+       int num= stationBasicServiceImpl.deleteList(idss);
+
+       return ResponseHelper.buildResponse(num>0?true:false);
     }
 
     /**
@@ -78,10 +84,11 @@ public class StationBasicController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@GetMapping(value = "/getById")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个场站基础信息表",  notes = "根据sequenceNbr查询单个场站基础信息表")
-	public ResponseModel<StationBasicDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(stationBasicServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<StationBasic> selectOne(@RequestParam Long sequenceNbr) {
+        StationBasic  stationBasic= stationBasicServiceImpl.getById(sequenceNbr);
+	    return ResponseHelper.buildResponse(stationBasic);
 	}
 
 	/**
@@ -94,12 +101,19 @@ public class StationBasicController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "场站基础信息表分页查询",  notes = "场站基础信息表分页查询")
-	public ResponseModel<Page<StationBasicDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
+	public ResponseModel<Page<StationBasicDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size,
+    @RequestParam(value = "stationMasterName",required = false) String stationMasterName,
+    @RequestParam(value = "stationName",required = false)String stationName,
+    @RequestParam(value = "stationType",required = false)String stationType
+
+    ) {
 	    Page<StationBasicDto> page = new Page<StationBasicDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(stationBasicServiceImpl.queryForStationBasicPage(page));
+	    return ResponseHelper.buildResponse(stationBasicServiceImpl.queryPage(page, stationMasterName,
+                stationName,
+                stationType));
 	}
 
 	/**

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

 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.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -17,6 +26,12 @@ import java.util.List;
  */
 @Service
 public class StationBasicServiceImpl extends BaseService<StationBasicDto,StationBasic,StationBasicMapper> implements IStationBasicService {
+
+
+    @Autowired
+    StationCoordinateServiceImpl stationCoordinateServiceImpl;
+    @Autowired
+    StationBasicMapper stationBasicMapper;
     /**
      * 分页查询
      */
@@ -24,10 +39,103 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         return this.queryForPage(page, null, false);
     }
 
+
+    /**
+     * 分页查询
+     */
+    public Page<StationBasicDto> queryPage(Page<StationBasicDto> page,
+                                           String stationMasterName,
+                                           String stationName,
+                                           String stationType)   {
+        List<StationBasicDto> list=stationBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  stationMasterName,
+                stationName,
+                stationType);
+        List<StationBasicDto> listcount=stationBasicMapper.queryPagecount( stationMasterName,
+                stationName,
+                stationType);
+        page.setTotal(listcount.size());
+        page.setRecords(list);
+        return page;
+    }
+
+
+
+
+
     /**
      * 列表查询 示例
      */
     public List<StationBasicDto> queryForStationBasicList()   {
         return this.queryForList("" , false);
     }
+
+    @Transactional
+    public void add(StationBasic  stationBasic)   {
+        //场站坐标信息
+        List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
+        List<StationCoordinate>  listdate=new ArrayList<>();
+        if(stationBasic.getBelongArealist()!=null){
+            stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
+        }
+
+        //场站基本信息
+        this.save(stationBasic);
+
+        for (StationCoordinate stationCoordinate : list) {
+            stationCoordinate.setStationId(stationBasic.getSequenceNbr());
+            listdate.add(stationCoordinate);
+        }
+
+        stationCoordinateServiceImpl.saveBatch(listdate);
+
+
+    }
+
+
+
+    public void update(StationBasic  stationBasic)   {
+        //场站坐标信息
+        List<StationCoordinate>  list=  stationBasic.getStationCoordinate();
+        List<StationCoordinate>  listdate=new ArrayList<>();
+        if(stationBasic.getBelongArealist()!=null){
+            stationBasic.setBelongArea(JSON.toJSONString(stationBasic.getBelongArealist()));
+        }
+        //场站基本信息
+        stationBasicMapper.updateById(stationBasic);
+
+
+        for (StationCoordinate stationCoordinate : list) {
+            stationCoordinate.setStationId(stationBasic.getSequenceNbr());
+            listdate.add(stationCoordinate);
+        }
+        stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
+
+    }
+
+
+    public   int deleteList(String[] ids){
+
+           return stationBasicMapper.deleteList(ids);
+         }
+
+
+    public  StationBasic getById(Long sequenceNbr){
+
+        QueryWrapper<StationBasic> wrapper1 = new QueryWrapper();
+        wrapper1.eq("sequence_nbr",sequenceNbr);
+        StationBasic  stationBasic=this.getOne(wrapper1);
+
+        if(stationBasic.getBelongArea()!=null){
+            stationBasic.setBelongArealist(JSON.parseArray(stationBasic.getBelongArea(),Integer.class));
+        }
+
+        QueryWrapper<StationCoordinate> wrapper = new QueryWrapper();
+        wrapper.eq("station_id",sequenceNbr);
+        List<StationCoordinate>  list=stationCoordinateServiceImpl.list(wrapper);
+        stationBasic.setStationCoordinate(list);
+        return stationBasic;
+
+    }
+
+
 }
\ No newline at end of file

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

@@ -24,6 +24,7 @@ public class StationCoordinateServiceImpl extends BaseService<StationCoordinateD
         return this.queryForPage(page, null, false);
     }
 
+
     /**
      * 列表查询 示例
      */