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

bug修改

Browse Source
This commit is contained in:
Administrator 2023-06-01 11:55:20 +08:00
parent 76e081cd3c
commit 05a0b927b4
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorAlarmController.java
View File

@ -34,20 +34,21 @@ import java.util.Map;
public class ConcreteMonitorAlarmController {
@Autowired
private IConcreteMonitorAlarmService concreteMonitorAlarmService;
/**
* 分页列表查询
* @return
*/
@ApiOperation(value = " 分页列表查询混凝土监测-报警数据表信息", notes = "分页列表查询混凝土监测-报警数据表信息", httpMethod="POST")
@ApiImplicitParams({
@ApiImplicitParam(name="devSn",value="设备编号",dataType = "String",paramType = "query",required =false),
@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),
@ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "query", required = false),
@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),
@ApiImplicitParam(name = "pointNo", value = "监测点点位号", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "alarmType", value = "报警类型", paramType = "query", required = false, dataType = "String"),
})
@PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String,Object> map) {

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

@ -4,23 +4,27 @@
<select id="queryConcreteMonitorAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
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)
LEFT JOIN concrete_monitor_dev_point_position c ON (a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and a.point_no=c.point_no)
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)
LEFT JOIN concrete_monitor_dev_point_position c ON (a.dev_sn=c.dev_sn and a.project_sn=c.project_sn and
a.point_no=c.point_no)
where a.project_sn=#{param.projectSn}
<if test="param.devSn!=null and param.devSn!=''">
<if test="param.devSn != null and param.devSn != ''">
and a.dev_sn=#{param.devSn}
</if>
<if test="param.pointNo!=null and param.pointNo!=''">
<if test="param.pointNo != null and param.pointNo != ''">
and a.point_no=#{param.pointNo}
</if>
<if test="param.startTime!=null and param.startTime!=''">
<if test="param.alarmValue != null and param.alarmValue != ''">
and a.alarm_value like CONCAT('%',#{param.alarmValue},'%')
</if>
<if test="param.startTime != null and param.startTime != ''">
AND a.add_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
</if>
<if test="param.endTime!=null and param.endTime!=''">
<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
</select>
<select id="selectDevAlarmList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*,c.point_name,b.dev_name
@ -32,4 +36,4 @@
</if>
order by a.add_time desc
</select>
</mapper>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java
View File

@ -130,7 +130,9 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl<ProjectDevStati
environmentList.add(map2);
}
}
Collections.reverse(videoList);
Collections.reverse(ufaceList);
Collections.reverse(environmentList);
}
@Override

3
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -438,6 +438,9 @@
<if test="companyType == '5'.toString()">
and cp.company_sn = #{sn}
</if>
<if test="projectSnResultFillZero != null and projectSnResultFillZero != ''">
and w.project_sn = #{projectSnResultFillZero}
</if>
</where>
GROUP BY w.type_name
ORDER BY personNum DESC

10
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -5,8 +5,10 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -1084,7 +1086,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
}
}
//工种
List<Map<String, Object>> workerTypeList = workerInfoMapper.selectWorkerTypeTotal(map);
Map<String, Object> selectWorkerTypeTotalMap = ObjectUtil.clone(map);
selectWorkerTypeTotalMap.remove("projectSn");
selectWorkerTypeTotalMap.remove("companyType");
selectWorkerTypeTotalMap.put("projectSnResultFillZero", MapUtils.getString(map, "projectSn"));
List<Map<String, Object>> workerTypeList = workerInfoMapper.selectWorkerTypeTotal(selectWorkerTypeTotalMap);
if (workerTypeList.size() > 0) {
for (Map<String, Object> temp : workerTypeList) {
double ratioNum = DataObjUtils.getPercentage(MapUtils.getString(temp, "personNum"), totallwPerson);
@ -1645,7 +1651,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
if (pageSize == null) {
pageSize = 100;
}
Page<WorkerInfoDetailsVo> p = new Page<>(pageNo,pageSize);
Page<WorkerInfoDetailsVo> p = new Page<>(pageNo, pageSize);
IPage<WorkerInfoDetailsVo> page = workerInfoMapper.getWorkerInfoDetails(p, projectSn);
return Result.success(page);
}