by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source
This commit is contained in:
dy
2025-08-18 20:21:24 +08:00
parent c8179e164d 38e75e6b6b
commit 23cab413c2
68 changed files with 2098 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java
View File

@@ -1,28 +1,28 @@
package org.dromara.property.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.property.domain.bo.AttendanceArrangementBo;
import org.dromara.property.domain.vo.AttendanceArrangementVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.property.service.IAttendanceUserGroupService;
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.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
/**
* 排班明细
@@ -67,7 +67,7 @@ public class AttendanceUserGroupController extends BaseController {
@SaCheckPermission("Property:userGroup:query")
@GetMapping("/{id}")
public R<AttendanceUserGroupVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@PathVariable("id") Long id) {
return R.ok(attendanceUserGroupService.queryById(id));
}
@@ -114,4 +114,16 @@ public class AttendanceUserGroupController extends BaseController {
public TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery) {
return attendanceUserGroupService.queryScheduleView(bo, pageQuery);
}
/**
* 查询今天的排班人员信息
*
* @return 返回排班人员信息
*/
@GetMapping("/query/currentDay")
public R<List<AttendanceUserGroupVo>> queryCurrentSchedu() {
return R.ok(attendanceUserGroupService.queryAttendPersonInfo(new Date()));
}
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/FaqManagementController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.FaqManagementVo;
import org.dromara.property.domain.bo.FaqManagementBo;
import org.dromara.property.service.IFaqManagementService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 常见问题管理
* 前端访问路由地址为:/property/faqManagement
*
* @author LionLi
* @date 2025-08-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/faqManagement")
public class FaqManagementController extends BaseController {
private final IFaqManagementService faqManagementService;
/**
* 查询常见问题管理列表
*/
@SaCheckPermission("property:faqManagement:list")
@GetMapping("/list")
public TableDataInfo<FaqManagementVo> list(FaqManagementBo bo, PageQuery pageQuery) {
return faqManagementService.queryPageList(bo, pageQuery);
}
/**
* 导出常见问题管理列表
*/
@SaCheckPermission("property:faqManagement:export")
@Log(title = "常见问题管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(FaqManagementBo bo, HttpServletResponse response) {
List<FaqManagementVo> list = faqManagementService.queryList(bo);
ExcelUtil.exportExcel(list, "常见问题管理", FaqManagementVo.class, response);
}
/**
* 获取常见问题管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:faqManagement:query")
@GetMapping("/{id}")
public R<FaqManagementVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(faqManagementService.queryById(id));
}
/**
* 新增常见问题管理
*/
@SaCheckPermission("property:faqManagement:add")
@Log(title = "常见问题管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody FaqManagementBo bo) {
return toAjax(faqManagementService.insertByBo(bo));
}
/**
* 修改常见问题管理
*/
@SaCheckPermission("property:faqManagement:edit")
@Log(title = "常见问题管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FaqManagementBo bo) {
return toAjax(faqManagementService.updateByBo(bo));
}
/**
* 删除常见问题管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:faqManagement:remove")
@Log(title = "常见问题管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(faqManagementService.deleteWithValidByIds(List.of(ids), true));
}
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/QuestionnaireController.java
View File

@@ -51,7 +51,7 @@ public class QuestionnaireController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("property:questionnaire:query")
// @SaCheckPermission("property:questionnaire:query")
@GetMapping("/{id}")
public R<QuestionnaireVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {

61
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/FaqManagement.java Normal file
View File

@@ -0,0 +1,61 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 常见问题管理对象 faq_management
*
* @author LionLi
* @date 2025-08-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("faq_management")
public class FaqManagement extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private Long id;
/**
* 标题
*/
private String head;
/**
* 分类
*/
private String type;
/**
* 浏览量
*/
private Long pageView;
/**
* 内容
*/
private String contents;
/**
* 状态(1草稿 2已发布)
*/
private String status;
/**
* 搜索值
*/
private String searchValue;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/Questionnaire.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
@@ -59,5 +58,4 @@ public class Questionnaire extends TenantEntity {
*/
private String status;
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java
View File

@@ -118,5 +118,8 @@ public class TbVisitorManagement extends TenantEntity {
*/
private String searchValue;
/**
* e8平台id
*/
private Long eEightId;
}

64
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/FaqManagementBo.java Normal file
View File

@@ -0,0 +1,64 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.FaqManagement;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 常见问题管理业务对象 faq_management
*
* @author LionLi
* @date 2025-08-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = FaqManagement.class, reverseConvertGenerate = false)
public class FaqManagementBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 标题
*/
@NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class })
private String head;
/**
* 分类
*/
@NotBlank(message = "分类不能为空", groups = { AddGroup.class, EditGroup.class })
private String type;
/**
* 浏览量
*/
private Long pageView;
/**
* 内容
*/
@NotBlank(message = "内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String contents;
/**
* 状态(1草稿 2已发布)
*/
@NotBlank(message = "状态(1草稿 2已发布)不能为空", groups = { AddGroup.class, EditGroup.class })
private String status;
/**
* 搜索值
*/
private String searchValue;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/QuestionnaireBo.java
View File

@@ -11,8 +11,6 @@ import jakarta.validation.constraints.*;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 调查问卷业务对象 questionnaire
*

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java
View File

@@ -4,7 +4,6 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.api.domain.vo.RemoteBuildingVo;
import org.dromara.property.domain.*;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +13,6 @@ import java.io.Serializable;
import java.time.LocalDate;
/**
* 排班明细视图对象 attendance_user_group
*

86
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/FaqManagementVo.java Normal file
View File

@@ -0,0 +1,86 @@
package org.dromara.property.domain.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import org.dromara.property.domain.FaqManagement;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 常见问题管理视图对象 faq_management
*
* @author LionLi
* @date 2025-08-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = FaqManagement.class)
public class FaqManagementVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 标题
*/
@ExcelProperty(value = "标题")
private String head;
/**
* 分类
*/
@ExcelProperty(value = "分类")
private String type;
/**
* 浏览量
*/
@ExcelProperty(value = "浏览量")
private Long pageView;
/**
* 内容
*/
@ExcelProperty(value = "内容")
private String contents;
/**
* 状态(1草稿 2已发布)
*/
@ExcelProperty(value = "状态(1草稿 2已发布)")
private String status;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireQuestionVo.java
View File

@@ -7,11 +7,12 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.QuestionnaireQuestionItem;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@@ -70,5 +71,8 @@ public class QuestionnaireQuestionVo implements Serializable {
@ExcelProperty(value = "排序")
private Long sort;
/**
* 问题列表
*/
private List<QuestionnaireQuestionItemVo> questionnaireQuestionItemVos;
}

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/QuestionnaireVo.java
View File

@@ -13,7 +13,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@@ -72,5 +72,8 @@ public class QuestionnaireVo implements Serializable {
@ExcelProperty(value = "状态(1草稿2已发布3未发布)")
private String status;
/**
* 问题列表
*/
private List<QuestionnaireQuestionVo> questionnaireQuestionVos;
}

37
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java Normal file
View File

@@ -0,0 +1,37 @@
package org.dromara.property.dubbo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.service.IAttendanceUserGroupService;
import java.util.Date;
import java.util.List;
/**
* 排班远程服务调用实现
*
* @author lxj
*/
@DubboService
@RequiredArgsConstructor
public class RemoteAttendanceServiceImpl implements RemoteAttendanceService {
private final IAttendanceUserGroupService attendanceUserGroupService;
public List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
List<AttendanceUserGroupVo> ls = attendanceUserGroupService.queryAttendPersonInfo(date);
if (CollUtil.isNotEmpty(ls)) {
return BeanUtil.copyToList(ls, RemoteAttendanceUserGroupVo.class);
}
return null;
}
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteVisitoreGetCodeInfo.java Normal file
View File

@@ -0,0 +1,19 @@
package org.dromara.property.dubbo;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.property.api.RemoteVisitoreGetCodeInfoService;
import org.dromara.property.domain.bo.QrCodeInfo;
@DubboService
@RequiredArgsConstructor
public class RemoteVisitoreGetCodeInfo implements RemoteVisitoreGetCodeInfoService {
@Override
public String getCodeInfo(String code) {
QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" +code);
return info.getUserid().toString();
}
}

17
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/FaqManagementMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.FaqManagement;
import org.dromara.property.domain.vo.FaqManagementVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 常见问题管理Mapper接口
*
* @author LionLi
* @date 2025-08-18
*/
@Mapper
public interface FaqManagementMapper extends BaseMapperPlus<FaqManagement, FaqManagementVo> {
}

17
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java
View File

@@ -1,11 +1,13 @@
package org.dromara.property.service;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -66,5 +68,14 @@ public interface IAttendanceUserGroupService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 根据日期查询人员排班信息
*
* @param date 日期
* @return 返回排班人员信息
*/
List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date);
TableDataInfo<AttendanceUserGroupVo> queryScheduleView(AttendanceUserGroupBo bo, PageQuery pageQuery);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IFaqManagementService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.FaqManagement;
import org.dromara.property.domain.vo.FaqManagementVo;
import org.dromara.property.domain.bo.FaqManagementBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 常见问题管理Service接口
*
* @author LionLi
* @date 2025-08-18
*/
public interface IFaqManagementService {
/**
* 查询常见问题管理
*
* @param id 主键
* @return 常见问题管理
*/
FaqManagementVo queryById(Long id);
/**
* 分页查询常见问题管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 常见问题管理分页列表
*/
TableDataInfo<FaqManagementVo> queryPageList(FaqManagementBo bo, PageQuery pageQuery);
/**
* 查询符合条件的常见问题管理列表
*
* @param bo 查询条件
* @return 常见问题管理列表
*/
List<FaqManagementVo> queryList(FaqManagementBo bo);
/**
* 新增常见问题管理
*
* @param bo 常见问题管理
* @return 是否新增成功
*/
Boolean insertByBo(FaqManagementBo bo);
/**
* 修改常见问题管理
*
* @param bo 常见问题管理
* @return 是否修改成功
*/
Boolean updateByBo(FaqManagementBo bo);
/**
* 校验并批量删除常见问题管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

21
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import org.dromara.property.mapper.*;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.system.api.RemoteDeptService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteDeptVo;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
@@ -158,6 +160,25 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<AttendanceUserGroupVo> queryAttendPersonInfo(Date date) {
LambdaQueryWrapper<AttendanceUserGroup> lqw = Wrappers.lambdaQuery();
lqw.le(AttendanceUserGroup::getStartDate, date)
.ge(AttendanceUserGroup::getEndDate, date);
// 如果今天存在排班信息。那么处理排班人员信息
List<AttendanceUserGroupVo> attendanceUserGroupVos = this.baseMapper.selectVoList(lqw);
if (CollUtil.isNotEmpty(attendanceUserGroupVos)) {
attendanceUserGroupVos.forEach(attendanceUserGroupVo -> {
// 查询排班人员信息
RemoteUserVo remoteUserVo = remoteUserService.getUserInfoById(attendanceUserGroupVo.getEmployeeId());
attendanceUserGroupVo.setRemoteUserVo(remoteUserVo);
// todo 当表冗余了部门信息，以下反查操作可以去掉
RemoteDeptVo dept = remoteDeptService.selectDeptVoById(attendanceUserGroupVo.getDeptId());
attendanceUserGroupVo.setDeptName(dept.getDeptName());
});
}
return attendanceUserGroupVos;
}
/**
* 查询排班的班表视图

137
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/FaqManagementServiceImpl.java Normal file
View File

@@ -0,0 +1,137 @@
package org.dromara.property.service.impl;
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;
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.springframework.stereotype.Service;
import org.dromara.property.domain.bo.FaqManagementBo;
import org.dromara.property.domain.vo.FaqManagementVo;
import org.dromara.property.domain.FaqManagement;
import org.dromara.property.mapper.FaqManagementMapper;
import org.dromara.property.service.IFaqManagementService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 常见问题管理Service业务层处理
*
* @author LionLi
* @date 2025-08-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class FaqManagementServiceImpl implements IFaqManagementService {
private final FaqManagementMapper baseMapper;
/**
* 查询常见问题管理
*
* @param id 主键
* @return 常见问题管理
*/
@Override
public FaqManagementVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询常见问题管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 常见问题管理分页列表
*/
@Override
public TableDataInfo<FaqManagementVo> queryPageList(FaqManagementBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<FaqManagement> lqw = buildQueryWrapper(bo);
Page<FaqManagementVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的常见问题管理列表
*
* @param bo 查询条件
* @return 常见问题管理列表
*/
@Override
public List<FaqManagementVo> queryList(FaqManagementBo bo) {
LambdaQueryWrapper<FaqManagement> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<FaqManagement> buildQueryWrapper(FaqManagementBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<FaqManagement> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(FaqManagement::getId);
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());
lqw.eq(StringUtils.isNotBlank(bo.getContents()), FaqManagement::getContents, bo.getContents());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), FaqManagement::getStatus, bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), FaqManagement::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增常见问题管理
*
* @param bo 常见问题管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(FaqManagementBo bo) {
FaqManagement add = MapstructUtils.convert(bo, FaqManagement.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改常见问题管理
*
* @param bo 常见问题管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(FaqManagementBo bo) {
FaqManagement update = MapstructUtils.convert(bo, FaqManagement.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(FaqManagement entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除常见问题管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

56
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/QuestionnaireServiceImpl.java
View File

@@ -16,6 +16,8 @@ import org.dromara.property.domain.QuestionnaireQuestion;
import org.dromara.property.domain.QuestionnaireQuestionItem;
import org.dromara.property.domain.bo.QuestionnaireQuestionBo;
import org.dromara.property.domain.bo.QuestionnaireQuestionItemBo;
import org.dromara.property.domain.vo.QuestionnaireQuestionItemVo;
import org.dromara.property.domain.vo.QuestionnaireQuestionVo;
import org.dromara.property.mapper.QuestionnaireQuestionItemMapper;
import org.dromara.property.mapper.QuestionnaireQuestionMapper;
import org.springframework.stereotype.Service;
@@ -53,7 +55,9 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
*/
@Override
public QuestionnaireVo queryById(Long id) {
return baseMapper.selectVoById(id);
QuestionnaireVo questionnaireVo = baseMapper.selectVoById(id);
processingData(questionnaireVo,null, null);
return questionnaireVo;
}
/**
@@ -67,6 +71,23 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
public TableDataInfo<QuestionnaireVo> queryPageList(QuestionnaireBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Questionnaire> lqw = buildQueryWrapper(bo);
Page<QuestionnaireVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if (CollUtil.isNotEmpty(result.getRecords())) {
//收集所有的问卷id
List<Long> questionnaireIds = result.getRecords().stream().map(QuestionnaireVo::getId).toList();
// 一次性查询所有问题
LambdaQueryWrapper<QuestionnaireQuestion> questionQueryWrapper = Wrappers.lambdaQuery();
questionQueryWrapper.in(QuestionnaireQuestion::getQuestionnaireId, questionnaireIds);
List<QuestionnaireQuestionVo> questionnaireQuestionVos = questionnaireQuestionMapper.selectVoList(questionQueryWrapper);
//收集所有问题id
List<Long> idList = questionnaireQuestionVos.stream().map(QuestionnaireQuestionVo::getId).toList();
//查询所有问题选项
LambdaQueryWrapper<QuestionnaireQuestionItem> questionItemQueryWrapper = Wrappers.lambdaQuery();
questionItemQueryWrapper.in(QuestionnaireQuestionItem::getQuestionId, idList);
List<QuestionnaireQuestionItemVo> questionnaireQuestionItemVos = questionnaireQuestionItemMapper.selectVoList(questionItemQueryWrapper);
result.getRecords().stream().forEach(questionnaireVo -> {
processingData(questionnaireVo, questionnaireQuestionVos, questionnaireQuestionItemVos);
});
}
return TableDataInfo.build(result);
}
@@ -91,6 +112,37 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
return lqw;
}
/**
* 处理数据
*/
private void processingData(QuestionnaireVo questionnaireVo, List<QuestionnaireQuestionVo> questionnaireQuestionVos, List<QuestionnaireQuestionItemVo> questionnaireQuestionItemVos) {
// 在此处添加您选中的代码来获取问卷问题列表
if (CollUtil.isEmpty(questionnaireQuestionVos)) {
LambdaQueryWrapper<QuestionnaireQuestion> questionQueryWrapper = Wrappers.lambdaQuery();
questionQueryWrapper.eq(QuestionnaireQuestion::getQuestionnaireId, questionnaireVo.getId());
questionnaireQuestionVos = questionnaireQuestionMapper.selectVoList(questionQueryWrapper);
if (CollUtil.isEmpty(questionnaireQuestionItemVos)) {
//收集所有问题id
List<Long> idList = questionnaireQuestionVos.stream().map(QuestionnaireQuestionVo::getId).toList();
//查询所有问题选项
LambdaQueryWrapper<QuestionnaireQuestionItem> questionItemQueryWrapper = Wrappers.lambdaQuery();
questionItemQueryWrapper.in(QuestionnaireQuestionItem::getQuestionId, idList);
questionnaireQuestionItemVos = questionnaireQuestionItemMapper.selectVoList(questionItemQueryWrapper);
}
}
if (CollUtil.isNotEmpty(questionnaireQuestionVos)) {
List<QuestionnaireQuestionItemVo> finalQuestionnaireQuestionItemVos = questionnaireQuestionItemVos;
questionnaireQuestionVos.stream().forEach(questionnaireQuestionVo -> {
//筛选出属于当前问题的问题项返回list
List<QuestionnaireQuestionItemVo> list = finalQuestionnaireQuestionItemVos.stream().filter(questionnaireQuestionItemVo -> questionnaireQuestionItemVo.getQuestionId().equals(questionnaireQuestionVo.getId())).toList();
questionnaireQuestionVo.setQuestionnaireQuestionItemVos(list);
});
}
questionnaireVo.setQuestionnaireQuestionVos(questionnaireQuestionVos);
}
;
/**
* 新增调查问卷
*
@@ -191,7 +243,7 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
boolean flag = baseMapper.deleteByIds(ids) > 0;
if(flag){
if (flag) {
ids.stream().forEach(id -> {
//查询问题
List<QuestionnaireQuestion> questionnaireQuestionList = questionnaireQuestionMapper.selectList(new LambdaUpdateWrapper<QuestionnaireQuestion>().eq(QuestionnaireQuestion::getQuestionnaireId, id));

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
View File

@@ -168,11 +168,12 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
.map(ServiceWorkOrdersType::getId)
.collect(Collectors.toList());
typeIds.add(bo.getType());
List<String> statusList = Arrays.asList(bo.getStatus().split(","));
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ServiceWorkOrders> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ServiceWorkOrders::getId);
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ServiceWorkOrders::getStatus, bo.getStatus());
lqw.in(CollUtil.isNotEmpty(statusList), ServiceWorkOrders::getStatus, statusList);
lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName());
lqw.eq(bo.getDispatchTime() != null, ServiceWorkOrders::getDispatchTime, bo.getDispatchTime());
lqw.like(StringUtils.isNotBlank(bo.getInitiatorName()), ServiceWorkOrders::getInitiatorPeople, bo.getInitiatorName());

50
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java
View File

@@ -1,6 +1,8 @@
package org.dromara.property.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -13,6 +15,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.property.domain.bo.QrCodeInfo;
import org.dromara.sis.api.RemoteVisitorService;
import org.dromara.sis.api.domain.RemoteVisitor;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
@@ -30,7 +34,7 @@ import java.util.Collection;
* 访客管理Service业务层处理
*
* @author mocheng
* @date 2025-06-19
* @since 2025-06-19
*/
@Slf4j
@RequiredArgsConstructor
@@ -38,7 +42,12 @@ import java.util.Collection;
public class TbVisitorManagementServiceImpl implements ITbVisitorManagementService {
private final TbVisitorManagementMapper baseMapper;
private final RemoteUserService remoteUserService;
@DubboReference
private RemoteUserService remoteUserService;
@DubboReference
private RemoteVisitorService remoteVisitorService;
/**
* 查询访客管理
@@ -47,7 +56,7 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
* @return 访客管理
*/
@Override
public TbVisitorManagementVo queryById(Long id){
public TbVisitorManagementVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -104,10 +113,11 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
*/
@Override
public Boolean insertByBo(TbVisitorManagementBo bo) {
QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + bo.getQrCodeId());
RedisUtils.deleteKeys(GlobalConstants.CAPTCHA_CODE_KEY +"Qrcode" + bo.getQrCodeId());
QrCodeInfo info = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + "Qrcode" + bo.getQrCodeId());
RedisUtils.deleteKeys(GlobalConstants.CAPTCHA_CODE_KEY + "Qrcode" + bo.getQrCodeId());
TbVisitorManagement add = MapstructUtils.convert(bo, TbVisitorManagement.class);
validEntityBeforeSave(add);
assert add != null;
add.setCreateById(info.getUserid());
RemoteUserVo userInfoById = remoteUserService.getUserInfoById(info.getUserid());
add.setTenantId(userInfoById.getTenantId());
@@ -118,8 +128,12 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
add.setUpdateBy(userInfoById.getUserId());
add.setCreateDept(userInfoById.getDeptId());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
Long e8Id = syncE8PlatVisitor(bo);
add.setEEightId(e8Id);
baseMapper.updateById(add);
}
return flag;
}
@@ -139,11 +153,33 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
// add.setCreateById(info.getUserid());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
assert add != null;
bo.setId(add.getId());
Long e8Id = syncE8PlatVisitor(bo);
add.setEEightId(e8Id);
baseMapper.updateById(add);
}
return flag;
}
/**
* 访客登记同步E8平台门禁
*
* @param visitor 访客信息
* @return E8平台访客ID
*/
private Long syncE8PlatVisitor(TbVisitorManagementBo visitor) {
RemoteVisitor remoteVisitor = new RemoteVisitor();
remoteVisitor.setVisitorName(visitor.getVisitorName());
remoteVisitor.setMobilePhone(visitor.getVisitorPhone());
remoteVisitor.setIntervieweeMobile(visitor.getInterviewedPhone());
remoteVisitor.setVisitorStartTime(DateUtil.format(visitor.getVisitingBeginTime(), "yyyy-MM-dd HH:mm:ss"));
remoteVisitor.setVistorEndTime(DateUtil.format(visitor.getVisitingEndTime(), "yyyy-MM-dd HH:mm:ss"));
remoteVisitor.setVisitorFaceImg(visitor.getFacePictures());
return remoteVisitorService.syncE8PlatVisitor(remoteVisitor);
}
/**
* 修改访客管理
*
@@ -160,7 +196,7 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbVisitorManagement entity){
private void validEntityBeforeSave(TbVisitorManagement entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -173,7 +209,7 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

7
ruoyi-modules/Property/src/main/resources/mapper/Property/FaqManagementMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.FaqManagementMapper">
</mapper>