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

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-03-31 18:12:59 +08:00
parent e13e47bf6e
commit a65c3927ca
28 changed files with 182 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/zhgd/xmgl/entity/vo/ConcreteMonitorCurrentDataVo.java
View File

@ -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<ConcreteMonitorCurrentData> list;
}

5
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ConstructionEquipmentToolClassificationMapper.xml
View File

@ -9,7 +9,8 @@
<update id="updateAncestors">
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}
</update>
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/MainProjectCompleteNameMapper.xml
View File

@ -23,7 +23,8 @@
</select>
<update id="updateAncestors">
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}
</update>
</mapper>

5
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PartyConstructionOrganizationMapper.xml
View File

@ -9,7 +9,8 @@
<update id="updateAncestors">
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}
</update>
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PlanMilestone2LeftMapper.xml
View File

@ -27,7 +27,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml
View File

@ -33,7 +33,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityAcceptanceMapper.xml
View File

@ -33,7 +33,8 @@
<update id="updateAncestors">
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}
</update>

5
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/QualityCommonProblemLibraryMapper.xml
View File

@ -9,7 +9,8 @@
<update id="updateAncestors">
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}
</update>
</update>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/baotou/plan/controller/PlanRecordController.java
View File

@ -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);

3
src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanPbsMapper.xml
View File

@ -42,7 +42,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanRecordMapper.xml
View File

@ -41,7 +41,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/baotou/plan/mapper/xml/PlanWorkCategoryMapper.xml
View File

@ -28,7 +28,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

10
src/main/java/com/zhgd/xmgl/modules/baotou/plan/service/impl/PlanRecordServiceImpl.java
View File

