From 0e9b63d31b3fb1a79859b0c220f9b92c9101af25 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 11 May 2024 22:12:17 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DangerousEngineeringRecordController.java | 106 +++++++++--------- ...erousEngineeringSideStationController.java | 4 +- .../DangerousEngineeringSideStation.java | 24 ++-- ...DangerousEngineeringSideStationMapper.java | 4 +- .../DangerousEngineeringSideStationMapper.xml | 6 +- ...angerousEngineeringSideStationService.java | 4 +- ...rousEngineeringSideStationServiceImpl.java | 4 +- ...rityQualityInspectionRecordController.java | 1 - .../entity/vo/StatsByEnterpriseVo.java | 2 + .../vo/StatsDirectorateBigscreenVo.java | 27 +++-- ...ecurityQualityInspectionRecordTotalVo.java | 2 + ...SecurityQualityInspectionRecordMapper.java | 4 +- ...zSecurityQualityInspectionRecordMapper.xml | 48 ++++---- ...ityQualityInspectionRecordServiceImpl.java | 99 +++++++++++++--- ...curityQualityRectifyRecordServiceImpl.java | 26 ++--- .../xml/XzTaskProgressContentMapper.xml | 1 + 16 files changed, 226 insertions(+), 136 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java index fedf794b7..d3e96f272 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java @@ -2,13 +2,17 @@ package com.zhgd.xmgl.modules.dangerous.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.dangerous.entity.*; -import com.zhgd.xmgl.modules.dangerous.service.*; +import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; +import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringTypeDescribeControlService; +import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringTypeDescribeService; +import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringTypeService; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.service.IEnterpriseInfoService; @@ -18,31 +22,27 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.zhgd.jeecg.common.api.vo.Result; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.extern.slf4j.Slf4j; - -import org.apache.commons.collections.MapUtils; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; /** * @Title: Controller * @Description: 现场危大工程 * @author： pds - * @date： 2021-06-28 + * @date： 2021-06-28 * @version： V1.0 */ @RestController @@ -52,9 +52,22 @@ import springfox.documentation.annotations.ApiIgnore; public class DangerousEngineeringRecordController { @Autowired private IDangerousEngineeringRecordService dangerousEngineeringRecordService; + @Autowired + private ISystemUserService systemUserService; + @Autowired + private IWorkerInfoService workerInfoService; + @Autowired + private IEnterpriseInfoService enterpriseInfoService; + @Autowired + private IDangerousEngineeringTypeDescribeService dangerousEngineeringTypeDescribeService; + @Autowired + private IDangerousEngineeringTypeService dangerousEngineeringTypeService; + @Autowired + private IDangerousEngineeringTypeDescribeControlService dangerousEngineeringTypeDescribeControlService; /** * 分页列表查询 + * * @return */ @ApiOperation(value = "分页列表查询现场危大工程信息", notes = "分页列表查询现场危大工程信息", httpMethod = "POST") @@ -64,17 +77,18 @@ public class DangerousEngineeringRecordController { @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) - @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result>(); - IPage pageList = dangerousEngineeringRecordService.queryDangerousEngineeringPageList(map); - result.setSuccess(true); - result.setResult(pageList); - return result; - } + @PostMapping(value = "/list") + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result>(); + IPage pageList = dangerousEngineeringRecordService.queryDangerousEngineeringPageList(map); + result.setSuccess(true); + result.setResult(pageList); + return result; + } /** - * 添加 + * 添加 + * * @param dangerousEngineeringRecord * @return */ @@ -85,26 +99,9 @@ public class DangerousEngineeringRecordController { return Result.ok(); } - @Autowired - private ISystemUserService systemUserService; - - @Autowired - private IWorkerInfoService workerInfoService; - - @Autowired - private IEnterpriseInfoService enterpriseInfoService; - - @Autowired - private IDangerousEngineeringTypeDescribeService dangerousEngineeringTypeDescribeService; - - @Autowired - private IDangerousEngineeringTypeService dangerousEngineeringTypeService; - - @Autowired - private IDangerousEngineeringTypeDescribeControlService dangerousEngineeringTypeDescribeControlService; - /** - * 添加 + * 添加 + * * @param map * @return */ @@ -141,7 +138,7 @@ public class DangerousEngineeringRecordController { dangerousEngineeringRecord.setEngineeringTypeName(engineeringType.getTypeName()); // dangerousEngineeringRecord.setBuildStartTime(buildTime.get(0)); // dangerousEngineeringRecord.setBuildEndTime(buildTime.get(1)); - dangerousEngineeringRecord.setPlanStartTime(planTime== null ? null : planTime.get(0)); + dangerousEngineeringRecord.setPlanStartTime(planTime == null ? null : planTime.get(0)); dangerousEngineeringRecord.setPlanEndTime(planTime == null ? null : planTime.get(1)); dangerousEngineeringRecord.setResponsibilityCompanyId(enterpriseInfo.getId()); String securityConstructionSchemeType = MapUtils.getString(map, "securityConstructionSchemeType"); @@ -199,11 +196,12 @@ public class DangerousEngineeringRecordController { } /** - * 编辑 + * 编辑 + * * @param dangerousEngineeringRecord * @return */ - @ApiOperation(value = "编辑现场危大工程信息", notes = "编辑现场危大工程信息" , httpMethod="POST") + @ApiOperation(value = "编辑现场危大工程信息", notes = "编辑现场危大工程信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody DangerousEngineeringRecord dangerousEngineeringRecord) { dangerousEngineeringRecordService.edit(dangerousEngineeringRecord); @@ -211,21 +209,22 @@ public class DangerousEngineeringRecordController { } /** - * 通过id删除 + * 通过id删除 + * * @param * @return */ @ApiOperation(value = "删除现场危大工程信息", notes = "删除现场危大工程信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "现场危大工程ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") - public Result delete(@RequestBody Map map) { + public Result delete(@RequestBody Map map) { Result result = new Result(); - DangerousEngineeringRecord dangerousEngineeringRecord = dangerousEngineeringRecordService.getById(MapUtils.getString(map,"id")); - if(dangerousEngineeringRecord==null) { + DangerousEngineeringRecord dangerousEngineeringRecord = dangerousEngineeringRecordService.getById(MapUtils.getString(map, "id")); + if (dangerousEngineeringRecord == null) { result.error500(MessageUtil.get("notFindErr")); - }else { - boolean ok = dangerousEngineeringRecordService.removeById(MapUtils.getString(map,"id")); - if(ok) { + } else { + boolean ok = dangerousEngineeringRecordService.removeById(MapUtils.getString(map, "id")); + if (ok) { result.successMsg(MessageUtil.get("deleteSucess")); } } @@ -235,6 +234,7 @@ public class DangerousEngineeringRecordController { /** * 通过id查询 + * * @param * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java index 661a6c49b..4f0d64aec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringSideStationController.java @@ -45,7 +45,7 @@ public class DangerousEngineeringSideStationController { @ApiImplicitParam(name = "projectSn", value = "projectSn", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/selectList") - public Result> selectSideStationList(@RequestBody Map map) { + public Result> selectSideStationList(@RequestBody Map map) { return Result.success(dangerousEngineeringSideStationService.selectSideStationList(map)); } @@ -55,7 +55,7 @@ public class DangerousEngineeringSideStationController { @ApiImplicitParam(name = "projectSn", value = "projectSn", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/page") - public Result> selectSideStationPage(@RequestBody Map map) { + public Result> selectSideStationPage(@RequestBody Map map) { return Result.success(dangerousEngineeringSideStationService.selectSideStationPage(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringSideStation.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringSideStation.java index 3f5894bd1..a4a506e02 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringSideStation.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringSideStation.java @@ -3,6 +3,7 @@ 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; @@ -22,7 +23,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="DangerousEngineeringSideStation实体类",description="DangerousEngineeringSideStation") public class DangerousEngineeringSideStation implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -55,14 +56,21 @@ public class DangerousEngineeringSideStation implements Serializable { /**图片*/ @Excel(name = "图片", width = 15) @ApiModelProperty(value="图片") - private java.lang.String imageUrl ; - /**创建人员ID*/ + private java.lang.String imageUrl; + /** + * 创建人员ID + */ @Excel(name = "创建人员ID", width = 15) - @ApiModelProperty(value="创建人员ID") + @ApiModelProperty(value = "创建人员ID") - private java.lang.Long createUser ; - /**创建时间*/ + private java.lang.Long createUser; + /** + * 创建时间 + */ @Excel(name = "创建时间", width = 15) - @ApiModelProperty(value="创建时间") - private java.lang.String createTime ; + @ApiModelProperty(value = "创建时间") + private java.lang.String createTime; + + @TableField(exist = false) + private String createUserName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java index 4a30d74ef..113f75773 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java @@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DangerousEngineeringSideStationMapper extends BaseMapper { - List selectSideStationList(@Param("param") Map map); + List selectSideStationList(@Param("param") Map map); - Page selectSideStationList(@Param("param") Map map, Page page); + Page selectSideStationList(@Param("param") Map map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml index c3185bebe..2f3f44132 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringSideStationMapper.xml @@ -1,9 +1,9 @@ - - + SELECT a.*,b.real_name as create_user_name from dangerous_engineering_side_station a LEFT JOIN system_user b ON a.create_user=b.user_id left join dangerous_engineering_record der on der.id=a.dangerous_engineering_id where 1=1 diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java index b1d7b47f1..a634fbf45 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java @@ -16,7 +16,7 @@ import java.util.Map; */ public interface IDangerousEngineeringSideStationService extends IService { - List selectSideStationList(Map map); + List selectSideStationList(Map map); - Page selectSideStationPage(Map map); + Page selectSideStationPage(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java index 0b88b0c10..7fde29a32 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java @@ -28,12 +28,12 @@ public class DangerousEngineeringSideStationServiceImpl extends ServiceImpl selectSideStationList(Map map) { + public List selectSideStationList(Map map) { return dangerousEngineeringSideStationMapper.selectSideStationList(map); } @Override - public Page selectSideStationPage(Map map) { + public Page selectSideStationPage(Map map) { Page page = PageUtil.getPage(map); return dangerousEngineeringSideStationMapper.selectSideStationList(map, page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java index 59700f8fc..6ec517c7d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java @@ -406,7 +406,6 @@ public class XzSecurityQualityInspectionRecordController { return Result.success(qualityInspectionRecordService.statsDangerType(paramMap)); } - @ApiOperation(value = "指挥部大屏数量统计", notes = "指挥部大屏数量统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java index 2f6836ec3..61e1ce6eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsByEnterpriseVo.java @@ -9,6 +9,8 @@ public class StatsByEnterpriseVo { private String enterpriseName; @ApiModelProperty("已整改数量") private Integer rectifiedNum; + @ApiModelProperty("隐患数量") + private Integer totalNum; @ApiModelProperty("已整改率") private Double rectifiedNumRatio; @ApiModelProperty("已及时整改率") diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java index 48edfb3f5..b144fda40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java @@ -1,20 +1,23 @@ package com.zhgd.xmgl.modules.xz.security.entity.vo; +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class StatsDirectorateBigscreenVo { - //@ApiModelProperty("危大工程数量") - //private Integer wdNum; - //@ApiModelProperty("人员登记培训数量") - //private Integer Num; - //@ApiModelProperty("影响进度数量") - //private Integer Num; - //@ApiModelProperty("风险统计数量") - //private Integer Num; - //@ApiModelProperty("安全隐患数量") - //private Integer Num; - //@ApiModelProperty("AI报警数量") - //private Integer Num; + @ApiModelProperty("危大工程数量") + private Integer dangerousEngineeringRecordNum; + + @ApiModelProperty("人员登记培训数量") + private Integer workerInfoAuditRecordNum; + + @ApiModelProperty("影响进度数量") + private Integer taskProgressContentNum; + + @ApiModelProperty("风险统计数量（安全隐患数量）") + private Integer securityQualityInspectionRecordNum; + + @ApiModelProperty("AI报警数量") + private Integer aiAnalyseHardWareAlarmRecordNum; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java index c3c58ac7f..6b6482ccd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java @@ -1,9 +1,11 @@ package com.zhgd.xmgl.modules.xz.security.entity.vo; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) public class XzSecurityQualityInspectionRecordTotalVo { private Integer verificationNum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java index d0d87c628..685c91b6b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/XzSecurityQualityInspectionRecordMapper.java @@ -33,7 +33,7 @@ public interface XzSecurityQualityInspectionRecordMapper extends BaseMapper map); - List selectQualityInspectionRecordPageTotal(@Param("map") Map map, @Param("o") Object o); + List selectQualityInspectionRecordPageTotal(@Param("param") Map map, @Param("o") Object o); List> selectQualityInspectionRecordCountByDay(Map map); @@ -67,7 +67,7 @@ public interface XzSecurityQualityInspectionRecordMapper extends BaseMapper statsByChangeId(@Param("param") Map paramMap, Page page); - ArrayList countDangerLevel(Map paramMap); + ArrayList countDangerLevel(@Param("param") Map paramMap); Page statsByInspectManVo(@Param("param") Map paramMap, Page page); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml index 169650e66..cca28c4ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml @@ -1,6 +1,21 @@ + + + and (t.status = 2 AND now() > t.change_limit_time) + + + and t.status != 5 + + + and t.inspect_time >= #{param.inspectStartTime} + + + and t.inspect_time <= if(LENGTH(#{param.inspectEndTime}) = 10, + CONCAT(DATE_FORMAT(#{param.inspectEndTime},'%Y-%m-%d'),' 23:59:59'), #{param.inspectEndTime}) + + @@ -687,7 +695,7 @@