sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dqinspecttask): 巡检任务新增EasyExcel导入导出接口，Controller继承JeecgController

Browse Source 
- DqInspectTask 实体添加 @ExcelColumn 注解，与旧 @Excel 共存
- Controller 重构继承 JeecgController，复用 importExcelByEasyExcel 等统一入口
- 新增 /importExcelByEasyExcel /exportXlsByEasyExcel /exportXlsHeaders 三个接口

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
wsm
2026-06-24 15:23:01 +08:00
co-authored by Claude Opus 4.7
parent a9a8028b59
commit 6b022cdce8
2 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java
+47 -20
View File
@@ -24,6 +24,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo;
@@ -57,12 +58,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
@RestController
@RequestMapping("/dqinspecttask/dqInspectTask")
@Slf4j
public class DqInspectTaskController {
@Autowired
private IDqInspectTaskService dqInspectTaskService;
public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqInspectTaskService> {
@Autowired
private IDqInspectProgressService dqInspectProgressService;
/**
* 分页列表查询
*
@@ -81,7 +80,7 @@ public class DqInspectTaskController {
HttpServletRequest req) {
QueryWrapper<DqInspectTask> queryWrapper = QueryGenerator.initQueryWrapper(dqInspectTask, req.getParameterMap());
Page<DqInspectTask> page = new Page<DqInspectTask>(pageNo, pageSize);
IPage<DqInspectTask> pageList = dqInspectTaskService.page(page, queryWrapper);
IPage<DqInspectTask> pageList = service.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -99,10 +98,10 @@ public class DqInspectTaskController {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Page<DqInspectTaskLedgerVo> page = new Page<DqInspectTaskLedgerVo>(pageNo, pageSize);
IPage<DqInspectTaskLedgerVo> pageList = dqInspectTaskService.queryLedgerPage(page, dqInspectTask);
IPage<DqInspectTaskLedgerVo> pageList = service.queryLedgerPage(page, dqInspectTask);
return Result.OK(pageList);
}
/**
* 添加
*
@@ -120,10 +119,10 @@ public class DqInspectTaskController {
if (oConvertUtils.isEmpty(dqInspectTask.getDelFlag())) {
dqInspectTask.setDelFlag("0");
}
dqInspectTaskService.saveMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
service.saveMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
return Result.OK("添加成功！");
}
/**
* 编辑
*
@@ -137,14 +136,14 @@ public class DqInspectTaskController {
public Result<String> edit(@RequestBody DqInspectTaskPage dqInspectTaskPage) {
DqInspectTask dqInspectTask = new DqInspectTask();
BeanUtils.copyProperties(dqInspectTaskPage, dqInspectTask);
DqInspectTask dqInspectTaskEntity = dqInspectTaskService.getById(dqInspectTask.getId());
DqInspectTask dqInspectTaskEntity = service.getById(dqInspectTask.getId());
if(dqInspectTaskEntity==null) {
return Result.error("未找到对应数据");
}
dqInspectTaskService.updateMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
service.updateMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@@ -156,10 +155,10 @@ public class DqInspectTaskController {
@RequiresPermissions("dqinspecttask:dq_inspect_task:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
dqInspectTaskService.delMain(id);
service.delMain(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@@ -171,10 +170,10 @@ public class DqInspectTaskController {
@RequiresPermissions("dqinspecttask:dq_inspect_task:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.dqInspectTaskService.delBatchMain(Arrays.asList(ids.split(",")));
this.service.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
}
/**
* 通过id查询
*
@@ -185,14 +184,14 @@ public class DqInspectTaskController {
@Operation(summary="dq_inspect_task-通过id查询")
@GetMapping(value = "/queryById")
public Result<DqInspectTask> queryById(@RequestParam(name="id",required=true) String id) {
DqInspectTask dqInspectTask = dqInspectTaskService.getById(id);
DqInspectTask dqInspectTask = service.getById(id);
if(dqInspectTask==null) {
return Result.error("未找到对应数据");
}
return Result.OK(dqInspectTask);
}
/**
* 通过id查询
*
@@ -228,7 +227,7 @@ public class DqInspectTaskController {
queryWrapper.in("id",selectionList);
}
//Step.2 获取导出数据
List<DqInspectTask> dqInspectTaskList = dqInspectTaskService.list(queryWrapper);
List<DqInspectTask> dqInspectTaskList = service.list(queryWrapper);
// Step.3 组装pageList
List<DqInspectTaskPage> pageList = new ArrayList<DqInspectTaskPage>();
@@ -273,7 +272,7 @@ public class DqInspectTaskController {
for (DqInspectTaskPage page : list) {
DqInspectTask po = new DqInspectTask();
BeanUtils.copyProperties(page, po);
dqInspectTaskService.saveMain(po, page.getDqInspectProgressList());
service.saveMain(po, page.getDqInspectProgressList());
}
return Result.OK("文件导入成功！数据行数:" + list.size());
} catch (Exception e) {
@@ -290,4 +289,32 @@ public class DqInspectTaskController {
return Result.OK("文件导入失败！");
}
/**
* 通过EasyExcel导入数据，支持字典校验和Hibernate Validator
*/
@RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
@PostMapping(value = "/importExcelByEasyExcel")
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
return super.importExcelByEasyExcel(request, DqInspectTask.class);
}
/**
* 通过EasyExcel导出数据
*/
@RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
@GetMapping(value = "/exportXlsByEasyExcel")
public void exportXlsByEasyExcel(HttpServletRequest request, HttpServletResponse response,
DqInspectTask dqInspectTask) throws IOException {
super.exportXlsByEasyExcel(request, response, dqInspectTask, DqInspectTask.class, "dq_inspect_task");
}
/**
* 仅导出Excel表头（EasyExcel）
*/
@RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
@GetMapping(value = "/exportXlsHeaders")
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
super.exportXlsHeadersByEasyExcel(response, DqInspectTask.class, "dq_inspect_task");
}
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java
+18
View File
@@ -13,6 +13,7 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.util.excel.annotation.ExcelColumn;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -54,71 +55,86 @@ public class DqInspectTask implements Serializable {
private java.lang.String sysOrgCode;
/**具体问题ID*/
@Excel(name = "具体问题", width = 15, dictTable = "dq_inspect_problem", dicText = "problem_name", dicCode = "id")
@ExcelColumn(name = "具体问题", width = 15, dictTable = "dq_inspect_problem", dicText = "problem_name", dicCode = "id")
@Dict(dictTable = "dq_inspect_problem", dicText = "problem_name", dicCode = "id")
@Schema(description = "具体问题ID")
private java.lang.String problemId;
/**密级*/
@Excel(name = "密级", width = 15, dicCode = "secret_level")
@ExcelColumn(name = "密级", width = 15, dicCode = "secret_level")
@Dict(dicCode = "secret_level")
@Schema(description = "密级")
private java.lang.String secretLevel;
/**整改措施*/
@Excel(name = "整改措施", width = 15)
@ExcelColumn(name = "整改措施", width = 15)
@Schema(description = "整改措施")
private java.lang.String improveMeasure;
/**完成时限*/
@Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd")
@ExcelColumn(name = "完成时限", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@Schema(description = "完成时限")
private java.util.Date deadline;
/**目标节点*/
@Excel(name = "目标节点", width = 15)
@ExcelColumn(name = "目标节点", width = 15)
@Schema(description = "目标节点")
private java.lang.String targetNode;
/**措施责任领导*/
@Excel(name = "措施责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ExcelColumn(name = "措施责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Schema(description = "措施责任领导")
private java.lang.String measureResLeader;
/**措施责任部门*/
@Excel(name = "措施责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ExcelColumn(name = "措施责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Schema(description = "措施责任部门")
private java.lang.String measureResDept;
/**整改交付成果*/
@Excel(name = "整改交付成果", width = 15)
@ExcelColumn(name = "整改交付成果", width = 15)
@Schema(description = "整改交付成果")
private java.lang.String rectificationEvidence;
/**成效评价标准*/
@Excel(name = "成效评价标准", width = 15)
@ExcelColumn(name = "成效评价标准", width = 15)
@Schema(description = "成效评价标准")
private java.lang.String evaluationCriterion;
/**是否需要党群领导审批*/
@Excel(name = "是否需要党群领导审批", width = 15, dicCode = "yn")
@ExcelColumn(name = "是否需要党群领导审批", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@Schema(description = "是否需要党群领导审批")
private java.lang.String isNeedAppro;
/**党群领导*/
@Excel(name = "党群领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ExcelColumn(name = "党群领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Schema(description = "党群领导")
private java.lang.String supDeptleaderid;
/**分管所领导*/
@Excel(name = "分管所领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ExcelColumn(name = "分管所领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Schema(description = "分管所领导")
private java.lang.String chargeLeaderId;
/**检查情况*/
@Excel(name = "检查情况", width = 15)
@ExcelColumn(name = "检查情况", width = 15)
@Schema(description = "检查情况")
private java.lang.String inspectionStatus;
/**监督意见*/
@Excel(name = "监督意见", width = 15)
@ExcelColumn(name = "监督意见", width = 15)
@Schema(description = "监督意见")
private java.lang.String supervisoryOpinion;
/**措施数量*/
@Excel(name = "措施数量", width = 15)
@ExcelColumn(name = "措施数量", width = 15)
@Schema(description = "措施数量")
private java.lang.Integer measureCount;
/**流程实例ID*/
@@ -132,10 +148,12 @@ public class DqInspectTask implements Serializable {
private java.lang.String bpmStatus;
/**整改状态*/
@Excel(name = "整改状态", width = 15)
@ExcelColumn(name = "整改状态", width = 15)
@Schema(description = "整改状态")
private java.lang.String taskStatus;
/**督办次数*/
@Excel(name = "督办次数", width = 15)
@ExcelColumn(name = "督办次数", width = 15)
@Schema(description = "督办次数")
private java.lang.String superviseCount;
/**排序*/