12290 【web-场站管理】场站删除未校验该场站是否关联人员，直接删除

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

@@ -30,7 +30,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
             @Param("stationType")String stationType,
             @Param("orgCode")String orgCode);
     //删除
-    int deleteList(String[] ids);
+    int deleteList(String ids);
     //导出
     List<ExStationBasicDto> getExStationBasicDto( @Param("stationMasterName") String stationMasterName,
                                                   @Param("stationName")String stationName,
@@ -40,6 +40,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
     //获取场站列表信息
     List<StationInfoDto> getStationList(@Param("areaCode")String areaCode);
     int deleteStationCoordinateByStationid (@Param("sequence_nbr") Long sequence_nbr );
+    int getStationPersonByStationID (@Param("sequence_nbr") String sequence_nbr );
 
 
 }

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

@@ -57,14 +57,8 @@
     </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 from station_coordinate where station_id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        delete from station_basic where sequence_nbr = #{id};
+        delete from station_coordinate where station_id = #{id}
     </delete>
     <delete id = "deleteStationCoordinateByStationid">
         delete from station_coordinate where station_id = #{sequence_nbr}
@@ -129,6 +123,14 @@
             AND station_basic.area_code like concat('%',#{areaCode},'%')
         </if>
     </select>
-
+    <select id="getStationPersonByStationID" resultType="int">
+        SELECT
+        COUNT( 1 )
+        FROM
+        person_account
+        LEFT JOIN station_basic ON person_account.project_id = station_basic.platform_station_id
+        WHERE
+        station_basic.sequence_nbr = #{sequence_nbr}
+    </select>
 
 </mapper>

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

@@ -10,12 +10,16 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
 import java.util.List;
+
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationBasicServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationBasicDto;
@@ -35,6 +39,7 @@ public class StationBasicController extends BaseController {
 
     @Autowired
     StationBasicServiceImpl stationBasicServiceImpl;
+
     /**
      * 新增场站基础信息表
      *
@@ -47,10 +52,11 @@ public class StationBasicController extends BaseController {
         try {
             stationBasicServiceImpl.add(model);
             return ResponseHelper.buildResponse(null);
-        }catch (InnerInvokException e){
+        } catch (InnerInvokException e) {
             return this.buildResponseFalse(e.getMessage());
         }
     }
+
     public ResponseModel buildResponseFalse(String message) {
         ResponseModel response = new ResponseModel();
         response.setResult(null);
@@ -60,6 +66,7 @@ public class StationBasicController extends BaseController {
         response.setDevMessage(message);
         return response;
     }
+
     /**
      * 根据sequenceNbr更新
      *
@@ -69,16 +76,14 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新场站基础信息表", notes = "根据sequenceNbr更新场站基础信息表")
-	public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
         try {
             model.setSequenceNbr(sequenceNbr);
 
 
-
-
             stationBasicServiceImpl.update(model);
             return ResponseHelper.buildResponse(null);
-        }catch (InnerInvokException e){
+        } catch (InnerInvokException e) {
             return this.buildResponseFalse(e.getMessage());
         }
     }
@@ -92,15 +97,12 @@ public class StationBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除场站基础信息表", notes = "根据sequenceNbr删除场站基础信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids){
-
-        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());
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids) {
+        if (stationBasicServiceImpl.getStationPersonByStationID(ids) > 0) {
+            return this.buildResponseFalse("请删除场站下的人员后再删除场站！");
         }
+        int num = stationBasicServiceImpl.deleteList(ids);
+        return ResponseHelper.buildResponse(num > 0 ? true : false);
     }
 
     /**
@@ -111,9 +113,9 @@ public class StationBasicController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getById")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个场站基础信息表",  notes = "根据sequenceNbr查询单个场站基础信息表")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个场站基础信息表", notes = "根据sequenceNbr查询单个场站基础信息表")
     public ResponseModel<StationBasic> selectOne(@RequestParam Long sequenceNbr) {
-        StationBasic  stationBasic= stationBasicServiceImpl.getById(sequenceNbr);
+        StationBasic stationBasic = stationBasicServiceImpl.getById(sequenceNbr);
         return ResponseHelper.buildResponse(stationBasic);
     }
 
@@ -126,13 +128,13 @@ public class StationBasicController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "场站基础信息表分页查询",  notes = "场站基础信息表分页查询")
+    @ApiOperation(httpMethod = "GET", value = "场站基础信息表分页查询", notes = "场站基础信息表分页查询")
     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,
-    @RequestParam(value = "orgCode",required = false)String orgCode
+                                                             @RequestParam(value = "stationMasterName", required = false) String stationMasterName,
+                                                             @RequestParam(value = "stationName", required = false) String stationName,
+                                                             @RequestParam(value = "stationType", required = false) String stationType,
+                                                             @RequestParam(value = "orgCode", required = false) String orgCode
 
     ) {
         Page<StationBasicDto> page = new Page<StationBasicDto>();
@@ -151,7 +153,7 @@ public class StationBasicController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "场站基础信息表列表全部数据查询",   notes = "场站基础信息表列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "场站基础信息表列表全部数据查询", notes = "场站基础信息表列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<StationBasicDto>> selectForList() {
         return ResponseHelper.buildResponse(stationBasicServiceImpl.queryForStationBasicList());
@@ -162,10 +164,10 @@ public class StationBasicController extends BaseController {
      *
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "场站地图数据",   notes = "场站地图数据")
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
     @GetMapping(value = "/listforMap")
-	public ResponseModel<List<StationInfoDto>> getStationList( @RequestParam(value = "areaCode",required = false)String areaCode) {
+    public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode) {
         return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode));
     }
 }

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

@@ -28,6 +28,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -238,9 +240,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
-    public   int deleteList(String[] ids){
-
-
+    public  int deleteList(String ids){
         QueryWrapper<StationBasic> wrapper = new QueryWrapper();
         wrapper.in("sequence_nbr",ids);
         List<StationBasic>  list=this.list(wrapper);
@@ -250,7 +250,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         }
         //删除平台
         this.deleteCompany(String.join(",",idscom));
-
         return stationBasicMapper.deleteList(ids);
     }
 
@@ -276,5 +275,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     public List<StationInfoDto> getStationList(String areaCode){
         return stationBasicMapper.getStationList(areaCode);
     }
+    public int getStationPersonByStationID(String id) {return stationBasicMapper.getStationPersonByStationID(id);};
 
 }
\ No newline at end of file