From f1ed37d2d29390a7765239eb8977e666bd0c3aa5 Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 9 Oct 2023 16:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=BF=9B=E5=BA=A6=E7=94=98?= =?UTF-8?q?=E7=89=B9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskProgressAlarmController.java | 196 ++++++++++++++++++ .../controller/TaskProgressController.java | 196 ++++++++++++++++++ .../TaskProgressMaterialRelController.java | 196 ++++++++++++++++++ .../TaskProgressMaterialTypeController.java | 196 ++++++++++++++++++ .../taskprogress/entity/TaskProgress.java | 141 +++++++++++++ .../entity/TaskProgressAlarm.java | 73 +++++++ .../entity/TaskProgressMaterialRel.java | 73 +++++++ .../entity/TaskProgressMaterialType.java | 67 ++++++ .../mapper/TaskProgressAlarmMapper.java | 16 ++ .../mapper/TaskProgressMapper.java | 16 ++ .../mapper/TaskProgressMaterialRelMapper.java | 16 ++ .../TaskProgressMaterialTypeMapper.java | 16 ++ .../mapper/xml/TaskProgressAlarmMapper.xml | 4 + .../mapper/xml/TaskProgressMapper.xml | 4 + .../xml/TaskProgressMaterialRelMapper.xml | 4 + .../xml/TaskProgressMaterialTypeMapper.xml | 4 + .../service/ITaskProgressAlarmService.java | 14 ++ .../ITaskProgressMaterialRelService.java | 14 ++ .../ITaskProgressMaterialTypeService.java | 14 ++ .../service/ITaskProgressService.java | 14 ++ .../impl/TaskProgressAlarmServiceImpl.java | 19 ++ .../TaskProgressMaterialRelServiceImpl.java | 19 ++ .../TaskProgressMaterialTypeServiceImpl.java | 19 ++ .../service/impl/TaskProgressServiceImpl.java | 19 ++ src/main/java/com/zhgd/xmgl/task/JzgTask.java | 19 +- 25 files changed, 1367 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressAlarmController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialRelController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialTypeController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressAlarm.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialRel.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialType.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressAlarmMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialRelMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialTypeMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressAlarmMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialTypeMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressAlarmService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialRelService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressAlarmServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialTypeServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressAlarmController.java new file mode 100644 index 000000000..8e7089b0e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressAlarmController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.taskprogress.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressAlarm; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressAlarmService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 任务进度甘特图-报警信息 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/taskProgressAlarm") +@Slf4j +@Api(tags = "任务进度甘特图-报警信息相关Api") +public class TaskProgressAlarmController { + @Autowired + private ITaskProgressAlarmService taskProgressAlarmService; + + /** + * 分页列表查询 + * + * @param taskProgressAlarm + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询任务进度甘特图-报警信息信息", notes = "分页列表查询任务进度甘特图-报警信息信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(TaskProgressAlarm taskProgressAlarm, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressAlarm, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = taskProgressAlarmService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param taskProgressAlarm + * @param req + * @return + */ + @ApiOperation(value = "列表查询任务进度甘特图-报警信息信息", notes = "列表查询任务进度甘特图-报警信息信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(TaskProgressAlarm taskProgressAlarm, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressAlarm, req.getParameterMap()); + return Result.success(taskProgressAlarmService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param taskProgressAlarm + * @return + */ + @ApiOperation(value = "添加任务进度甘特图-报警信息信息", notes = "添加任务进度甘特图-报警信息信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskProgressAlarm taskProgressAlarm) { + taskProgressAlarmService.save(taskProgressAlarm); + return Result.ok(); + } + + /** + * 编辑 + * + * @param taskProgressAlarm + * @return + */ + @ApiOperation(value = "编辑任务进度甘特图-报警信息信息", notes = "编辑任务进度甘特图-报警信息信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody TaskProgressAlarm taskProgressAlarm) { + taskProgressAlarmService.updateById(taskProgressAlarm); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除任务进度甘特图-报警信息信息", notes = "删除任务进度甘特图-报警信息信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-报警信息ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + TaskProgressAlarm taskProgressAlarm = taskProgressAlarmService.getById(id); + if (taskProgressAlarm == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = taskProgressAlarmService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询任务进度甘特图-报警信息信息", notes = "通过id查询任务进度甘特图-报警信息信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-报警信息ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + TaskProgressAlarm taskProgressAlarm = taskProgressAlarmService.getById(id); + if (taskProgressAlarm == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(taskProgressAlarm); + result.setSuccess(true); + } + return result; + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel任务进度甘特图-报警信息信息", notes = "导出excel任务进度甘特图-报警信息信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + TaskProgressAlarm taskProgressAlarm = JSON.parseObject(deString, TaskProgressAlarm.class); + queryWrapper = QueryGenerator.initQueryWrapper(taskProgressAlarm, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = taskProgressAlarmService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "任务进度甘特图-报警信息列表"); + mv.addObject(NormalExcelConstants.CLASS, TaskProgressAlarm.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("任务进度甘特图-报警信息列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java new file mode 100644 index 000000000..6924092fb --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.taskprogress.controller; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgress; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 任务进度甘特图 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/taskProgress") +@Slf4j +@Api(tags = "任务进度甘特图相关Api") +public class TaskProgressController { + @Autowired + private ITaskProgressService taskProgressService; + + /** + * 分页列表查询 + * + * @param taskProgress + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询任务进度甘特图信息", notes = "分页列表查询任务进度甘特图信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(TaskProgress taskProgress, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgress, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = taskProgressService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param taskProgress + * @param req + * @return + */ + @ApiOperation(value = "列表查询任务进度甘特图信息", notes = "列表查询任务进度甘特图信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(TaskProgress taskProgress, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgress, req.getParameterMap()); + return Result.success(taskProgressService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param taskProgress + * @return + */ + @ApiOperation(value = "添加任务进度甘特图信息", notes = "添加任务进度甘特图信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskProgress taskProgress) { + taskProgressService.save(taskProgress); + return Result.ok(); + } + + /** + * 编辑 + * + * @param taskProgress + * @return + */ + @ApiOperation(value = "编辑任务进度甘特图信息", notes = "编辑任务进度甘特图信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody TaskProgress taskProgress) { + taskProgressService.updateById(taskProgress); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除任务进度甘特图信息", notes = "删除任务进度甘特图信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "任务进度甘特图ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + TaskProgress taskProgress = taskProgressService.getById(id); + if (taskProgress == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = taskProgressService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询任务进度甘特图信息", notes = "通过id查询任务进度甘特图信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "任务进度甘特图ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + TaskProgress taskProgress = taskProgressService.getById(id); + if (taskProgress == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(taskProgress); + result.setSuccess(true); + } + return result; + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel任务进度甘特图信息", notes = "导出excel任务进度甘特图信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + TaskProgress taskProgress = JSON.parseObject(deString, TaskProgress.class); + queryWrapper = QueryGenerator.initQueryWrapper(taskProgress, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = taskProgressService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "任务进度甘特图列表"); + mv.addObject(NormalExcelConstants.CLASS, TaskProgress.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("任务进度甘特图列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialRelController.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialRelController.java new file mode 100644 index 000000000..9ab7d4e4e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialRelController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.taskprogress.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressMaterialRelService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 任务进度甘特图-材料类型-关联 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/taskProgressMaterialRel") +@Slf4j +@Api(tags = "任务进度甘特图-材料类型-关联相关Api") +public class TaskProgressMaterialRelController { + @Autowired + private ITaskProgressMaterialRelService taskProgressMaterialRelService; + + /** + * 分页列表查询 + * + * @param taskProgressMaterialRel + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询任务进度甘特图-材料类型-关联信息", notes = "分页列表查询任务进度甘特图-材料类型-关联信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(TaskProgressMaterialRel taskProgressMaterialRel, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialRel, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = taskProgressMaterialRelService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param taskProgressMaterialRel + * @param req + * @return + */ + @ApiOperation(value = "列表查询任务进度甘特图-材料类型-关联信息", notes = "列表查询任务进度甘特图-材料类型-关联信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(TaskProgressMaterialRel taskProgressMaterialRel, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialRel, req.getParameterMap()); + return Result.success(taskProgressMaterialRelService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param taskProgressMaterialRel + * @return + */ + @ApiOperation(value = "添加任务进度甘特图-材料类型-关联信息", notes = "添加任务进度甘特图-材料类型-关联信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskProgressMaterialRel taskProgressMaterialRel) { + taskProgressMaterialRelService.save(taskProgressMaterialRel); + return Result.ok(); + } + + /** + * 编辑 + * + * @param taskProgressMaterialRel + * @return + */ + @ApiOperation(value = "编辑任务进度甘特图-材料类型-关联信息", notes = "编辑任务进度甘特图-材料类型-关联信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody TaskProgressMaterialRel taskProgressMaterialRel) { + taskProgressMaterialRelService.updateById(taskProgressMaterialRel); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除任务进度甘特图-材料类型-关联信息", notes = "删除任务进度甘特图-材料类型-关联信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-材料类型-关联ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + TaskProgressMaterialRel taskProgressMaterialRel = taskProgressMaterialRelService.getById(id); + if (taskProgressMaterialRel == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = taskProgressMaterialRelService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询任务进度甘特图-材料类型-关联信息", notes = "通过id查询任务进度甘特图-材料类型-关联信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-材料类型-关联ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + TaskProgressMaterialRel taskProgressMaterialRel = taskProgressMaterialRelService.getById(id); + if (taskProgressMaterialRel == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(taskProgressMaterialRel); + result.setSuccess(true); + } + return result; + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel任务进度甘特图-材料类型-关联信息", notes = "导出excel任务进度甘特图-材料类型-关联信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + TaskProgressMaterialRel taskProgressMaterialRel = JSON.parseObject(deString, TaskProgressMaterialRel.class); + queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialRel, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = taskProgressMaterialRelService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "任务进度甘特图-材料类型-关联列表"); + mv.addObject(NormalExcelConstants.CLASS, TaskProgressMaterialRel.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("任务进度甘特图-材料类型-关联列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialTypeController.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialTypeController.java new file mode 100644 index 000000000..859fc69ec --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressMaterialTypeController.java @@ -0,0 +1,196 @@ +package com.zhgd.xmgl.modules.taskprogress.controller; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.List; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.oConvertUtils; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressMaterialTypeService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + + +/** + * @Title: Controller + * @Description: 任务进度甘特图-材料类型 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/taskProgressMaterialType") +@Slf4j +@Api(tags = "任务进度甘特图-材料类型相关Api") +public class TaskProgressMaterialTypeController { + @Autowired + private ITaskProgressMaterialTypeService taskProgressMaterialTypeService; + + /** + * 分页列表查询 + * + * @param taskProgressMaterialType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value = "分页列表查询任务进度甘特图-材料类型信息", notes = "分页列表查询任务进度甘特图-材料类型信息", httpMethod = "GET") + @GetMapping(value = "/page") + public Result> queryPageList(TaskProgressMaterialType taskProgressMaterialType, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Result> result = new Result>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialType, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = taskProgressMaterialTypeService.page(page, queryWrapper); + result.setSuccess(true); + result.setResult(pageList); + return result; + } + + /** + * 列表查询 + * + * @param taskProgressMaterialType + * @param req + * @return + */ + @ApiOperation(value = "列表查询任务进度甘特图-材料类型信息", notes = "列表查询任务进度甘特图-材料类型信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(TaskProgressMaterialType taskProgressMaterialType, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialType, req.getParameterMap()); + return Result.success(taskProgressMaterialTypeService.list(queryWrapper)); + } + + /** + * 添加 + * + * @param taskProgressMaterialType + * @return + */ + @ApiOperation(value = "添加任务进度甘特图-材料类型信息", notes = "添加任务进度甘特图-材料类型信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskProgressMaterialType taskProgressMaterialType) { + taskProgressMaterialTypeService.save(taskProgressMaterialType); + return Result.ok(); + } + + /** + * 编辑 + * + * @param taskProgressMaterialType + * @return + */ + @ApiOperation(value = "编辑任务进度甘特图-材料类型信息", notes = "编辑任务进度甘特图-材料类型信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody TaskProgressMaterialType taskProgressMaterialType) { + taskProgressMaterialTypeService.updateById(taskProgressMaterialType); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @ApiOperation(value = "删除任务进度甘特图-材料类型信息", notes = "删除任务进度甘特图-材料类型信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-材料类型ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + String id = MapUtils.getString(map, "id"); + Result result = new Result(); + TaskProgressMaterialType taskProgressMaterialType = taskProgressMaterialTypeService.getById(id); + if (taskProgressMaterialType == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = taskProgressMaterialTypeService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } + + return result; + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询任务进度甘特图-材料类型信息", notes = "通过id查询任务进度甘特图-材料类型信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "任务进度甘特图-材料类型ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + TaskProgressMaterialType taskProgressMaterialType = taskProgressMaterialTypeService.getById(id); + if (taskProgressMaterialType == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(taskProgressMaterialType); + result.setSuccess(true); + } + return result; + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @ApiOperation(value = "导出excel任务进度甘特图-材料类型信息", notes = "导出excel任务进度甘特图-材料类型信息", httpMethod = "POST") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + // Step.1 组装查询条件 + QueryWrapper queryWrapper = null; + try { + String paramsStr = request.getParameter("paramsStr"); + if (oConvertUtils.isNotEmpty(paramsStr)) { + String deString = URLDecoder.decode(paramsStr, "UTF-8"); + TaskProgressMaterialType taskProgressMaterialType = JSON.parseObject(deString, TaskProgressMaterialType.class); + queryWrapper = QueryGenerator.initQueryWrapper(taskProgressMaterialType, request.getParameterMap()); + } + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + + //Step.2 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + List pageList = taskProgressMaterialTypeService.list(queryWrapper); + //导出文件名称 + mv.addObject(NormalExcelConstants.FILE_NAME, "任务进度甘特图-材料类型列表"); + mv.addObject(NormalExcelConstants.CLASS, TaskProgressMaterialType.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("任务进度甘特图-材料类型列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.DATA_LIST, pageList); + return mv; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java new file mode 100644 index 000000000..7e8be820b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java @@ -0,0 +1,141 @@ +package com.zhgd.xmgl.modules.taskprogress.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 任务进度甘特图 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Data +@TableName("task_progress") +@ApiModel(value = "TaskProgress实体类", description = "TaskProgress") +public class TaskProgress implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 所属项目SN + */ + @Excel(name = "所属项目SN", width = 15) + @ApiModelProperty(value = "所属项目SN") + private java.lang.String projectSn; + /** + * 任务名称 + */ + @Excel(name = "任务名称", width = 15) + @ApiModelProperty(value = "任务名称") + private java.lang.String taskName; + /** + * 任务工期 天为单位 + */ + @Excel(name = "任务工期 天为单位", width = 15) + @ApiModelProperty(value = "任务工期 天为单位") + private java.lang.Double duration; + /** + * 进度比例 + */ + @Excel(name = "进度比例", width = 15) + @ApiModelProperty(value = "进度比例") + private java.lang.Double progressRatio; + /** + * 预计开始时间 + */ + @Excel(name = "预计开始时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "预计开始时间") + private java.util.Date startDate; + /** + * 实际开始时间 + */ + @Excel(name = "实际开始时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "实际开始时间") + private java.util.Date actualStartDate; + /** + * 预计完成时间 + */ + @Excel(name = "预计完成时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "预计完成时间") + private java.util.Date finishDate; + /** + * 实际完成时间 + */ + @Excel(name = "实际完成时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "实际完成时间") + private java.util.Date actualFinishDate; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateDate; + /** + * 状态，0未开始 ,1进行中，2已完成，3已逾期 默认未开始 + */ + @Excel(name = "状态，0未开始 ,1进行中，2已完成，3已逾期 默认未开始", width = 15) + @ApiModelProperty(value = "状态，0未开始 ,1进行中，2已完成，3已逾期 默认未开始") + private java.lang.Integer status; + /** + * 开始预警：1提前2正常3逾期 + */ + @Excel(name = "开始预警：1提前2正常3逾期", width = 15) + @ApiModelProperty(value = "开始预警：1提前2正常3逾期") + private java.lang.Integer beginWarning; + /** + * 结束预警：1提前2正常3逾期 + */ + @Excel(name = "结束预警：1提前2正常3逾期", width = 15) + @ApiModelProperty(value = "结束预警：1提前2正常3逾期") + private java.lang.Integer endWarning; + /** + * 父节点id + */ + @Excel(name = "父节点id", width = 15) + @ApiModelProperty(value = "父节点id") + private java.lang.Integer parentId; + /** + * 负责人id + */ + @Excel(name = "负责人id", width = 15) + @ApiModelProperty(value = "负责人id") + private java.lang.Integer dutyUserId; + /** + * 前置任务id列表 + */ + @Excel(name = "前置任务id列表", width = 15) + @ApiModelProperty(value = "前置任务id列表") + private java.lang.String predecessorIds; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressAlarm.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressAlarm.java new file mode 100644 index 000000000..2c68802e3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressAlarm.java @@ -0,0 +1,73 @@ +package com.zhgd.xmgl.modules.taskprogress.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 任务进度甘特图-报警信息 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Data +@TableName("task_progress_alarm") +@ApiModel(value = "TaskProgressAlarm实体类", description = "TaskProgressAlarm") +public class TaskProgressAlarm implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 所属项目SN + */ + @Excel(name = "所属项目SN", width = 15) + @ApiModelProperty(value = "所属项目SN") + private java.lang.String projectSn; + /** + * 任务进度甘特图id + */ + @Excel(name = "任务进度甘特图id", width = 15) + @ApiModelProperty(value = "任务进度甘特图id") + private java.lang.Long taskProgressId; + /** + * 报警详情 + */ + @Excel(name = "报警详情", width = 15) + @ApiModelProperty(value = "报警详情") + private java.lang.String alarmDetails; + /** + * 报警类型 1：逾期未开始 2：逾期未完成 + */ + @Excel(name = "报警类型 1：逾期未开始 2：逾期未完成", width = 15) + @ApiModelProperty(value = "报警类型 1：逾期未开始 2：逾期未完成") + private java.lang.Integer alarmType; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateDate; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialRel.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialRel.java new file mode 100644 index 000000000..2ac77a07f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialRel.java @@ -0,0 +1,73 @@ +package com.zhgd.xmgl.modules.taskprogress.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 任务进度甘特图-材料类型-关联 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Data +@TableName("task_progress_material_rel") +@ApiModel(value = "TaskProgressMaterialRel实体类", description = "TaskProgressMaterialRel") +public class TaskProgressMaterialRel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * taskProgressId + */ + @Excel(name = "taskProgressId", width = 15) + @ApiModelProperty(value = "taskProgressId") + private java.lang.Long taskProgressId; + /** + * taskProgressMaterialTypeId + */ + @Excel(name = "taskProgressMaterialTypeId", width = 15) + @ApiModelProperty(value = "taskProgressMaterialTypeId") + private java.lang.Long taskProgressMaterialTypeId; + /** + * 计划用量 + */ + @Excel(name = "计划用量", width = 15) + @ApiModelProperty(value = "计划用量") + private java.lang.Double planUsage; + /** + * 实际用量 + */ + @Excel(name = "实际用量", width = 15) + @ApiModelProperty(value = "实际用量") + private java.lang.Double actualAmount; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateDate; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialType.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialType.java new file mode 100644 index 000000000..79798335f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgressMaterialType.java @@ -0,0 +1,67 @@ +package com.zhgd.xmgl.modules.taskprogress.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 任务进度甘特图-材料类型 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Data +@TableName("task_progress_material_type") +@ApiModel(value = "TaskProgressMaterialType实体类", description = "TaskProgressMaterialType") +public class TaskProgressMaterialType implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 所属项目SN + */ + @Excel(name = "所属项目SN", width = 15) + @ApiModelProperty(value = "所属项目SN") + private java.lang.String projectSn; + /** + * 名称（如工种、材料、设备名称等） + */ + @Excel(name = "名称（如工种、材料、设备名称等）", width = 15) + @ApiModelProperty(value = "名称（如工种、材料、设备名称等）") + private java.lang.String name; + /** + * 类型：1工种2材料3设备 + */ + @Excel(name = "类型：1工种2材料3设备", width = 15) + @ApiModelProperty(value = "类型：1工种2材料3设备") + private java.lang.Integer type; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateDate; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressAlarmMapper.java new file mode 100644 index 000000000..183beef2e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressAlarmMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.taskprogress.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressAlarm; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 任务进度甘特图-报警信息 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Mapper +public interface TaskProgressAlarmMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java new file mode 100644 index 000000000..3c87132e4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.taskprogress.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgress; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 任务进度甘特图 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Mapper +public interface TaskProgressMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialRelMapper.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialRelMapper.java new file mode 100644 index 000000000..b3939deb6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialRelMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.taskprogress.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 任务进度甘特图-材料类型-关联 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Mapper +public interface TaskProgressMaterialRelMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialTypeMapper.java new file mode 100644 index 000000000..08aab120c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/TaskProgressMaterialTypeMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.taskprogress.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 任务进度甘特图-材料类型 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Mapper +public interface TaskProgressMaterialTypeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressAlarmMapper.xml new file mode 100644 index 000000000..073f303b4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressAlarmMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml new file mode 100644 index 000000000..9e630d358 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml new file mode 100644 index 000000000..49d1e5803 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialRelMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialTypeMapper.xml new file mode 100644 index 000000000..d91ae64da --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMaterialTypeMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressAlarmService.java new file mode 100644 index 000000000..5cf158708 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressAlarmService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.taskprogress.service; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressAlarm; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 任务进度甘特图-报警信息 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +public interface ITaskProgressAlarmService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialRelService.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialRelService.java new file mode 100644 index 000000000..73c090aa8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialRelService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.taskprogress.service; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 任务进度甘特图-材料类型-关联 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +public interface ITaskProgressMaterialRelService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java new file mode 100644 index 000000000..e5b945d4f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressMaterialTypeService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.taskprogress.service; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialType; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 任务进度甘特图-材料类型 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +public interface ITaskProgressMaterialTypeService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java new file mode 100644 index 000000000..5880a2d38 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.taskprogress.service; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgress; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 任务进度甘特图 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +public interface ITaskProgressService extends IService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressAlarmServiceImpl.java new file mode 100644 index 000000000..0a0278007 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressAlarmServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.taskprogress.service.impl; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressAlarm; +import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressAlarmMapper; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressAlarmService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 任务进度甘特图-报警信息 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Service +public class TaskProgressAlarmServiceImpl extends ServiceImpl implements ITaskProgressAlarmService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java new file mode 100644 index 000000000..dcba7afa3 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialRelServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.taskprogress.service.impl; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; +import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMaterialRelMapper; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressMaterialRelService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 任务进度甘特图-材料类型-关联 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Service +public class TaskProgressMaterialRelServiceImpl extends ServiceImpl implements ITaskProgressMaterialRelService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialTypeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialTypeServiceImpl.java new file mode 100644 index 000000000..fd5f15ce0 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressMaterialTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.taskprogress.service.impl; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialType; +import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMaterialTypeMapper; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressMaterialTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 任务进度甘特图-材料类型 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Service +public class TaskProgressMaterialTypeServiceImpl extends ServiceImpl implements ITaskProgressMaterialTypeService { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java new file mode 100644 index 000000000..dc73b9961 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.taskprogress.service.impl; + +import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgress; +import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMapper; +import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 任务进度甘特图 + * @author： pds + * @date： 2023-10-09 + * @version： V1.0 + */ +@Service +public class TaskProgressServiceImpl extends ServiceImpl implements ITaskProgressService { + +} diff --git a/src/main/java/com/zhgd/xmgl/task/JzgTask.java b/src/main/java/com/zhgd/xmgl/task/JzgTask.java index 0bf98c7ec..3f1e19f2e 100644 --- a/src/main/java/com/zhgd/xmgl/task/JzgTask.java +++ b/src/main/java/com/zhgd/xmgl/task/JzgTask.java @@ -62,6 +62,8 @@ public class JzgTask { @Value("${basePath}") private String path; @Autowired + private UfaceDevMapper ufaceDevMapper; + @Autowired private ProjectEnterpriseMapper projectEnterpriseMapper; @Autowired private ProjectMapper projectMapper; @@ -141,10 +143,12 @@ public class JzgTask { String key = JZG_WORKER_ATTENDANCE_LAST_TIME_PREFIX + projectSn; Long time = (Long) redisRepository.get(key); workerAttendancePresenceMapper.delete(new LambdaQueryWrapper().eq(WorkerAttendancePresence::getProjectSn, projectSn)); + List ufaceDevs = ufaceDevMapper.selectList(new LambdaQueryWrapper() + .eq(UfaceDev::getProjectSn, projectSn)); for (JzgWorkerAttendance attendance : jzgList) { try { if (time == null || attendance.getCheckDate() > time) { - saveWorkerAttendance(attendance, projectSn); + saveWorkerAttendance(attendance, projectSn, ufaceDevs); } } catch (Exception e) { log.error("err:", e); @@ -174,7 +178,7 @@ public class JzgTask { } } - private void saveWorkerAttendance(JzgWorkerAttendance jzg, String projectSn) { + private void saveWorkerAttendance(JzgWorkerAttendance jzg, String projectSn, List ufaceDevs) { WorkerAttendance workerAttendance = new WorkerAttendance(); WorkerInfo wi = workerInfoMapper.selectOne(new LambdaQueryWrapper() .eq(WorkerInfo::getJzgUserId, jzg.getUserId())); @@ -188,6 +192,17 @@ public class JzgTask { workerAttendance.setPassType(Integer.valueOf(jzg.getDirection())); workerAttendance.setCardType(getCardType(jzg.getAttendType())); workerAttendance.setImageUrl(uploadFileService.uploadUrlResourceRtName(jzg.getImageUrl())); + for (UfaceDev ufaceDev : ufaceDevs) { + Integer passType = workerAttendance.getPassType(); + if (Objects.equals(passType, 1) && Objects.equals(ufaceDev.getIsEnter(), 1)) { + workerAttendance.setDevSn(ufaceDev.getDevSn()); + break; + } + if (Objects.equals(passType, 2) && Objects.equals(ufaceDev.getIsOut(), 1)) { + workerAttendance.setDevSn(ufaceDev.getDevSn()); + break; + } + } workerAttendanceMapper.insert(workerAttendance); }