@ -105,7 +105,7 @@ public class PlanRecordServiceImpl extends ServiceImpl<PlanRecordMapper, PlanRec
rtList.add(curve);
}
}
return rtList;
return rtList.stream().sorted((o1, o2) -> o1.getTime().compareTo(o2.getTime())).collect(Collectors.toList());
}
/**
@ -228,23 +228,23 @@ public class PlanRecordServiceImpl extends ServiceImpl<PlanRecordMapper, PlanRec
}
if (!Objects.equals(oldPlanRecord.getParentId(), planRecord.getParentId())) {
if (Objects.equals(planRecord.getId(), planRecord.getParentId())) {
throw new OpenAlertException("不能将部门移动到其自身");
throw new OpenAlertException("不能将自己移动到其自身");
}
List<PlanRecord> 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) {

12
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PlanMilestone2LeftServiceImpl.java
View File

@ -131,13 +131,15 @@ public class PlanMilestone2LeftServiceImpl extends ServiceImpl<PlanMilestone2Lef
throw new OpenAlertException("未找到对应实体");
}
baseMapper.deleteById(id);
planMilestone2RightService.remove(new LambdaQueryWrapper<PlanMilestone2Right>()
int rightCount = planMilestone2RightService.count(new LambdaQueryWrapper<PlanMilestone2Right>()
.eq(PlanMilestone2Right::getLeftId, id));
List<PlanMilestone2Left> children = baseMapper.getChildren(Long.valueOf(id));
for (PlanMilestone2Left child : children) {
this.delete(String.valueOf(child.getId()));
if (rightCount > 0) {
throw new OpenAlertException("编制内容不为空");
}
List<PlanMilestone2Left> children = baseMapper.getChildren(Long.valueOf(id));
if (CollUtil.isNotEmpty(children)) {
throw new OpenAlertException("下级不为空");
}
}
@Override

29
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
View File

@ -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<List<TrendOneVo>> countTrend(@ApiIgnore @RequestBody HashMap<String, Object> 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<IPage<BaotouConcreteMonitorCurrentDataVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
return Result.success(concreteMonitorCurrentDataService.queryPageList(param));
}
@ApiOperation(value = "手动采集添加混凝土监测-实时数据信息", notes = "手动采集添加混凝土监测-实时数据信息", httpMethod = "POST")
@PostMapping(value = "/manual/add")
public Result<ConcreteMonitorCurrentData> addByManual(@RequestBody ConcreteMonitorCurrentDataVo concreteMonitorCurrentDataVo) {
concreteMonitorCurrentDataVo.setUploadType(2);
concreteMonitorCurrentDataService.saveConcreteMonitorCurrentData(concreteMonitorCurrentDataVo);
return Result.ok();
}
}

2
src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java
View File

@ -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 正常")

23
src/main/java/com/zhgd/xmgl/modules/concrete/entity/vo/BaotouConcreteMonitorCurrentDataVo.java Normal file
View File

@ -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<ConcreteMonitorCurrentData> dataList;
}

4
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorAlarmMapper.java
View File

@ -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<ConcreteMonitorAlarm> {
List<ConcreteMonitorAlarm> queryConcreteMonitorAlarmPageList(Page<ConcreteMonitorAlarm> page, @Param("param") Map<String, Object> map);
List<ConcreteMonitorAlarm> queryConcreteMonitorAlarmPageList(Page<ConcreteMonitorAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<ConcreteMonitorAlarm> queryWrapper, @Param("param") Map<String, Object> map);
List<ConcreteMonitorAlarm> selectDevAlarmList(Map<String, Object> map);

8
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java
View File

@ -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<ConcreteMon
ArrayList<TrendOneVo> countTrend(HashMap<String, Object> paramMap);
ConcreteMonitorCurrentData newestCurrentData(Map<String, Object> map);
IPage<BaotouConcreteMonitorCurrentDataVo> queryList(Page<BaotouConcreteMonitorCurrentDataVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaotouConcreteMonitorCurrentDataVo> queryWrapper, @Param("param") HashMap<String, Object> param);
}

4
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorAlarmMapper.xml
View File

@ -4,6 +4,7 @@
<select id="queryConcreteMonitorAlarmPageList"
resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm">
select * from(
SELECT a.*,c.point_name,b.dev_name
from concrete_monitor_alarm a LEFT JOIN concrete_monitor_dev b ON (a.dev_sn=b.dev_sn and
a.project_sn=b.project_sn)
@ -25,7 +26,8 @@
<if test="param.endTime != null and param.endTime != ''">
AND a.add_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
</if>
order by a.add_time desc
)t
${ew.customSqlSegment}
</select>
<select id="selectDevAlarmList" resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm">
SELECT a.*,c.point_name,b.dev_name

18
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
View File

@ -6,7 +6,12 @@
SELECT *
from concrete_monitor_current_data
WHERE dev_sn = #{devSn}
and point_no = #{pointNo}
<if test="uploadType != null and uploadType != ''">
and upload_type = #{uploadType}
</if>
<if test="pointNo != null and pointNo != ''">
and point_no = #{pointNo}
</if>
<if test="type == 1">
and receive_time >= DATE_ADD(NOW(), INTERVAL -24 HOUR)
</if>
@ -63,4 +68,15 @@
order by receive_time desc
LIMIT 1
</select>
<select id="queryList" resultType="com.zhgd.xmgl.modules.concrete.entity.vo.BaotouConcreteMonitorCurrentDataVo">
select * from (
select t.*
,cmd.dev_name
from concrete_monitor_current_data t
left join concrete_monitor_dev cmd on t.dev_sn=cmd.dev_sn
group by t.receive_time
)t
${ew.customSqlSegment}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java
View File

@ -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<ConcreteMon
* @param str
*/
void addDataFromTcpForLianRuiKe(String str);
IPage<BaotouConcreteMonitorCurrentDataVo> queryPageList(HashMap<String, Object> param);
}

7
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorAlarmServiceImpl.java
View File

@ -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<ConcreteMonitor
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<ConcreteMonitorAlarm> page = new Page<>(pageNo, pageSize);
List<ConcreteMonitorAlarm> list = concreteMonitorAlarmMapper.queryConcreteMonitorAlarmPageList(page, map);
QueryWrapper<ConcreteMonitorAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(ConcreteMonitorAlarm.class, map, true);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ConcreteMonitorAlarm::getAddTime));
List<ConcreteMonitorAlarm> list = concreteMonitorAlarmMapper.queryConcreteMonitorAlarmPageList(page, queryWrapper, map);
return page.setRecords(list);
}

