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

钢丝绳bug修改

Browse Source
This commit is contained in:
Administrator 2023-05-26 17:39:22 +08:00
parent b763bec632
commit e490595d48
10 changed files with 88 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/Tower.java
View File

@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -442,6 +440,9 @@ public class Tower implements Serializable {
@ApiModelProperty(value = "标准高")
private java.lang.String standardHigh;
@ApiModelProperty(value = "钢丝绳设备id")
private java.lang.Long tckwWireRopeId;
@TableField(exist = false)
@ApiModelProperty(value = "总承包单位企业名称")
private java.lang.String generalContractorsName;

4
src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml
View File

@ -72,7 +72,9 @@
select *
from dust_noise_data
where project_sn = #{projectSn}
and device_id = #{deviceId}
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
ORDER BY upload_date desc
limit 1
</select>

41
src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.async.AsyncEnvironment;
import com.zhgd.xmgl.modules.environment.entity.DustNoiseData;
import com.zhgd.xmgl.modules.environment.entity.EnvironmentDev;
@ -21,50 +20,16 @@ import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.WindDirectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.environment.entity.DustNoiseData;
import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService;
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.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
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.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;
/**
* @Description: 扬尘噪声实时数据
* @author： pds
@ -107,8 +72,8 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
DustNoiseData noiseData = null;
if (map.get("deviceId") == null) {
List<DustNoiseData> noiseDataList = dustNoiseDataMapper.getRealTimeDustNoiseDataList(map);
DustNoiseData nd = dustNoiseDataMapper.getRealTimeDustNoiseData(map);
List<DustNoiseData> noiseDataList = Arrays.asList(nd);
for (DustNoiseData dustNoiseData : noiseDataList) {
DustNoiseData dataBuilder = dataBuilder(dustNoiseData);
if (noiseData == null) {

14
src/main/java/com/zhgd/xmgl/modules/tckw/controller/TckwWireRopeInspectionRecordController.java
View File

@ -10,13 +10,16 @@ import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord;
import com.zhgd.xmgl.modules.tckw.service.ITckwWireRopeInspectionRecordService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -46,11 +49,18 @@ public class TckwWireRopeInspectionRecordController {
* @return
*/
@ApiOperation(value = " 分页列表查询TCK.W钢丝绳检测记录信息", notes = "分页列表查询TCK.W钢丝绳检测记录信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "startTime", value = "开始时间,格式2020-08-16", dataType = "String", paramType = "query", required = false),
@ApiImplicitParam(name = "endTime", value = "结束时间,格式2020-08-16", dataType = "String", paramType = "query", required = false),
})
@GetMapping(value = "/page")
public Result<IPage<TckwWireRopeInspectionRecord>> queryPageList(TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
HttpServletRequest req,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime
) {
Result<IPage<TckwWireRopeInspectionRecord>> result = new Result<IPage<TckwWireRopeInspectionRecord>>();
IPage<TckwWireRopeInspectionRecord> pageList = tckwWireRopeInspectionRecordService.queryPageList(tckwWireRopeInspectionRecord, pageNo, pageSize, req);
result.setSuccess(true);
@ -184,7 +194,7 @@ public class TckwWireRopeInspectionRecordController {
}
/**
* 设备端添加TCK.W钢丝绳记录，TCK.W检测站点名称填项目sn
* 设备端添加TCK.W钢丝绳记录
*/
@ApiOperation(value = " 设备端添加TCK.W钢丝绳记录", notes = "设备端添加TCK.W钢丝绳记录", httpMethod = "POST")
@PostMapping(value = "/addWithDamage")

21
src/main/java/com/zhgd/xmgl/modules/tckw/entity/TckwWireRopeInspectionRecord.java
View File

@ -136,4 +136,25 @@ public class TckwWireRopeInspectionRecord implements Serializable {
@ApiModelProperty(value = "钢丝绳检测损伤记录列表")
@TableField(exist = false)
private List<TckwWireRopeInspectionDamageRecord> damageRecordList;
@ApiModelProperty(value = "塔吊设备名称")
@TableField(exist = false)
private java.lang.String devName;
@ApiModelProperty(value = "塔吊id（下拉查询）")
@TableField(exist = false)
private java.lang.Long towerId;
@ApiModelProperty(value = "损伤程度（0=轻微，1=轻度，2=中度，3=较重，4=严重， 5=超限）")
@TableField(exist = false)
private java.lang.Integer damageSeverity;
@ApiModelProperty(value = "查询开始时间，格式：2023-05-22 18:00:00")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date queryStartTime;
@ApiModelProperty(value = "查询结束时间，格式：2023-05-22 18:00:00")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date queryEndTime;
}

8
src/main/java/com/zhgd/xmgl/modules/tckw/mapper/TckwWireRopeInspectionDamageRecordMapper.java
View File

@ -1,8 +1,14 @@
package com.zhgd.xmgl.modules.tckw.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.modules.tckw.entity.TckwWireRopeInspectionDamageRecord;
import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: TCK.W钢丝绳检测损伤记录
@ -13,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface TckwWireRopeInspectionDamageRecordMapper extends BaseMapper<TckwWireRopeInspectionDamageRecord> {
IPage<TckwWireRopeInspectionRecord> queryPageList(Page<TckwWireRopeInspectionRecord> page, @Param(Constants.WRAPPER) QueryWrapper<TckwWireRopeInspectionRecord> queryWrapper);
}

8
src/main/java/com/zhgd/xmgl/modules/tckw/mapper/xml/TckwWireRopeInspectionDamageRecordMapper.xml
View File

@ -1,4 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.tckw.mapper.TckwWireRopeInspectionDamageRecordMapper">
<select id="queryPageList" resultType="com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord">
select ir.*, t.dev_name, max(dr.damage_severity) as damage_severity, t.id as tower_id
from tckw_wire_rope_inspection_record ir
left join tckw_wire_rope_inspection_damage_record dr on dr.tckw_wire_rope_inspection_record_id = ir.id
inner join tower t on t.tckw_wire_rope_id = ir.remote_id
${ew.customSqlSegment}
group by ir.id
</select>
</mapper>

29
src/main/java/com/zhgd/xmgl/modules/tckw/service/impl/TckwWireRopeInspectionRecordServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.tckw.service.impl;
import cn.hutool.core.date.DateUtil;
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.extension.plugins.pagination.Page;
@ -8,17 +9,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.gexin.fastjson.JSONArray;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.bigdevice.entity.Tower;
import com.zhgd.xmgl.modules.bigdevice.mapper.TowerMapper;
import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionDamageRecord;
import com.zhgd.xmgl.modules.tckw.entity.TckwWireRopeInspectionRecord;
import com.zhgd.xmgl.modules.tckw.mapper.TckwWireRopeInspectionDamageRecordMapper;
import com.zhgd.xmgl.modules.tckw.mapper.TckwWireRopeInspectionRecordMapper;
import com.zhgd.xmgl.modules.tckw.service.ITckwWireRopeInspectionRecordService;
import com.zhgd.xmgl.util.ReflectionUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
/**
@ -30,6 +35,8 @@ import java.util.HashMap;
@Service
@Transactional(rollbackFor = Exception.class)
public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl<TckwWireRopeInspectionRecordMapper, TckwWireRopeInspectionRecord> implements ITckwWireRopeInspectionRecordService {
@Autowired
private TowerMapper towerMapper;
@Autowired
private TckwWireRopeInspectionDamageRecordMapper tckwWireRopeInspectionDamageRecordMapper;
@ -64,6 +71,12 @@ public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl<TckwWir
“rope_cnt” : <整型>, 释义：钢丝绳根数
｝
*/
Long wireDeviceId = MapUtils.getLong(map, "ID");
Tower tower = towerMapper.selectOne(new LambdaQueryWrapper<Tower>().eq(Tower::getTckwWireRopeId, wireDeviceId));
if (tower == null) {
throw new RuntimeException("塔吊设备未绑定钢丝绳设备（需要绑定钢丝绳设备id）");
}
map.put("projectSn", tower.getProjectSn());
TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord = saveTckwWireRopeInspectionRecord(map);
saveTckwWireRopeInspectionDamageRecord(map, tckwWireRopeInspectionRecord);
@ -82,7 +95,7 @@ public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl<TckwWir
r.setDamageEndPosition(Double.valueOf(dataArr.get(3).toString()));
r.setDamageValue(Double.valueOf(dataArr.get(4).toString()));
r.setDamageSeverity(Integer.valueOf(dataArr.get(5).toString()));
r.setProjectSn(MapUtils.getString(map, "name"));
r.setProjectSn(MapUtils.getString(map, "projectSn"));
tckwWireRopeInspectionDamageRecordMapper.insert(r);
}
}
@ -100,16 +113,24 @@ public class TckwWireRopeInspectionRecordServiceImpl extends ServiceImpl<TckwWir
r.setRopeSpec(MapUtils.getString(map, "rope_spec"));
r.setRopeLen(MapUtils.getDouble(map, "rope_len"));
r.setRopeCnt(MapUtils.getInteger(map, "rope_cnt"));
r.setProjectSn(MapUtils.getString(map, "name"));
r.setProjectSn(MapUtils.getString(map, "projectSn"));
r.setRemoteId(MapUtils.getLong(map, "ID"));
save(r);
return r;
}
public IPage<TckwWireRopeInspectionRecord> queryPageList(TckwWireRopeInspectionRecord tckwWireRopeInspectionRecord, Integer pageNo, Integer pageSize, HttpServletRequest req) {
QueryWrapper<TckwWireRopeInspectionRecord> queryWrapper = QueryGenerator.initQueryWrapper(tckwWireRopeInspectionRecord, req.getParameterMap());
String defaultAlias = "ir.";
QueryWrapper<TckwWireRopeInspectionRecord> queryWrapper = QueryGenerator.initQueryWrapper(tckwWireRopeInspectionRecord, req.getParameterMap(),
ReflectionUtil.getFieldNameList(TckwWireRopeInspectionRecord::getDevName, TckwWireRopeInspectionRecord::getQueryStartTime, TckwWireRopeInspectionRecord::getQueryEndTime), null, defaultAlias);
Long towerId = tckwWireRopeInspectionRecord.getTowerId();
queryWrapper.eq(towerId != null, "t." + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getDevName), towerId);
Date queryEndTime = tckwWireRopeInspectionRecord.getQueryEndTime();
Date queryStartTime = tckwWireRopeInspectionRecord.getQueryStartTime();
queryWrapper.le(queryEndTime != null, defaultAlias + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getStartTime), queryEndTime);
queryWrapper.ge(queryStartTime != null, defaultAlias + ReflectionUtil.getFieldNameToUlc(TckwWireRopeInspectionRecord::getStartTime), queryStartTime);
Page<TckwWireRopeInspectionRecord> page = new Page<TckwWireRopeInspectionRecord>(pageNo, pageSize);
IPage<TckwWireRopeInspectionRecord> pageList = page(page, queryWrapper);
IPage<TckwWireRopeInspectionRecord> pageList = tckwWireRopeInspectionDamageRecordMapper.queryPageList(page, queryWrapper);
return pageList;
}
}

