From 76c0aa74f105d8b1fc5ba11439b10c85f36a039a Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 01:21:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(property):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E7=94=B5/=E6=B0=B4/=E6=B0=94=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbMeterRecordController.java | 23 ++++++- .../TbMeterRecordMapper.java | 9 +++ .../TbMeterRecordServiceImpl.java | 29 +++++++-- .../ITbMeterRecordService.java | 12 ++++ .../TbMeterReocordMapper.xml | 60 +++++++++++++++++++ 5 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java index d25a2488..998c8208 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java @@ -65,7 +65,7 @@ public class TbMeterRecordController extends BaseController { @SaCheckPermission("property:meterRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(tbMeterRecordService.queryById(id)); } @@ -103,4 +103,25 @@ public class TbMeterRecordController extends BaseController { @PathVariable("ids") Long[] ids) { return toAjax(tbMeterRecordService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 获取用电/水/气趋势分析数据 + * + * @param floorId 楼层id + * @param meterId 仪表id + * @param meterType 仪表类型 + * @param day 日期 + * @param month 月份 + * @param year 年份 + */ + @GetMapping("/trend") + public R getEnergyTrend(@RequestParam(required = false) String floorId, + @RequestParam(required = false) String meterId, + @RequestParam Long meterType, + @RequestParam String day, + @RequestParam String month, + @RequestParam String year) { + tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year); + return R.ok(); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java index e82a4650..73a1068e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/smartDevicesMapper/TbMeterRecordMapper.java @@ -1,10 +1,14 @@ package org.dromara.property.mapper.smartDevicesMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.dromara.property.domain.entity.smartDevices.TbMeterRecord; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; +import java.util.Map; + /** * 抄记录Mapper接口 * @@ -14,4 +18,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @Mapper public interface TbMeterRecordMapper extends BaseMapperPlus { + List> getHourTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("day") String day); + + List> getDayTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("year") String year, @Param("month") String month); + + List> getMonthTrend(@Param("floorId") Long floorId, @Param("meterId") Long meterId, @Param("meterType") Long meterType, @Param("year") String year); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java index df552533..bcbdb9c2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java @@ -3,9 +3,8 @@ package org.dromara.property.service.impl.smartDevicesImpl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.json.JSONObject; +import cn.hutool.core.util.StrUtil; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,13 +12,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterInfoBo; import org.dromara.property.domain.enums.MeterRecordTypeEnum; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterInfoVo; import org.dromara.property.rocketmq.domain.MeterResult; import org.dromara.property.service.smartDevicesService.ITbMeterInfoService; -import org.dromara.system.api.model.LoginUser; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.smartDevicesBo.TbMeterRecordBo; import org.dromara.property.domain.vo.smartDevicesVo.TbMeterRecordVo; @@ -225,4 +222,28 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService { Assert.isTrue(flag, "批量写入抄表记录失败!"); } } + + /** + * 获取用电/水/气趋势分析数据 + * + * @param floorId 楼层id + * @param meterId 仪表id + * @param meterType 仪表类型 + * @param day 日期 + * @param month 月份 + * @param year 年份 + */ + @Override + public void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year) { + + List> hourList = baseMapper.getHourTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, day); + log.info("小时数据：{}", hourList); + + String[] monthArr = month.split("-"); + List> dayList = baseMapper.getDayTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, monthArr[0], monthArr[1]); + log.info("天数据：{}", dayList); + + List> monthList = baseMapper.getMonthTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, year); + log.info("月数据：{}", monthList); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java index 4b8b30f9..b084f76a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java @@ -73,4 +73,16 @@ public interface ITbMeterRecordService { * @param results 推送消息 */ void autoWriteMeterRecord(List results); + + /** + * 获取用电/水/气趋势分析数据 + * + * @param floorId 楼层id + * @param meterId 仪表id + * @param meterType 仪表类型 + * @param day 日期 + * @param month 月份 + * @param year 年份 + */ + void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year); } diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml new file mode 100644 index 00000000..e3fca9c9 --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + From cfff5df7d01a49e61b8e4be10d89754462d43b5a Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 15:05:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(property):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E8=B6=8B=E5=8A=BF=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbMeterRecordController.java | 7 +- .../vo/smartDevicesVo/TbMeterInfoVo.java | 5 ++ .../TbMeterRecordServiceImpl.java | 43 ++++++++++- .../ITbMeterRecordService.java | 3 +- .../TbMeterReocordMapper.xml | 4 +- .../sis/controller/SisVisitorController.java | 75 +++++++++---------- .../sdk/e8/service/E8PlatformApiService.java | 2 + 7 files changed, 89 insertions(+), 50 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java index 998c8208..2c4fbbd2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java @@ -1,6 +1,7 @@ package org.dromara.property.controller.smartDevicesController; import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -115,13 +116,13 @@ public class TbMeterRecordController extends BaseController { * @param year 年份 */ @GetMapping("/trend") - public R getEnergyTrend(@RequestParam(required = false) String floorId, + public R> getEnergyTrend(@RequestParam(required = false) String floorId, @RequestParam(required = false) String meterId, @RequestParam Long meterType, @RequestParam String day, @RequestParam String month, @RequestParam String year) { - tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year); - return R.ok(); + Map resultMap = tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year); + return R.ok(resultMap); } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java index 467f85c3..2ec7ef46 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java @@ -133,6 +133,11 @@ public class TbMeterInfoVo implements Serializable { @ExcelProperty(value = "采集器IP") private String hostIp; + /** + * 租户编号 + */ + private String tenantId; + /** * 备注 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java index bcbdb9c2..13793fdd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java @@ -194,6 +194,7 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService { record.setMeterType(info.getMeterType()); record.setReaderId(1L); record.setReadingTime(DateUtil.parse(result.getRecordTime(), "yyyy-MM-dd HH:mm:ss")); + record.setTenantId(info.getTenantId()); // 获取当前读数 BigDecimal currentReading = BigDecimal.valueOf( @@ -234,16 +235,50 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService { * @param year 年份 */ @Override - public void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year) { + public Map getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year) { + Map resultMap = new HashMap<>(); + // hour List> hourList = baseMapper.getHourTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, day); - log.info("小时数据：{}", hourList); + Map hourMap = new HashMap<>(); + String[] hourCategories = hourList.stream() + .map(map -> map.get("hour").toString()) + .toArray(String[]::new); + BigDecimal[] hourData = hourList.stream() + .map(map -> new BigDecimal(map.get("total_consumption").toString())) + .toArray(BigDecimal[]::new); + hourMap.put("categories", hourCategories); + hourMap.put("data", hourData); + // day String[] monthArr = month.split("-"); List> dayList = baseMapper.getDayTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, monthArr[0], monthArr[1]); - log.info("天数据：{}", dayList); + Map dayMap = new HashMap<>(); + String[] dayCategories = dayList.stream() + .map(map -> map.get("day").toString()) + .toArray(String[]::new); + BigDecimal[] dayData = dayList.stream() + .map(map -> new BigDecimal(map.get("total_consumption").toString())) + .toArray(BigDecimal[]::new); + dayMap.put("categories", dayCategories); + dayMap.put("data", dayData); + // month List> monthList = baseMapper.getMonthTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, year); - log.info("月数据：{}", monthList); + Map monthMap = new HashMap<>(); + String[] monthCategories = monthList.stream() + .map(map -> map.get("month").toString()) + .toArray(String[]::new); + BigDecimal[] monthData = monthList.stream() + .map(map -> new BigDecimal(map.get("total_consumption").toString())) + .toArray(BigDecimal[]::new); + monthMap.put("categories", monthCategories); + monthMap.put("data", monthData); + + + resultMap.put("hour", hourMap); + resultMap.put("day", dayMap); + resultMap.put("month", monthMap); + return resultMap; } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java index b084f76a..795ee91e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/smartDevicesService/ITbMeterRecordService.java @@ -8,6 +8,7 @@ import org.dromara.property.rocketmq.domain.MeterResult; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 抄记录Service接口 @@ -84,5 +85,5 @@ public interface ITbMeterRecordService { * @param month 月份 * @param year 年份 */ - void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year); + Map getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year); } diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml index e3fca9c9..b56d55e2 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml @@ -15,8 +15,8 @@ AND a.meter_id = #{meterId} - GROUP BY CONCAT_WS(':', HOUR(reading_time), '00') - ORDER BY hour + GROUP BY CONCAT_WS(':', HOUR(reading_time), '00'), HOUR(reading_time) + ORDER BY HOUR(reading_time) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java index c0ce0a21..588bd650 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java @@ -4,6 +4,8 @@ package org.dromara.sis.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -17,6 +19,7 @@ import org.dromara.sis.service.ISisPersonLibImgService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -40,46 +43,38 @@ public class SisVisitorController { * 查询人员通行记录 */ @GetMapping("/list") - public TableDataInfo list(QueryDto dto) { + public TableDataInfo list(@RequestParam(required = false) String beginTime, + @RequestParam(required = false) String endTime, + @NotNull(message = "页码不能为空") @RequestParam Integer pageNum, + @NotNull(message = "页数不能为空") @RequestParam Integer pageSize, + @RequestParam(required = false) String personName, + @RequestParam(required = false) Integer recordType) { + AccessRecordFindReq req = new AccessRecordFindReq(); + if (beginTime != null && !beginTime.isEmpty()) { + req.setStartTime(DateUtil.format(DateUtil.parse(beginTime), "yyyy-MM-dd 00:00:00")); + } else { + // 默认设置为7天前 + req.setStartTime(DateUtil.format(DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, -7), "yyyy-MM-dd 00:00:00")); + } + if (endTime != null && !endTime.isEmpty()) { + req.setEndTime(DateUtil.format(DateUtil.parse(endTime), "yyyy-MM-dd 23:59:59")); + } else { + // 默认设置为今天 + req.setEndTime(DateUtil.format(new Date(), "yyyy-MM-dd 23:59:59")); + } - TableDataInfo tableDataInfo = new TableDataInfo(); - List accessRecordFindResList = new ArrayList<>(); - AccessRecordFindRes accessRecordFindRes = new AccessRecordFindRes(); - accessRecordFindRes.setDeviceName("4#岗亭09"); - accessRecordFindRes.setDoorName("4#岗亭09"); - accessRecordFindRes.setDeviceType(1102); - accessRecordFindRes.setReaderName(""); - accessRecordFindRes.setGatewayType(1); - accessRecordFindRes.setCustomerName("德隆吴鹏"); - accessRecordFindRes.setOrganFullPath("主楼11楼"); - accessRecordFindRes.setPictureUrl("https://bpic.588ku.com/back_list_pic/23/04/21/ef5e2a3dd5cfc336fdcf2fd000474f0f.jpg"); - accessRecordFindRes.setCardType(34); - accessRecordFindRes.setRecordType(2); - accessRecordFindRes.setActionTime(new Date()); - accessRecordFindResList.add(accessRecordFindRes); - tableDataInfo.setRows(accessRecordFindResList); - tableDataInfo.setTotal(1); - tableDataInfo.setCode(200); - return tableDataInfo; -// -// dto.setPageIndex(1); -// dto.setMaxResultCount(20); -// -// // 10秒内 -// String starTime = DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, -10), "yyyy-MM-dd HH:mm:ss"); -// String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); -// -// AccessRecordFindReq lift = new AccessRecordFindReq(); -// lift.setStartTime(starTime); -// lift.setEndTime(endTime); -// lift.setRecordType(2); -// // 9号电梯 -// lift.setDeviceId(550757939925061L); -// dto.setQueryDto(lift); -//// TableDataInfo nineLiftList = e8PlatformApi.getPageAccessRecordList(dto); -// TableDataInfo pageAccessRecordList = new TableDataInfo(); -// -// return e8PlatformApi.getPageAccessRecordList(dto); - //如果pageAccessRecordList报错就捕获并封装 + if (personName != null && !personName.isEmpty()) { + req.setCustomerName(personName); + } + + if (recordType != null) { + req.setRecordType(recordType); + } + + QueryDto dto = new QueryDto(); + dto.setQueryDto(req); + dto.setPageIndex(pageNum); + dto.setMaxResultCount(pageSize); + return e8PlatformApi.getPageAccessRecordList(dto); } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java index 6a0096ee..673c7090 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java @@ -422,6 +422,8 @@ public class E8PlatformApiService implements E8PlatformApi { tableData.setTotal(Long.parseLong(result.get("total").toString())); // 从结果映射中获取项目列表，转换为访问记录信息列表后设置到分页对象中 tableData.setRows(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), AccessRecordFindRes.class)); + tableData.setCode(200); + tableData.setMsg("查询成功"); // 返回填充了数据的分页对象 return tableData; } From 130e3aeb048166ed0f9b78f8cd7b66859b0186ed Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Thu, 28 Aug 2025 15:18:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/service/impl/AppFunListServiceImpl.java | 9 +++++---- .../property/service/impl/ApplicationServiceImpl.java | 4 +++- .../dromara/property/service/impl/AssetServiceImpl.java | 8 +++----- .../property/service/impl/AssetTypeServiceImpl.java | 4 +++- .../service/impl/CapitalApplicationServiceImpl.java | 3 ++- .../property/service/impl/CarInfoServiceImpl.java | 4 +++- .../property/service/impl/CarTypeServiceImpl.java | 4 +++- .../property/service/impl/ConteactServiceImpl.java | 4 +++- .../property/service/impl/CostCarChargeServiceImpl.java | 8 +++----- .../service/impl/CostHouseChargeServiceImpl.java | 8 +++----- .../property/service/impl/CostItemsServiceImpl.java | 4 +++- .../property/service/impl/CostMeterTypeServiceImpl.java | 4 +++- .../property/service/impl/CostMeterWaterServiceImpl.java | 4 +++- .../service/impl/CostPayFeeAuditServiceImpl.java | 4 +++- .../service/impl/CostReturnPayFeeServiceImpl.java | 4 +++- .../service/impl/CustomerContingenPlanServiceImpl.java | 4 +++- .../service/impl/CustomerFeedbacksServiceImpl.java | 8 +++----- .../service/impl/CustomerNoticesServiceImpl.java | 4 +++- .../property/service/impl/DepotLogServiceImpl.java | 4 +++- .../dromara/property/service/impl/DepotServiceImpl.java | 4 +++- .../property/service/impl/FaqManagementServiceImpl.java | 4 +++- .../property/service/impl/InspectionItemServiceImpl.java | 4 +++- .../property/service/impl/InspectionPlanServiceImpl.java | 8 +++----- .../service/impl/InspectionPlanStaffServiceImpl.java | 4 +++- .../service/impl/InspectionPointServiceImpl.java | 4 +++- .../service/impl/InspectionRouteServiceImpl.java | 4 +++- .../service/impl/InspectionStaffServiceImpl.java | 4 +++- .../service/impl/InspectionTaskDetailServiceImpl.java | 4 +++- .../property/service/impl/InspectionTaskServiceImpl.java | 4 +++- .../service/impl/MachineLocationServiceImpl.java | 4 +++- .../service/impl/MachineMaintainPlanServiceImpl.java | 4 +++- .../impl/MachineMaintainPlanStaffServiceImpl.java | 4 +++- .../impl/MachineMaintainTaskDetailServiceImpl.java | 4 +++- .../service/impl/MachineMaintainTaskServiceImpl.java | 4 +++- .../property/service/impl/MachineServiceImpl.java | 4 +++- .../property/service/impl/MachineTypeServiceImpl.java | 4 +++- .../service/impl/MaintainKnowledgeServiceImpl.java | 4 +++- .../property/service/impl/MeetAttachServiceImpl.java | 4 +++- .../property/service/impl/MeetBookingServiceImpl.java | 4 +++- .../dromara/property/service/impl/MeetServiceImpl.java | 3 ++- .../service/impl/PlantsOrderChargeServiceImpl.java | 4 +++- .../service/impl/PlantsOrderMaintainServiceImpl.java | 4 +++- .../service/impl/PlantsPlanProductServiceImpl.java | 4 +++- .../property/service/impl/PlantsProductServiceImpl.java | 4 +++- .../service/impl/PlantsRentalOrderServiceImpl.java | 4 +++- .../service/impl/PlantsRentalPlanServiceImpl.java | 4 +++- .../service/impl/PopularActivitiesServiceImpl.java | 4 +++- .../property/service/impl/QuestionnaireServiceImpl.java | 4 +++- .../property/service/impl/ResidentPersonServiceImpl.java | 4 +++- .../property/service/impl/ResidentUnitServiceImpl.java | 4 +++- .../property/service/impl/ServerBookingServiceImpl.java | 4 +++- .../dromara/property/service/impl/ServerServiceImpl.java | 4 +++- .../property/service/impl/ServiceWarningServiceImpl.java | 4 +++- .../service/impl/ServiceWorkOrdersServiceImpl.java | 3 ++- .../property/service/impl/SuppliersServiceImpl.java | 4 +++- .../property/service/impl/TbAreaGroupServiceImpl.java | 4 +++- .../property/service/impl/TbBuildingServiceImpl.java | 4 +++- .../service/impl/TbCeremonialServeServiceImpl.java | 4 +++- .../impl/TbCeremonialserveRoombookingServiceImpl.java | 4 +++- .../property/service/impl/TbCommunityServiceImpl.java | 4 +++- .../property/service/impl/TbConferenceServiceImpl.java | 4 +++- .../property/service/impl/TbE8ConfigServiceImpl.java | 4 +++- .../property/service/impl/TbFloorServiceImpl.java | 4 +++- .../property/service/impl/TbRoomBookingServiceImpl.java | 4 +++- .../dromara/property/service/impl/TbRoomServiceImpl.java | 4 +++- .../service/impl/TbServiceClassificationServiceImpl.java | 4 +++- .../dromara/property/service/impl/TbUnitServiceImpl.java | 4 +++- .../property/service/impl/TbUserGroupServiceImpl.java | 4 +++- .../service/impl/TbVisitorManagementServiceImpl.java | 4 +++- .../property/service/impl/TdDeviceTypeServiceImpl.java | 4 +++- .../property/service/impl/TsConfigServiceImpl.java | 4 +++- .../property/service/impl/TsOperationLogServiceImpl.java | 4 +++- .../property/service/impl/VerificationServiceImpl.java | 4 +++- 73 files changed, 218 insertions(+), 96 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java index 42912b25..eb32731c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AppFunListServiceImpl.java @@ -46,7 +46,7 @@ public class AppFunListServiceImpl implements IAppFunListService { * @return APP功能列表 */ @Override - public AppFunListVo queryById(Long id){ + public AppFunListVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -80,7 +80,8 @@ public class AppFunListServiceImpl implements IAppFunListService { private LambdaQueryWrapper buildQueryWrapper(AppFunListBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(AppFunList::getId); + lqw.orderByDesc(AppFunList::getCreateTime) + .orderByDesc(AppFunList::getUpdateTime); lqw.eq(bo.getRoleid() != null, AppFunList::getRoleid, bo.getRoleid()); lqw.like(StringUtils.isNotBlank(bo.getName()), AppFunList::getName, bo.getName()); lqw.eq(StringUtils.isNotBlank(bo.getIcon()), AppFunList::getIcon, bo.getIcon()); @@ -121,7 +122,7 @@ public class AppFunListServiceImpl implements IAppFunListService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(AppFunList entity){ + private void validEntityBeforeSave(AppFunList entity) { //TODO 做一些数据校验,如唯一约束 } @@ -134,7 +135,7 @@ public class AppFunListServiceImpl implements IAppFunListService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java index 80d4c0dd..acb02424 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ApplicationServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.property.domain.AppFunList; import org.dromara.property.domain.Asset; import org.dromara.property.domain.DepotLog; import org.dromara.property.domain.vo.AssetVo; @@ -134,7 +135,8 @@ public class ApplicationServiceImpl implements IApplicationService { private LambdaQueryWrapper buildQueryWrapper(ApplicationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Application::getId); + lqw.orderByDesc(Application::getCreateTime) + .orderByDesc(Application::getUpdateTime); lqw.eq(bo.getAssetId() != null, Application::getAssetId, bo.getAssetId()); lqw.eq(bo.getUserId() != null, Application::getUserId, bo.getUserId()); lqw.eq(bo.getNumber() != null, Application::getNumber, bo.getNumber()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java index 039ef3c6..49f584ad 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetServiceImpl.java @@ -9,16 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.property.domain.AssetType; -import org.dromara.property.domain.Depot; -import org.dromara.property.domain.Suppliers; +import org.dromara.property.domain.*; import org.dromara.property.mapper.AssetTypeMapper; import org.dromara.property.mapper.DepotMapper; import org.dromara.property.mapper.SuppliersMapper; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.AssetBo; import org.dromara.property.domain.vo.AssetVo; -import org.dromara.property.domain.Asset; import org.dromara.property.mapper.AssetMapper; import org.dromara.property.service.IAssetService; @@ -114,7 +111,8 @@ public class AssetServiceImpl implements IAssetService { private LambdaQueryWrapper buildQueryWrapper(AssetBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Asset::getId); + lqw.orderByDesc(Asset::getCreateTime) + .orderByDesc(Asset::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getName()), Asset::getName, bo.getName()); lqw.eq(StringUtils.isNotBlank(bo.getModel()), Asset::getModel, bo.getModel()); lqw.eq(StringUtils.isNotBlank(bo.getSpecs()), Asset::getSpecs, bo.getSpecs()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java index fad7357c..8f257711 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AssetTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Asset; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.AssetTypeBo; import org.dromara.property.domain.vo.AssetTypeVo; @@ -73,7 +74,8 @@ public class AssetTypeServiceImpl implements IAssetTypeService { private LambdaQueryWrapper buildQueryWrapper(AssetTypeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(AssetType::getSort); + lqw.orderByDesc(AssetType::getCreateTime) + .orderByDesc(AssetType::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getAssetTypeName()), AssetType::getAssetTypeName, bo.getAssetTypeName()); lqw.eq(bo.getSort() != null, AssetType::getSort, bo.getSort()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java index 02ed3ce6..beb8846f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CapitalApplicationServiceImpl.java @@ -115,7 +115,8 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService private LambdaQueryWrapper buildQueryWrapper(CapitalApplicationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CapitalApplication::getId); + lqw.orderByDesc(CapitalApplication::getCreateTime) + .orderByDesc(CapitalApplication::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CapitalApplication::getTitle, bo.getTitle()); lqw.eq(bo.getApplicat() != null, CapitalApplication::getApplicat, bo.getApplicat()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CapitalApplication::getPhone, bo.getPhone()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarInfoServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarInfoServiceImpl.java index c6b712fc..9d7db3dd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarInfoServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CapitalApplication; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CarInfoBo; import org.dromara.property.domain.vo.CarInfoVo; @@ -73,7 +74,8 @@ public class CarInfoServiceImpl implements ICarInfoService { private LambdaQueryWrapper buildQueryWrapper(CarInfoBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CarInfo::getId); + lqw.orderByDesc(CarInfo::getCreateTime) + .orderByDesc(CarInfo::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CarInfo::getCarNumber, bo.getCarNumber()); lqw.eq(StringUtils.isNotBlank(bo.getCarFrameNumber()), CarInfo::getCarFrameNumber, bo.getCarFrameNumber()); lqw.eq(StringUtils.isNotBlank(bo.getCarColour()), CarInfo::getCarColour, bo.getCarColour()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarTypeServiceImpl.java index 1fc20aa0..428f5a77 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CarTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CarInfo; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CarTypeBo; import org.dromara.property.domain.vo.CarTypeVo; @@ -73,7 +74,8 @@ public class CarTypeServiceImpl implements ICarTypeService { private LambdaQueryWrapper buildQueryWrapper(CarTypeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CarType::getId); + lqw.orderByDesc(CarType::getCreateTime) + .orderByDesc(CarType::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getCarTypeNumber()), CarType::getCarTypeNumber, bo.getCarTypeNumber()); lqw.like(StringUtils.isNotBlank(bo.getCarTypeName()), CarType::getCarTypeName, bo.getCarTypeName()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ConteactServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ConteactServiceImpl.java index baf94444..a6b3601d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ConteactServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ConteactServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CarType; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.ConteactBo; import org.dromara.property.domain.vo.ConteactVo; @@ -73,7 +74,8 @@ public class ConteactServiceImpl implements IConteactService { private LambdaQueryWrapper buildQueryWrapper(ConteactBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Conteact::getId); + lqw.orderByDesc(Conteact::getCreateTime) + .orderByDesc(Conteact::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getContract()), Conteact::getContract, bo.getContract()); lqw.like(StringUtils.isNotBlank(bo.getName()), Conteact::getName, bo.getName()); lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Conteact::getMsg, bo.getMsg()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java index 993f144f..d0c778df 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java @@ -14,10 +14,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.property.domain.CostCarCharge; -import org.dromara.property.domain.CostPayFeeAudit; -import org.dromara.property.domain.CostReturnPayFee; -import org.dromara.property.domain.ResidentPerson; +import org.dromara.property.domain.*; import org.dromara.property.domain.bo.CostCarChargeBo; import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; @@ -109,7 +106,8 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { private LambdaQueryWrapper buildQueryWrapper(CostCarChargeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostCarCharge::getId); + lqw.orderByDesc(CostCarCharge::getCreateTime) + .orderByDesc(CostCarCharge::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CostCarCharge::getCarNumber, bo.getCarNumber()); lqw.eq(bo.getPersonId() != null, CostCarCharge::getPersonId, bo.getPersonId()); lqw.eq(bo.getFloorId() != null, CostCarCharge::getFloorId, bo.getFloorId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java index 2debf50a..b8fb38c3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java @@ -15,9 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.property.domain.CostPayFeeAudit; -import org.dromara.property.domain.CostReturnPayFee; -import org.dromara.property.domain.ResidentPerson; +import org.dromara.property.domain.*; import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; import org.dromara.property.domain.vo.*; @@ -26,7 +24,6 @@ import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.vo.RemoteUserVo; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CostHouseChargeBo; -import org.dromara.property.domain.CostHouseCharge; import org.dromara.property.service.ICostHouseChargeService; import org.springframework.transaction.annotation.Transactional; @@ -117,7 +114,8 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService { private LambdaQueryWrapper buildQueryWrapper(CostHouseChargeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostHouseCharge::getId); + lqw.orderByDesc(CostHouseCharge::getCreateTime) + .orderByDesc(CostHouseCharge::getUpdateTime); lqw.eq(bo.getRoomId() != null, CostHouseCharge::getRoomId, bo.getRoomId()); lqw.eq(bo.getCostItemsId() != null, CostHouseCharge::getCostItemsId, bo.getCostItemsId()); lqw.eq(StringUtils.isNotBlank(bo.getChargeCycle()), CostHouseCharge::getChargeCycle, bo.getChargeCycle()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java index 20a614dc..7aae22d4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostItemsServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CostHouseCharge; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CostItemsBo; import org.dromara.property.domain.vo.CostItemsVo; @@ -75,7 +76,8 @@ public class CostItemsServiceImpl implements ICostItemsService { private LambdaQueryWrapper buildQueryWrapper(CostItemsBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostItems::getId); + lqw.orderByDesc(CostItems::getCreateTime) + .orderByDesc(CostItems::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostItems::getCostType, bo.getCostType()); lqw.eq(StringUtils.isNotBlank(bo.getChargeItem()), CostItems::getChargeItem, bo.getChargeItem()); lqw.eq(StringUtils.isNotBlank(bo.getChargeNo()), CostItems::getChargeNo, bo.getChargeNo()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterTypeServiceImpl.java index a0009535..ed74a1d8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CostItems; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.CostMeterTypeBo; import org.dromara.property.domain.vo.CostMeterTypeVo; @@ -74,7 +75,8 @@ public class CostMeterTypeServiceImpl implements ICostMeterTypeService { private LambdaQueryWrapper buildQueryWrapper(CostMeterTypeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostMeterType::getId); + lqw.orderByDesc(CostMeterType::getCreateTime) + .orderByDesc(CostMeterType::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getMeterType()), CostMeterType::getMeterType, bo.getMeterType()); lqw.like(StringUtils.isNotBlank(bo.getName()), CostMeterType::getName, bo.getName()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), CostMeterType::getSearchValue, bo.getSearchValue()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterWaterServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterWaterServiceImpl.java index b8e5e537..8d9ad55f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterWaterServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostMeterWaterServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.CostMeterType; import org.dromara.property.domain.vo.CostMeterTypeVo; import org.dromara.property.mapper.CostMeterTypeMapper; import org.springframework.stereotype.Service; @@ -91,7 +92,8 @@ public class CostMeterWaterServiceImpl implements ICostMeterWaterService { private LambdaQueryWrapper buildQueryWrapper(CostMeterWaterBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostMeterWater::getId); + lqw.orderByDesc(CostMeterWater::getCreateTime) + .orderByDesc(CostMeterWater::getUpdateTime); lqw.eq(bo.getItemId() != null, CostMeterWater::getItemId, bo.getItemId()); lqw.eq(bo.getMeterTypeId() != null, CostMeterWater::getMeterTypeId, bo.getMeterTypeId()); lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostMeterWater::getCostType, bo.getCostType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java index c2875629..ff18a5a0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostPayFeeAuditServiceImpl.java @@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.CostCarCharge; import org.dromara.property.domain.CostHouseCharge; +import org.dromara.property.domain.CostMeterWater; import org.dromara.property.domain.CostPayFeeAudit; import org.dromara.property.domain.bo.CostPayFeeAuditBo; import org.dromara.property.domain.enums.ChargeStatusEnum; @@ -130,7 +131,8 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService { private LambdaQueryWrapper buildQueryWrapper(CostPayFeeAuditBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostPayFeeAudit::getId); + lqw.orderByDesc(CostPayFeeAudit::getCreateTime) + .orderByDesc(CostPayFeeAudit::getUpdateTime); lqw.eq(bo.getChargeId() != null, CostPayFeeAudit::getChargeId, bo.getChargeId()); lqw.eq(bo.getItemId() != null, CostPayFeeAudit::getItemId, bo.getItemId()); lqw.eq(bo.getStartTime() != null, CostPayFeeAudit::getStartTime, bo.getStartTime()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostReturnPayFeeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostReturnPayFeeServiceImpl.java index 13028282..77964db4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostReturnPayFeeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostReturnPayFeeServiceImpl.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.CostCarCharge; import org.dromara.property.domain.CostHouseCharge; +import org.dromara.property.domain.CostPayFeeAudit; import org.dromara.property.domain.CostReturnPayFee; import org.dromara.property.domain.bo.CostReturnPayFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; @@ -81,7 +82,8 @@ public class CostReturnPayFeeServiceImpl implements ICostReturnPayFeeService { private LambdaQueryWrapper buildQueryWrapper(CostReturnPayFeeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CostReturnPayFee::getId); + lqw.orderByDesc(CostReturnPayFee::getCreateTime) + .orderByDesc(CostReturnPayFee::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getReturnNo()), CostReturnPayFee::getReturnNo, bo.getReturnNo()); lqw.eq(StringUtils.isNotBlank(bo.getPayNo()), CostReturnPayFee::getPayNo, bo.getPayNo()); lqw.eq(StringUtils.isNotBlank(bo.getReason()), CostReturnPayFee::getReason, bo.getReason()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java index 53822805..4037023b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerContingenPlanServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.translation.annotation.Translation; +import org.dromara.property.domain.CostReturnPayFee; import org.dromara.property.domain.CustomerContingenPlan; import org.dromara.property.domain.CustomerContingenPlanRecord; import org.dromara.property.domain.ResidentPerson; @@ -110,7 +111,8 @@ public class CustomerContingenPlanServiceImpl implements ICustomerContingenPlanS private LambdaQueryWrapper buildQueryWrapper(CustomerContingenPlanBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CustomerContingenPlan::getId); + lqw.orderByDesc(CustomerContingenPlan::getCreateTime) + .orderByDesc(CustomerContingenPlan::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getContingenPlanType()), CustomerContingenPlan::getContingenPlanType, bo.getContingenPlanType()); lqw.eq(ObjectUtil.isNotEmpty(bo.getDutyPersion()), CustomerContingenPlan::getDutyPersion, bo.getDutyPersion()); lqw.like(StringUtils.isNotBlank(bo.getContingenPlanName()), CustomerContingenPlan::getContingenPlanName, bo.getContingenPlanName()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java index 82bc8d29..bbd57e96 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java @@ -14,10 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.property.domain.CustomerFeedbacks; -import org.dromara.property.domain.ServiceWorkOrders; -import org.dromara.property.domain.ServiceWorkOrdersRecord; -import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.*; import org.dromara.property.domain.bo.CustomerFeedbacksBo; import org.dromara.property.domain.bo.ServiceWorkOrdersBo; import org.dromara.property.domain.vo.CustomerFeedbacksVo; @@ -138,7 +135,8 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService { private LambdaQueryWrapper buildQueryWrapper(CustomerFeedbacksBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CustomerFeedbacks::getId); + lqw.orderByDesc(CustomerFeedbacks::getCreateTime) + .orderByDesc(CustomerFeedbacks::getUpdateTime); lqw.eq(ObjectUtil.isNotNull(bo.getFeedbackType()), CustomerFeedbacks::getFeedbackType, bo.getFeedbackType()); lqw.eq(bo.getFeedbackPersion() != null, CustomerFeedbacks::getFeedbackPersion, bo.getFeedbackPersion()); lqw.eq(StringUtils.isNotBlank(bo.getFeedbackPersionPhone()), CustomerFeedbacks::getFeedbackPersionPhone, bo.getFeedbackPersionPhone()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java index 31af0580..f2ccdc1c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerNoticesServiceImpl.java @@ -13,6 +13,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.property.domain.CustomerFeedbacks; import org.dromara.property.domain.CustomerNotices; import org.dromara.property.domain.bo.CustomerNoticesBo; import org.dromara.property.domain.vo.CustomerNoticesVo; @@ -153,7 +154,8 @@ public class CustomerNoticesServiceImpl implements ICustomerNoticesService { private LambdaQueryWrapper buildQueryWrapper(CustomerNoticesBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(CustomerNotices::getId); + lqw.orderByDesc(CustomerNotices::getCreateTime) + .orderByDesc(CustomerNotices::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CustomerNotices::getTitle, bo.getTitle()); lqw.eq(StringUtils.isNotBlank(bo.getType()), CustomerNotices::getType, bo.getType()); lqw.eq(StringUtils.isNotBlank(bo.getIsAll()), CustomerNotices::getIsAll, bo.getIsAll()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotLogServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotLogServiceImpl.java index 2f887bc1..77b8aedf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotLogServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotLogServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.Asset; +import org.dromara.property.domain.CustomerNotices; import org.dromara.property.domain.Depot; import org.dromara.property.mapper.AssetMapper; import org.dromara.property.mapper.DepotMapper; @@ -119,7 +120,8 @@ public class DepotLogServiceImpl implements IDepotLogService { private LambdaQueryWrapper buildQueryWrapper(DepotLogBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(DepotLog::getId); + lqw.orderByDesc(DepotLog::getCreateTime) + .orderByDesc(DepotLog::getUpdateTime); lqw.eq(bo.getDepotId() != null, DepotLog::getDepotId, bo.getDepotId()); lqw.eq(bo.getAssetId() != null, DepotLog::getAssetId, bo.getAssetId()); lqw.eq(bo.getType() != null, DepotLog::getType, bo.getType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotServiceImpl.java index 366431a7..16865cd1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/DepotServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.DepotLog; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.DepotBo; import org.dromara.property.domain.vo.DepotVo; @@ -73,7 +74,8 @@ public class DepotServiceImpl implements IDepotService { private LambdaQueryWrapper buildQueryWrapper(DepotBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Depot::getId); + lqw.orderByDesc(Depot::getCreateTime) + .orderByDesc(Depot::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getDepotName()), Depot::getDepotName, bo.getDepotName()); lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Depot::getMsg, bo.getMsg()); lqw.eq(StringUtils.isNotBlank(bo.getModelType()), Depot::getModelType, bo.getModelType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java index b0ae90fc..6cc7e674 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Depot; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.FaqManagementBo; import org.dromara.property.domain.vo.FaqManagementVo; @@ -73,7 +74,8 @@ public class FaqManagementServiceImpl implements IFaqManagementService { private LambdaQueryWrapper buildQueryWrapper(FaqManagementBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(FaqManagement::getId); + lqw.orderByDesc(FaqManagement::getCreateTime) + .orderByDesc(FaqManagement::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getHead()), FaqManagement::getHead, bo.getHead()); lqw.eq(StringUtils.isNotBlank(bo.getType()), FaqManagement::getType, bo.getType()); lqw.eq(bo.getPageView() != null, FaqManagement::getPageView, bo.getPageView()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java index 246203f1..93cd1ecb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionItemServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.FaqManagement; import org.dromara.property.domain.InspectionItem; import org.dromara.property.domain.bo.InspectionItemBo; import org.dromara.property.domain.vo.InspectionItemVo; @@ -74,7 +75,8 @@ public class InspectionItemServiceImpl implements IInspectionItemService { private LambdaQueryWrapper buildQueryWrapper(InspectionItemBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionItem::getId); + lqw.orderByDesc(InspectionItem::getCreateTime) + .orderByDesc(InspectionItem::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getItemName()), InspectionItem::getItemName, bo.getItemName()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionItem::getSearchValue, bo.getSearchValue()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java index 9906ecc9..d060ce78 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanServiceImpl.java @@ -17,10 +17,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.property.domain.InspectionPlan; -import org.dromara.property.domain.InspectionPlanStaff; -import org.dromara.property.domain.InspectionRoute; -import org.dromara.property.domain.MachineMaintainPlanStaff; +import org.dromara.property.domain.*; import org.dromara.property.domain.bo.InspectionPlanBo; import org.dromara.property.domain.bo.InspectionPlanStaffBo; import org.dromara.property.domain.bo.MachineMaintainPlanBo; @@ -128,7 +125,8 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService { private LambdaQueryWrapper buildQueryWrapper(InspectionPlanBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionPlan::getId); + lqw.orderByDesc(InspectionPlan::getCreateTime) + .orderByDesc(InspectionPlan::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getPlanName()), InspectionPlan::getPlanName, bo.getPlanName()); lqw.eq(bo.getInspectionRouteId() != null, InspectionPlan::getInspectionRouteId, bo.getInspectionRouteId()); lqw.eq(StringUtils.isNotBlank(bo.getInspectionPlanPeriod()), InspectionPlan::getInspectionPlanPeriod, bo.getInspectionPlanPeriod()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java index 2da869e4..a152299c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPlanStaffServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionPlan; import org.dromara.property.domain.InspectionPlanStaff; import org.dromara.property.domain.bo.InspectionPlanStaffBo; import org.dromara.property.domain.vo.InspectionPlanStaffVo; @@ -74,7 +75,8 @@ public class InspectionPlanStaffServiceImpl implements IInspectionPlanStaffServi private LambdaQueryWrapper buildQueryWrapper(InspectionPlanStaffBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionPlanStaff::getId); + lqw.orderByDesc(InspectionPlanStaff::getCreateTime) + .orderByDesc(InspectionPlanStaff::getUpdateTime); lqw.eq(bo.getUserId() != null, InspectionPlanStaff::getUserId, bo.getUserId()); lqw.eq(bo.getInspectionPlanId() != null, InspectionPlanStaff::getInspectionPlanId, bo.getInspectionPlanId()); lqw.eq(bo.getStartTime() != null, InspectionPlanStaff::getStartTime, bo.getStartTime()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java index ad4b399b..deb1c310 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionPlanStaff; import org.dromara.property.domain.InspectionPoint; import org.dromara.property.domain.bo.InspectionPointBo; import org.dromara.property.domain.vo.InspectionItemVo; @@ -98,7 +99,8 @@ public class InspectionPointServiceImpl implements IInspectionPointService { private LambdaQueryWrapper buildQueryWrapper(InspectionPointBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionPoint::getId); + lqw.orderByDesc(InspectionPoint::getCreateTime) + .orderByDesc(InspectionPoint::getUpdateTime); lqw.eq(bo.getItemId() != null, InspectionPoint::getItemId, bo.getItemId()); lqw.like(StringUtils.isNotBlank(bo.getPointName()), InspectionPoint::getPointName, bo.getPointName()); lqw.eq(StringUtils.isNotBlank(bo.getPointType()), InspectionPoint::getPointType, bo.getPointType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java index e0500165..02154086 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionRouteServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionPoint; import org.dromara.property.domain.InspectionRoute; import org.dromara.property.domain.InspectionRoutePoint; import org.dromara.property.domain.bo.InspectionRouteBo; @@ -91,7 +92,8 @@ public class InspectionRouteServiceImpl implements IInspectionRouteService { private LambdaQueryWrapper buildQueryWrapper(InspectionRouteBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionRoute::getId); + lqw.orderByDesc(InspectionRoute::getCreateTime) + .orderByDesc(InspectionRoute::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getRouteName()), InspectionRoute::getRouteName, bo.getRouteName()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionRoute::getSearchValue, bo.getSearchValue()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java index 3d3bc201..52801d58 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionStaffServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionRoute; import org.dromara.property.domain.InspectionStaff; import org.dromara.property.domain.bo.InspectionStaffBo; import org.dromara.property.domain.vo.InspectionStaffVo; @@ -74,7 +75,8 @@ public class InspectionStaffServiceImpl implements IInspectionStaffService { private LambdaQueryWrapper buildQueryWrapper(InspectionStaffBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionStaff::getId); + lqw.orderByDesc(InspectionStaff::getCreateTime) + .orderByDesc(InspectionStaff::getUpdateTime); lqw.eq(bo.getUserId() != null, InspectionStaff::getUserId, bo.getUserId()); lqw.eq(bo.getInspectionPlanId() != null, InspectionStaff::getInspectionPlanId, bo.getInspectionPlanId()); lqw.eq(bo.getStartTime() != null, InspectionStaff::getStartTime, bo.getStartTime()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java index 08940d1c..e9b4d1db 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionStaff; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.InspectionTaskDetailBo; import org.dromara.property.domain.vo.InspectionTaskDetailVo; @@ -73,7 +74,8 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer private LambdaQueryWrapper buildQueryWrapper(InspectionTaskDetailBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionTaskDetail::getId); + lqw.orderByDesc(InspectionTaskDetail::getCreateTime) + .orderByDesc(InspectionTaskDetail::getUpdateTime); lqw.eq(bo.getTaskId() != null, InspectionTaskDetail::getTaskId, bo.getTaskId()); lqw.eq(bo.getRouteId() != null, InspectionTaskDetail::getRouteId, bo.getRouteId()); lqw.eq(bo.getPlanId() != null, InspectionTaskDetail::getPlanId, bo.getPlanId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java index 4860dd5a..dd44bf47 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionTaskServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.property.domain.InspectionPlan; import org.dromara.property.domain.InspectionTask; +import org.dromara.property.domain.InspectionTaskDetail; import org.dromara.property.domain.bo.InspectionTaskBo; import org.dromara.property.domain.vo.InspectionPlanVo; import org.dromara.property.domain.vo.InspectionTaskVo; @@ -99,7 +100,8 @@ public class InspectionTaskServiceImpl implements IInspectionTaskService { private LambdaQueryWrapper buildQueryWrapper(InspectionTaskBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(InspectionTask::getId); + lqw.orderByDesc(InspectionTask::getCreateTime) + .orderByDesc(InspectionTask::getUpdateTime); lqw.eq(bo.getInspectionPlanId() != null, InspectionTask::getInspectionPlanId, bo.getInspectionPlanId()); lqw.eq(bo.getActInsTime() != null, InspectionTask::getActInsTime, bo.getActInsTime()); lqw.eq(bo.getActUserId() != null, InspectionTask::getActUserId, bo.getActUserId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java index 942eb66e..35f30944 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineLocationServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.InspectionTask; import org.dromara.property.domain.enums.MachineLocationTypeEnum; import org.dromara.property.domain.vo.MachineLocationDetailVo; import org.dromara.property.mapper.*; @@ -135,7 +136,8 @@ public class MachineLocationServiceImpl implements IMachineLocationService { private LambdaQueryWrapper buildQueryWrapper(MachineLocationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineLocation::getId); + lqw.orderByDesc(MachineLocation::getCreateTime) + .orderByDesc(MachineLocation::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getLocationName()), MachineLocation::getLocationName, bo.getLocationName()); lqw.eq(StringUtils.isNotBlank(bo.getLocationCode()), MachineLocation::getLocationCode, bo.getLocationCode()); lqw.eq(bo.getLocationObjId() != null, MachineLocation::getLocationObjId, bo.getLocationObjId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java index 94bb107d..372f8880 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.InspectionPlanStaff; +import org.dromara.property.domain.MachineLocation; import org.dromara.property.domain.MachineMaintainPlan; import org.dromara.property.domain.MachineMaintainPlanStaff; import org.dromara.property.domain.bo.InspectionPlanStaffBo; @@ -118,7 +119,8 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi private LambdaQueryWrapper buildQueryWrapper(MachineMaintainPlanBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineMaintainPlan::getId); + lqw.orderByDesc(MachineMaintainPlan::getCreateTime) + .orderByDesc(MachineMaintainPlan::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getPlanName()), MachineMaintainPlan::getPlanName, bo.getPlanName()); lqw.eq(StringUtils.isNotBlank(bo.getPlanNo()), MachineMaintainPlan::getPlanNo, bo.getPlanNo()); lqw.eq(StringUtils.isNotBlank(bo.getPlanPeriod()), MachineMaintainPlan::getPlanPeriod, bo.getPlanPeriod()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanStaffServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanStaffServiceImpl.java index 9974ef54..a75622c9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanStaffServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainPlanStaffServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MachineMaintainPlan; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.MachineMaintainPlanStaffBo; import org.dromara.property.domain.vo.MachineMaintainPlanStaffVo; @@ -73,7 +74,8 @@ public class MachineMaintainPlanStaffServiceImpl implements IMachineMaintainPlan private LambdaQueryWrapper buildQueryWrapper(MachineMaintainPlanStaffBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineMaintainPlanStaff::getId); + lqw.orderByDesc(MachineMaintainPlanStaff::getCreateTime) + .orderByDesc(MachineMaintainPlanStaff::getUpdateTime); lqw.eq(bo.getUserId() != null, MachineMaintainPlanStaff::getUserId, bo.getUserId()); lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainPlanStaff::getMaintainPlanId, bo.getMaintainPlanId()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), MachineMaintainPlanStaff::getSearchValue, bo.getSearchValue()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskDetailServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskDetailServiceImpl.java index 2f6988a5..b8518a01 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskDetailServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MachineMaintainPlanStaff; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.MachineMaintainTaskDetailBo; import org.dromara.property.domain.vo.MachineMaintainTaskDetailVo; @@ -73,7 +74,8 @@ public class MachineMaintainTaskDetailServiceImpl implements IMachineMaintainTas private LambdaQueryWrapper buildQueryWrapper(MachineMaintainTaskDetailBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineMaintainTaskDetail::getId); + lqw.orderByDesc(MachineMaintainTaskDetail::getCreateTime) + .orderByDesc(MachineMaintainTaskDetail::getUpdateTime); lqw.eq(bo.getTaskId() != null, MachineMaintainTaskDetail::getTaskId, bo.getTaskId()); lqw.eq(bo.getMachineId() != null, MachineMaintainTaskDetail::getMachineId, bo.getMachineId()); lqw.eq(StringUtils.isNotBlank(bo.getSendFlag()), MachineMaintainTaskDetail::getSendFlag, bo.getSendFlag()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskServiceImpl.java index ff740eb8..ad4d8b9d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineMaintainTaskServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MachineMaintainTaskDetail; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.MachineMaintainTaskBo; import org.dromara.property.domain.vo.MachineMaintainTaskVo; @@ -73,7 +74,8 @@ public class MachineMaintainTaskServiceImpl implements IMachineMaintainTaskServi private LambdaQueryWrapper buildQueryWrapper(MachineMaintainTaskBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineMaintainTask::getId); + lqw.orderByDesc(MachineMaintainTask::getCreateTime) + .orderByDesc(MachineMaintainTask::getUpdateTime); lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainTask::getMaintainPlanId, bo.getMaintainPlanId()); lqw.eq(StringUtils.isNotBlank(bo.getMaintainTaskNo()), MachineMaintainTask::getMaintainTaskNo, bo.getMaintainTaskNo()); lqw.eq(StringUtils.isNotBlank(bo.getPlanUserId()), MachineMaintainTask::getPlanUserId, bo.getPlanUserId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineServiceImpl.java index 8dc1dc67..4fc8bf35 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MachineMaintainTask; import org.dromara.property.domain.MachineType; import org.dromara.property.domain.vo.*; import org.dromara.property.mapper.MachineLocationMapper; @@ -90,7 +91,8 @@ public class MachineServiceImpl implements IMachineService { private LambdaQueryWrapper buildQueryWrapper(MachineBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Machine::getId); + lqw.orderByDesc(Machine::getCreateTime) + .orderByDesc(Machine::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getMachineName()), Machine::getMachineName, bo.getMachineName()); lqw.eq(StringUtils.isNotBlank(bo.getMachineCode()), Machine::getMachineCode, bo.getMachineCode()); lqw.eq(StringUtils.isNotBlank(bo.getMachineBrand()), Machine::getMachineBrand, bo.getMachineBrand()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java index 042a2a32..7726163d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MachineTypeServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.Machine; import org.dromara.property.domain.MachineType; import org.dromara.property.domain.bo.MachineTypeBo; import org.dromara.property.domain.vo.MachineTypeTreeVo; @@ -74,7 +75,8 @@ public class MachineTypeServiceImpl implements IMachineTypeService { private LambdaQueryWrapper buildQueryWrapper(MachineTypeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MachineType::getId); + lqw.orderByDesc(MachineType::getCreateTime) + .orderByDesc(MachineType::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getMachineTypeName()), MachineType::getMachineTypeName, bo.getMachineTypeName()); lqw.eq(StringUtils.isNotBlank(bo.getMachineTypeCode()), MachineType::getMachineTypeCode, bo.getMachineTypeCode()); lqw.eq(bo.getParentTypeId() != null, MachineType::getParentTypeId, bo.getParentTypeId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MaintainKnowledgeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MaintainKnowledgeServiceImpl.java index 26bf2369..2d03d4ec 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MaintainKnowledgeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MaintainKnowledgeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MachineType; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.MaintainKnowledgeBo; import org.dromara.property.domain.vo.MaintainKnowledgeVo; @@ -73,7 +74,8 @@ public class MaintainKnowledgeServiceImpl implements IMaintainKnowledgeService { private LambdaQueryWrapper buildQueryWrapper(MaintainKnowledgeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MaintainKnowledge::getId); + lqw.orderByDesc(MaintainKnowledge::getCreateTime) + .orderByDesc(MaintainKnowledge::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getTitle()), MaintainKnowledge::getTitle, bo.getTitle()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MaintainKnowledge::getStatus, bo.getStatus()); lqw.eq(StringUtils.isNotBlank(bo.getCovers()), MaintainKnowledge::getCovers, bo.getCovers()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java index 9e7c4419..13c11fa5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.MaintainKnowledge; import org.dromara.property.domain.Meet; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.MeetAttachBo; @@ -77,7 +78,8 @@ public class MeetAttachServiceImpl implements IMeetAttachService { private LambdaQueryWrapper buildQueryWrapper(MeetAttachBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MeetAttach::getId); + lqw.orderByDesc(MeetAttach::getCreateTime) + .orderByDesc(MeetAttach::getUpdateTime); lqw.eq(bo.getMeetId() != null, MeetAttach::getMeetId, bo.getMeetId()); lqw.like(StringUtils.isNotBlank(bo.getProjectName()), MeetAttach::getProjectName, bo.getProjectName()); lqw.eq(bo.getPrice() != null, MeetAttach::getPrice, bo.getPrice()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index 39f4e93b..ff54ba26 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -14,6 +14,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.MeetAttach; import org.dromara.property.domain.MeetAttachOrder; import org.dromara.property.domain.MeetBooking; import org.dromara.property.domain.bo.MeetBookingBo; @@ -224,7 +225,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService { private LambdaQueryWrapper buildQueryWrapper(MeetBookingBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MeetBooking::getId); + lqw.orderByDesc(MeetBooking::getCreateTime) + .orderByDesc(MeetBooking::getUpdateTime); lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState()); lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState()); lqw.eq(ObjectUtil.isNotEmpty(bo.getPerson()), MeetBooking::getPerson, bo.getPerson()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java index 56a6e119..9cec2e91 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetServiceImpl.java @@ -152,7 +152,8 @@ public class MeetServiceImpl implements IMeetService { private LambdaQueryWrapper buildQueryWrapper(MeetBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Meet::getId); + lqw.orderByDesc(Meet::getCreateTime) + .orderByDesc(Meet::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getName()), Meet::getName, bo.getName()); // lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation()); lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java index 955be64c..b78d82c3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Meet; import org.dromara.property.domain.PlantsOrderMaintain; import org.dromara.property.domain.vo.PlantsRentalOrderVo; import org.dromara.property.service.IPlantsRentalOrderService; @@ -83,7 +84,8 @@ public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService { private LambdaQueryWrapper buildQueryWrapper(PlantsOrderChargeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsOrderCharge::getId); + lqw.orderByDesc(PlantsOrderCharge::getCreateTime) + .orderByDesc(PlantsOrderCharge::getUpdateTime); lqw.eq(bo.getOrderId() != null, PlantsOrderCharge::getOrderId, bo.getOrderId()); lqw.eq(bo.getUserId() != null, PlantsOrderCharge::getUserId, bo.getUserId()); lqw.like(StringUtils.isNotBlank(bo.getUserName()), PlantsOrderCharge::getUserName, bo.getUserName()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java index 91273237..b143e61d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PlantsOrderCharge; import org.dromara.property.domain.vo.PlantsRentalOrderVo; import org.dromara.property.service.IPlantsRentalOrderService; import org.dromara.property.service.ITbRoomService; @@ -90,7 +91,8 @@ public class PlantsOrderMaintainServiceImpl implements IPlantsOrderMaintainServi private LambdaQueryWrapper buildQueryWrapper(PlantsOrderMaintainBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsOrderMaintain::getId); + lqw.orderByDesc(PlantsOrderMaintain::getCreateTime) + .orderByDesc(PlantsOrderMaintain::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getMaintainName()), PlantsOrderMaintain::getMaintainName, bo.getMaintainName()); lqw.eq(bo.getRoomId() != null, PlantsOrderMaintain::getRoomId, bo.getRoomId()); lqw.eq(bo.getServeType() != null, PlantsOrderMaintain::getServeType, bo.getServeType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsPlanProductServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsPlanProductServiceImpl.java index 1d6f5474..0b5bc676 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsPlanProductServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsPlanProductServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PlantsOrderMaintain; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.PlantsPlanProductBo; import org.dromara.property.domain.vo.PlantsPlanProductVo; @@ -74,7 +75,8 @@ public class PlantsPlanProductServiceImpl implements IPlantsPlanProductService { private LambdaQueryWrapper buildQueryWrapper(PlantsPlanProductBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsPlanProduct::getId); + lqw.orderByDesc(PlantsPlanProduct::getCreateTime) + .orderByDesc(PlantsPlanProduct::getUpdateTime); lqw.eq(bo.getPlanId() != null, PlantsPlanProduct::getPlanId, bo.getPlanId()); lqw.eq(bo.getProductId() != null, PlantsPlanProduct::getProductId, bo.getProductId()); lqw.in(CollectionUtils.isNotEmpty(bo.getProductIds()), PlantsPlanProduct::getProductId, bo.getProductIds()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsProductServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsProductServiceImpl.java index ce439764..92567a09 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsProductServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsProductServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PlantsPlanProduct; import org.dromara.property.domain.bo.PlantsPlanProductBo; import org.dromara.property.domain.bo.PlantsRentalOrderBo; import org.dromara.property.domain.vo.PlantsPlanProductVo; @@ -90,7 +91,8 @@ public class PlantsProductServiceImpl implements IPlantsProductService { private LambdaQueryWrapper buildQueryWrapper(PlantsProductBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsProduct::getId); + lqw.orderByDesc(PlantsProduct::getCreateTime) + .orderByDesc(PlantsProduct::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getPlantCode()), PlantsProduct::getPlantCode, bo.getPlantCode()); lqw.like(StringUtils.isNotBlank(bo.getPlantName()), PlantsProduct::getPlantName, bo.getPlantName()); lqw.eq(bo.getPlantType() != null, PlantsProduct::getPlantType, bo.getPlantType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java index 45f014c8..cd3d98d9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PlantsProduct; import org.dromara.property.domain.bo.PlantsOrderChargeBo; import org.dromara.property.domain.bo.PlantsOrderMaintainBo; import org.dromara.property.domain.bo.PlantsProductBo; @@ -108,7 +109,8 @@ public class PlantsRentalOrderServiceImpl implements IPlantsRentalOrderService { private LambdaQueryWrapper buildQueryWrapper(PlantsRentalOrderBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsRentalOrder::getId); + lqw.orderByDesc(PlantsRentalOrder::getCreateTime) + .orderByDesc(PlantsRentalOrder::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), PlantsRentalOrder::getOrderNo, bo.getOrderNo()); lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), PlantsRentalOrder::getCustomerName, bo.getCustomerName()); lqw.eq(bo.getCustomerType() != null, PlantsRentalOrder::getCustomerType, bo.getCustomerType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalPlanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalPlanServiceImpl.java index a4947964..574b7ee6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalPlanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalPlanServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.PlantsPlanProduct; +import org.dromara.property.domain.PlantsRentalOrder; import org.dromara.property.domain.bo.PlantsPlanProductBo; import org.dromara.property.domain.bo.PlantsRentalOrderBo; import org.dromara.property.domain.vo.PlantsPlanProductVo; @@ -89,7 +90,8 @@ public class PlantsRentalPlanServiceImpl implements IPlantsRentalPlanService { private LambdaQueryWrapper buildQueryWrapper(PlantsRentalPlanBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PlantsRentalPlan::getId); + lqw.orderByDesc(PlantsRentalPlan::getCreateTime) + .orderByDesc(PlantsRentalPlan::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getPlanName()), PlantsRentalPlan::getPlanName, bo.getPlanName()); lqw.eq(bo.getRentalPeriod() != null, PlantsRentalPlan::getRentalPeriod, bo.getRentalPeriod()); lqw.eq(StringUtils.isNotBlank(bo.getScene()), PlantsRentalPlan::getScene, bo.getScene()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java index e3a54ed9..e290dbdd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PopularActivitiesServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PlantsRentalPlan; import org.dromara.property.domain.enums.ActivitiesStatusEnum; import org.dromara.property.domain.vo.CustomerNoticesVo; import org.dromara.system.api.RemoteUserService; @@ -113,7 +114,8 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService { private LambdaQueryWrapper buildQueryWrapper(PopularActivitiesBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(PopularActivities::getId); + lqw.orderByDesc(PopularActivities::getCreateTime) + .orderByDesc(PopularActivities::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getTitle()), PopularActivities::getTitle, bo.getTitle()); lqw.eq(bo.getStartTime() != null, PopularActivities::getStartTime, bo.getStartTime()); lqw.eq(bo.getEndTime() != null, PopularActivities::getEndTime, bo.getEndTime()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java index 08de4aaf..d68c8c3d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.PopularActivities; import org.dromara.property.domain.QuestionnaireQuestion; import org.dromara.property.domain.QuestionnaireQuestionItem; import org.dromara.property.domain.bo.QuestionnaireQuestionBo; @@ -106,7 +107,8 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService { private LambdaQueryWrapper buildQueryWrapper(QuestionnaireBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Questionnaire::getId); + lqw.orderByDesc(Questionnaire::getCreateTime) + .orderByDesc(Questionnaire::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getHead()), Questionnaire::getHead, bo.getHead()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Questionnaire::getStatus, bo.getStatus()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java index 5ba0c70e..4bd985f0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentPersonServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Questionnaire; import org.dromara.property.domain.vo.ResidentUnitVo; import org.dromara.property.service.IResidentUnitService; import org.dromara.sis.api.RemoteSisAuthService; @@ -90,7 +91,8 @@ public class ResidentPersonServiceImpl implements IResidentPersonService { private LambdaQueryWrapper buildQueryWrapper(ResidentPersonBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(ResidentPerson::getId); + lqw.orderByDesc(ResidentPerson::getCreateTime) + .orderByDesc(ResidentPerson::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getUserName()), ResidentPerson::getUserName, bo.getUserName()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ResidentPerson::getPhone, bo.getPhone()); lqw.eq(bo.getGender() != null, ResidentPerson::getGender, bo.getGender()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java index 7130b2de..fb2f95ec 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ResidentUnitServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ResidentPerson; import org.dromara.property.service.IResidentPersonService; import org.dromara.property.service.ITbRoomService; import org.springframework.stereotype.Service; @@ -100,7 +101,8 @@ public class ResidentUnitServiceImpl implements IResidentUnitService { private LambdaQueryWrapper buildQueryWrapper(ResidentUnitBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(ResidentUnit::getId); + lqw.orderByDesc(ResidentUnit::getCreateTime) + .orderByDesc(ResidentUnit::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getName()), ResidentUnit::getName, bo.getName()); lqw.eq(bo.getUnitNumber() != null, ResidentUnit::getUnitNumber, bo.getUnitNumber()); lqw.eq(bo.getType() != null, ResidentUnit::getType, bo.getType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerBookingServiceImpl.java index 4b16007b..441baa60 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerBookingServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ResidentUnit; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.ServerBookingBo; import org.dromara.property.domain.vo.ServerBookingVo; @@ -73,7 +74,8 @@ public class ServerBookingServiceImpl implements IServerBookingService { private LambdaQueryWrapper buildQueryWrapper(ServerBookingBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(ServerBooking::getId); + lqw.orderByDesc(ServerBooking::getCreateTime) + .orderByDesc(ServerBooking::getUpdateTime); lqw.eq(bo.getServerId() != null, ServerBooking::getServerId, bo.getServerId()); lqw.eq(bo.getServerNum() != null, ServerBooking::getServerNum, bo.getServerNum()); lqw.eq(StringUtils.isNotBlank(bo.getBookingType()), ServerBooking::getBookingType, bo.getBookingType()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerServiceImpl.java index 6a25227e..7bbfb840 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServerServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ServerBooking; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.ServerBo; import org.dromara.property.domain.vo.ServerVo; @@ -73,7 +74,8 @@ public class ServerServiceImpl implements IServerService { private LambdaQueryWrapper buildQueryWrapper(ServerBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Server::getId); + lqw.orderByDesc(Server::getCreateTime) + .orderByDesc(Server::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getServerName()), Server::getServerName, bo.getServerName()); lqw.eq(bo.getServerType() != null, Server::getServerType, bo.getServerType()); lqw.eq(bo.getPrice() != null, Server::getPrice, bo.getPrice()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWarningServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWarningServiceImpl.java index 1827e36c..ab70d8da 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWarningServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWarningServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Server; import org.dromara.property.domain.ServiceWarning; import org.dromara.property.domain.bo.ServiceWarningBo; import org.dromara.property.domain.vo.ServiceWarningVo; @@ -80,7 +81,8 @@ public class ServiceWarningServiceImpl implements IServiceWarningService { private LambdaQueryWrapper buildQueryWrapper(ServiceWarningBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(ServiceWarning::getId); + lqw.orderByDesc(ServiceWarning::getCreateTime) + .orderByDesc(ServiceWarning::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getEventNo()), ServiceWarning::getEventNo, bo.getEventNo()); lqw.eq(bo.getEventType() != null, ServiceWarning::getEventType, bo.getEventType()); lqw.eq(bo.getAlarmLevel() != null, ServiceWarning::getAlarmLevel, bo.getAlarmLevel()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java index 543061ac..623e7b85 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java @@ -181,7 +181,8 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(ServiceWorkOrders::getId); + lqw.orderByDesc(ServiceWorkOrders::getCreateTime) + .orderByDesc(ServiceWorkOrders::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo()); lqw.in(CollUtil.isNotEmpty(statusList), ServiceWorkOrders::getStatus, statusList); lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SuppliersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SuppliersServiceImpl.java index 7c6f0741..68eaf640 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SuppliersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SuppliersServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ServiceWorkOrders; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.SuppliersBo; import org.dromara.property.domain.vo.SuppliersVo; @@ -73,7 +74,8 @@ public class SuppliersServiceImpl implements ISuppliersService { private LambdaQueryWrapper buildQueryWrapper(SuppliersBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Suppliers::getId); + lqw.orderByDesc(Suppliers::getCreateTime) + .orderByDesc(Suppliers::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getSuppliersName()), Suppliers::getSuppliersName, bo.getSuppliersName()); lqw.eq(StringUtils.isNotBlank(bo.getPhone()), Suppliers::getPhone, bo.getPhone()); lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Suppliers::getLocation, bo.getLocation()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAreaGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAreaGroupServiceImpl.java index 1cbe9cd6..8f8692db 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAreaGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAreaGroupServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.Suppliers; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbAreaGroupBo; import org.dromara.property.domain.vo.TbAreaGroupVo; @@ -73,7 +74,8 @@ public class TbAreaGroupServiceImpl implements ITbAreaGroupService { private LambdaQueryWrapper buildQueryWrapper(TbAreaGroupBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbAreaGroup::getId); + lqw.orderByDesc(TbAreaGroup::getCreateTime) + .orderByDesc(TbAreaGroup::getUpdateTime); lqw.eq(bo.getAreaGroupId() != null, TbAreaGroup::getAreaGroupId, bo.getAreaGroupId()); lqw.like(StringUtils.isNotBlank(bo.getAreaGroupName()), TbAreaGroup::getAreaGroupName, bo.getAreaGroupName()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java index e8eafa08..ab046057 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.TbAreaGroup; import org.dromara.property.domain.TbBuilding; import org.dromara.property.domain.bo.TbBuildingBo; import org.dromara.property.domain.vo.TbBuildingVo; @@ -77,7 +78,8 @@ public class TbBuildingServiceImpl implements ITbBuildingService { private LambdaQueryWrapper buildQueryWrapper(TbBuildingBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbBuilding::getId); + lqw.orderByDesc(TbBuilding::getCreateTime) + .orderByDesc(TbBuilding::getUpdateTime); lqw.eq(bo.getCommunityId() != null, TbBuilding::getCommunityId, bo.getCommunityId()); lqw.like(StringUtils.isNotBlank(bo.getBuildingName()), TbBuilding::getBuildingName, bo.getBuildingName()); lqw.eq(bo.getFloorCount() != null, TbBuilding::getFloorCount, bo.getFloorCount()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java index 679f2654..2de90718 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbCeremonialserveRoombooking; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbCeremonialServeBo; import org.dromara.property.domain.vo.TbCeremonialServeVo; @@ -73,7 +74,8 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService { private LambdaQueryWrapper buildQueryWrapper(TbCeremonialServeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbCeremonialServe::getId); + lqw.orderByDesc(TbCeremonialServe::getCreateTime) + .orderByDesc(TbCeremonialServe::getUpdateTime); lqw.eq(bo.getClassificationId() != null, TbCeremonialServe::getClassificationId, bo.getClassificationId()); lqw.eq(bo.getRoomBookId() != null, TbCeremonialServe::getRoomBookId, bo.getRoomBookId()); lqw.eq(bo.getServeNum() != null, TbCeremonialServe::getServeNum, bo.getServeNum()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java index fdd875de..5fb94417 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbBuilding; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbCeremonialserveRoombookingBo; import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo; @@ -73,7 +74,8 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser private LambdaQueryWrapper buildQueryWrapper(TbCeremonialserveRoombookingBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbCeremonialserveRoombooking::getId); + lqw.orderByDesc(TbCeremonialserveRoombooking::getCreateTime) + .orderByDesc(TbCeremonialserveRoombooking::getUpdateTime); lqw.eq(bo.getCeremonialServeId() != null, TbCeremonialserveRoombooking::getCeremonialServeId, bo.getCeremonialServeId()); lqw.eq(bo.getRoomBookingId() != null, TbCeremonialserveRoombooking::getRoomBookingId, bo.getRoomBookingId()); lqw.eq(bo.getTotalPrice() != null, TbCeremonialserveRoombooking::getTotalPrice, bo.getTotalPrice()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java index 61ad865b..6c272ef2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java @@ -12,6 +12,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.TreeUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.TbCeremonialServe; import org.dromara.property.domain.TbCommunity; import org.dromara.property.domain.bo.TbCommunityBo; import org.dromara.property.domain.vo.*; @@ -170,7 +171,8 @@ public class TbCommunityServiceImpl implements ITbCommunityService { private LambdaQueryWrapper buildQueryWrapper(TbCommunityBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbCommunity::getId); + lqw.orderByDesc(TbCommunity::getCreateTime) + .orderByDesc(TbCommunity::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), TbCommunity::getCommunityName, bo.getCommunityName()); lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType()); lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java index f416e329..0d2f7027 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbCommunity; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbConferenceBo; import org.dromara.property.domain.vo.TbConferenceVo; @@ -73,7 +74,8 @@ public class TbConferenceServiceImpl implements ITbConferenceService { private LambdaQueryWrapper buildQueryWrapper(TbConferenceBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbConference::getId); + lqw.orderByDesc(TbConference::getCreateTime) + .orderByDesc(TbConference::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getRoomName()), TbConference::getRoomName, bo.getRoomName()); lqw.eq(bo.getRoomNo() != null, TbConference::getRoomNo, bo.getRoomNo()); lqw.eq(StringUtils.isNotBlank(bo.getRoomLocation()), TbConference::getRoomLocation, bo.getRoomLocation()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java index 6dde8a07..528b312e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbConference; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbE8ConfigBo; import org.dromara.property.domain.vo.TbE8ConfigVo; @@ -73,7 +74,8 @@ public class TbE8ConfigServiceImpl implements ITbE8ConfigService { private LambdaQueryWrapper buildQueryWrapper(TbE8ConfigBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbE8Config::getId); + lqw.orderByDesc(TbE8Config::getCreateTime) + .orderByDesc(TbE8Config::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getE8Name()), TbE8Config::getE8Name, bo.getE8Name()); lqw.eq(StringUtils.isNotBlank(bo.getE8ServerUrl()), TbE8Config::getE8ServerUrl, bo.getE8ServerUrl()); lqw.eq(StringUtils.isNotBlank(bo.getE8Secret()), TbE8Config::getE8Secret, bo.getE8Secret()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java index 45b8dc2e..656c5529 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.TbE8Config; import org.dromara.property.domain.TbFloor; import org.dromara.property.domain.bo.TbFloorBo; import org.dromara.property.domain.vo.TbBuildingVo; @@ -80,7 +81,8 @@ public class TbFloorServiceImpl implements ITbFloorService { private LambdaQueryWrapper buildQueryWrapper(TbFloorBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbFloor::getId); + lqw.orderByDesc(TbFloor::getCreateTime) + .orderByDesc(TbFloor::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName()); lqw.eq(bo.getFloorNumber() != null, TbFloor::getFloorNumber, bo.getFloorNumber()); lqw.eq(bo.getBuildingId()!= null, TbFloor::getUnitId, bo.getBuildingId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java index 9f5ade90..3d44fe45 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbFloor; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbRoomBookingBo; import org.dromara.property.domain.vo.TbRoomBookingVo; @@ -73,7 +74,8 @@ public class TbRoomBookingServiceImpl implements ITbRoomBookingService { private LambdaQueryWrapper buildQueryWrapper(TbRoomBookingBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbRoomBooking::getId); + lqw.orderByDesc(TbRoomBooking::getCreateTime) + .orderByDesc(TbRoomBooking::getUpdateTime); lqw.eq(bo.getTbConferenceId() != null, TbRoomBooking::getTbConferenceId, bo.getTbConferenceId()); lqw.eq(bo.getBookingStatus() != null, TbRoomBooking::getBookingStatus, bo.getBookingStatus()); lqw.eq(bo.getReviewStatus() != null, TbRoomBooking::getReviewStatus, bo.getReviewStatus()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomServiceImpl.java index 305f579e..34a59e1c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.property.domain.TbRoom; +import org.dromara.property.domain.TbRoomBooking; import org.dromara.property.domain.bo.TbRoomBo; import org.dromara.property.domain.vo.TbFloorVo; import org.dromara.property.domain.vo.TbRoomVo; @@ -77,7 +78,8 @@ public class TbRoomServiceImpl implements ITbRoomService { private LambdaQueryWrapper buildQueryWrapper(TbRoomBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbRoom::getId); + lqw.orderByDesc(TbRoom::getCreateTime) + .orderByDesc(TbRoom::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getRoomNumber()), TbRoom::getRoomNumber, bo.getRoomNumber()); lqw.eq(bo.getRoomType() != null, TbRoom::getRoomType, bo.getRoomType()); lqw.eq(bo.getFloorId() != null, TbRoom::getFloorId, bo.getFloorId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbServiceClassificationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbServiceClassificationServiceImpl.java index 75b75e2b..150dd7c4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbServiceClassificationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbServiceClassificationServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbRoom; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbServiceClassificationBo; import org.dromara.property.domain.vo.TbServiceClassificationVo; @@ -73,7 +74,8 @@ public class TbServiceClassificationServiceImpl implements ITbServiceClassificat private LambdaQueryWrapper buildQueryWrapper(TbServiceClassificationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbServiceClassification::getId); + lqw.orderByDesc(TbServiceClassification::getCreateTime) + .orderByDesc(TbServiceClassification::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getType()), TbServiceClassification::getType, bo.getType()); lqw.like(StringUtils.isNotBlank(bo.getName()), TbServiceClassification::getName, bo.getName()); lqw.eq(bo.getSort() != null, TbServiceClassification::getSort, bo.getSort()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUnitServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUnitServiceImpl.java index cc474ac4..af860357 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUnitServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUnitServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.TbServiceClassification; import org.dromara.property.domain.TbUnit; import org.dromara.property.domain.bo.TbUnitBo; import org.dromara.property.domain.vo.TbBuildingVo; @@ -77,7 +78,8 @@ public class TbUnitServiceImpl implements ITbUnitService { private LambdaQueryWrapper buildQueryWrapper(TbUnitBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbUnit::getId); + lqw.orderByDesc(TbUnit::getCreateTime) + .orderByDesc(TbUnit::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getUnitName()), TbUnit::getUnitName, bo.getUnitName()); lqw.eq(bo.getFloorCount() != null, TbUnit::getFloorCount, bo.getFloorCount()); lqw.eq(bo.getBuildingId() != null, TbUnit::getBuildingId, bo.getBuildingId()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java index e2f298d9..b7b3c845 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUserGroupServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbUnit; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TbUserGroupBo; import org.dromara.property.domain.vo.TbUserGroupVo; @@ -73,7 +74,8 @@ public class TbUserGroupServiceImpl implements ITbUserGroupService { private LambdaQueryWrapper buildQueryWrapper(TbUserGroupBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbUserGroup::getId); + lqw.orderByDesc(TbUserGroup::getCreateTime) + .orderByDesc(TbUserGroup::getUpdateTime); lqw.like(bo.getUserGroupId() != null, TbUserGroup::getUserGroupId, bo.getUserGroupId()); lqw.like(StringUtils.isNotBlank(bo.getUserGroupName()), TbUserGroup::getUserGroupName, bo.getUserGroupName()); return lqw; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java index 81bfedfc..e49bc73d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.property.domain.TbUserGroup; import org.dromara.property.domain.bo.QrCodeInfo; import org.dromara.resource.api.RemoteFileService; import org.dromara.sis.api.RemoteVisitorService; @@ -105,7 +106,8 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi private LambdaQueryWrapper buildQueryWrapper(TbVisitorManagementBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TbVisitorManagement::getId); + lqw.orderByDesc(TbVisitorManagement::getCreateTime) + .orderByDesc(TbVisitorManagement::getUpdateTime); lqw.like(StringUtils.isNotBlank(bo.getVisitorName()), TbVisitorManagement::getVisitorName, bo.getVisitorName()); lqw.eq(StringUtils.isNotBlank(bo.getVisitorUnit()), TbVisitorManagement::getVisitorUnit, bo.getVisitorUnit()); lqw.eq(StringUtils.isNotBlank(bo.getVisitorPhone()), TbVisitorManagement::getVisitorPhone, bo.getVisitorPhone()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java index a99e6a71..c52b16ba 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TbVisitorManagement; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TdDeviceTypeBo; import org.dromara.property.domain.vo.TdDeviceTypeVo; @@ -73,7 +74,8 @@ public class TdDeviceTypeServiceImpl implements ITdDeviceTypeService { private LambdaQueryWrapper buildQueryWrapper(TdDeviceTypeBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TdDeviceType::getId); + lqw.orderByDesc(TdDeviceType::getCreateTime) + .orderByDesc(TdDeviceType::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getDvNo()), TdDeviceType::getDvNo, bo.getDvNo()); lqw.like(StringUtils.isNotBlank(bo.getDvName()), TdDeviceType::getDvName, bo.getDvName()); lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdDeviceType::getFactoryNo, bo.getFactoryNo()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java index b0e8c074..440b2785 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TdDeviceType; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TsConfigBo; import org.dromara.property.domain.vo.TsConfigVo; @@ -73,7 +74,8 @@ public class TsConfigServiceImpl implements ITsConfigService { private LambdaQueryWrapper buildQueryWrapper(TsConfigBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TsConfig::getId); + lqw.orderByDesc(TsConfig::getCreateTime) + .orderByDesc(TsConfig::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getCodeKind()), TsConfig::getCodeKind, bo.getCodeKind()); lqw.eq(StringUtils.isNotBlank(bo.getCodeValue()), TsConfig::getCodeValue, bo.getCodeValue()); lqw.like(StringUtils.isNotBlank(bo.getCodeName()), TsConfig::getCodeName, bo.getCodeName()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java index 344b5336..4f147233 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TsConfig; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.TsOperationLogBo; import org.dromara.property.domain.vo.TsOperationLogVo; @@ -73,7 +74,8 @@ public class TsOperationLogServiceImpl implements ITsOperationLogService { private LambdaQueryWrapper buildQueryWrapper(TsOperationLogBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(TsOperationLog::getId); + lqw.orderByDesc(TsOperationLog::getCreateTime) + .orderByDesc(TsOperationLog::getUpdateTime); lqw.eq(StringUtils.isNotBlank(bo.getUserCode()), TsOperationLog::getUserCode, bo.getUserCode()); lqw.like(StringUtils.isNotBlank(bo.getUserName()), TsOperationLog::getUserName, bo.getUserName()); lqw.eq(StringUtils.isNotBlank(bo.getSysArea()), TsOperationLog::getSysArea, bo.getSysArea()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/VerificationServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/VerificationServiceImpl.java index a7d3ac23..58e594cf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/VerificationServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/VerificationServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.TsOperationLog; import org.springframework.stereotype.Service; import org.dromara.property.domain.bo.VerificationBo; import org.dromara.property.domain.vo.VerificationVo; @@ -73,7 +74,8 @@ public class VerificationServiceImpl implements IVerificationService { private LambdaQueryWrapper buildQueryWrapper(VerificationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(Verification::getId); + lqw.orderByDesc(Verification::getCreateTime) + .orderByDesc(Verification::getUpdateTime); lqw.eq(bo.getServerId() != null, Verification::getServerId, bo.getServerId()); lqw.eq(bo.getUserId() != null, Verification::getUserId, bo.getUserId()); lqw.eq(bo.getOutcome() != null, Verification::getOutcome, bo.getOutcome()); From efeafd5e13f9ab434c927f91e984c941e744a845 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 15:28:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor(sis):=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=9B=BE=E7=89=87URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sis/sdk/e8/service/E8PlatformApiService.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java index 673c7090..0e3dbc16 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java @@ -37,6 +37,7 @@ import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq; import org.dromara.sis.sdk.e8.domain.voucher.res.IssueVoucherRes; import org.dromara.sis.sdk.e8.utils.E8ApiUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -55,6 +56,11 @@ public class E8PlatformApiService implements E8PlatformApi { private final E8ApiUtil e8ApiUtil; + @Value("${E8Plat.imgUrl}") + private String imgUrl; + + private final static String URL = "http://192.168.24.8:50030"; + //***************************************客户信息接口******************************************* private final static String CUSTOMER_GET_PAGE_LIST = "/api/E8/customer/get-page-list"; private final static String CUSTOMER_GET_FIRST_OR_DEFAULT = "/api/E8/customer/get-first-or-default"; @@ -422,6 +428,16 @@ public class E8PlatformApiService implements E8PlatformApi { tableData.setTotal(Long.parseLong(result.get("total").toString())); // 从结果映射中获取项目列表，转换为访问记录信息列表后设置到分页对象中 tableData.setRows(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), AccessRecordFindRes.class)); + + for (AccessRecordFindRes res : tableData.getRows()){ + if (res.getVoucherUrl() != null && !res.getVoucherUrl().isEmpty()) { + res.setVoucherUrl(res.getVoucherUrl().replace(URL, imgUrl)); + } + + if (res.getPictureUrl() != null && !res.getPictureUrl().isEmpty()) { + res.setPictureUrl(res.getPictureUrl().replace(URL, imgUrl)); + } + } tableData.setCode(200); tableData.setMsg("查询成功"); // 返回填充了数据的分页对象