diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java index 1ae0ff211..904c33168 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/BigDevicesMaintenanceRecordController.java @@ -41,28 +41,30 @@ public class BigDevicesMaintenanceRecordController { */ @ApiOperation(value = " 分页列表查询大型设备-维保记录表信息", notes = "分页列表查询大型设备-维保记录表信息", httpMethod="POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "query", required = false), - @ApiImplicitParam(name = "devType", value = "设备类型，1塔吊，2升降机，3龙门吊", paramType = "query", required = true, 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 = "maintenanceStartTime", value = "维保开始时间", paramType = "query", required = false, dataType = "String"), - @ApiImplicitParam(name = "maintenanceEndTime", value = "维保结束时间", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备编号", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "devType", value = "设备类型，1塔吊，2升降机，3龙门吊", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "maintenanceStartTime", value = "维保开始时间", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "maintenanceEndTime", value = "维保结束时间", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result>(); - IPage pageList = bigDevicesMaintenanceRecordService.queryBigDevicesMaintenanceRecordPageList(map); + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result<>(); + IPage pageList = bigDevicesMaintenanceRecordService.queryBigDevicesMaintenanceRecordPageList(map); result.setSuccess(true); result.setResult(pageList); return result; } - /** - * 添加 - * @param bigDevicesMaintenanceRecord - * @return - */ - @OperLog(operModul = "设备维保管理",operType = "添加大型设备-维保记录",operDesc = "添加大型设备-维保记录表信息") + + /** + * 添加 + * + * @param bigDevicesMaintenanceRecord + * @return + */ + @OperLog(operModul = "设备维保管理", operType = "添加大型设备-维保记录", operDesc = "添加大型设备-维保记录表信息") @ApiOperation(value = " 添加大型设备-维保记录表信息", notes = "添加大型设备-维保记录表信息" , httpMethod="POST") @PostMapping(value = "/add") public Result add(@RequestBody BigDevicesMaintenanceRecord bigDevicesMaintenanceRecord) { diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java index 413588377..dd0bfeee7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerAlarmController.java @@ -347,8 +347,8 @@ public class TowerAlarmController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "query", required = false, dataType = "String"), - @ApiImplicitParam(name = "queryStartTime", value = "查询开始时间，格式：2023-05-22 18:00:00", paramType = "query", required = true, dataType = "String"), - @ApiImplicitParam(name = "queryEndTime", value = "查询结束时间，格式：2023-05-22 18:00:00", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "queryStartTime", value = "查询开始时间，格式：2023-05-22", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "queryEndTime", value = "查询结束时间，格式：2023-05-22", paramType = "query", required = true, dataType = "String"), }) @PostMapping(value = "/queryAlarmsDistinguishedNumberByAlarmType") public Result queryAlarmsDistinguishedNumberByAlarmType(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceDriverRecord.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceDriverRecord.java index 17ef50f82..abc73fbbd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceDriverRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDeviceDriverRecord.java @@ -94,7 +94,7 @@ public class BigDeviceDriverRecord implements Serializable { @ApiModelProperty(value = "工作年限") @TableField(exist = false) private java.lang.Integer workYear; - @ApiModelProperty(value = "本次连续工作时长（分钟）") + @ApiModelProperty(value = "本次连续工作时长（秒）") @TableField(exist = false) private java.lang.Integer continuousWorkingTime; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDevicesMaintenanceRecord.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDevicesMaintenanceRecord.java index 403b67442..6ae3ddab0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDevicesMaintenanceRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/BigDevicesMaintenanceRecord.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.bigdevice.entity; 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.annotation.JsonFormat; @@ -98,4 +99,6 @@ public class BigDevicesMaintenanceRecord implements Serializable { @Excel(name = "描述，备注", width = 15) @ApiModelProperty(value = "描述，备注") private java.lang.String remark; + @TableField(exist = false) + private java.lang.String devName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java index fbf67e207..bc653fcdf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/DriverVO.java @@ -2,9 +2,7 @@ package com.zhgd.xmgl.modules.bigdevice.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; /** * @author 邱平毅 @@ -30,8 +28,10 @@ public class DriverVO { private java.lang.Integer sex; @ApiModelProperty(value = "年龄") private java.lang.Integer age; - @ApiModelProperty(value = "本次连续工作时长（分钟）") + @ApiModelProperty(value = "本次连续工作时长（秒）") private java.lang.Integer continuousWorkingTime; + @ApiModelProperty(value = "本次连续工作时长（时分秒）") + private String continuousWorkingTimeName; @ApiModelProperty(value = "身份证号") private java.lang.String idCard; } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TodayOperatingStatusStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TodayOperatingStatusStatisticsVo.java index f72649c5d..6cf4bfd92 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TodayOperatingStatusStatisticsVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/TodayOperatingStatusStatisticsVo.java @@ -5,8 +5,10 @@ import lombok.Data; @Data public class TodayOperatingStatusStatisticsVo { - @ApiModelProperty(value = "工作时长（分钟）") + @ApiModelProperty(value = "工作时长（秒）") private Integer workTime; + @ApiModelProperty(value = "工作时长（时分秒）") + private String workTimeName; @ApiModelProperty(value = "装载次数") private Integer loadingNum; @ApiModelProperty(value = "装载工效(kg/min)") diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/BigDevicesMaintenanceRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/BigDevicesMaintenanceRecordMapper.java index 7b2a76a27..886d8e15f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/BigDevicesMaintenanceRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/BigDevicesMaintenanceRecordMapper.java @@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface BigDevicesMaintenanceRecordMapper extends BaseMapper { - List queryTowerMaintenanceRecordPageList(Page page, @Param("param")Map map); + List queryTowerMaintenanceRecordPageList(Page page, @Param("param") Map map); - List queryLifterMaintenanceRecordPageList(Page page, @Param("param")Map map); + List queryLifterMaintenanceRecordPageList(Page page, @Param("param") Map map); - List queryGantryCraneMaintenanceRecordPageList(Page page, @Param("param")Map map); + List queryGantryCraneMaintenanceRecordPageList(Page page, @Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml index a5c5f01b7..ee6a8d2bc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/BigDevicesMaintenanceRecordMapper.xml @@ -3,7 +3,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml index 5d80de3fd..79a44a355 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/LifterWorkCycleMapper.xml @@ -32,9 +32,9 @@ select ta.* from tower_alarm ta where ta.add_time >= #{queryStartTime} and ta.add_time - #{queryEndTime} and ta.alarm_type=1 + concat(#{queryEndTime},' 23:59:59') and ta.alarm_type=1 diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IBigDevicesMaintenanceRecordService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IBigDevicesMaintenanceRecordService.java index e87ee1678..c11f29a9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IBigDevicesMaintenanceRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/IBigDevicesMaintenanceRecordService.java @@ -15,5 +15,5 @@ import java.util.Map; */ public interface IBigDevicesMaintenanceRecordService extends IService { - IPage queryBigDevicesMaintenanceRecordPageList(Map map); + IPage queryBigDevicesMaintenanceRecordPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/BigDevicesMaintenanceRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/BigDevicesMaintenanceRecordServiceImpl.java index 98b02e87a..83ca7be13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/BigDevicesMaintenanceRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/BigDevicesMaintenanceRecordServiceImpl.java @@ -28,18 +28,18 @@ public class BigDevicesMaintenanceRecordServiceImpl extends ServiceImpl queryBigDevicesMaintenanceRecordPageList(Map map) { + public IPage queryBigDevicesMaintenanceRecordPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); - Page page = new Page<>(pageNo, pageSize); - List list=null; + Page page = new Page<>(pageNo, pageSize); + List list = null; int devType = Integer.parseInt(map.getOrDefault("devType", 1).toString()); - if(devType==1) { - list=bigDevicesMaintenanceRecordMapper.queryTowerMaintenanceRecordPageList(page, map); - }else if(devType==2) { - list=bigDevicesMaintenanceRecordMapper.queryLifterMaintenanceRecordPageList(page, map); - }else { - list=bigDevicesMaintenanceRecordMapper.queryGantryCraneMaintenanceRecordPageList(page, map); + if (devType == 1) { + list = bigDevicesMaintenanceRecordMapper.queryTowerMaintenanceRecordPageList(page, map); + } else if (devType == 2) { + list = bigDevicesMaintenanceRecordMapper.queryLifterMaintenanceRecordPageList(page, map); + } else { + list = bigDevicesMaintenanceRecordMapper.queryGantryCraneMaintenanceRecordPageList(page, map); } return page.setRecords(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterAlarmServiceImpl.java index b903e05a2..0afa90162 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterAlarmServiceImpl.java @@ -19,6 +19,7 @@ import com.zhgd.xmgl.util.DateUtil; import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.ReflectionUtil; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -203,10 +204,9 @@ public class LifterAlarmServiceImpl extends ServiceImpl map) { - String queryEndTime = map.getOrDefault("queryEndTime", DateUtil.format(new Date(), "yyyy-MM-dd")).toString(); - String queryStartTime = map.getOrDefault("queryStartTime", DateUtil.offsetDay(new Date(), -7)).toString(); - map.putIfAbsent("queryEndTime", queryEndTime); - map.putIfAbsent("queryStartTime", queryStartTime); + if (StringUtils.isBlank(MapUtils.getString(map, "queryEndTime")) || StringUtils.isBlank(MapUtils.getString(map, "queryStartTime"))) { + throw new OpenAlertException("queryEndTime和queryStartTime不能为空"); + } List lifterAlarms = lifterAlarmMapper.queryAlarmsByTime(map); Map countTowerAlarmByTypeMap = countLifterAlarmByType(lifterAlarms); List typeNums = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java index becb39427..39ed4ec57 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/LifterServiceImpl.java @@ -23,6 +23,7 @@ import com.zhgd.xmgl.modules.bigdevice.mapper.*; import com.zhgd.xmgl.modules.bigdevice.service.ILifterService; import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.ReflectionUtil; +import com.zhgd.xmgl.util.TimeUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -345,6 +346,7 @@ public class LifterServiceImpl extends ServiceImpl impleme driverVO.setWorkerName(driver.getDriverName()); driverVO.setPhoneNumber(driver.getDriverPhone()); driverVO.setSpecialCertificateNumber(driver.getCertificateNumber()); + driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime())); driverVO.setImageUrl(driver.getImageUrl()); return driverVO; }).collect(Collectors.toList()); @@ -399,6 +401,7 @@ public class LifterServiceImpl extends ServiceImpl impleme @Override public TodayOperatingStatusStatisticsVo queryTodayOperatingStatusStatistics(Map map) { TodayOperatingStatusStatisticsVo workCycleStatusStatistics = lifterWorkCycleMapper.queryTodayWorkCycleStatusStatistics(map); + workCycleStatusStatistics.setWorkTimeName(TimeUtil.toHourMinSecond(workCycleStatusStatistics.getWorkTime())); map.put("queryStartTime", DateUtil.today()); Integer todayRunNum = lifterViolationMapper.selectLifterViolationCount(map); workCycleStatusStatistics.setViolationNum(todayRunNum); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java index 39eb9be39..3a7b954a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerAlarmServiceImpl.java @@ -560,10 +560,9 @@ public class TowerAlarmServiceImpl extends ServiceImpl map) { - String queryEndTime = map.getOrDefault("queryEndTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")).toString(); - String queryStartTime = map.getOrDefault("queryStartTime", DateUtil.offsetDay(new Date(), -7)).toString(); - map.putIfAbsent("queryEndTime", queryEndTime); - map.putIfAbsent("queryStartTime", queryStartTime); + if (StringUtils.isBlank(MapUtils.getString(map, "queryEndTime")) || StringUtils.isBlank(MapUtils.getString(map, "queryStartTime"))) { + throw new OpenAlertException("queryEndTime和queryStartTime不能为空"); + } List towerAlarms = towerAlarmMapper.queryAlarmsByTime(map); Map countTowerAlarmByTypeMap = countTowerAlarmByType(towerAlarms); List typeNums = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerNutServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerNutServiceImpl.java index a4ca742dc..80131441d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerNutServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerNutServiceImpl.java @@ -49,50 +49,6 @@ public class TowerNutServiceImpl extends ServiceImpl i public void saveNutData(TowerNut towerNut, Map data, int nutNum, int offLineNum, int alarmNum) { TowerNut oldTowerNut = towerNutMapper.selectTowerNutByHostId(towerNut.getNutHostId()); if (oldTowerNut != null) { - JSONObject jsonObject = JSONObject.parseObject(oldTowerNut.getAfterAnalysisData()); - if (offLineNum > 0) { - jsonObject.put("offLineNum", offLineNum); - } - if (alarmNum > 0) { - jsonObject.put("alarmNum", alarmNum); - } - if (nutNum > 0) { - jsonObject.put("nutNum", nutNum); - } - JSONArray jsonArray = jsonObject.getJSONArray("list"); - Integer totalAlarmNum = 0; - Integer totaloffLineNum = 0; - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject object = jsonArray.getJSONObject(i); - NutObj nutObj = data.get(object.getInteger("nutNo")); - if (nutObj != null) { - if (nutObj.getAlarm() > 0) { - object.put("alarm", nutObj.getAlarm()); - object.put("offLine", nutObj.getAlarm()); - } - if (nutObj.getOffLine() > 0) { - object.put("offLine", nutObj.getOffLine()); - object.put("offLineTime", nutObj.getOffLineTime()); - } - if (nutObj.getOnLine() > 0 && nutObj.getAlarm() == 0 && nutObj.getOffLine() == 0) { - object.put("alarm", 0); - object.put("alarmTime", ""); - object.put("offLine", 0); - object.put("offLineTime", ""); - object.put("onLine", nutObj.getOnLine()); - } else { - if (nutObj.getOnLine() > 0) { - object.put("onLine", nutObj.getOnLine()); - } - } - totalAlarmNum = totalAlarmNum + object.getInteger("alarm"); - totaloffLineNum = totaloffLineNum + object.getInteger("offLine"); - } - } - jsonObject.put("alarmNum", totalAlarmNum); - jsonObject.put("offLineNum", totaloffLineNum); - jsonObject.put("list", jsonArray); - towerNut.setAfterAnalysisData(jsonObject.toString()); towerNut.setId(oldTowerNut.getId()); towerNutMapper.updateById(towerNut); } else { @@ -166,6 +122,10 @@ public class TowerNutServiceImpl extends ServiceImpl i nutObj.setNutNo(nutNo); int temp = paramValue - 100; int remainder = temp % 3; + if (remainder == 1 && value.getValue() == 0) { + //排除不存在的螺母 + continue; + } if (value.getVt() == 1) { if (remainder == 0) { nutObj.setAlarm(value.getValue()); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java index ec06eb881..fecdf9090 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerServiceImpl.java @@ -25,6 +25,7 @@ import com.zhgd.xmgl.modules.bigdevice.service.ITowerVisualizeService; import com.zhgd.xmgl.modules.project.mapper.ProjectDevStatisticsMapper; import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.ReflectionUtil; +import com.zhgd.xmgl.util.TimeUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -483,6 +484,7 @@ public class TowerServiceImpl extends ServiceImpl implements driverVO.setSex(driver.getSex()); driverVO.setAge(driver.getAge()); driverVO.setContinuousWorkingTime(driver.getContinuousWorkingTime()); + driverVO.setContinuousWorkingTimeName(TimeUtil.toHourMinSecond(driver.getContinuousWorkingTime())); driverVO.setIdCard(driver.getDriverIdCard()); return driverVO; }).collect(Collectors.toList()); diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java index 4be5be015..2f3be6f0c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDev.java @@ -1,11 +1,5 @@ package com.zhgd.xmgl.modules.frontier.entity; -import java.util.Date; -import java.io.Serializable; - -import lombok.*; - - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,8 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * 临边防护-设备(FrontierProtectionDev)表实体类 * @@ -87,5 +87,18 @@ public class FrontierProtectionDev implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateDate; + + @ApiModelProperty(value = "责任班组id") + private Long dutyTeamInfoId; + + @ApiModelProperty(value = "图片") + private String image; + + @ApiModelProperty(value = "使用状态1正常2异常") + private Integer status; + @TableField(exist = false) + @ApiModelProperty(value = "班组名称") + private String teamName; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDevCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDevCurrentData.java index 9935e0460..d2666f63f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDevCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/entity/FrontierProtectionDevCurrentData.java @@ -119,6 +119,10 @@ public class FrontierProtectionDevCurrentData implements Serializable { @ApiModelProperty(value = "防翻越 1-正常；2-报警；3-失效") private Integer antiCross; + @TableField(exist = false) + @ApiModelProperty(value = "设备名称") + private String devName; + public FrontierProtectionDevCurrentData(String devSn, Date receiveTime, Float battery, Integer proximity, Integer antiCross) { this.id = IdUtil.getSnowflake().nextId(); this.devSn = devSn; diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevCurrentDataMapper.java index cfeda95a6..ba1281974 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevCurrentDataMapper.java @@ -1,5 +1,9 @@ package com.zhgd.xmgl.modules.frontier.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 org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevCurrentData; @@ -25,5 +29,6 @@ public interface FrontierProtectionDevCurrentDataMapper extends BaseMapper entities); + IPage selectPageDetail(Page page, @Param(Constants.WRAPPER) QueryWrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevMapper.java index 10948dd32..4cfb6eb0e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/FrontierProtectionDevMapper.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.frontier.mapper; -import org.apache.ibatis.annotations.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.modules.frontier.entity.FrontierProtectionDev; - +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,5 +28,6 @@ public interface FrontierProtectionDevMapper extends BaseMapper entities); + IPage selectPageDetail(Page page, @Param(Constants.WRAPPER) QueryWrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevCurrentDataMapper.xml index 27d7e7d6d..4891cc389 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevCurrentDataMapper.xml @@ -26,15 +26,21 @@ #{entity.portStatus1}, #{entity.portStatus2}, #{entity.magStatus1}, #{entity.magStatus2}, #{entity.antiCross}) - on duplicate key update dev_sn = values(dev_sn), - battery = values(battery), - proximity = values(proximity), - receive_time = values(receive_time), - port_status1 = values(port_status1), - port_status2 = values(port_status2), - mag_status1 = values(mag_status1), - mag_status2 = values(mag_status2), - anti_cross = values(anti_cross) + on duplicate key update dev_sn = values(dev_sn), + battery = values(battery), + proximity = values(proximity), + receive_time = values(receive_time), + port_status1 = values(port_status1), + port_status2 = values(port_status2), + mag_status1 = values(mag_status1), + mag_status2 = values(mag_status2), + anti_cross = values(anti_cross) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevMapper.xml index f09a8632d..a736307eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/mapper/xml/FrontierProtectionDevMapper.xml @@ -28,5 +28,10 @@ create_date = values(create_date), update_date = values(update_date) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java index 0b8e7ee23..549500aa0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevCurrentDataServiceImpl.java @@ -6,15 +6,15 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDevCurrentData; import com.zhgd.xmgl.modules.frontier.entity.qo.FrontierProtectionDevCurrentDataQO; import com.zhgd.xmgl.modules.frontier.mapper.FrontierProtectionDevCurrentDataMapper; import com.zhgd.xmgl.modules.frontier.service.FrontierProtectionDevCurrentDataService; +import com.zhgd.xmgl.util.ReflectionUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,38 +37,40 @@ public class FrontierProtectionDevCurrentDataServiceImpl extends ServiceImpl selectPageInfo(Page page, FrontierProtectionDevCurrentDataQO frontierProtectionDevCurrentDataQo) { + String alias = "fpdcd."; // 查询临边防护-设备实时数据条件 根据需求调整 - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + QueryWrapper wrapper = new QueryWrapper() // 通过devId临边防护设备id 精准查询 - .eq(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getDevSn()), FrontierProtectionDevCurrentData::getDevSn, frontierProtectionDevCurrentDataQo.getDevSn()) + .eq(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getDevSn()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getDevSn), frontierProtectionDevCurrentDataQo.getDevSn()) // 通过battery剩余电量百分比(0-100) 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getBattery() != null, FrontierProtectionDevCurrentData::getBattery, frontierProtectionDevCurrentDataQo.getBattery()) + .eq(frontierProtectionDevCurrentDataQo.getBattery() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getBattery), frontierProtectionDevCurrentDataQo.getBattery()) // 通过proximity人员靠近 1-正常；2-入侵；3-正常入侵 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getProximity() != null, FrontierProtectionDevCurrentData::getProximity, frontierProtectionDevCurrentDataQo.getProximity()) + .eq(frontierProtectionDevCurrentDataQo.getProximity() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getProximity), frontierProtectionDevCurrentDataQo.getProximity()) // 采集时间 之后 - .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartReceiveTime()), FrontierProtectionDevCurrentData::getReceiveTime, frontierProtectionDevCurrentDataQo.getStartReceiveTime()) + .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartReceiveTime()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getReceiveTime), frontierProtectionDevCurrentDataQo.getStartReceiveTime()) // 采集时间 之前 - .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndReceiveTime()), FrontierProtectionDevCurrentData::getReceiveTime, frontierProtectionDevCurrentDataQo.getEndReceiveTime()) + .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndReceiveTime()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getReceiveTime), frontierProtectionDevCurrentDataQo.getEndReceiveTime() != null ? DateUtil.endOfDay(DateUtil.parseDate(frontierProtectionDevCurrentDataQo.getEndReceiveTime())) : null) // 创建时间 yyyy-MM-dd HH:mm:ss 之后 - .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartCreateDate()), FrontierProtectionDevCurrentData::getCreateDate, frontierProtectionDevCurrentDataQo.getStartCreateDate()) + .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartCreateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getCreateDate), frontierProtectionDevCurrentDataQo.getStartCreateDate()) // 创建时间 yyyy-MM-dd HH:mm:ss 之前 - .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndCreateDate()), FrontierProtectionDevCurrentData::getCreateDate, frontierProtectionDevCurrentDataQo.getEndCreateDate()) + .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndCreateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getCreateDate), frontierProtectionDevCurrentDataQo.getEndCreateDate()) // 更新时间 yyyy-MM-dd HH:mm:ss 之后 - .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartUpdateDate()), FrontierProtectionDevCurrentData::getUpdateDate, frontierProtectionDevCurrentDataQo.getStartUpdateDate()) + .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getStartUpdateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getUpdateDate), frontierProtectionDevCurrentDataQo.getStartUpdateDate()) // 更新时间 yyyy-MM-dd HH:mm:ss 之前 - .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndUpdateDate()), FrontierProtectionDevCurrentData::getUpdateDate, frontierProtectionDevCurrentDataQo.getEndUpdateDate()) + .le(CharSequenceUtil.isNotBlank(frontierProtectionDevCurrentDataQo.getEndUpdateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getUpdateDate), frontierProtectionDevCurrentDataQo.getEndUpdateDate()) // 通过portStatus1线锁1 状态 1-正常；2-断开；3-正常断开 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getPortStatus1() != null, FrontierProtectionDevCurrentData::getPortStatus1, frontierProtectionDevCurrentDataQo.getPortStatus1()) + .eq(frontierProtectionDevCurrentDataQo.getPortStatus1() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getPortStatus1), frontierProtectionDevCurrentDataQo.getPortStatus1()) // 通过portStatus2线锁2 状态 1-正常；2-断开；3-正常断开 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getPortStatus2() != null, FrontierProtectionDevCurrentData::getPortStatus2, frontierProtectionDevCurrentDataQo.getPortStatus2()) + .eq(frontierProtectionDevCurrentDataQo.getPortStatus2() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getPortStatus2), frontierProtectionDevCurrentDataQo.getPortStatus2()) // 通过magStatus1磁锁1 状态 1-正常；2-报警；3-失效 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getMagStatus1() != null, FrontierProtectionDevCurrentData::getMagStatus1, frontierProtectionDevCurrentDataQo.getMagStatus1()) + .eq(frontierProtectionDevCurrentDataQo.getMagStatus1() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getMagStatus1), frontierProtectionDevCurrentDataQo.getMagStatus1()) // 通过magStatus2磁锁2 状态 1-正常；2-报警；3-失效 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getMagStatus2() != null, FrontierProtectionDevCurrentData::getMagStatus2, frontierProtectionDevCurrentDataQo.getMagStatus2()) + .eq(frontierProtectionDevCurrentDataQo.getMagStatus2() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getMagStatus2), frontierProtectionDevCurrentDataQo.getMagStatus2()) // 通过antiCross防翻越 1-正常；2-报警；3-失效 精准查询 - .eq(frontierProtectionDevCurrentDataQo.getAntiCross() != null, FrontierProtectionDevCurrentData::getAntiCross, frontierProtectionDevCurrentDataQo.getAntiCross()); + .eq(frontierProtectionDevCurrentDataQo.getAntiCross() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getAntiCross), frontierProtectionDevCurrentDataQo.getAntiCross()) + .orderByDesc(ReflectionUtil.getFieldNameToUlc(FrontierProtectionDevCurrentData::getReceiveTime)); - return frontierProtectionDevCurrentDataMapper.selectPage(page, wrapper.orderByDesc(FrontierProtectionDevCurrentData::getReceiveTime)); + return frontierProtectionDevCurrentDataMapper.selectPageDetail(page, wrapper); } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java index daa886725..af29d8a8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontier/service/impl/FrontierProtectionDevServiceImpl.java @@ -1,15 +1,15 @@ package com.zhgd.xmgl.modules.frontier.service.impl; import cn.hutool.core.text.CharSequenceUtil; -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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.frontier.entity.FrontierProtectionDev; import com.zhgd.xmgl.modules.frontier.entity.qo.FrontierProtectionDevQO; import com.zhgd.xmgl.modules.frontier.mapper.FrontierProtectionDevMapper; import com.zhgd.xmgl.modules.frontier.service.FrontierProtectionDevService; +import com.zhgd.xmgl.util.ReflectionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,24 +27,26 @@ public class FrontierProtectionDevServiceImpl extends ServiceImpl selectPageInfo(Page page, FrontierProtectionDevQO frontierProtectionDevQo) { + String alias = "fpd."; // 查询临边防护-设备条件 根据需求调整 - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getDevSn()), FrontierProtectionDev::getDevSn, frontierProtectionDevQo.getDevSn()) - .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getDevName()), FrontierProtectionDev::getDevName, frontierProtectionDevQo.getDevName()) - .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getLocation()), FrontierProtectionDev::getLocation, frontierProtectionDevQo.getLocation()) + QueryWrapper wrapper = new QueryWrapper() + .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getDevSn()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getDevSn), frontierProtectionDevQo.getDevSn()) + .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getDevName()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getDevName), frontierProtectionDevQo.getDevName()) + .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getLocation()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getLocation), frontierProtectionDevQo.getLocation()) // 通过devType设备类型 1.xxx 2.xxx 精准查询 - .eq(frontierProtectionDevQo.getDevType() != null, FrontierProtectionDev::getDevType, frontierProtectionDevQo.getDevType()) - .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getProjectSn()), FrontierProtectionDev::getProjectSn, frontierProtectionDevQo.getProjectSn()) + .eq(frontierProtectionDevQo.getDevType() != null, alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getDevType), frontierProtectionDevQo.getDevType()) + .like(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getProjectSn()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getProjectSn), frontierProtectionDevQo.getProjectSn()) // 创建时间 yyyy-MM-dd HH:mm:ss 之后 - .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getStartCreateDate()), FrontierProtectionDev::getCreateDate, frontierProtectionDevQo.getStartCreateDate()) + .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getStartCreateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getCreateDate), frontierProtectionDevQo.getStartCreateDate()) // 创建时间 yyyy-MM-dd HH:mm:ss 之前 - .le(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getEndCreateDate()), FrontierProtectionDev::getCreateDate, frontierProtectionDevQo.getEndCreateDate()) + .le(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getEndCreateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getCreateDate), frontierProtectionDevQo.getEndCreateDate()) // 更新时间 yyyy-MM-dd HH:mm:ss 之后 - .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getStartUpdateDate()), FrontierProtectionDev::getUpdateDate, frontierProtectionDevQo.getStartUpdateDate()) + .ge(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getStartUpdateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getUpdateDate), frontierProtectionDevQo.getStartUpdateDate()) // 更新时间 yyyy-MM-dd HH:mm:ss 之前 - .le(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getEndUpdateDate()), FrontierProtectionDev::getUpdateDate, frontierProtectionDevQo.getEndUpdateDate()); + .le(CharSequenceUtil.isNotBlank(frontierProtectionDevQo.getEndUpdateDate()), alias + ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getUpdateDate), frontierProtectionDevQo.getEndUpdateDate()) + .orderByDesc(ReflectionUtil.getFieldNameToUlc(FrontierProtectionDev::getCreateDate)); - return frontierProtectionDevMapper.selectPage(page, wrapper); + return frontierProtectionDevMapper.selectPageDetail(page, wrapper); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 1dee98c98..809221038 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -240,7 +240,7 @@ ELSE 0 END)), 0) certificate_person_total, SUM(wc.num) certificate_total, - round(SUM(wc.num)/COUNT(1)*100,2) certificate_rate, + round(SUM(wc.num) / COUNT(1) * 100, 2) certificate_rate, IFNULL(AVG(IFNULL(TIMESTAMPDIFF(YEAR, w1.birthday, CURDATE()), 0)), 0) avgage, IFNULL(sum((CASE WHEN IFNULL(TIMESTAMPDIFF(YEAR, w1.birthday, CURDATE()), 0) < 18 then 1 ELSE 0 END)), 0) age18, @@ -271,8 +271,11 @@ Left JOIN company f ON b.parent_id = f.company_id Left JOIN team_info g ON w1.team_id = g.id Left JOIN worker_blacklist ba ON w1.id = ba.worker_id - LEFT JOIN (SELECT wi.id,count(*) num FROM worker_certificate wc,worker_info wi WHERE wc.worker_id=wi.id GROUP BY - wi.id) wc ON wc.id=w1.id + LEFT JOIN (SELECT wi.id, count(*) num + FROM worker_certificate wc, + worker_info wi + WHERE wc.worker_id = wi.id + GROUP BY wi.id) wc ON wc.id = w1.id where w1.inService_type = 1 and a.project_name like CONCAT(CONCAT('%', #{projectName}), '%') @@ -413,10 +416,10 @@