5
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
View File

@ -55,6 +55,8 @@ import static com.zhgd.xmgl.config.FaceRunner.faceEngine;
@Slf4j
@Transactional(rollbackFor = Exception.class)
public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMapper, WorkerAttendance> implements IWorkerAttendanceService {
@Autowired
private WorkerAttendancePresenceServiceImpl workerAttendancePresenceService;
@Autowired
private WorkerAttendanceMapper workerAttendanceMapper;
@Autowired
@ -754,9 +756,10 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
workerAttendance.setAttendanceType(1);
workerAttendanceMapper.insert(workerAttendance);
//asyncSendAttendance.saveAndSendAttendance(workerAttendance,info);
if (profileJudgeUtil.isJlwProd()) {
if (profileJudgeUtil.isJlw()) {
// 向政务平台发送数据
govtOpenApiService.workerAttendanceSync(workerAttendance);
workerAttendancePresenceService.addWorkerAttendancePresence(workerAttendance);
}
}
} catch (Exception e) {

2
src/main/resources/application-ljw-gsx.properties
View File

@ -74,7 +74,7 @@ server.tomcat.basedir=C:/tempImage/
license.licensePath=C:/license/license.lic
license.publicKeysStorePath=C:/license/publicCerts.keystore
govt.host=http://47.96.183.143/uatapi
govt.host=
server.ssl.enabled=false