diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java index 2114b401..94ce085d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java @@ -6,14 +6,15 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.property.domain.bo.ServiceWorkOrdersBo; import org.dromara.property.domain.bo.mobile.MServiceWorkOrdersBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersVo; import org.dromara.property.service.IServiceWorkOrdersService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 【业务管理-工单处理】 @@ -38,4 +39,11 @@ public class MServiceWorkOrdersController extends BaseController { public R add(@Validated(AddGroup.class) @RequestBody MServiceWorkOrdersBo bo) { return toAjax(serviceWorkOrdersService.insertMServiceWorkOrdersBo(bo)); } + /** + * 小程序查询【工单处理】 + */ + @GetMapping("/list") + public TableDataInfo list(ServiceWorkOrdersBo bo, PageQuery pageQuery) { + return serviceWorkOrdersService.queryPageList(bo, pageQuery); + } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java index 12dd4157..e93cd13d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java @@ -30,7 +30,7 @@ public class AttendanceArea extends TenantEntity { /** * 摄像机id */ - private Long deviceManageId; + private String deviceManageId; /** * 区域 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestion.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/QuestionnaireQuestionItem.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java index 6f4b3039..b65fc902 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.List; + /** * 区域区域管理业务对象 attendance_area * @@ -29,7 +31,7 @@ public class AttendanceAreaBo extends BaseEntity { /** * 摄像机id */ - private Long deviceManageId; + private List deviceManageId; /** * 区域 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionBo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireQuestionItemBo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionItemVo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireMapper.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionItemMapper.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/QuestionnaireQuestionMapper.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IQuestionnaireService.java new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java index e22440b7..113999b1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.property.service.impl; +import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -89,6 +90,12 @@ public class AttendanceAreaServiceImpl implements IAttendanceAreaService { @Override public Boolean insertByBo(AttendanceAreaBo bo) { AttendanceArea add = MapstructUtils.convert(bo, AttendanceArea.class); + if (ObjectUtil.isNotEmpty(bo.getDeviceManageId())) { + assert add != null; + // 将 deviceManageId 集合转换为以逗号分隔的字符串 + String deviceManageIdsStr = StringUtils.join(bo.getDeviceManageId(), ","); + add.setDeviceManageId(deviceManageIdsStr); + } validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { 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 new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireMapper.xml new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionItemMapper.xml new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/QuestionnaireQuestionMapper.xml new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java index 929d50c0..1ed9b47c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java @@ -130,7 +130,7 @@ public class AlarmPushController { sisAlarmEvents.setId(recordId); // 转换类型和级别 - sisAlarmEvents.setType(convertToLong(recordMap.get("Type"))); +// sisAlarmEvents.setType(convertToLong(recordMap.get("Type"))); sisAlarmEvents.setLevel(convertToLong(recordMap.get("Level"))); // 设备信息 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java index b9a4012d..b46809bc 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java @@ -86,7 +86,7 @@ public class DataSyncTask { //同步成功后，将两张表的数据合并到alarmEvents表中 SisAlarmEventsBo sisAlarmEvents = new SisAlarmEventsBo(); sisAlarmEvents.setId(recordId); - sisAlarmEvents.setType(Long.valueOf((Integer) recordMap.get("Type"))); +// sisAlarmEvents.setType(Long.valueOf((Integer) recordMap.get("Type"))); sisAlarmEvents.setLevel(Long.valueOf((Integer) recordMap.get("Level"))); sisAlarmEvents.setDeviceIp((String) recordMap.get("DeviceSipNum")); sisAlarmEvents.setDeviceName(recordMap.get("DeviceName").toString());