admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-11-06 11:17:42 +08:00
parent e839917ae2
commit 598a2a87e1
8 changed files with 142 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceVideo.java
View File

@ -22,23 +22,31 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("big_device_video")
@ApiModel(value="BigDeviceVideo实体类",description="BigDeviceVideo")
public class BigDeviceVideo implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="id")
private java.lang.Long id ;
/**设备编号*/
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value="设备编号")
private java.lang.String devSn ;
/**类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘*/
@Excel(name = "类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘", width = 15)
@ApiModelProperty(value="类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘")
private java.lang.Integer type ;
/**项目sn*/
@ApiModelProperty(value = "设备编号")
private java.lang.String devSn;
/**
* 类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘,6架桥机
*/
@Excel(name = "类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘,6架桥机", width = 15)
@ApiModelProperty(value = "类型，1塔吊，2升降机,3标养室,4龙门吊,5扬尘,6架桥机")
private java.lang.Integer type;
/**
* 项目sn
*/
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value="项目sn")
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**
* videoItemId

2
src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDevArchiveController.java
View File

@ -58,6 +58,7 @@ public class BridgeErectMachineDevArchiveController {
*/
@ApiOperation(value = "分页列表查询架桥机设备档案信息", notes = "分页列表查询架桥机设备档案信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@ -72,6 +73,7 @@ public class BridgeErectMachineDevArchiveController {
* @return
*/
@ApiOperation(value = "列表查询架桥机设备档案信息", notes = "列表查询架桥机设备档案信息", httpMethod = "GET")
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String")
@GetMapping(value = "/list")
public Result<List<BridgeErectMachineDevArchive>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(bridgeErectMachineDevArchiveService.queryList(paramMap));

8
src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/BridgeErectMachineDevArchive.java
View File

@ -1,10 +1,13 @@
package com.zhgd.xmgl.modules.bridgeerectmachine.entity;
import java.io.Serializable;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zhgd.xmgl.modules.bigdevice.entity.BigDeviceVideo;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@ -192,4 +195,9 @@ public class BridgeErectMachineDevArchive implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
private java.util.Date updateDate;
@TableField(exist = false)
@ApiModelProperty(value = "视频列表")
private List<BigDeviceVideo> videoList;
}

40
src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDevArchiveServiceImpl.java
View File

@ -1,20 +1,25 @@
package com.zhgd.xmgl.modules.bridgeerectmachine.service.impl;
import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDevArchive;
import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevArchiveMapper;
import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDevArchiveService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.util.PageUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.bigdevice.entity.BigDeviceVideo;
import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper;
import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDevArchive;
import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevArchiveMapper;
import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDevArchiveService;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import com.zhgd.xmgl.util.RefUtil;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Description: 架桥机设备档案
@ -24,19 +29,22 @@ import com.zhgd.xmgl.util.RefUtil;
*/
@Service
public class BridgeErectMachineDevArchiveServiceImpl extends ServiceImpl<BridgeErectMachineDevArchiveMapper, BridgeErectMachineDevArchive> implements IBridgeErectMachineDevArchiveService {
@Autowired
private BigDeviceVideoMapper bigDeviceVideoMapper;
@Override
public IPage<BridgeErectMachineDevArchive> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<BridgeErectMachineDevArchive> queryWrapper = getQueryWrapper(paramMap);
Page<BridgeErectMachineDevArchive> page = PageUtil.getPage(paramMap);
IPage<BridgeErectMachineDevArchive> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
pageList.setRecords(dealList(pageList.getRecords(), paramMap));
return pageList;
}
@Override
public List<BridgeErectMachineDevArchive> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<BridgeErectMachineDevArchive> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
return dealList(this.list(queryWrapper), paramMap);
}
private QueryWrapper<BridgeErectMachineDevArchive> getQueryWrapper(HashMap<String, Object> paramMap) {
@ -45,7 +53,17 @@ public class BridgeErectMachineDevArchiveServiceImpl extends ServiceImpl<BridgeE
return queryWrapper;
}
private List<BridgeErectMachineDevArchive> dealList(List<BridgeErectMachineDevArchive> list) {
private List<BridgeErectMachineDevArchive> dealList(List<BridgeErectMachineDevArchive> list, HashMap<String, Object> paramMap) {
String projectSn = MapUtils.getString(paramMap, "projectSn");
QueryWrapper<BigDeviceVideo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.lambda()
.eq(BigDeviceVideo::getProjectSn, projectSn)
.eq(BigDeviceVideo::getType, 6);
List<BigDeviceVideo> videoList = bigDeviceVideoMapper.selectList(queryWrapper2);
Map<String, List<BigDeviceVideo>> listMap = videoList.stream().collect(Collectors.groupingBy(BigDeviceVideo::getDevSn));
for (BridgeErectMachineDevArchive bridgeErectMachineDevArchive : list) {
bridgeErectMachineDevArchive.setVideoList(listMap.get(bridgeErectMachineDevArchive.getDevSn()));
}
return list;
}
}

