|
@@ -38,20 +38,6 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
|
|
|
QueryWrapper<SpSj2017> queryWrapper = Wrappers.query();
|
|
|
queryWrapper.select("DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') AS alarm_time","data1 AS alarm_type","data4 AS alarm_point " ,"device_code")
|
|
|
.inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
|
|
|
- if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
|
|
|
-
|
|
|
- }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
|
|
|
- // 如果同时传了 startTime 和 endTime
|
|
|
- queryWrapper.between("time", startTimeString, endTimeString);
|
|
|
- } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
|
|
|
- // 如果只传了 startTime
|
|
|
- queryWrapper.between("time", startTimeString, LocalDateTime.now().toString());
|
|
|
- } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
|
|
|
- // 如果只传了 endTime
|
|
|
- queryWrapper.le("time", endTimeString);
|
|
|
- } else {
|
|
|
- throw new BusinessException("时间参数错误");
|
|
|
- }
|
|
|
queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
|
|
|
.orderByDesc("id");
|
|
|
List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
|
|
@@ -66,20 +52,6 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
|
|
|
QueryWrapper<SpSj2017> queryWrapper1 = Wrappers.query();
|
|
|
queryWrapper1.select("COUNT(CASE WHEN clzt = 0 THEN 1 ELSE NULL END) AS untreated", "COUNT(CASE WHEN clzt = 1 THEN 1 ELSE NULL END) AS processed")
|
|
|
.inSql("device_code", "SELECT owner_code FROM sp_owner WHERE company = '" + companyCode + "' AND dwtype IN (2,5)");
|
|
|
- if (StringUtils.isBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
|
|
|
-
|
|
|
- }else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isNotBlank(endTimeString)) {
|
|
|
- // 如果同时传了 startTime 和 endTime
|
|
|
- queryWrapper1.between("time", startTimeString, endTimeString);
|
|
|
- } else if (StringUtils.isNotBlank(startTimeString) && StringUtils.isBlank(endTimeString)) {
|
|
|
- // 如果只传了 startTime
|
|
|
- queryWrapper1.between("time", startTimeString, LocalDateTime.now().toString());
|
|
|
- } else if (StringUtils.isNotBlank(endTimeString) && StringUtils.isBlank(startTimeString)) {
|
|
|
- // 如果只传了 endTime
|
|
|
- queryWrapper1.le("time", endTimeString);
|
|
|
- } else {
|
|
|
- throw new BusinessException("时间参数错误");
|
|
|
- }
|
|
|
List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
|
|
|
return deviceStatusList1;
|
|
|
}
|