zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化水电基地流域表

Browse Source
This commit is contained in:
tangwei 2026-04-27 11:24:42 +08:00
parent ef1027fc5c
commit 23d639cba9
12 changed files with 365 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java
View File

@ -263,8 +263,8 @@ public class FishDraftDataController {
@PostMapping("/cancelImport")
@Operation(summary = "取消导入任务")
public ResponseResult cancelImport(@RequestParam String taskId) {
boolean result = importTaskService.cancelTask(taskId,SecurityUtils.getUserId());
public ResponseResult cancelImport(@RequestBody FishImportRequest fishImportRequest) {
boolean result = importTaskService.cancelTask(fishImportRequest.getTaskId(),SecurityUtils.getUserId());
return result ? ResponseResult.success("取消成功") : ResponseResult.error("取消失败");
}

5
backend/src/main/java/com/yfd/platform/data/controller/ImportTaskController.java
View File

@ -5,6 +5,7 @@ import com.yfd.platform.common.DataSourceLoadOptionsBase;
import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.data.domain.ImportTask;
import com.yfd.platform.data.domain.ImportTaskRequest;
import com.yfd.platform.data.service.IImportTaskService;
import com.yfd.platform.utils.KendoUtil;
import com.yfd.platform.utils.QgcQueryWrapperUtil;
@ -124,8 +125,8 @@ public class ImportTaskController {
@PostMapping("/markSuccess")
@Operation(summary = "标记任务成功")
public ResponseResult markSuccess(@RequestParam String id) {
boolean result = importTaskService.markSuccess(id);
public ResponseResult markSuccess(@RequestBody ImportTaskRequest request) {
boolean result = importTaskService.markSuccess(request.getId());
return result ? ResponseResult.success("标记成功") : ResponseResult.error("标记失败");
}

2
backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java
View File

@ -188,7 +188,7 @@ public class FishDraftData implements Serializable {
* 电站名称
*/
@TableField(exist = false)
private String engName;
private String ennm;
/**
* 基地名称

2
backend/src/main/java/com/yfd/platform/data/domain/FishImportRequest.java
View File

@ -16,5 +16,7 @@ public class FishImportRequest implements Serializable {
private String uploadUserId;
private String taskId;
private Map<String, String> columnMapping;
}

8
backend/src/main/java/com/yfd/platform/data/domain/ImportTaskRequest.java Normal file
View File

@ -0,0 +1,8 @@
package com.yfd.platform.data.domain;
import lombok.Data;
@Data
public class ImportTaskRequest {
private String id;
}

10
backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java
View File

@ -185,15 +185,15 @@ public class FishImportServiceImpl implements IFishImportService {
switch (fieldName) {
case "stationName":
if (!StringUtils.hasText(cellValue)) {
importRow.getWarnings().add("engName");
data.setEngName(cellValue.trim());
importRow.getWarnings().add("ennm");
data.setEnnm(cellValue.trim());
} else {
String stcd = resolveStationCode(cellValue.trim());
if (stcd == null) {
importRow.getWarnings().add("engName");
data.setEngName(cellValue.trim());
importRow.getWarnings().add("ennm");
data.setEnnm(cellValue.trim());
} else {
data.setEngName(cellValue.trim());
data.setEnnm(cellValue.trim());
}
}
break;

99
backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java vendored Normal file
View File

@ -0,0 +1,99 @@
package com.yfd.platform.env.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.env.domain.SdHbrvDic;
import com.yfd.platform.env.service.ISdHbrvDicService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import java.util.List;
/**
* <p>
* 水电基地流域表 前端控制器
* </p>
*/
@RestController
@RequestMapping("/env/hbrv")
@Tag(name = "基地流域管理")
public class SdHbrvDicController {
@Resource
private ISdHbrvDicService hbrvDicService;
@GetMapping("/queryPageList")
@Operation(summary = "分页查询流域列表")
public ResponseResult queryPageList(
@RequestParam(required = false) String hbrvnm,
@RequestParam(required = false) String baseid,
@RequestParam(defaultValue = "1") Long pageNum,
@RequestParam(defaultValue = "10") Long pageSize) {
Page<SdHbrvDic> page = new Page<>(pageNum, pageSize);
Page<SdHbrvDic> result = hbrvDicService.queryPageList(page, hbrvnm, baseid);
return ResponseResult.successData(result);
}
@GetMapping("/list")
@Operation(summary = "查询所有流域")
public ResponseResult list() {
return ResponseResult.successData(hbrvDicService.list());
}
@GetMapping("/getByBaseid")
@Operation(summary = "根据基地编码查询流域")
public ResponseResult getByBaseid(@RequestParam(required = false) String baseid) {
List<SdHbrvDic> list = hbrvDicService.getByBaseid(baseid);
return ResponseResult.successData(list);
}
@GetMapping("/getByHbrvcd")
@Operation(summary = "根据父流域编码查询流域")
public ResponseResult getByHbrvcd(@RequestParam(required = false) String hbrvcd,
@RequestParam(required = false) String baseid) {
List<SdHbrvDic> list = hbrvDicService.getByHbrvcd(hbrvcd, baseid);
return ResponseResult.successData(list);
}
@GetMapping("/getEnabledList")
@Operation(summary = "查询所有启用的流域")
public ResponseResult getEnabledList() {
return ResponseResult.successData(hbrvDicService.getEnabledList());
}
@GetMapping("/getById")
@Operation(summary = "根据编码查询流域")
public ResponseResult getById(@RequestParam String hbrvcd,
@RequestParam String baseid) {
SdHbrvDic hbrvDic = hbrvDicService.getById(hbrvcd);
return ResponseResult.successData(hbrvDic);
}
@Log(module = "基地流域管理", value = "新增流域")
@PostMapping("/add")
@Operation(summary = "新增流域")
public ResponseResult add(@RequestBody SdHbrvDic hbrvDic) {
boolean result = hbrvDicService.addHbrvDic(hbrvDic);
return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败");
}
@Log(module = "基地流域管理", value = "修改流域")
@PostMapping("/update")
@Operation(summary = "修改流域")
public ResponseResult update(@RequestBody SdHbrvDic hbrvDic) {
boolean result = hbrvDicService.updateHbrvDic(hbrvDic);
return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败");
}
@Log(module = "基地流域管理", value = "删除流域")
@PostMapping("/delete")
@Operation(summary = "删除流域")
public ResponseResult delete(@RequestParam String hbrvcd,
@RequestParam String baseid) {
boolean result = hbrvDicService.deleteHbrvDic(hbrvcd, baseid);
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
}
}

56
backend/src/main/java/com/yfd/platform/env/domain/SdHbrvDic.java vendored Normal file
View File

@ -0,0 +1,56 @@
package com.yfd.platform.env.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
* 水电基地流域表
* </p>
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("SD_HBRV_DIC")
public class SdHbrvDic implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 基地流域编码
*/
@TableId(type = IdType.INPUT)
private String hbrvcd;
/**
* 基地流域名称
*/
private String hbrvnm;
/**
* 水电基地编码
*/
private String baseid;
/**
* 树级别，从1开始
*/
private Integer grd;
/**
* 树全路径，中间以逗号分隔，末级要加逗号不加会影响like递归
*/
private String path;
/**
* 排序，建议业务规则"升序排序"
*/
private Integer orderIndex;
/**
* 是否启用：0=禁用 1=启用
*/
private Integer enabled;
}

30
backend/src/main/java/com/yfd/platform/env/mapper/SdHbrvDicMapper.java vendored Normal file
View File

@ -0,0 +1,30 @@
package com.yfd.platform.env.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yfd.platform.env.domain.SdHbrvDic;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 水电基地流域表 Mapper 接口
* </p>
*/
public interface SdHbrvDicMapper extends BaseMapper<SdHbrvDic> {
/**
* 根据基地编码查询流域列表
*/
List<SdHbrvDic> selectByBaseid(@Param("baseid") String baseid);
/**
* 根据父流域编码查询流域列表
*/
List<SdHbrvDic> selectByPhycd(@Param("hbrvcd") String hbrvcd, @Param("baseid") String baseid);
/**
* 查询所有启用的流域
*/
List<SdHbrvDic> selectEnabledList();
}

50
backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java vendored Normal file
View File

@ -0,0 +1,50 @@
package com.yfd.platform.env.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yfd.platform.env.domain.SdHbrvDic;
import java.util.List;
/**
* <p>
* 水电基地流域表 服务类
* </p>
*/
public interface ISdHbrvDicService extends IService<SdHbrvDic> {
/**
* 分页查询流域列表
*/
Page<SdHbrvDic> queryPageList(Page<SdHbrvDic> page, String hbrvnm, String baseid);
/**
* 根据基地编码查询流域列表
*/
List<SdHbrvDic> getByBaseid(String baseid);
/**
* 根据父流域编码查询流域列表
*/
List<SdHbrvDic> getByHbrvcd(String hbrvcd, String baseid);
/**
* 查询所有启用的流域
*/
List<SdHbrvDic> getEnabledList();
/**
* 新增流域
*/
boolean addHbrvDic(SdHbrvDic hbrvDic);
/**
* 修改流域
*/
boolean updateHbrvDic(SdHbrvDic hbrvDic);
/**
* 删除流域
*/
boolean deleteHbrvDic(String hbrvcd, String baseid);
}

74
backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java vendored Normal file
View File

@ -0,0 +1,74 @@
package com.yfd.platform.env.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yfd.platform.env.domain.SdHbrvDic;
import com.yfd.platform.env.mapper.SdHbrvDicMapper;
import com.yfd.platform.env.service.ISdHbrvDicService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 水电基地流域表 服务实现类
* </p>
*/
@Service
public class SdHbrvDicServiceImpl extends ServiceImpl<SdHbrvDicMapper, SdHbrvDic> implements ISdHbrvDicService {
@Override
public Page<SdHbrvDic> queryPageList(Page<SdHbrvDic> page, String hbrvnm, String baseid) {
return this.page(page, this.lambdaQuery()
.like(hbrvnm != null && !hbrvnm.isEmpty(), SdHbrvDic::getHbrvnm, hbrvnm)
.eq(baseid != null && !baseid.isEmpty(), SdHbrvDic::getBaseid, baseid)
.orderByAsc(SdHbrvDic::getOrderIndex)
.getWrapper());
}
@Override
public List<SdHbrvDic> getByBaseid(String baseid) {
return this.lambdaQuery()
.eq(SdHbrvDic::getBaseid, baseid)
.orderByAsc(SdHbrvDic::getOrderIndex)
.list();
}
@Override
public List<SdHbrvDic> getByHbrvcd(String hbrvcd, String baseid) {
return this.lambdaQuery()
.eq(SdHbrvDic::getHbrvcd, hbrvcd)
.eq(SdHbrvDic::getBaseid, baseid)
.orderByAsc(SdHbrvDic::getOrderIndex)
.list();
}
@Override
public List<SdHbrvDic> getEnabledList() {
return this.lambdaQuery()
.eq(SdHbrvDic::getEnabled, 1)
.orderByAsc(SdHbrvDic::getOrderIndex)
.list();
}
@Override
public boolean addHbrvDic(SdHbrvDic hbrvDic) {
if (hbrvDic.getOrderIndex() == null) {
hbrvDic.setOrderIndex(9999);
}
if (hbrvDic.getEnabled() == null) {
hbrvDic.setEnabled(1);
}
return this.save(hbrvDic);
}
@Override
public boolean updateHbrvDic(SdHbrvDic hbrvDic) {
return this.updateById(hbrvDic);
}
@Override
public boolean deleteHbrvDic(String hbrvcd, String baseid) {
return this.removeById(hbrvcd);
}
}

35
backend/src/main/resources/mapper/env/SdHbrvDicMapper.xml vendored Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yfd.platform.env.mapper.SdHbrvDicMapper">
<resultMap id="BaseResultMap" type="com.yfd.platform.env.domain.SdHbrvDic">
<id column="HBRVCD" property="hbrvcd"/>
<id column="BASEID" property="baseid"/>
<result column="HBRVNM" property="hbrvnm"/>
<result column="GRD" property="grd"/>
<result column="PATH" property="path"/>
<result column="ORDER_INDEX" property="orderIndex"/>
<result column="ENABLED" property="enabled"/>
</resultMap>
<select id="selectByBaseid" resultMap="BaseResultMap">
SELECT * FROM SD_HBRV_DIC
WHERE BASEID = #{baseid}
ORDER BY ORDER_INDEX ASC
</select>
<select id="selectByPhycd" resultMap="BaseResultMap">
SELECT * FROM SD_HBRV_DIC
WHERE HBRVCD = #{hbrvcd}
AND BASEID = #{baseid}
ORDER BY ORDER_INDEX ASC
</select>
<select id="selectEnabledList" resultMap="BaseResultMap">
SELECT * FROM SD_HBRV_DIC
WHERE ENABLED = 1
ORDER BY ORDER_INDEX ASC
</select>
</mapper>