128
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/HiddenDangerInspectRecord.java
View File

@ -1,32 +1,31 @@
package com.zhgd.xmgl.modules.dangerous.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 隐患检查记录
* @author： pds
* @date： 2021-08-17
* @date： 2021-08-17
* @version： V1.0
*/
@Data
@TableName("hidden_danger_inspection_record")
@ApiModel(value="HiddenDangerInspectRecord实体类",description="HiddenDangerInspectRecord")
@ApiModel(value = "HiddenDangerInspectRecord实体类", description = "HiddenDangerInspectRecord")
public class HiddenDangerInspectRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ -45,61 +44,75 @@ public class HiddenDangerInspectRecord implements Serializable {
@Excel(name = "责任区域", width = 15)
@ApiModelProperty(value = "责任区域")
private java.lang.String dutyRegion;
/**隐患级别*/
@Excel(name = "隐患级别", width = 15)
@ApiModelProperty(value="隐患级别")
private java.lang.String hiddenDangerLevel ;
/**排查内容*/
@Excel(name = "排查内容", width = 15)
@ApiModelProperty(value="排查内容")
private java.lang.String checkContent ;
/**检查项*/
@Excel(name = "检查项", width = 15)
@ApiModelProperty(value="检查项")
private java.lang.String checkItem ;
/**检查子项*/
@Excel(name = "检查子项", width = 15)
@ApiModelProperty(value="检查子项")
private java.lang.String checkSubitem ;
/**整改要求*/
@Excel(name = "整改要求", width = 15)
@ApiModelProperty(value="整改要求")
private java.lang.String rectifyRequire ;
/**
/**
* 隐患级别
*/
@Excel(name = "隐患级别", width = 15)
@ApiModelProperty(value = "隐患级别")
private java.lang.String hiddenDangerLevel;
/**
* 排查内容
*/
@Excel(name = "排查内容", width = 15)
@ApiModelProperty(value = "排查内容")
private java.lang.String checkContent;
/**
* 检查项
*/
@Excel(name = "检查项", width = 15)
@ApiModelProperty(value = "检查项")
private java.lang.String checkItem;
/**
* 检查子项
*/
@Excel(name = "检查子项", width = 15)
@ApiModelProperty(value = "检查子项")
private java.lang.String checkSubitem;
/**
* 整改要求
*/
@Excel(name = "整改要求", width = 15)
@ApiModelProperty(value = "整改要求")
private java.lang.String rectifyRequire;
/**
* 补充说明
*/
@Excel(name = "补充说明", width = 15)
@ApiModelProperty(value = "补充说明")
private java.lang.String dangerDesc;
/**
* 事故隐患等级，1一般，2重大
*/
@Excel(name = "事故隐患等级，1一般，2重大", width = 15)
@ApiModelProperty(value = "事故隐患等级，1一般，2重大")
private java.lang.Integer faultLevel;
/**
* 创建人
*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
/**
* 事故隐患等级，1一般，2重大
*/
@Excel(name = "事故隐患等级，1一般，2重大", width = 15)
@ApiModelProperty(value = "事故隐患等级，1一般，2重大")
private java.lang.Integer faultLevel;
/**
* 创建人
*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.Long createUser;
private java.lang.Long createUser;
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 15)
@ApiModelProperty(value = "创建时间")
private java.lang.String createTime ;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value="updateTime")
private java.util.Date updateTime ;
/**检查时间*/
@Excel(name = "检查时间", width = 15)
@ApiModelProperty(value="检查时间")
private java.lang.String inspectTime ;
/**整改时限*/
@Excel(name = "整改时限", width = 15)
private java.lang.String createTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**
* 检查时间
*/
@Excel(name = "检查时间", width = 15)
@ApiModelProperty(value = "检查时间")
private java.lang.String inspectTime;
/**
* 整改时限
*/
@Excel(name = "整改时限", width = 15)
@ApiModelProperty(value = "整改时限")
private java.lang.String changeLimitTime;
/**
@ -159,7 +172,7 @@ public class HiddenDangerInspectRecord implements Serializable {
* 状态，1无需整改，2待整改，3待复查，4合格，5不合格
*/
@Excel(name = "状态，1无需整改，2待整改，3待复查，4合格，5不合格", width = 15)
@ApiModelProperty(value = "状态，1无需整改，2待整改，3待复查，4合格，5不合格")
@ApiModelProperty(value = "状态，1无需整改，2待整改，3待复查，4合格，5不合格")
private java.lang.Integer status;
/**
* 分包单位SN
@ -183,10 +196,10 @@ public class HiddenDangerInspectRecord implements Serializable {
private java.lang.Integer rectifyFailType;
/**
* 是否是超期关闭，0否，1是
* 是否是超期关闭，0否，1是，不是实时的
*/
@Excel(name = "是否是超期关闭，0否，1是", width = 15)
@ApiModelProperty(value = "是否是超期关闭，0否，1是")
@Deprecated
private java.lang.Integer overdueCloseType;
@TableField(exist = false)
@ -209,6 +222,7 @@ public class HiddenDangerInspectRecord implements Serializable {
@TableField(exist = false)
private String inspectTypeName;
@TableField(exist = false)
@ApiModelProperty(value = "是否是超期未关闭，0否，1是")
private Integer overdueType;
}

4
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
View File

@ -54,7 +54,7 @@
t.inspect_type_name,
en.enterprise_name create_enterprise_name,
(case
when a.change_limit_time &lt; DATE_FORMAT(now(), "%Y-%m-%d") and (status = 2 or status = 3)
when a.change_limit_time &lt; now() and (status = 2 or status = 3)
then 1
else 0 end) overdue_type
from hidden_danger_inspection_record a
@ -161,7 +161,7 @@
IFNULL(SUM((CASE WHEN a.status = 2 OR a.status = 3 THEN 1 ELSE 0 END)), 0) notCloseNum,
IFNULL(SUM((CASE
WHEN (a.status = 2 OR a.status = 3)
AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1
AND now() > a.change_limit_time THEN 1
ELSE 0 END)), 0) overdueNotCloseNum,
IFNULL(SUM((CASE
WHEN a.status = 2 AND DATE_FORMAT(now(), "%Y-%m-%d") > a.change_limit_time THEN 1

2
src/main/java/com/zhgd/xmgl/modules/taskprogress/mapper/xml/TaskProgressMapper.xml
View File

@ -12,7 +12,7 @@
from task_progress tp
left join system_user su on su.user_id = tp.duty_user_id
where tp.project_sn = #{p.projectSn}
<if test="p.status != null and p.status != ''">
<if test="p.status != null">
and tp.status = #{p.status}
</if>
<if test="p.taskName != null and p.taskName != ''">

15
src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
View File

@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.api.vo.Result;
@ -17,14 +19,8 @@ import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
import com.zhgd.xmgl.modules.project.constants.ProgressTaskConstant;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgress;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressAlarm;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressContent;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel;
import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressAlarmMapper;
import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressContentMapper;
import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMapper;
import com.zhgd.xmgl.modules.taskprogress.mapper.TaskProgressMaterialRelMapper;
import com.zhgd.xmgl.modules.taskprogress.entity.*;
import com.zhgd.xmgl.modules.taskprogress.mapper.*;
import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressService;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.PageUtil;
@ -68,6 +64,8 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
@Autowired
TaskProgressMaterialRelMapper taskProgressMaterialRelMapper;
@Autowired
TaskProgressMaterialRelPlanMapper taskProgressMaterialRelPlanMapper;
@Autowired
TaskProgressAlarmMapper taskProgressAlarmMapper;
@Autowired
TaskProgressMapper taskProgressMapper;
@ -182,6 +180,7 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
taskProgressContentMapper.delete(Wrappers.lambdaQuery(TaskProgressContent.class).eq(TaskProgressContent::getProjectSn, projectSn));
taskProgressMaterialRelMapper.delete(Wrappers.lambdaQuery(TaskProgressMaterialRel.class).eq(TaskProgressMaterialRel::getProjectSn, projectSn));
taskProgressAlarmMapper.delete(Wrappers.lambdaQuery(TaskProgressAlarm.class).eq(TaskProgressAlarm::getProjectSn, projectSn));
taskProgressMaterialRelPlanMapper.delete(Wrappers.lambdaQuery(TaskProgressMaterialRelPlan.class).eq(TaskProgressMaterialRelPlan::getProjectSn, projectSn));
if (CollUtil.isNotEmpty(progressTaskList)) {
this.saveBatch(progressTaskList);
}