From 432ae50f24d8d9b08f6d16ddedefc2f9295ac795 Mon Sep 17 00:00:00 2001 From: lj7788 Date: Sat, 30 Aug 2025 07:26:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + .../yanzhu/flowable/domain/my/FlowDeptVo.java | 2 + .../domain/ProMobileAttendanceConfig.java | 201 ++++++++++++++++++ .../ProMobileAttendanceConfigGroup.java | 66 ++++++ .../ProMobileAttendanceConfigGroupMapper.java | 61 ++++++ .../ProMobileAttendanceConfigMapper.java | 61 ++++++ .../ProMobileAttendanceConfigGroupMapper.xml | 61 ++++++ .../ProMobileAttendanceConfigMapper.xml | 126 +++++++++++ yanzhu-modules/yanzhu-flowable/pom.xml | 4 +- yanzhu-modules/yanzhu-gen/pom.xml | 4 +- yanzhu-modules/yanzhu-job/pom.xml | 4 +- yanzhu-modules/yanzhu-manage/pom.xml | 4 +- .../ProMobileAttendanceConfigController.java | 107 ++++++++++ ...MobileAttendanceConfigGroupController.java | 108 ++++++++++ ...ProMobileAttendanceConfigGroupService.java | 61 ++++++ .../IProMobileAttendanceConfigService.java | 61 ++++++ ...obileAttendanceConfigGroupServiceImpl.java | 93 ++++++++ .../ProMobileAttendanceConfigServiceImpl.java | 100 +++++++++ yanzhu-modules/yanzhu-system/pom.xml | 4 +- yanzhu-rocketmq/pom.xml | 4 +- 20 files changed, 1127 insertions(+), 12 deletions(-) create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigGroupController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigGroupService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigGroupServiceImpl.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigServiceImpl.java diff --git a/pom.xml b/pom.xml index 0ea61c65..3d89d64f 100644 --- a/pom.xml +++ b/pom.xml @@ -288,6 +288,13 @@ 13.0.2 + + + com.mysql + mysql-connector-j + 8.0.31 + + diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/my/FlowDeptVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/my/FlowDeptVo.java index 69e8ca7e..68b8ae53 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/my/FlowDeptVo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/my/FlowDeptVo.java @@ -3,6 +3,7 @@ package com.yanzhu.flowable.domain.my; import com.yanzhu.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-02-23 */ @Data +@EqualsAndHashCode(callSuper = false) @ApiModel("工作流项目单位关系") public class FlowDeptVo extends BaseEntity { diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java new file mode 100644 index 00000000..937bcfd3 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfig.java @@ -0,0 +1,201 @@ +package com.yanzhu.manage.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 移动端考勤配置对象 pro_mobile_attendance_config + * + * @author yanzhu + * @date 2025-08-29 + */ +public class ProMobileAttendanceConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long comId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long projectId; + + /** 标题 */ + @Excel(name = "标题") + private String title; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date starteDate; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endDate; + + /** 地址 */ + @Excel(name = "地址") + private String address; + + /** 经度 */ + @Excel(name = "经度") + private BigDecimal longitude; + + /** 纬度 */ + @Excel(name = "纬度") + private BigDecimal latitude; + + /** 有效 */ + @Excel(name = "有效") + private Long valid; + + /** 考勤范围 */ + @Excel(name = "考勤范围") + private BigDecimal rang; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long state; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setStarteDate(Date starteDate) + { + this.starteDate = starteDate; + } + + public Date getStarteDate() + { + return starteDate; + } + public void setEndDate(Date endDate) + { + this.endDate = endDate; + } + + public Date getEndDate() + { + return endDate; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setLongitude(BigDecimal longitude) + { + this.longitude = longitude; + } + + public BigDecimal getLongitude() + { + return longitude; + } + public void setLatitude(BigDecimal latitude) + { + this.latitude = latitude; + } + + public BigDecimal getLatitude() + { + return latitude; + } + public void setValid(Long valid) + { + this.valid = valid; + } + + public Long getValid() + { + return valid; + } + public void setRang(BigDecimal rang) + { + this.rang = rang; + } + + public BigDecimal getRang() + { + return rang; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("title", getTitle()) + .append("starteDate", getStarteDate()) + .append("endDate", getEndDate()) + .append("address", getAddress()) + .append("longitude", getLongitude()) + .append("latitude", getLatitude()) + .append("valid", getValid()) + .append("rang", getRang()) + .append("state", getState()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java new file mode 100644 index 00000000..db1ce05a --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProMobileAttendanceConfigGroup.java @@ -0,0 +1,66 @@ +package com.yanzhu.manage.domain; + +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + + +/** + * 移动端考勤配置分组信息对象 pro_mobile_attendance_config_group + * + * @author yanzhu + * @date 2025-08-29 + */ +public class ProMobileAttendanceConfigGroup extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 配置表ID */ + @Excel(name = "配置表ID") + private Long cfgId; + + /** 班级ID */ + @Excel(name = "班级ID") + private Long groupId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCfgId(Long cfgId) + { + this.cfgId = cfgId; + } + + public Long getCfgId() + { + return cfgId; + } + public void setGroupId(Long groupId) + { + this.groupId = groupId; + } + + public Long getGroupId() + { + return groupId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("cfgId", getCfgId()) + .append("groupId", getGroupId()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java new file mode 100644 index 00000000..26d04280 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigGroupMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.ProMobileAttendanceConfigGroup; + +/** + * 移动端考勤配置分组信息Mapper接口 + * + * @author yanzhu + * @date 2025-08-29 + */ +public interface ProMobileAttendanceConfigGroupMapper +{ + /** + * 查询移动端考勤配置分组信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 移动端考勤配置分组信息 + */ + public ProMobileAttendanceConfigGroup selectProMobileAttendanceConfigGroupById(Long id); + + /** + * 查询移动端考勤配置分组信息列表 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 移动端考勤配置分组信息集合 + */ + public List selectProMobileAttendanceConfigGroupList(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 新增移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + public int insertProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 修改移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + public int updateProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 删除移动端考勤配置分组信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigGroupById(Long id); + + /** + * 批量删除移动端考勤配置分组信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigGroupByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java new file mode 100644 index 00000000..40cea124 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProMobileAttendanceConfigMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.ProMobileAttendanceConfig; + +/** + * 移动端考勤配置Mapper接口 + * + * @author yanzhu + * @date 2025-08-29 + */ +public interface ProMobileAttendanceConfigMapper +{ + /** + * 查询移动端考勤配置 + * + * @param id 移动端考勤配置主键 + * @return 移动端考勤配置 + */ + public ProMobileAttendanceConfig selectProMobileAttendanceConfigById(Long id); + + /** + * 查询移动端考勤配置列表 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 移动端考勤配置集合 + */ + public List selectProMobileAttendanceConfigList(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 新增移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + public int insertProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 修改移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + public int updateProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 删除移动端考勤配置 + * + * @param id 移动端考勤配置主键 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigById(Long id); + + /** + * 批量删除移动端考勤配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml new file mode 100644 index 00000000..2c8a89ae --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigGroupMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + select id, cfg_id, group_id from pro_mobile_attendance_config_group + + + + + + + + insert into pro_mobile_attendance_config_group + + cfg_id, + group_id, + + + #{cfgId}, + #{groupId}, + + + + + update pro_mobile_attendance_config_group + + cfg_id = #{cfgId}, + group_id = #{groupId}, + + where id = #{id} + + + + delete from pro_mobile_attendance_config_group where id = #{id} + + + + delete from pro_mobile_attendance_config_group where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml new file mode 100644 index 00000000..5022b299 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMobileAttendanceConfigMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, com_id, project_id, title, starte_date, end_date, address, longitude, latitude, valid, rang, state, remark, create_by, create_time, update_by, update_time from pro_mobile_attendance_config + + + + + + + + insert into pro_mobile_attendance_config + + com_id, + project_id, + title, + starte_date, + end_date, + address, + longitude, + latitude, + valid, + rang, + state, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{comId}, + #{projectId}, + #{title}, + #{starteDate}, + #{endDate}, + #{address}, + #{longitude}, + #{latitude}, + #{valid}, + #{rang}, + #{state}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update pro_mobile_attendance_config + + com_id = #{comId}, + project_id = #{projectId}, + title = #{title}, + starte_date = #{starteDate}, + end_date = #{endDate}, + address = #{address}, + longitude = #{longitude}, + latitude = #{latitude}, + valid = #{valid}, + rang = #{rang}, + state = #{state}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from pro_mobile_attendance_config where id = #{id} + + + + delete from pro_mobile_attendance_config where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-flowable/pom.xml b/yanzhu-modules/yanzhu-flowable/pom.xml index 90c1d3c4..d6c92a5e 100644 --- a/yanzhu-modules/yanzhu-flowable/pom.xml +++ b/yanzhu-modules/yanzhu-flowable/pom.xml @@ -62,8 +62,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/yanzhu-modules/yanzhu-gen/pom.xml b/yanzhu-modules/yanzhu-gen/pom.xml index be477070..274b4e28 100644 --- a/yanzhu-modules/yanzhu-gen/pom.xml +++ b/yanzhu-modules/yanzhu-gen/pom.xml @@ -56,8 +56,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/yanzhu-modules/yanzhu-job/pom.xml b/yanzhu-modules/yanzhu-job/pom.xml index 25f31449..e718ce47 100644 --- a/yanzhu-modules/yanzhu-job/pom.xml +++ b/yanzhu-modules/yanzhu-job/pom.xml @@ -62,8 +62,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml index 5af93791..f94592bb 100644 --- a/yanzhu-modules/yanzhu-manage/pom.xml +++ b/yanzhu-modules/yanzhu-manage/pom.xml @@ -61,8 +61,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigController.java new file mode 100644 index 00000000..9e56c308 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigController.java @@ -0,0 +1,107 @@ +package com.yanzhu.manage.controller.remoteAttendance; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.yanzhu.manage.domain.ProMobileAttendanceConfig; +import com.yanzhu.manage.service.IProMobileAttendanceConfigService; + +/** + * 移动端考勤配置Controller + * + * @author yanzhu + * @date 2025-08-29 + */ +@RestController +@RequestMapping("/mobileAttendConfig") +public class ProMobileAttendanceConfigController extends BaseController +{ + @Autowired + private IProMobileAttendanceConfigService proMobileAttendanceConfigService; + + /** + * 查询移动端考勤配置列表 + */ + @RequiresPermissions("manage:mobileAttendConfig:list") + @GetMapping("/list") + public TableDataInfo list(ProMobileAttendanceConfig proMobileAttendanceConfig) + { + startPage(); + List list = proMobileAttendanceConfigService.selectProMobileAttendanceConfigList(proMobileAttendanceConfig); + return getDataTable(list); + } + + /** + * 导出移动端考勤配置列表 + */ + @RequiresPermissions("manage:mobileAttendConfig:export") + @Log(title = "移动端考勤配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProMobileAttendanceConfig proMobileAttendanceConfig) + { + List list = proMobileAttendanceConfigService.selectProMobileAttendanceConfigList(proMobileAttendanceConfig); + ExcelUtil util = new ExcelUtil(ProMobileAttendanceConfig.class); + util.exportExcel(response, list, "移动端考勤配置数据"); + } + + /** + * 获取移动端考勤配置详细信息 + */ + @RequiresPermissions("manage:mobileAttendConfig:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(proMobileAttendanceConfigService.selectProMobileAttendanceConfigById(id)); + } + + /** + * 新增移动端考勤配置 + */ + @RequiresPermissions("manage:mobileAttendConfig:add") + @Log(title = "移动端考勤配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProMobileAttendanceConfig proMobileAttendanceConfig) + { + return toAjax(proMobileAttendanceConfigService.insertProMobileAttendanceConfig(proMobileAttendanceConfig)); + } + + /** + * 修改移动端考勤配置 + */ + @RequiresPermissions("manage:mobileAttendConfig:edit") + @Log(title = "移动端考勤配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProMobileAttendanceConfig proMobileAttendanceConfig) + { + return toAjax(proMobileAttendanceConfigService.updateProMobileAttendanceConfig(proMobileAttendanceConfig)); + } + + /** + * 删除移动端考勤配置 + */ + @RequiresPermissions("manage:mobileAttendConfig:remove") + @Log(title = "移动端考勤配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(proMobileAttendanceConfigService.deleteProMobileAttendanceConfigByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigGroupController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigGroupController.java new file mode 100644 index 00000000..bda0eafe --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/remoteAttendance/ProMobileAttendanceConfigGroupController.java @@ -0,0 +1,108 @@ +package com.yanzhu.manage.controller.remoteAttendance; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.yanzhu.manage.domain.ProMobileAttendanceConfigGroup; +import com.yanzhu.manage.service.IProMobileAttendanceConfigGroupService; + + +/** + * 移动端考勤配置分组信息Controller + * + * @author yanzhu + * @date 2025-08-29 + */ +@RestController +@RequestMapping("/mobileAttendanceConfigGroup") +public class ProMobileAttendanceConfigGroupController extends BaseController +{ + @Autowired + private IProMobileAttendanceConfigGroupService proMobileAttendanceConfigGroupService; + + /** + * 查询移动端考勤配置分组信息列表 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:list") + @GetMapping("/list") + public TableDataInfo list(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + startPage(); + List list = proMobileAttendanceConfigGroupService.selectProMobileAttendanceConfigGroupList(proMobileAttendanceConfigGroup); + return getDataTable(list); + } + + /** + * 导出移动端考勤配置分组信息列表 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:export") + @Log(title = "移动端考勤配置分组信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + List list = proMobileAttendanceConfigGroupService.selectProMobileAttendanceConfigGroupList(proMobileAttendanceConfigGroup); + ExcelUtil util = new ExcelUtil(ProMobileAttendanceConfigGroup.class); + util.exportExcel(response, list, "移动端考勤配置分组信息数据"); + } + + /** + * 获取移动端考勤配置分组信息详细信息 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(proMobileAttendanceConfigGroupService.selectProMobileAttendanceConfigGroupById(id)); + } + + /** + * 新增移动端考勤配置分组信息 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:add") + @Log(title = "移动端考勤配置分组信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + return toAjax(proMobileAttendanceConfigGroupService.insertProMobileAttendanceConfigGroup(proMobileAttendanceConfigGroup)); + } + + /** + * 修改移动端考勤配置分组信息 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:edit") + @Log(title = "移动端考勤配置分组信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + return toAjax(proMobileAttendanceConfigGroupService.updateProMobileAttendanceConfigGroup(proMobileAttendanceConfigGroup)); + } + + /** + * 删除移动端考勤配置分组信息 + */ + @RequiresPermissions("manage:mobileAttendanceConfigGroup:remove") + @Log(title = "移动端考勤配置分组信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(proMobileAttendanceConfigGroupService.deleteProMobileAttendanceConfigGroupByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigGroupService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigGroupService.java new file mode 100644 index 00000000..316ffd0e --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigGroupService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.ProMobileAttendanceConfigGroup; + +/** + * 移动端考勤配置分组信息Service接口 + * + * @author yanzhu + * @date 2025-08-29 + */ +public interface IProMobileAttendanceConfigGroupService +{ + /** + * 查询移动端考勤配置分组信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 移动端考勤配置分组信息 + */ + public ProMobileAttendanceConfigGroup selectProMobileAttendanceConfigGroupById(Long id); + + /** + * 查询移动端考勤配置分组信息列表 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 移动端考勤配置分组信息集合 + */ + public List selectProMobileAttendanceConfigGroupList(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 新增移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + public int insertProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 修改移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + public int updateProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup); + + /** + * 批量删除移动端考勤配置分组信息 + * + * @param ids 需要删除的移动端考勤配置分组信息主键集合 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigGroupByIds(Long[] ids); + + /** + * 删除移动端考勤配置分组信息信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigGroupById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigService.java new file mode 100644 index 00000000..2ea620dd --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProMobileAttendanceConfigService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.ProMobileAttendanceConfig; + +/** + * 移动端考勤配置Service接口 + * + * @author yanzhu + * @date 2025-08-29 + */ +public interface IProMobileAttendanceConfigService +{ + /** + * 查询移动端考勤配置 + * + * @param id 移动端考勤配置主键 + * @return 移动端考勤配置 + */ + public ProMobileAttendanceConfig selectProMobileAttendanceConfigById(Long id); + + /** + * 查询移动端考勤配置列表 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 移动端考勤配置集合 + */ + public List selectProMobileAttendanceConfigList(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 新增移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + public int insertProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 修改移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + public int updateProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig); + + /** + * 批量删除移动端考勤配置 + * + * @param ids 需要删除的移动端考勤配置主键集合 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigByIds(Long[] ids); + + /** + * 删除移动端考勤配置信息 + * + * @param id 移动端考勤配置主键 + * @return 结果 + */ + public int deleteProMobileAttendanceConfigById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigGroupServiceImpl.java new file mode 100644 index 00000000..656c98f0 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigGroupServiceImpl.java @@ -0,0 +1,93 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.ProMobileAttendanceConfigGroupMapper; +import com.yanzhu.manage.domain.ProMobileAttendanceConfigGroup; +import com.yanzhu.manage.service.IProMobileAttendanceConfigGroupService; + +/** + * 移动端考勤配置分组信息Service业务层处理 + * + * @author yanzhu + * @date 2025-08-29 + */ +@Service +public class ProMobileAttendanceConfigGroupServiceImpl implements IProMobileAttendanceConfigGroupService +{ + @Autowired + private ProMobileAttendanceConfigGroupMapper proMobileAttendanceConfigGroupMapper; + + /** + * 查询移动端考勤配置分组信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 移动端考勤配置分组信息 + */ + @Override + public ProMobileAttendanceConfigGroup selectProMobileAttendanceConfigGroupById(Long id) + { + return proMobileAttendanceConfigGroupMapper.selectProMobileAttendanceConfigGroupById(id); + } + + /** + * 查询移动端考勤配置分组信息列表 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 移动端考勤配置分组信息 + */ + @Override + public List selectProMobileAttendanceConfigGroupList(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + return proMobileAttendanceConfigGroupMapper.selectProMobileAttendanceConfigGroupList(proMobileAttendanceConfigGroup); + } + + /** + * 新增移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + @Override + public int insertProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + return proMobileAttendanceConfigGroupMapper.insertProMobileAttendanceConfigGroup(proMobileAttendanceConfigGroup); + } + + /** + * 修改移动端考勤配置分组信息 + * + * @param proMobileAttendanceConfigGroup 移动端考勤配置分组信息 + * @return 结果 + */ + @Override + public int updateProMobileAttendanceConfigGroup(ProMobileAttendanceConfigGroup proMobileAttendanceConfigGroup) + { + return proMobileAttendanceConfigGroupMapper.updateProMobileAttendanceConfigGroup(proMobileAttendanceConfigGroup); + } + + /** + * 批量删除移动端考勤配置分组信息 + * + * @param ids 需要删除的移动端考勤配置分组信息主键 + * @return 结果 + */ + @Override + public int deleteProMobileAttendanceConfigGroupByIds(Long[] ids) + { + return proMobileAttendanceConfigGroupMapper.deleteProMobileAttendanceConfigGroupByIds(ids); + } + + /** + * 删除移动端考勤配置分组信息信息 + * + * @param id 移动端考勤配置分组信息主键 + * @return 结果 + */ + @Override + public int deleteProMobileAttendanceConfigGroupById(Long id) + { + return proMobileAttendanceConfigGroupMapper.deleteProMobileAttendanceConfigGroupById(id); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigServiceImpl.java new file mode 100644 index 00000000..4f83cbee --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProMobileAttendanceConfigServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.ProMobileAttendanceConfigMapper; +import com.yanzhu.manage.domain.ProMobileAttendanceConfig; +import com.yanzhu.manage.service.IProMobileAttendanceConfigService; + +/** + * 移动端考勤配置Service业务层处理 + * + * @author yanzhu + * @date 2025-08-29 + */ +@Service +public class ProMobileAttendanceConfigServiceImpl implements IProMobileAttendanceConfigService +{ + @Autowired + private ProMobileAttendanceConfigMapper proMobileAttendanceConfigMapper; + + /** + * 查询移动端考勤配置 + * + * @param id 移动端考勤配置主键 + * @return 移动端考勤配置 + */ + @Override + public ProMobileAttendanceConfig selectProMobileAttendanceConfigById(Long id) + { + return proMobileAttendanceConfigMapper.selectProMobileAttendanceConfigById(id); + } + + /** + * 查询移动端考勤配置列表 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 移动端考勤配置 + */ + @Override + public List selectProMobileAttendanceConfigList(ProMobileAttendanceConfig proMobileAttendanceConfig) + { + return proMobileAttendanceConfigMapper.selectProMobileAttendanceConfigList(proMobileAttendanceConfig); + } + + /** + * 新增移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + @Override + public int insertProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig) + { + proMobileAttendanceConfig.setCreateBy(SecurityContextHolder.getUserName()); + proMobileAttendanceConfig.setCreateTime(DateUtils.getNowDate()); + return proMobileAttendanceConfigMapper.insertProMobileAttendanceConfig(proMobileAttendanceConfig); + } + + /** + * 修改移动端考勤配置 + * + * @param proMobileAttendanceConfig 移动端考勤配置 + * @return 结果 + */ + @Override + public int updateProMobileAttendanceConfig(ProMobileAttendanceConfig proMobileAttendanceConfig) + { + proMobileAttendanceConfig.setUpdateBy(SecurityContextHolder.getUserName()); + proMobileAttendanceConfig.setUpdateTime(DateUtils.getNowDate()); + return proMobileAttendanceConfigMapper.updateProMobileAttendanceConfig(proMobileAttendanceConfig); + } + + /** + * 批量删除移动端考勤配置 + * + * @param ids 需要删除的移动端考勤配置主键 + * @return 结果 + */ + @Override + public int deleteProMobileAttendanceConfigByIds(Long[] ids) + { + return proMobileAttendanceConfigMapper.deleteProMobileAttendanceConfigByIds(ids); + } + + /** + * 删除移动端考勤配置信息 + * + * @param id 移动端考勤配置主键 + * @return 结果 + */ + @Override + public int deleteProMobileAttendanceConfigById(Long id) + { + return proMobileAttendanceConfigMapper.deleteProMobileAttendanceConfigById(id); + } +} diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml index ad21b65d..76d27031 100644 --- a/yanzhu-modules/yanzhu-system/pom.xml +++ b/yanzhu-modules/yanzhu-system/pom.xml @@ -57,8 +57,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/yanzhu-rocketmq/pom.xml b/yanzhu-rocketmq/pom.xml index 52ca2869..4c7f60df 100644 --- a/yanzhu-rocketmq/pom.xml +++ b/yanzhu-rocketmq/pom.xml @@ -49,8 +49,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j From 9ac6586e86bdcf2eb17fc7b35ac073de68af38ac Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Sat, 30 Aug 2025 11:33:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B8=B2?= =?UTF-8?q?=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-bigscreen/public/index.html | 2 +- .../src/views/bim/briefingTools.js | 150 ++++++++++++++++-- yanzhu-bigscreen/src/views/bimBriefing.vue | 97 +++++------ yanzhu-bigscreen/src/views/bimRoaming.vue | 4 - 4 files changed, 180 insertions(+), 73 deletions(-) diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html index 3230291e..081a3048 100644 --- a/yanzhu-bigscreen/public/index.html +++ b/yanzhu-bigscreen/public/index.html @@ -27,7 +27,7 @@ - + diff --git a/yanzhu-bigscreen/src/views/bim/briefingTools.js b/yanzhu-bigscreen/src/views/bim/briefingTools.js index 4ab8b910..907e3d99 100644 --- a/yanzhu-bigscreen/src/views/bim/briefingTools.js +++ b/yanzhu-bigscreen/src/views/bim/briefingTools.js @@ -46,9 +46,37 @@ function dataFiltering(that, id) { }); } /** - * 获取构件属性信息 + * 获取构件属性信息-客户端渲染 + */ +function getClientProperty(that) { + let api = bimBriefingApi; + api.Public.event("LEFT_CLICK", e => { + api.Feature.getByEvent(e.position, n => { + if (n && n["id"]) { + let featureId = n.id; + if (featureId.split("^")[1]) { + clearSelectFeature(that); + api.Feature.setColor(featureId, 255, 0, 255, 1); + that.selFeatureId = featureId; + dataFiltering(that, featureId); + that.propertyLoad = "start"; + that.attributeInformation = "查询中，请稍候~"; + } + } else { + that.attributeInformation = "未选中构件"; + } + }, false, false) + }); +} +/** + * 获取构件属性信息-服务端渲染 */ function getProperty(that) { + that.$message.info("请在模型中点击选中构件"); + if (that.isClient) { + getClientProperty(that); + return; + } let api = bimBriefingApi; api.Feature.getByEvent(true, (n) => { if (n && n["id"]) { @@ -74,18 +102,67 @@ function getModelUnit(that, modelId) { } /** - * 获取构件尺寸信息 + * 获取构件尺寸信息-客户端渲染 */ -function subFeatureSize(that) { +function subFeatureSizeClient(that) { let api = bimBriefingApi; let result = [ { name: "构建尺寸", data: [] }, { name: "构建表面积", data: [] }, { name: "构建体积", data: [] }, ]; + api.Public.event("LEFT_CLICK", e => { + api.Feature.getByEvent(e.position, n => { + if (n && n["id"]) { + let featureId = n.id; + if (featureId.split("^")[1]) { + let modelId = featureId.split("^")[0]; + + clearSelectFeature(that); + api.Feature.setColor(featureId, 255, 0, 255, 1); + that.selFeatureId = featureId; + api.Feature.getGeometrySizeById(featureId, modelId, res => { + if (res) { + let unit = getModelUnit(that, modelId); + let size = res || {}; + let x = (size.x || 0) * unit * 1.0; + let y = (size.y || 0) * unit * 1.0; + let z = (size.z || 0) * unit * 1.0; + result[0].data = [ + { name: "长", value: x.toFixed(2) + "" }, + { name: "宽", value: y.toFixed(2) + "" }, + { name: "高", value: z.toFixed(2) + "" }, + ]; + result[1].data = [{ name: "面积", value: (x * y).toFixed(4) + "" }]; + result[2].data = [{ name: "体积", value: (x * y * z).toFixed(6) }]; + } + }); + } + } + }); + }); + that.info = result; +} + +/** + * 获取构件尺寸信息-服务端渲染 + */ +function subFeatureSize(that) { + let api = bimBriefingApi; that.info = []; api.Public.clearHandler(); api.Measurement.clearAllTrace(); + if (that.isClient) { + subFeatureSizeClient(that); + return; + } + + let result = [ + { name: "构建尺寸", data: [] }, + { name: "构建表面积", data: [] }, + { name: "构建体积", data: [] }, + ]; + api.Feature.getByEvent(true, (n) => { if (n && n["id"]) { let featureId = n.id; @@ -115,7 +192,8 @@ function subFeatureSize(that) { function measurementArea(that) { let api = bimBriefingApi; that.info = []; - api.Public.clearHandler(), api.Measurement.clearAllTrace(); + api.Public.clearHandler(); + api.Measurement.clearAllTrace(); api.Feature.getByEvent(true, (n) => { console.log(n); if (n && n["id"]) { @@ -133,13 +211,55 @@ function measurementArea(that) { //构件体积 function measuringVolume(that) { } -//构件距离 +//构件距离--客户端渲染 +function distanceClient(that) { + let api = bimBriefingApi; + let result = [{ name: "测量结果", data: [] }]; + let unit = 1; + api.Public.event("LEFT_CLICK", e => { + api.Feature.getByEvent(e.position, n => { + if (n && n["id"]) { + let featureId = n.id; + if (featureId.split("^")[1]) { + let modelId = featureId.split("^")[0]; + unit = getModelUnit(that, modelId); + } + } + }); + }); + api.Measurement.distance(data => { + if (data) { + result[0].data = [ + { + name: "距离", + value: (data.dis * unit).toFixed(2), + }, + { name: "X", value: (data.X * unit).toFixed(2) }, + { name: "Y", value: (data.Y * unit).toFixed(2) }, + { name: "Z", value: (data.Z * unit).toFixed(2) }, + ]; + that.info = result; + } + }, true); +} +//构件距离--服务端渲染 function distance(that) { let api = bimBriefingApi; let result = [{ name: "测量结果", data: [] }]; that.$message.info("请在模型中点击两点，右键结束测量"); api.Public.clearHandler(); api.Measurement.clearAllTrace(); + api.Public.event("LEFT_CLICK", (res) => { + api.Measurement.clearAllTrace(); + }); + //右键结束测量 + api.Public.event("RIGHT_CLICK", (res) => { + api.Measurement.distance(false); + }); + if (that.isClient) { + distanceClient(that); + return; + } let unit = 1; api.Feature.getByEvent(true, (n) => { if (n && n["id"]) { @@ -162,19 +282,23 @@ function distance(that) { that.info = result; }); - api.Public.event("LEFT_CLICK", (res) => { - api.Measurement.clearAllTrace(); - }); - //右键结束测量 - api.Public.event("RIGHT_CLICK", (res) => { - api.Measurement.distance(false); - }); + } function getModels(that) { return that.models.map((d) => d.modelId); } -//剖切 +//剖切 -- 客户端渲染 +function initClientClipping(that) { + let api = bimBriefingApi; +} +//剖切 -- 服务端渲染 function initClipping(that) { + api.Public.clearHandler(); + api.Measurement.clearAllTrace(); + if(that.isClient){ + initClientClipping(that); + return; + } let api = bimBriefingApi; api.Model.clipByBox(getModels(that)); } diff --git a/yanzhu-bigscreen/src/views/bimBriefing.vue b/yanzhu-bigscreen/src/views/bimBriefing.vue index 576de43f..98a1fda6 100644 --- a/yanzhu-bigscreen/src/views/bimBriefing.vue +++ b/yanzhu-bigscreen/src/views/bimBriefing.vue @@ -50,8 +50,8 @@ - - + +
{{ item2.propertyName }}{{ item2.value }}{{ item2.propertyName }}{{ item2.value }}
@@ -66,8 +66,8 @@ - - +
{{ item2.name }} + {{ item2.name }} {{ item2.value }} 米 米2 @@ -216,7 +216,6 @@