pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaMapCoordinatesMapper.java
@@ -24,4 +24,11 @@ int updateByPrimaryKeySelective(BaMapCoordinates record); int updateByPrimaryKey(BaMapCoordinates record); /** * 根据片区ID删除该片区下的坐标点 * @param blockId * @return */ int deleteByBlockId(Long blockId); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaMapGraphMapper.java
@@ -24,4 +24,11 @@ int updateByPrimaryKeySelective(BaMapGraph record); int updateByPrimaryKey(BaMapGraph record); /** * 根据片区ID删除地图图形 * @param blockId * @return */ int deleteByBlockId(Long blockId); } pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@ pipIrr: global: dev: false #是否开发阶段，true或false dev: fals #是否开发阶段，true或false dsName: ym #开发阶段，设置临时的数据库名称 mw: webPort: 8070 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapCoordinatesMapper.xml
@@ -11,7 +11,10 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> id, graph_id, lat, lng id, graph_id, lat, lng </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> @@ -22,7 +25,8 @@ </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from ba_map_coordinates delete from ba_map_coordinates where id = #{id,jdbcType=BIGINT} </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaMapCoordinates"> @@ -88,4 +92,12 @@ lng = #{lng,jdbcType=DECIMAL} where id = #{id,jdbcType=BIGINT} </update> <!--根据片区ID删除该片区下的坐标点--> <delete id="deleteByBlockId" parameterType="java.lang.Long"> DELETE coo.* FROM ba_map_coordinates coo INNER JOIN ba_map_graph gra ON gra.id = coo.graph_id WHERE gra.block_id = #{blockId} </delete> </mapper> pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaMapGraphMapper.xml
@@ -10,7 +10,9 @@ </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> id, block_id, graph_type id, block_id, graph_type </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> @@ -21,15 +23,14 @@ </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from ba_map_graph delete from ba_map_graph where id = #{id,jdbcType=BIGINT} </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaMapGraph"> <!--@mbg.generated--> insert into ba_map_graph (id, block_id, graph_type ) values (#{id,jdbcType=BIGINT}, #{blockId,jdbcType=BIGINT}, #{graphType,jdbcType=TINYINT} ) insert into ba_map_graph (id, block_id, graph_type) values (#{id,jdbcType=BIGINT}, #{blockId,jdbcType=BIGINT}, #{graphType,jdbcType=TINYINT}) </insert> <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaMapGraph"> <!--@mbg.generated--> @@ -77,4 +78,11 @@ graph_type = #{graphType,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} </update> <!--根据片区ID删除地图图形--> <delete id="deleteByBlockId" parameterType="java.lang.Long"> DELETE FROM ba_map_graph WHERE block_id = #{blockId} </delete> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -49,6 +49,7 @@ /** * 客户端请求得到所有片区数据 * * @return 所有片区数据 */ @Operation(summary = "获得全部片区", description = "返回全部片区数据") @@ -74,6 +75,7 @@ /** * 客户端请求得到所有片区数据 2024-08-14废弃 * * @return 所有片区数据 */ @PostMapping(path = "some2", consumes = MediaType.APPLICATION_JSON_VALUE) @@ -90,6 +92,7 @@ /** * 根据指定条件获取片区，2024-08-14新增，替换原来的片区分页查询 * * @param qo * @param bindingResult * @return @@ -110,6 +113,7 @@ /** * 得到一个片区数据 * * @return 一个片区数据 */ @Operation(summary = "一个片区", description = "得到一个片区数据") @@ -130,6 +134,7 @@ /** * 保存片区 * * @param po 保存片区form表单对象 * @return 是否成功 */ @@ -225,22 +230,14 @@ } /** * 编辑修改片区 * 编辑修改片区 2024-08-15 作废 * * @param po 保存片区form表单对象 * @return 是否成功 */ @Operation(summary = "编辑修改片区", description = "提交片区数据（form表单），进行修改") @ApiResponses(value = { @ApiResponse( responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, description = "操作结果：true：成功，false：失败（BaseResponse.content）", content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = Boolean.class))} ) }) @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(path = "update2", consumes = MediaType.APPLICATION_JSON_VALUE) @SsoAop() public BaseResponse<Boolean> update(@RequestBody @Valid BaBlock po, BindingResult bindingResult){ public BaseResponse<Boolean> update2(@RequestBody @Valid BaBlock po, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } @@ -261,9 +258,58 @@ } } /** * 修改片区信息，2024-08-15新增，替换原来的片区修改接口 * * @param po * @param bindingResult * @return */ @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE) @SsoAop() public BaseResponse<Boolean> update(@RequestBody @Valid Block po, BindingResult bindingResult) { if (bindingResult != null && bindingResult.hasErrors()) { return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } Long blockId = po.getId(); if (blockId == null) { return BaseResponseUtils.buildErrorMsg(SystemResultCode.THE_BLOCK_NOT_EXIST.getMessage()); } // 修改片区信息 BaBlock baBlock = new BaBlock(); baBlock.setId(po.getId()); baBlock.setName(po.getName()); baBlock.setHeader(po.getHeader()); baBlock.setPhone(po.getPhone()); baBlock.setArea(po.getArea()); baBlock.setColor(po.getColor()); baBlock.setRemark(po.getRemark()); baBlock.setDeleted(po.getDeleted()); int count; try { count = this.sv.update(baBlock); } catch (Exception e) { log.error("保存片区异常", e); return BaseResponseUtils.buildException(e.getMessage()); } if (count <= 0) { return BaseResponseUtils.buildFail("数据库存储失败"); } // 删除片区关联的地图图形 this.sv.deleteMapGraph(blockId); // 删除地图图形坐标 this.sv.deleteMapCoordinates(blockId); return BaseResponseUtils.buildSuccess(true); } /** * 删除片区 * * @param id 片区ID * @return 是否成功 */ @@ -276,6 +322,7 @@ schema = @Schema(implementation = Boolean.class))} ) }) //@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE) @GetMapping(path = "delete") @SsoAop() @@ -292,8 +339,13 @@ } if(count <= 0){ return BaseResponseUtils.buildFail("数据库存储失败") ; }else{ return BaseResponseUtils.buildSuccess(true) ; } // 删除片区关联的地图图形 this.sv.deleteMapGraph(id); // 删除地图图形坐标 this.sv.deleteMapCoordinates(id); return BaseResponseUtils.buildSuccess(true); } } pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -188,4 +188,22 @@ return po.getId(); }; /** * 根据片区ID删除地图图形 * @param blockId * @return */ public int deleteMapGraph(Long blockId) { return this.baMapGraphMapper.deleteByBlockId(blockId); } /** * 根据片区ID删除该片区下的坐标点 * @param blockId * @return */ public int deleteMapCoordinates(Long blockId) { return this.baMapCoordinatesMapper.deleteByBlockId(blockId); } } pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/dto/Block.java
@@ -20,6 +20,11 @@ public static final long serialVersionUID = 202408131140001L; /** * 片区ID */ private Long id; /** * 片区名称 */ @NotBlank(message = "片区名称不能为空") pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/result/SystemResultCode.java
@@ -32,7 +32,8 @@ /** * 片区 */ SAVA_BLOCK_ERROR(30001, "保存片区失败"); SAVA_BLOCK_ERROR(30001, "保存片区失败"), THE_BLOCK_NOT_EXIST(30002, "片区不存在"); private final Integer code; private final String message;
