From a65c3927ca738c114cb7577c77b39dee254dec91 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 31 Mar 2025 18:12:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ConcreteMonitorCurrentDataVo.java | 20 +++++----- ...ctionEquipmentToolClassificationMapper.xml | 5 ++- .../xml/MainProjectCompleteNameMapper.xml | 3 +- .../PartyConstructionOrganizationMapper.xml | 5 ++- .../mapper/xml/PlanMilestone2LeftMapper.xml | 3 +- .../xml/ProjectScheduleDeviceUnitMapper.xml | 3 +- .../mapper/xml/QualityAcceptanceMapper.xml | 3 +- .../xml/QualityCommonProblemLibraryMapper.xml | 5 ++- .../plan/controller/PlanRecordController.java | 2 +- .../baotou/plan/mapper/xml/PlanPbsMapper.xml | 3 +- .../plan/mapper/xml/PlanRecordMapper.xml | 3 +- .../mapper/xml/PlanWorkCategoryMapper.xml | 3 +- .../service/impl/PlanRecordServiceImpl.java | 10 ++--- .../impl/PlanMilestone2LeftServiceImpl.java | 12 +++--- .../ConcreteMonitorCurrentDataController.java | 29 ++++++++++++-- .../entity/ConcreteMonitorCurrentData.java | 2 + .../BaotouConcreteMonitorCurrentDataVo.java | 23 +++++++++++ .../mapper/ConcreteMonitorAlarmMapper.java | 4 +- .../ConcreteMonitorCurrentDataMapper.java | 8 ++++ .../mapper/xml/ConcreteMonitorAlarmMapper.xml | 4 +- .../xml/ConcreteMonitorCurrentDataMapper.xml | 18 ++++++++- .../IConcreteMonitorCurrentDataService.java | 4 ++ .../impl/ConcreteMonitorAlarmServiceImpl.java | 7 +++- ...ConcreteMonitorCurrentDataServiceImpl.java | 38 ++++++++++++++++++- .../mapper/xml/ProjectEnterpriseMapper.xml | 3 +- .../mapper/xml/QualityRegionMapper.xml | 3 +- .../video/mapper/xml/VideoGroupMapper.xml | 3 +- .../xz/mapper/xml/XzProjectOrgMapper.xml | 3 +- 28 files changed, 182 insertions(+), 47 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/BaotouConcreteMonitorCurrentDataVo.java diff --git a/src/main/java/com/zhgd/xmgl/entity/vo/ConcreteMonitorCurrentDataVo.java b/src/main/java/com/zhgd/xmgl/entity/vo/ConcreteMonitorCurrentDataVo.java index a755e9d57..87e952c3d 100644 --- a/src/main/java/com/zhgd/xmgl/entity/vo/ConcreteMonitorCurrentDataVo.java +++ b/src/main/java/com/zhgd/xmgl/entity/vo/ConcreteMonitorCurrentDataVo.java @@ -7,20 +7,20 @@ import lombok.Data; import java.util.List; -/** - * @program: wisdomSite - * @description: - * @author: Mr.Peng - * @create: 2021-04-22 15:14 - **/ @Data -@ApiModel(value="ConcreteMonitorDevVo实体类",description="ConcreteMonitorCurrentDataVo") +@ApiModel(value = "ConcreteMonitorDevVo实体类", description = "BaotouConcreteMonitorCurrentDataVo") public class ConcreteMonitorCurrentDataVo { - @ApiModelProperty(value="设备编号") - private java.lang.String devSn ; + @ApiModelProperty(value = "设备编号") + private java.lang.String devSn; - @ApiModelProperty(value="监测点数据") + @ApiModelProperty(value = "接收时间") + private java.lang.String receiveTime; + + @ApiModelProperty(value = "1自动采集2手动采集（默认自动采集）") + private Integer uploadType; + + @ApiModelProperty(value = "监测点数据") private List list; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ConstructionEquipmentToolClassificationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ConstructionEquipmentToolClassificationMapper.xml index 05200ff6a..a2fb9bd84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ConstructionEquipmentToolClassificationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ConstructionEquipmentToolClassificationMapper.xml @@ -9,7 +9,8 @@ UPDATE construction_equipment_tool_classification - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, #{oldAncestor}, + #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} - + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/MainProjectCompleteNameMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/MainProjectCompleteNameMapper.xml index ea922e9e7..8acc89093 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/MainProjectCompleteNameMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/MainProjectCompleteNameMapper.xml @@ -23,7 +23,8 @@ UPDATE main_project_complete_name - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PartyConstructionOrganizationMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PartyConstructionOrganizationMapper.xml index d6e15a06f..e28c7d8a0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PartyConstructionOrganizationMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PartyConstructionOrganizationMapper.xml @@ -9,7 +9,8 @@ UPDATE party_construction_organization - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, #{oldAncestor}, + #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} - + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PlanMilestone2LeftMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PlanMilestone2LeftMapper.xml index 930ed9b28..0a7d8d78b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PlanMilestone2LeftMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PlanMilestone2LeftMapper.xml @@ -27,7 +27,8 @@ UPDATE plan_milestone2_left - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml index ac05877b2..26fd04027 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml @@ -33,7 +33,8 @@ UPDATE party_construction_organization - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityAcceptanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityAcceptanceMapper.xml index c043e4635..25344e109 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityAcceptanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityAcceptanceMapper.xml @@ -33,7 +33,8 @@ UPDATE quality_acceptance - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemLibraryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemLibraryMapper.xml index 5dca8bf93..2c5f892ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemLibraryMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemLibraryMapper.xml @@ -9,7 +9,8 @@ UPDATE quality_common_problem_library - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, #{oldAncestor}, + #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} - + diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java index 1fe5ef41a..4c06f7d51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java @@ -234,7 +234,7 @@ public class PlanRecordController { curve.setActual(NumberUtil.round(NumberUtil.mul(curve.getActual(), weightValue), 10)); curve.setActualTotal(NumberUtil.round(NumberUtil.mul(curve.getActualTotal(), weightValue), 10)); } - return Result.success(new ArrayList<>(curveMap.values())); + return Result.success(new ArrayList<>(curveMap.values().stream().sorted((o1, o2) -> o1.getTime().compareTo(o2.getTime())).collect(Collectors.toList()))); } } catch (Exception e) { log.error("", e); diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanPbsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanPbsMapper.xml index a8962d4ab..ad4ad438e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanPbsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanPbsMapper.xml @@ -42,7 +42,8 @@ UPDATE plan_pbs - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanRecordMapper.xml index ff715e40d..331007628 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanRecordMapper.xml @@ -41,7 +41,8 @@ UPDATE plan_record - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanWorkCategoryMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanWorkCategoryMapper.xml index 462483fd1..14efa7672 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanWorkCategoryMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanWorkCategoryMapper.xml @@ -28,7 +28,8 @@ UPDATE plan_work_category - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/service/impl/PlanRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/service/impl/PlanRecordServiceImpl.java index 6d3b3b5e7..800956e49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/plan/service/impl/PlanRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/plan/service/impl/PlanRecordServiceImpl.java @@ -105,7 +105,7 @@ public class PlanRecordServiceImpl extends ServiceImpl o1.getTime().compareTo(o2.getTime())).collect(Collectors.toList()); } /** @@ -228,23 +228,23 @@ public class PlanRecordServiceImpl extends ServiceImpl children = baseMapper.getChildren(planRecord.getId()); for (PlanRecord child : children) { if (child.getId().equals(planRecord.getParentId())) { - throw new OpenAlertException("不能将部门移动到其自身下级"); + throw new OpenAlertException("不能将自己移动到其自身下级"); } } PlanRecord pOrg = baseMapper.selectById(planRecord.getParentId()); - // 修改子部门 + // 修改子 boolean top = planRecord.getParentId() == null || planRecord.getParentId() == 0; if (top) { planRecord.setParentId(0L); planRecord.setAncestors("0"); } else { if (pOrg == null) { - throw new OpenAlertException("上级部门不存在"); + throw new OpenAlertException("上级自己不存在"); } planRecord.setAncestors(pOrg.getAncestors() + "," + pOrg.getId()); if (planRecord.getWorkType() == 1 && pOrg.getWorkType() != 2) { diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PlanMilestone2LeftServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PlanMilestone2LeftServiceImpl.java index 5474052ee..af582c202 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PlanMilestone2LeftServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PlanMilestone2LeftServiceImpl.java @@ -131,13 +131,15 @@ public class PlanMilestone2LeftServiceImpl extends ServiceImpl() + int rightCount = planMilestone2RightService.count(new LambdaQueryWrapper() .eq(PlanMilestone2Right::getLeftId, id)); - List children = baseMapper.getChildren(Long.valueOf(id)); - for (PlanMilestone2Left child : children) { - this.delete(String.valueOf(child.getId())); + if (rightCount > 0) { + throw new OpenAlertException("编制内容不为空"); + } + List children = baseMapper.getChildren(Long.valueOf(id)); + if (CollUtil.isNotEmpty(children)) { + throw new OpenAlertException("下级不为空"); } - } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java index 457384393..1a63989cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java @@ -1,11 +1,15 @@ package com.zhgd.xmgl.modules.concrete.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; +import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; +import com.zhgd.xmgl.modules.baotou.entity.ConstructionPlanLedgerSet; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import com.zhgd.xmgl.modules.concrete.entity.vo.BaotouConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -14,10 +18,7 @@ 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 org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.HashMap; @@ -126,4 +127,24 @@ public class ConcreteMonitorCurrentDataController { public Result> countTrend(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(concreteMonitorCurrentDataService.countTrend(paramMap)); } + + @ApiOperation(value = "分页列表混凝土监测数据信息", notes = "分页列表混凝土监测数据信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(concreteMonitorCurrentDataService.queryPageList(param)); + } + + @ApiOperation(value = "手动采集添加混凝土监测-实时数据信息", notes = "手动采集添加混凝土监测-实时数据信息", httpMethod = "POST") + @PostMapping(value = "/manual/add") + public Result addByManual(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) { + concreteMonitorCurrentDataVo.setUploadType(2); + concreteMonitorCurrentDataService.saveConcreteMonitorCurrentData(concreteMonitorCurrentDataVo); + return Result.ok(); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java index 5c9dfdc5b..caa42328a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java @@ -59,6 +59,8 @@ public class ConcreteMonitorCurrentData implements Serializable { @Excel(name = "温度", width = 15) @ApiModelProperty(value = "温度") private Double temperature; + @ApiModelProperty(value = "1自动采集2手动采集") + private Integer uploadType; @TableField(exist = false) @ApiModelProperty(value = "报警等级，1 紧急告警，2 重要告警，3 次要告警，4 提示告警，5 正常") diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/BaotouConcreteMonitorCurrentDataVo.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/BaotouConcreteMonitorCurrentDataVo.java new file mode 100644 index 000000000..72d66031f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/BaotouConcreteMonitorCurrentDataVo.java @@ -0,0 +1,23 @@ +package com.zhgd.xmgl.modules.concrete.entity.vo; + +import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class BaotouConcreteMonitorCurrentDataVo { + /** + * 混凝土监测设备唯一标识 + */ + @ApiModelProperty(value = "混凝土监测设备唯一标识") + private String devSn; + @ApiModelProperty(value = "设备名称") + private String devName; + @ApiModelProperty(value = "1自动采集2手动采集") + private Integer uploadType; + @ApiModelProperty(value = "接收时间") + private String receiveTime; + private List dataList; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java index 30455e2fc..155fb39e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.modules.concrete.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import org.apache.ibatis.annotations.Mapper; @@ -18,7 +20,7 @@ import java.util.Map; @Mapper public interface ConcreteMonitorAlarmMapper extends BaseMapper { - List queryConcreteMonitorAlarmPageList(Page page, @Param("param") Map map); + List queryConcreteMonitorAlarmPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") Map map); List selectDevAlarmList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java index d4f40a000..bf1e11a27 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java @@ -1,8 +1,14 @@ package com.zhgd.xmgl.modules.concrete.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; +import com.zhgd.xmgl.modules.concrete.entity.vo.BaotouConcreteMonitorCurrentDataVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,4 +33,6 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper countTrend(HashMap paramMap); ConcreteMonitorCurrentData newestCurrentData(Map map); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml index ce6a17ecf..29732dbd3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml @@ -4,6 +4,7 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java index 590c82273..fb5ce1fcd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java @@ -1,10 +1,12 @@ package com.zhgd.xmgl.modules.concrete.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import com.zhgd.xmgl.modules.concrete.entity.vo.BaotouConcreteMonitorCurrentDataVo; import java.util.HashMap; import java.util.List; @@ -32,4 +34,6 @@ public interface IConcreteMonitorCurrentDataService extends IService queryPageList(HashMap param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java index 37a447a9b..43b7b5f68 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java @@ -4,6 +4,8 @@ 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.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.baotou.entity.BuildingInstallationUnqualifiedReport; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev; import com.zhgd.xmgl.modules.basicdata.entity.Notice; @@ -12,6 +14,7 @@ import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.RefUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,7 +46,9 @@ public class ConcreteMonitorAlarmServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); - List list = concreteMonitorAlarmMapper.queryConcreteMonitorAlarmPageList(page, map); + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorAlarm.class, map, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ConcreteMonitorAlarm::getAddTime)); + List list = concreteMonitorAlarmMapper.queryConcreteMonitorAlarmPageList(page, queryWrapper, map); return page.setRecords(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java index be66cbb6e..049da84f6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java @@ -1,6 +1,9 @@ package com.zhgd.xmgl.modules.concrete.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import cn.hutool.core.util.StrUtil; @@ -8,12 +11,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo; +import com.zhgd.xmgl.modules.baotou.entity.ConstructionPlanLedgerSet; +import com.zhgd.xmgl.modules.baotou.entity.SunshineProject; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDev; import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition; +import com.zhgd.xmgl.modules.concrete.entity.vo.BaotouConcreteMonitorCurrentDataVo; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorCurrentDataMapper; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevMapper; import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper; @@ -21,6 +28,7 @@ import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorAlarmService; import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService; import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.PageUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import java.sql.Struct; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 混凝土监测-实时数据 @@ -64,6 +73,10 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl qu = new QueryWrapper<>(); qu.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, projectSn) @@ -139,6 +152,8 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl dataList = Lists.newArrayList(); vo.setList(dataList); @@ -157,11 +172,32 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl queryPageList(HashMap param) { + Page page = PageUtil.getPage(param); + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(BaotouConcreteMonitorCurrentDataVo.class, param, true); + ; + IPage pageList = baseMapper.queryList(page, queryWrapper, param); + List records = pageList.getRecords(); + if (CollUtil.isNotEmpty(records)) { + List times = records.stream().map(BaotouConcreteMonitorCurrentDataVo::getReceiveTime).collect(Collectors.toList()); + List devsns = records.stream().map(BaotouConcreteMonitorCurrentDataVo::getDevSn).collect(Collectors.toList()); + Map> timeMap = this.list(new LambdaQueryWrapper() + .in(ConcreteMonitorCurrentData::getReceiveTime, times).in(ConcreteMonitorCurrentData::getDevSn, devsns)).stream().collect(Collectors.groupingBy(ConcreteMonitorCurrentData::getReceiveTime)); + for (BaotouConcreteMonitorCurrentDataVo record : records) { + List concreteMonitorCurrentDatas = timeMap.get(record.getReceiveTime()); + record.setDataList(concreteMonitorCurrentDatas); + } + } + pageList.setRecords(records); + return pageList; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml index 3a8f1a41f..fd357927a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml @@ -223,7 +223,8 @@ UPDATE project_enterprise - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml index 98741be75..3168c609c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml @@ -77,7 +77,8 @@ UPDATE quality_region - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoGroupMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoGroupMapper.xml index a5cc156b9..156025514 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoGroupMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoGroupMapper.xml @@ -14,7 +14,8 @@ UPDATE video_group - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml index 903b20d63..628311464 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml @@ -9,7 +9,8 @@ UPDATE xz_project_org - SET ancestors=REPLACE(ancestors, #{oldAncestor}, #{newAncestor}) + SET ancestors=if(#{oldAncestor}='0',CONCAT(#{newAncestor},SUBSTR(ancestors, 2)),REPLACE(ancestors, + #{oldAncestor}, #{newAncestor})) WHERE ancestors LIKE N'${oldAncestor},${id}%' and project_sn = #{projectSn}