bonus
/
ah_jjzhgd_service
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
jiang 2025-07-24 23:14:04 +08:00
parent a142426be3 4753c8f719
commit dca726187c
6 changed files with 115 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java
View File

@ -82,6 +82,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
"/largeScreen/deviceEnergyAnalysis/selectLatestAll",
"/largeScreen/tb_project_new/list4progress",
"/largeScreen/tb_project_new/listRiskDetail",
"/largeScreen/tb_project_new/list4cost",
};

37
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ProjectNewController.java
View File

@ -104,6 +104,41 @@ public class ProjectNewController extends BaseController {
return getDataTable(list);
}
@ApiOperation(value = "查询工程成本表")
@GetMapping("/list4cost")
public TableDataInfo list4cost() {
List<ProjectNew> list = new ArrayList<>();
ProjectNew projectProgress1 = new ProjectNew();
ProjectNew projectProgress2 = new ProjectNew();
ProjectNew projectProgress3 = new ProjectNew();
ProjectNew projectProgress4 = new ProjectNew();
ProjectNew projectProgress5 = new ProjectNew();
ProjectNew projectProgress6 = new ProjectNew();
ProjectNew projectProgress7 = new ProjectNew();
projectProgress1.setMonth("九月");
projectProgress1.setMonthProgress("10");
projectProgress2.setMonth("十月");
projectProgress2.setMonthProgress("21");
projectProgress3.setMonth("十一月");
projectProgress3.setMonthProgress("32");
projectProgress4.setMonth("十二月");
projectProgress4.setMonthProgress("45");
projectProgress5.setMonth("元月");
projectProgress5.setMonthProgress("67");
projectProgress6.setMonth("二月");
projectProgress6.setMonthProgress("82");
projectProgress7.setMonth("三月");
projectProgress7.setMonthProgress("95");
list.add(projectProgress1);
list.add(projectProgress2);
list.add(projectProgress3);
list.add(projectProgress4);
list.add(projectProgress5);
list.add(projectProgress6);
list.add(projectProgress7);
return getDataTable(list);
}
/**
* 获取工程信息详细信息
*/
@ -164,7 +199,7 @@ public class ProjectNewController extends BaseController {
@Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志")
@GetMapping("/export")
public void export(@Param("proName") String proName, HttpServletResponse response) throws IOException {
int index = new Random().nextInt(4) + 1;
int index = new Random().nextInt(2) + 1;
List<ScreemDocData> screemDocDataList = projectNewService.selectScreenDocData(index);
Map<String, String> screemDocDataMap = screemDocDataList.stream()
.collect(Collectors.toMap(

17
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectNew.java
View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.securitycontrol.common.core.web.domain.BaseEntity;
import com.securitycontrol.entity.screen.dto.ScreenDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -18,7 +19,7 @@ import lombok.ToString;
@Data
@ToString
public class ProjectNew extends BaseEntity {
public class ProjectNew extends ScreenDto {
private static final long serialVersionUID = 1L;
/** 主键 */
@ -91,4 +92,18 @@ public class ProjectNew extends BaseEntity {
private String monthProgress;
private String monthProgress2;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

17
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectProgressNew.java
View File

@ -3,6 +3,7 @@ package com.securitycontrol.screen.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.securitycontrol.common.core.web.domain.BaseEntity;
import com.securitycontrol.entity.screen.dto.ScreenDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
@ -17,7 +18,7 @@ import lombok.ToString;
@Data
@ToString
public class ProjectProgressNew extends BaseEntity {
public class ProjectProgressNew extends ScreenDto {
private static final long serialVersionUID = 1L;
/** 主键id */
@ -98,4 +99,18 @@ public class ProjectProgressNew extends BaseEntity {
private String categoryValue;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

23
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/ProjectRisk.java
View File

@ -1,11 +1,32 @@
package com.securitycontrol.screen.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.securitycontrol.entity.screen.dto.ScreenDto;
import lombok.Data;
import java.util.Date;
@Data
public class ProjectRisk {
public class ProjectRisk extends ScreenDto {
private String id;
private String proId;
private String proPart;
private String riskDesc;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

46
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ProjectProgressNewMapper.xml
View File

@ -29,38 +29,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProjectProgressNewVo">
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, delay_status, delay_policy, analyze_result
from tb_project_progress_new
select tpn.id, tpn.project_id, tpn.project_name, tpn.task_code, tpn.task_name, tpn.plan_start_time,
tpn.plan_end_time, tpn.actual_start_time, tpn.actual_end_time, tpn.process_diff, tpn.total_effort,
tpn.complete_effort, tpn.delay_actor, tpn.resource_match_status, tpn.key_path_flag,
tpn.create_by, tpn.create_time, tpn.update_by, tpn.update_time, tpn.delay_status, tpn.delay_policy, tpn.analyze_result
from tb_project_progress_new tpn
left join tb_project_new pn on pn.pro_name = tpn.project_name
</sql>
<select id="selectProjectProgressNewList" parameterType="com.securitycontrol.screen.domain.ProjectProgressNew" resultMap="ProjectProgressNewResult">
<include refid="selectProjectProgressNewVo"/>
<where>
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
<if test="taskCode != null and taskCode != ''"> and task_code = #{taskCode}</if>
<if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
<if test="planStartTime != null "> and plan_start_time = #{planStartTime}</if>
<if test="planEndTime != null "> and plan_end_time = #{planEndTime}</if>
<if test="actualStartTime != null "> and actual_start_time = #{actualStartTime}</if>
<if test="actualEndTime != null "> and actual_end_time = #{actualEndTime}</if>
<if test="processDiff != null and processDiff != ''"> and process_diff = #{processDiff}</if>
<if test="totalEffort != null and totalEffort != ''"> and total_effort = #{totalEffort}</if>
<if test="completeEffort != null and completeEffort != ''"> and complete_effort = #{completeEffort}</if>
<if test="delayActor != null and delayActor != ''"> and delay_actor = #{delayActor}</if>
<if test="delayStatus != null and delayStatus != ''"> and delay_status = #{delayStatus}</if>
<if test="delayPolicy != null and delayPolicy != ''"> and delay_policy = #{delayPolicy}</if>
<if test="resourceMatchStatus != null and resourceMatchStatus != ''"> and resource_match_status = #{resourceMatchStatus}</if>
<if test="keyPathFlag != null and keyPathFlag != ''"> and key_path_flag = #{keyPathFlag}</if>
<if test="projectId != null "> and tpn.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and tpn.project_name like concat('%', #{projectName}, '%')</if>
<if test="taskCode != null and taskCode != ''"> and tpn.task_code = #{taskCode}</if>
<if test="taskName != null and taskName != ''"> and tpn.task_name like concat('%', #{taskName}, '%')</if>
<if test="planStartTime != null "> and tpn.plan_start_time = #{planStartTime}</if>
<if test="planEndTime != null "> and tpn.plan_end_time = #{planEndTime}</if>
<if test="actualStartTime != null "> and tpn.actual_start_time = #{actualStartTime}</if>
<if test="actualEndTime != null "> and tpn.actual_end_time = #{actualEndTime}</if>
<if test="processDiff != null and processDiff != ''"> and tpn.process_diff = #{processDiff}</if>
<if test="totalEffort != null and totalEffort != ''"> and tpn.total_effort = #{totalEffort}</if>
<if test="completeEffort != null and completeEffort != ''"> and tpn.complete_effort = #{completeEffort}</if>
<if test="delayActor != null and delayActor != ''"> and tpn.delay_actor = #{delayActor}</if>
<if test="delayStatus != null and delayStatus != ''"> and tpn.delay_status = #{delayStatus}</if>
<if test="delayPolicy != null and delayPolicy != ''"> and tpn.delay_policy = #{delayPolicy}</if>
<if test="resourceMatchStatus != null and resourceMatchStatus != ''"> and tpn.resource_match_status = #{resourceMatchStatus}</if>
<if test="keyPathFlag != null and keyPathFlag != ''"> and tpn.key_path_flag = #{keyPathFlag}</if>
<if test="bidCode != null and bidCode != ''"> and pn.bid_code = #{bidCode}</if>
</where>
</select>
<select id="selectProjectProgressNewById" parameterType="Long" resultMap="ProjectProgressNewResult">
<include refid="selectProjectProgressNewVo"/>
where id = #{id}
where tpn.id = #{id}
</select>
<insert id="insertProjectProgressNew" parameterType="com.securitycontrol.screen.domain.ProjectProgressNew">