38
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
View File

@ -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<ConcreteM
for (ConcreteMonitorCurrentData currentData : concreteMonitorCurrentDataVo.getList()) {
currentData.setProjectSn(projectSn);
currentData.setDevSn(devSn);
currentData.setReceiveTime(concreteMonitorCurrentDataVo.getReceiveTime());
if (concreteMonitorCurrentDataVo.getUploadType() != null) {
currentData.setUploadType(concreteMonitorCurrentDataVo.getUploadType());
}
concreteMonitorCurrentDataMapper.insert(currentData);
QueryWrapper<ConcreteMonitorDevPointPosition> qu = new QueryWrapper<>();
qu.lambda().eq(ConcreteMonitorDevPointPosition::getProjectSn, projectSn)
@ -139,6 +152,8 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
return;
}
ConcreteMonitorCurrentDataVo vo = new ConcreteMonitorCurrentDataVo();
String now = DateUtil.now();
vo.setReceiveTime(now);
vo.setDevSn(devSn);
ArrayList<ConcreteMonitorCurrentData> dataList = Lists.newArrayList();
vo.setList(dataList);
@ -157,11 +172,32 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
ConcreteMonitorCurrentData curData = new ConcreteMonitorCurrentData();
curData.setDevSn(devSn);
curData.setPointNo(Convert.toInt(entry.getKey().substring("T".length())));
curData.setReceiveTime(DateUtil.now());
curData.setReceiveTime(now);
curData.setTemperature(Convert.toDouble(entry.getValue()));
dataList.add(curData);
}
}
this.saveConcreteMonitorCurrentData(vo);
}
@Override
public IPage<BaotouConcreteMonitorCurrentDataVo> queryPageList(HashMap<String, Object> param) {
Page<BaotouConcreteMonitorCurrentDataVo> page = PageUtil.getPage(param);
QueryWrapper<BaotouConcreteMonitorCurrentDataVo> queryWrapper = QueryGenerator.initPageQueryWrapper(BaotouConcreteMonitorCurrentDataVo.class, param, true);
;
IPage<BaotouConcreteMonitorCurrentDataVo> pageList = baseMapper.queryList(page, queryWrapper, param);
List<BaotouConcreteMonitorCurrentDataVo> records = pageList.getRecords();
if (CollUtil.isNotEmpty(records)) {
List<String> times = records.stream().map(BaotouConcreteMonitorCurrentDataVo::getReceiveTime).collect(Collectors.toList());
List<String> devsns = records.stream().map(BaotouConcreteMonitorCurrentDataVo::getDevSn).collect(Collectors.toList());
Map<String, List<ConcreteMonitorCurrentData>> timeMap = this.list(new LambdaQueryWrapper<ConcreteMonitorCurrentData>()
.in(ConcreteMonitorCurrentData::getReceiveTime, times).in(ConcreteMonitorCurrentData::getDevSn, devsns)).stream().collect(Collectors.groupingBy(ConcreteMonitorCurrentData::getReceiveTime));
for (BaotouConcreteMonitorCurrentDataVo record : records) {
List<ConcreteMonitorCurrentData> concreteMonitorCurrentDatas = timeMap.get(record.getReceiveTime());
record.setDataList(concreteMonitorCurrentDatas);
}
}
pageList.setRecords(records);
return pageList;
}
}

3
src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml
View File

@ -223,7 +223,8 @@
<update id="updateAncestors">
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}
</update>

3
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
View File

@ -77,7 +77,8 @@
<update id="updateAncestors">
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}
</update>

3
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoGroupMapper.xml
View File

@ -14,7 +14,8 @@
<update id="updateAncestors">
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}
</update>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzProjectOrgMapper.xml
View File

@ -9,7 +9,8 @@
<update id="updateAncestors">
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}
</update>