From 41a79431cb718864c709a57cb3e1cb71aa143c88 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 23 Jul 2025 19:52:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectNewController.java | 104 +++++++++++++ .../ProjectProgressNewController.java | 101 +++++++++++++ .../screen/domain/ProjectNew.java | 84 +++++++++++ .../screen/domain/ProjectProgressNew.java | 86 +++++++++++ .../screen/mapper/ProjectNewMapper.java | 60 ++++++++ .../mapper/ProjectProgressNewMapper.java | 60 ++++++++ .../screen/service/IProjectNewService.java | 60 ++++++++ .../service/IProjectProgressNewService.java | 60 ++++++++ .../service/impl/ProjectNewServiceImpl.java | 86 +++++++++++ .../impl/ProjectProgressNewServiceImpl.java | 86 +++++++++++ .../resources/mapper/ProjectNewMapper.xml | 117 +++++++++++++++ .../mapper/ProjectProgressNewMapper.xml | 138 ++++++++++++++++++ 12 files changed, 1042 insertions(+) create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectProgressNewMapper.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectProgressNewService.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectProgressNewServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java new file mode 100644 index 0000000..d5f89e0 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java @@ -0,0 +1,104 @@ +package com.securitycontrol.screen.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.securitycontrol.screen.domain.ProjectNew; +import com.securitycontrol.screen.service.IProjectNewService; + +/** + * 工程信息Controller + * + * @author xsheng + * @date 2025-07-23 + */ +@Api(tags = "工程信息接口") +@RestController +@RequestMapping("/tb_project_new") +public class ProjectNewController extends BaseController { + @Autowired + private IProjectNewService projectNewService; + + /** + * 查询工程信息列表 + */ + @ApiOperation(value = "查询工程信息列表") + //@RequiresPermissions("screen:new:list") + @GetMapping("/list") + public TableDataInfo list(ProjectNew projectNew) { + startPage(); + List list = projectNewService.selectProjectNewList(projectNew); + return getDataTable(list); + } + + + /** + * 获取工程信息详细信息 + */ + @ApiOperation(value = "获取工程信息详细信息") + //@RequiresPermissions("screen:new:query") + @GetMapping(value = "/{proId}") + public AjaxResult getInfo(@PathVariable("proId") String proId) { + return success(projectNewService.selectProjectNewByProId(proId)); + } + + /** + * 新增工程信息 + */ + @ApiOperation(value = "新增工程信息") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:add") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping + public AjaxResult add(@RequestBody ProjectNew projectNew) { + try { + return toAjax(projectNewService.insertProjectNew(projectNew)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + + /** + * 修改工程信息 + */ + @ApiOperation(value = "修改工程信息") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:edit") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody ProjectNew projectNew) { + try { + return toAjax(projectNewService.updateProjectNew(projectNew)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + + /** + * 删除工程信息 + */ + @ApiOperation(value = "删除工程信息") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:remove") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping("/del/{proIds}") + public AjaxResult remove(@PathVariable String[] proIds) { + return toAjax(projectNewService.deleteProjectNewByProIds(proIds)); + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java new file mode 100644 index 0000000..35c07ad --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java @@ -0,0 +1,101 @@ +package com.securitycontrol.screen.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.securitycontrol.screen.domain.ProjectProgressNew; +import com.securitycontrol.screen.service.IProjectProgressNewService; + +/** + * 工程进度Controller + * + * @author xsheng + * @date 2025-07-23 + */ +@Api(tags = "工程进度接口") +@RestController +@RequestMapping("/tb_project_progress_new") +public class ProjectProgressNewController extends BaseController { + @Autowired + private IProjectProgressNewService projectProgressNewService; + + /** + * 查询工程进度列表 + */ + @ApiOperation(value = "查询工程进度列表") + //@RequiresPermissions("screen:new:list") + @GetMapping("/list") + public TableDataInfo list(ProjectProgressNew projectProgressNew) { + startPage(); + List list = projectProgressNewService.selectProjectProgressNewList(projectProgressNew); + return getDataTable(list); + } + + /** + * 获取工程进度详细信息 + */ + @ApiOperation(value = "获取工程进度详细信息") + //@RequiresPermissions("screen:new:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(projectProgressNewService.selectProjectProgressNewById(id)); + } + + /** + * 新增工程进度 + */ + @ApiOperation(value = "新增工程进度") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:add") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping + public AjaxResult add(@RequestBody ProjectProgressNew projectProgressNew) { + try { + return toAjax(projectProgressNewService.insertProjectProgressNew(projectProgressNew)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + + /** + * 修改工程进度 + */ + @ApiOperation(value = "修改工程进度") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:edit") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody ProjectProgressNew projectProgressNew) { + try { + return toAjax(projectProgressNewService.updateProjectProgressNew(projectProgressNew)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + + /** + * 删除工程进度 + */ + @ApiOperation(value = "删除工程进度") + //@PreventRepeatSubmit + //@RequiresPermissions("screen:new:remove") + @Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志") + @PostMapping("/del/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(projectProgressNewService.deleteProjectProgressNewByIds(ids)); + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java new file mode 100644 index 0000000..4b8b651 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java @@ -0,0 +1,84 @@ +package com.securitycontrol.screen.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.securitycontrol.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * 工程信息对象 tb_project_new + * + * @author xsheng + * @date 2025-07-23 + */ + + +@Data +@ToString +public class ProjectNew extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String proId; + + /** 单项工程编码 */ + @ApiModelProperty(value = "单项工程编码") + private String signCode; + + /** 标段工程编码 */ + @ApiModelProperty(value = "标段工程编码") + private String bidCode; + + /** 工程编码 */ + @ApiModelProperty(value = "工程编码") + private String proCode; + + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String proName; + + /** 工程状态 */ + @ApiModelProperty(value = "工程状态") + private String status; + + /** 计划开始时间 */ + @ApiModelProperty(value = "计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartTime; + + /** 计划结束时间 */ + @ApiModelProperty(value = "计划结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planEndTime; + + /** 实际开始时间 */ + @ApiModelProperty(value = "实际开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + /** 实际竣工时间 */ + @ApiModelProperty(value = "实际竣工时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + /** 偏差天数 */ + @ApiModelProperty(value = "偏差天数") + private String diffDay; + + /** 工程成本预算 */ + @ApiModelProperty(value = "工程成本预算") + private String planCost; + + /** 实际成本 */ + @ApiModelProperty(value = "实际成本") + private BigDecimal actualCost; + + /** 风险等级 */ + @ApiModelProperty(value = "风险等级") + private String riskLevel; + + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java new file mode 100644 index 0000000..aefd48a --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java @@ -0,0 +1,86 @@ +package com.securitycontrol.screen.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.securitycontrol.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +/** + * 工程进度对象 tb_project_progress_new + * + * @author xsheng + * @date 2025-07-23 + */ + + +@Data +@ToString +public class ProjectProgressNew extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键id */ + private Long id; + + /** 工程id */ + @ApiModelProperty(value = "工程id") + private Long projectId; + + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String projectName; + + /** 任务编码 */ + @ApiModelProperty(value = "任务编码") + private String taskCode; + + /** 任务名称 */ + @ApiModelProperty(value = "任务名称") + private String taskName; + + /** 计划开始时间 */ + @ApiModelProperty(value = "计划开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartTime; + + /** 计划完成时间 */ + @ApiModelProperty(value = "计划完成时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planEndTime; + + /** 实际开始时间 */ + @ApiModelProperty(value = "实际开始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualStartTime; + + /** 实际完成时间 */ + @ApiModelProperty(value = "实际完成时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date actualEndTime; + + /** 进度偏差 */ + @ApiModelProperty(value = "进度偏差") + private String processDiff; + + /** 总工程量 */ + @ApiModelProperty(value = "总工程量") + private String totalEffort; + + /** 已完成工程量 */ + @ApiModelProperty(value = "已完成工程量") + private String completeEffort; + + /** 延误因素 */ + @ApiModelProperty(value = "延误因素") + private String delayActor; + + /** 资源匹配状态 */ + @ApiModelProperty(value = "资源匹配状态") + private String resourceMatchStatus; + + /** 关键路径任务标识（是 / 否） */ + private String keyPathFlag; + + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java new file mode 100644 index 0000000..af019a8 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectNewMapper.java @@ -0,0 +1,60 @@ +package com.securitycontrol.screen.mapper; + +import java.util.List; +import com.securitycontrol.screen.domain.ProjectNew; + +/** + * 工程信息Mapper接口 + * + * @author xsheng + * @date 2025-07-23 + */ +public interface ProjectNewMapper { + /** + * 查询工程信息 + * + * @param proId 工程信息主键 + * @return 工程信息 + */ + public ProjectNew selectProjectNewByProId(String proId); + + /** + * 查询工程信息列表 + * + * @param projectNew 工程信息 + * @return 工程信息集合 + */ + public List selectProjectNewList(ProjectNew projectNew); + + /** + * 新增工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + public int insertProjectNew(ProjectNew projectNew); + + /** + * 修改工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + public int updateProjectNew(ProjectNew projectNew); + + /** + * 删除工程信息 + * + * @param proId 工程信息主键 + * @return 结果 + */ + public int deleteProjectNewByProId(String proId); + + /** + * 批量删除工程信息 + * + * @param proIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectNewByProIds(String[] proIds); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectProgressNewMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectProgressNewMapper.java new file mode 100644 index 0000000..9c0534a --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ProjectProgressNewMapper.java @@ -0,0 +1,60 @@ +package com.securitycontrol.screen.mapper; + +import java.util.List; +import com.securitycontrol.screen.domain.ProjectProgressNew; + +/** + * 工程进度Mapper接口 + * + * @author xsheng + * @date 2025-07-23 + */ +public interface ProjectProgressNewMapper { + /** + * 查询工程进度 + * + * @param id 工程进度主键 + * @return 工程进度 + */ + public ProjectProgressNew selectProjectProgressNewById(Long id); + + /** + * 查询工程进度列表 + * + * @param projectProgressNew 工程进度 + * @return 工程进度集合 + */ + public List selectProjectProgressNewList(ProjectProgressNew projectProgressNew); + + /** + * 新增工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + public int insertProjectProgressNew(ProjectProgressNew projectProgressNew); + + /** + * 修改工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + public int updateProjectProgressNew(ProjectProgressNew projectProgressNew); + + /** + * 删除工程进度 + * + * @param id 工程进度主键 + * @return 结果 + */ + public int deleteProjectProgressNewById(Long id); + + /** + * 批量删除工程进度 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProjectProgressNewByIds(Long[] ids); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java new file mode 100644 index 0000000..830121a --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectNewService.java @@ -0,0 +1,60 @@ +package com.securitycontrol.screen.service; + +import java.util.List; +import com.securitycontrol.screen.domain.ProjectNew; + +/** + * 工程信息Service接口 + * + * @author xsheng + * @date 2025-07-23 + */ +public interface IProjectNewService { + /** + * 查询工程信息 + * + * @param proId 工程信息主键 + * @return 工程信息 + */ + public ProjectNew selectProjectNewByProId(String proId); + + /** + * 查询工程信息列表 + * + * @param projectNew 工程信息 + * @return 工程信息集合 + */ + public List selectProjectNewList(ProjectNew projectNew); + + /** + * 新增工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + public int insertProjectNew(ProjectNew projectNew); + + /** + * 修改工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + public int updateProjectNew(ProjectNew projectNew); + + /** + * 批量删除工程信息 + * + * @param proIds 需要删除的工程信息主键集合 + * @return 结果 + */ + public int deleteProjectNewByProIds(String[] proIds); + + /** + * 删除工程信息信息 + * + * @param proId 工程信息主键 + * @return 结果 + */ + public int deleteProjectNewByProId(String proId); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectProgressNewService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectProgressNewService.java new file mode 100644 index 0000000..0c1793a --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IProjectProgressNewService.java @@ -0,0 +1,60 @@ +package com.securitycontrol.screen.service; + +import java.util.List; +import com.securitycontrol.screen.domain.ProjectProgressNew; + +/** + * 工程进度Service接口 + * + * @author xsheng + * @date 2025-07-23 + */ +public interface IProjectProgressNewService { + /** + * 查询工程进度 + * + * @param id 工程进度主键 + * @return 工程进度 + */ + public ProjectProgressNew selectProjectProgressNewById(Long id); + + /** + * 查询工程进度列表 + * + * @param projectProgressNew 工程进度 + * @return 工程进度集合 + */ + public List selectProjectProgressNewList(ProjectProgressNew projectProgressNew); + + /** + * 新增工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + public int insertProjectProgressNew(ProjectProgressNew projectProgressNew); + + /** + * 修改工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + public int updateProjectProgressNew(ProjectProgressNew projectProgressNew); + + /** + * 批量删除工程进度 + * + * @param ids 需要删除的工程进度主键集合 + * @return 结果 + */ + public int deleteProjectProgressNewByIds(Long[] ids); + + /** + * 删除工程进度信息 + * + * @param id 工程进度主键 + * @return 结果 + */ + public int deleteProjectProgressNewById(Long id); +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java new file mode 100644 index 0000000..67c58fc --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectNewServiceImpl.java @@ -0,0 +1,86 @@ +package com.securitycontrol.screen.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.securitycontrol.screen.mapper.ProjectNewMapper; +import com.securitycontrol.screen.domain.ProjectNew; +import com.securitycontrol.screen.service.IProjectNewService; + +/** + * 工程信息Service业务层处理 + * + * @author xsheng + * @date 2025-07-23 + */ +@Service +public class ProjectNewServiceImpl implements IProjectNewService { + @Autowired + private ProjectNewMapper projectNewMapper; + + /** + * 查询工程信息 + * + * @param proId 工程信息主键 + * @return 工程信息 + */ + @Override + public ProjectNew selectProjectNewByProId(String proId) { + return projectNewMapper.selectProjectNewByProId(proId); + } + + /** + * 查询工程信息列表 + * + * @param projectNew 工程信息 + * @return 工程信息 + */ + @Override + public List selectProjectNewList(ProjectNew projectNew) { + return projectNewMapper.selectProjectNewList(projectNew); + } + + /** + * 新增工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + @Override + public int insertProjectNew(ProjectNew projectNew) { + return projectNewMapper.insertProjectNew(projectNew); + } + + /** + * 修改工程信息 + * + * @param projectNew 工程信息 + * @return 结果 + */ + @Override + public int updateProjectNew(ProjectNew projectNew) { + return projectNewMapper.updateProjectNew(projectNew); + } + + /** + * 批量删除工程信息 + * + * @param proIds 需要删除的工程信息主键 + * @return 结果 + */ + @Override + public int deleteProjectNewByProIds(String[] proIds) { + return projectNewMapper.deleteProjectNewByProIds(proIds); + } + + /** + * 删除工程信息信息 + * + * @param proId 工程信息主键 + * @return 结果 + */ + @Override + public int deleteProjectNewByProId(String proId) { + return projectNewMapper.deleteProjectNewByProId(proId); + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectProgressNewServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectProgressNewServiceImpl.java new file mode 100644 index 0000000..7365502 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectProgressNewServiceImpl.java @@ -0,0 +1,86 @@ +package com.securitycontrol.screen.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.securitycontrol.screen.mapper.ProjectProgressNewMapper; +import com.securitycontrol.screen.domain.ProjectProgressNew; +import com.securitycontrol.screen.service.IProjectProgressNewService; + +/** + * 工程进度Service业务层处理 + * + * @author xsheng + * @date 2025-07-23 + */ +@Service +public class ProjectProgressNewServiceImpl implements IProjectProgressNewService { + @Autowired + private ProjectProgressNewMapper projectProgressNewMapper; + + /** + * 查询工程进度 + * + * @param id 工程进度主键 + * @return 工程进度 + */ + @Override + public ProjectProgressNew selectProjectProgressNewById(Long id) { + return projectProgressNewMapper.selectProjectProgressNewById(id); + } + + /** + * 查询工程进度列表 + * + * @param projectProgressNew 工程进度 + * @return 工程进度 + */ + @Override + public List selectProjectProgressNewList(ProjectProgressNew projectProgressNew) { + return projectProgressNewMapper.selectProjectProgressNewList(projectProgressNew); + } + + /** + * 新增工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + @Override + public int insertProjectProgressNew(ProjectProgressNew projectProgressNew) { + return projectProgressNewMapper.insertProjectProgressNew(projectProgressNew); + } + + /** + * 修改工程进度 + * + * @param projectProgressNew 工程进度 + * @return 结果 + */ + @Override + public int updateProjectProgressNew(ProjectProgressNew projectProgressNew) { + return projectProgressNewMapper.updateProjectProgressNew(projectProgressNew); + } + + /** + * 批量删除工程进度 + * + * @param ids 需要删除的工程进度主键 + * @return 结果 + */ + @Override + public int deleteProjectProgressNewByIds(Long[] ids) { + return projectProgressNewMapper.deleteProjectProgressNewByIds(ids); + } + + /** + * 删除工程进度信息 + * + * @param id 工程进度主键 + * @return 结果 + */ + @Override + public int deleteProjectProgressNewById(Long id) { + return projectProgressNewMapper.deleteProjectProgressNewById(id); + } +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml new file mode 100644 index 0000000..9e5afa0 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + select pro_id, sign_code, bid_code, pro_code, pro_name, status, plan_start_time, plan_end_time, start_time, end_time, diff_day, plan_cost, actual_cost, risk_level from tb_project_new + + + + + + + + insert into tb_project_new + + pro_id, + sign_code, + bid_code, + pro_code, + pro_name, + status, + plan_start_time, + plan_end_time, + start_time, + end_time, + diff_day, + plan_cost, + actual_cost, + risk_level, + + + #{proId}, + #{signCode}, + #{bidCode}, + #{proCode}, + #{proName}, + #{status}, + #{planStartTime}, + #{planEndTime}, + #{startTime}, + #{endTime}, + #{diffDay}, + #{planCost}, + #{actualCost}, + #{riskLevel}, + + + + + update tb_project_new + + sign_code = #{signCode}, + bid_code = #{bidCode}, + pro_code = #{proCode}, + pro_name = #{proName}, + status = #{status}, + plan_start_time = #{planStartTime}, + plan_end_time = #{planEndTime}, + start_time = #{startTime}, + end_time = #{endTime}, + diff_day = #{diffDay}, + plan_cost = #{planCost}, + actual_cost = #{actualCost}, + risk_level = #{riskLevel}, + + where pro_id = #{proId} + + + + delete from tb_project_new where pro_id = #{proId} + + + + delete from tb_project_new where pro_id in + + #{proId} + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml new file mode 100644 index 0000000..b55f972 --- /dev/null +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, project_id, project_name, task_code, task_name, plan_start_time, plan_end_time, actual_start_time, actual_end_time, process_diff, total_effort, complete_effort, delay_actor, resource_match_status, key_path_flag, create_by, create_time, update_by, update_time from tb_project_progress_new + + + + + + + + insert into tb_project_progress_new + + id, + project_id, + project_name, + task_code, + task_name, + plan_start_time, + plan_end_time, + actual_start_time, + actual_end_time, + process_diff, + total_effort, + complete_effort, + delay_actor, + resource_match_status, + key_path_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{projectId}, + #{projectName}, + #{taskCode}, + #{taskName}, + #{planStartTime}, + #{planEndTime}, + #{actualStartTime}, + #{actualEndTime}, + #{processDiff}, + #{totalEffort}, + #{completeEffort}, + #{delayActor}, + #{resourceMatchStatus}, + #{keyPathFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update tb_project_progress_new + + project_id = #{projectId}, + project_name = #{projectName}, + task_code = #{taskCode}, + task_name = #{taskName}, + plan_start_time = #{planStartTime}, + plan_end_time = #{planEndTime}, + actual_start_time = #{actualStartTime}, + actual_end_time = #{actualEndTime}, + process_diff = #{processDiff}, + total_effort = #{totalEffort}, + complete_effort = #{completeEffort}, + delay_actor = #{delayActor}, + resource_match_status = #{resourceMatchStatus}, + key_path_flag = #{keyPathFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from tb_project_progress_new where id = #{id} + + + + delete from tb_project_progress_new where id in + + #{id} + + + \ No newline at end of file From b0cdc040279e66371259ae5ea5335964e7028884 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 23 Jul 2025 20:07:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=BE=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/interceptor/ParamSecureHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index 2652ae8..a816141 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -58,7 +58,11 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { /** * 越权白名单路径->指定的路径 */ - public static String[] WHITE_URLS= new String[]{"/sys/sysLog/addLogs","/largeScreen/constrDisplay/pushImageData"}; + public static String[] WHITE_URLS= new String[]{ + "/sys/sysLog/addLogs", + "/largeScreen/constrDisplay/pushImageData", + "/largeScreen/tb_project_new/list" + }; /** * 越权 大屏路径拦截-指定的前缀拦截 From 5416362d4b2ec7566a6eb8fab37d0fe880692e35 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 23 Jul 2025 20:18:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/interceptor/ParamSecureHandler.java | 3 ++- .../screen/controller/ProjectNewController.java | 2 +- .../screen/controller/ProjectProgressNewController.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index a816141..ea0da9c 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -61,7 +61,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { public static String[] WHITE_URLS= new String[]{ "/sys/sysLog/addLogs", "/largeScreen/constrDisplay/pushImageData", - "/largeScreen/tb_project_new/list" + "/largeScreen/tb_project_new/list", + "/largeScreen/tb_project_progress_new/list" }; /** diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java index d5f89e0..404eb9f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java @@ -30,7 +30,7 @@ import com.securitycontrol.screen.service.IProjectNewService; */ @Api(tags = "工程信息接口") @RestController -@RequestMapping("/tb_project_new") +@RequestMapping("/largeScreen/tb_project_new") public class ProjectNewController extends BaseController { @Autowired private IProjectNewService projectNewService; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java index 35c07ad..af27166 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectProgressNewController.java @@ -28,7 +28,7 @@ import com.securitycontrol.screen.service.IProjectProgressNewService; */ @Api(tags = "工程进度接口") @RestController -@RequestMapping("/tb_project_progress_new") +@RequestMapping("/largeScreen/tb_project_progress_new") public class ProjectProgressNewController extends BaseController { @Autowired private IProjectProgressNewService projectProgressNewService; From 445043ee65eaa71b87f72ab9ff8633827b94d360 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 23 Jul 2025 20:29:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/securitycontrol/screen/domain/ProjectNew.java | 2 ++ .../src/main/resources/mapper/ProjectNewMapper.xml | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java index 4b8b651..33be8fc 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java @@ -80,5 +80,7 @@ public class ProjectNew extends BaseEntity { @ApiModelProperty(value = "风险等级") private String riskLevel; + private String suggestion; + private String taskName; } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml index 9e5afa0..5a644d6 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectNewMapper.xml @@ -18,10 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select pro_id, sign_code, bid_code, pro_code, pro_name, status, plan_start_time, plan_end_time, start_time, end_time, diff_day, plan_cost, actual_cost, risk_level from tb_project_new + select pro_id, sign_code, bid_code, pro_code, pro_name, status, plan_start_time, + plan_end_time, start_time, end_time, diff_day, plan_cost, actual_cost, risk_level, + suggestion, task_name + from tb_project_new From 2634b9c6c25ec9f22daa39ff4067b20b608ef1d7 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 23 Jul 2025 20:53:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/securitycontrol/screen/domain/ProjectProgressNew.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java index aefd48a..eadfde6 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java @@ -25,7 +25,7 @@ public class ProjectProgressNew extends BaseEntity { /** 工程id */ @ApiModelProperty(value = "工程id") - private Long projectId; + private String projectId; /** 工程名称 */ @ApiModelProperty(value = "工程名称")