From 3abf9dd40ef19e4f926e9d6fec2e26b25d618bb5 Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Tue, 22 Jul 2025 18:34:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9JOB=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/mac-modules-job | 2 +- .../com/yanzhu/job/domain/SysApplyConfig.java | 173 ------------------ .../job/mapper/SysApplyConfigMapper.java | 62 ------- .../job/service/ISysApplyConfigService.java | 67 ------- .../impl/SysApplyConfigServiceImpl.java | 161 ---------------- .../mapper/job/SysApplyConfigMapper.xml | 117 ------------ 6 files changed, 1 insertion(+), 581 deletions(-) delete mode 100644 yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysApplyConfig.java delete mode 100644 yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysApplyConfigMapper.java delete mode 100644 yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysApplyConfigService.java delete mode 100644 yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysApplyConfigServiceImpl.java delete mode 100644 yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml diff --git a/bin/mac-modules-job b/bin/mac-modules-job index b14bcb55..00c74aa9 100755 --- a/bin/mac-modules-job +++ b/bin/mac-modules-job @@ -1 +1 @@ -java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar ruoyi-modules/ruoyi-job/target/yanzhu-modules-job.jar +java -Dfile.encoding=utf-8 -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -jar yanzhu-modules/yanzhu-job/target/yanzhu-modules-job.jar diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysApplyConfig.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysApplyConfig.java deleted file mode 100644 index 813a99e5..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/domain/SysApplyConfig.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.yanzhu.job.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; - -/** - * 系统应用注册对象 sys_apply_config - * - * @author JiangYuQi - * @date 2024-01-13 - */ -public class SysApplyConfig extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 服务配置主键 */ - private Long cfgId; - - /** 服务配置类型 */ - private String cfgType; - - /** 应用主键 */ - @Excel(name = "应用主键") - private String appId; - - /** 公钥 */ - private String publicKey; - - /** 私钥 */ - private String privateKey; - - /** 项目主键 */ - @Excel(name = "项目主键") - private Long projectId; - - /** 项目名称 */ - @Excel(name = "项目名称") - private String projectName; - - /** 部门主键 */ - @Excel(name = "部门主键") - private Long deptId; - - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; - - /** 是否删除 */ - @Excel(name = "是否删除") - private String isDel; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setAppId(String appId) - { - this.appId = appId; - } - - public String getAppId() - { - return appId; - } - - public void setPublicKey(String publicKey) - { - this.publicKey = publicKey; - } - - public String getPublicKey() - { - return publicKey; - } - public void setPrivateKey(String privateKey) - { - this.privateKey = privateKey; - } - - public String getPrivateKey() - { - return privateKey; - } - public void setProjectId(Long projectId) - { - this.projectId = projectId; - } - - public Long getProjectId() - { - return projectId; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - - public Long getDeptId() - { - return deptId; - } - public void setIsDel(String isDel) - { - this.isDel = isDel; - } - - public String getIsDel() - { - return isDel; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public Long getCfgId() { - return cfgId; - } - - public void setCfgId(Long cfgId) { - this.cfgId = cfgId; - } - - public String getCfgType() { - return cfgType; - } - - public void setCfgType(String cfgType) { - this.cfgType = cfgType; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("cfgId", getCfgId()) - .append("cfgType", getCfgType()) - .append("appId", getAppId()) - .append("publicKey", getPublicKey()) - .append("privateKey", getPrivateKey()) - .append("projectId", getProjectId()) - .append("deptId", getDeptId()) - .append("isDel", getIsDel()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysApplyConfigMapper.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysApplyConfigMapper.java deleted file mode 100644 index bcc02a24..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/mapper/SysApplyConfigMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.yanzhu.job.mapper; - -import com.yanzhu.job.domain.SysApplyConfig; - -import java.util.List; - -/** - * 系统应用注册Mapper接口 - * - * @author JiangYuQi - * @date 2024-01-13 - */ -public interface SysApplyConfigMapper -{ - /** - * 查询系统应用注册 - * - * @param id 系统应用注册主键 - * @return 系统应用注册 - */ - public SysApplyConfig selectSysApplyConfigById(Long id); - - /** - * 查询系统应用注册列表 - * - * @param sysApplyConfig 系统应用注册 - * @return 系统应用注册集合 - */ - public List selectSysApplyConfigList(SysApplyConfig sysApplyConfig); - - /** - * 新增系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - public int insertSysApplyConfig(SysApplyConfig sysApplyConfig); - - /** - * 修改系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - public int updateSysApplyConfig(SysApplyConfig sysApplyConfig); - - /** - * 删除系统应用注册 - * - * @param id 系统应用注册主键 - * @return 结果 - */ - public int deleteSysApplyConfigById(Long id); - - /** - * 批量删除系统应用注册 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSysApplyConfigByIds(Long[] ids); -} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysApplyConfigService.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysApplyConfigService.java deleted file mode 100644 index 76f67736..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/ISysApplyConfigService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.yanzhu.job.service; - -import com.yanzhu.job.domain.SysApplyConfig; - -import java.util.List; - -/** - * 系统应用注册Service接口 - * - * @author JiangYuQi - * @date 2024-01-13 - */ -public interface ISysApplyConfigService -{ - /** - * 查询系统应用注册 - * - * @param id 系统应用注册主键 - * @return 系统应用注册 - */ - public SysApplyConfig selectSysApplyConfigById(Long id); - - /** - * 查询系统应用注册列表 - * - * @param sysApplyConfig 系统应用注册 - * @return 系统应用注册集合 - */ - public List selectSysApplyConfigList(SysApplyConfig sysApplyConfig); - - /** - * 新增系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - public int insertSysApplyConfig(SysApplyConfig sysApplyConfig); - - /** - * 修改系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - public int updateSysApplyConfig(SysApplyConfig sysApplyConfig); - - /** - * 批量删除系统应用注册 - * - * @param ids 需要删除的系统应用注册主键集合 - * @return 结果 - */ - public int deleteSysApplyConfigByIds(Long[] ids); - - /** - * 删除系统应用注册信息 - * - * @param id 系统应用注册主键 - * @return 结果 - */ - public int deleteSysApplyConfigById(Long id); - - /** - * 加载注册应用 - */ - public void loadingSysApplyConfigCache(); -} diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysApplyConfigServiceImpl.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysApplyConfigServiceImpl.java deleted file mode 100644 index 7fe1b15d..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/service/impl/SysApplyConfigServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.yanzhu.job.service.impl; - -import com.yanzhu.common.core.constant.CacheConstants; -import com.yanzhu.common.core.exception.ServiceException; -import com.yanzhu.common.core.utils.DateUtils; -import com.yanzhu.common.core.utils.RSAUtil; -import com.yanzhu.common.redis.service.RedisService; -import com.yanzhu.common.security.utils.SecurityUtils; -import com.yanzhu.job.domain.SysApplyConfig; -import com.yanzhu.job.mapper.SysApplyConfigMapper; -import com.yanzhu.job.service.ISysApplyConfigService; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.security.KeyPair; -import java.util.List; - -/** - * 系统应用注册Service业务层处理 - * - * @author JiangYuQi - * @date 2024-01-13 - */ -@Service -public class SysApplyConfigServiceImpl implements ISysApplyConfigService -{ - @Autowired - private RedisService redisCache; - - @Autowired - private SysApplyConfigMapper sysApplyConfigMapper; - - /** - * 项目启动时，初始化注册应用到缓存 - */ - @PostConstruct - public void init() - { - loadingSysApplyConfigCache(); - } - - /** - * 加载注册应用 - */ - @Override - public void loadingSysApplyConfigCache() - { - List configList = sysApplyConfigMapper.selectSysApplyConfigList(new SysApplyConfig()); - if(CollectionUtils.isNotEmpty(configList)){ - for (SysApplyConfig sysApplyConfig : configList) { - redisCache.setCacheObject(CacheConstants.YANZHU_SYSTEM_CONFIG + sysApplyConfig.getAppId(), sysApplyConfig); - } - } - } - - /** - * 查询系统应用注册 - * - * @param id 系统应用注册主键 - * @return 系统应用注册 - */ - @Override - public SysApplyConfig selectSysApplyConfigById(Long id) - { - return sysApplyConfigMapper.selectSysApplyConfigById(id); - } - - /** - * 查询系统应用注册列表 - * - * @param sysApplyConfig 系统应用注册 - * @return 系统应用注册 - */ - @Override - public List selectSysApplyConfigList(SysApplyConfig sysApplyConfig) - { - return sysApplyConfigMapper.selectSysApplyConfigList(sysApplyConfig); - } - - /** - * 新增系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - @Override - public int insertSysApplyConfig(SysApplyConfig sysApplyConfig) - { - sysApplyConfig.setCreateBy(SecurityUtils.getUsername()); - sysApplyConfig.setCreateTime(DateUtils.getNowDate()); - try { - // 生成密钥对 - KeyPair keyPair = RSAUtil.getKeyPair(); - // 公匙 - String publicKey = RSAUtil.getPublicKeyBase64(keyPair); - sysApplyConfig.setPublicKey(publicKey); - // 私匙 - String privateKey = RSAUtil.getPrivateKeyBase64(keyPair); - sysApplyConfig.setPrivateKey(privateKey); - }catch (Exception e){ - throw new ServiceException(); - } - int res = sysApplyConfigMapper.insertSysApplyConfig(sysApplyConfig); - if(res>0){ - this.loadingSysApplyConfigCache(); - } - return res; - } - - /** - * 修改系统应用注册 - * - * @param sysApplyConfig 系统应用注册 - * @return 结果 - */ - @Override - public int updateSysApplyConfig(SysApplyConfig sysApplyConfig) - { - sysApplyConfig.setUpdateBy(SecurityUtils.getUsername()); - sysApplyConfig.setUpdateTime(DateUtils.getNowDate()); - int res = sysApplyConfigMapper.updateSysApplyConfig(sysApplyConfig); - if(res>0){ - this.loadingSysApplyConfigCache(); - } - return res; - } - - /** - * 批量删除系统应用注册 - * - * @param ids 需要删除的系统应用注册主键 - * @return 结果 - */ - @Override - public int deleteSysApplyConfigByIds(Long[] ids) - { - int res = sysApplyConfigMapper.deleteSysApplyConfigByIds(ids); - if(res>0){ - this.loadingSysApplyConfigCache(); - } - return res; - } - - /** - * 删除系统应用注册信息 - * - * @param id 系统应用注册主键 - * @return 结果 - */ - @Override - public int deleteSysApplyConfigById(Long id) - { - int res = sysApplyConfigMapper.deleteSysApplyConfigById(id); - if(res>0){ - this.loadingSysApplyConfigCache(); - } - return res; - } -} diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml deleted file mode 100644 index 76043900..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/SysApplyConfigMapper.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select sac.id, sac.cfg_type, sac.cfg_id, sac.app_id, sac.public_key, sac.private_key, sac.project_id, sp.project_name, sac.dept_id, sd.dept_name as deptName, sac.is_del, sac.create_by, sac.create_time, sac.update_by, sac.update_time, sac.remark from sys_apply_config sac - left join pro_project_info sp on sac.project_id = sp.id - left join sys_dept sd on sac.dept_id = sd.dept_id - - - - - - - - insert into sys_apply_config - - id, - cfg_type, - cfg_id, - app_id, - public_key, - private_key, - project_id, - dept_id, - is_del, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{id}, - #{cfgType}, - #{cfgId}, - #{appId}, - #{publicKey}, - #{privateKey}, - #{projectId}, - #{deptId}, - #{isDel}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update sys_apply_config - - cfg_type = #{cfgType}, - cfg_id = #{cfgId}, - app_id = #{appId}, - public_key = #{publicKey}, - private_key = #{privateKey}, - project_id = #{projectId}, - dept_id = #{deptId}, - is_del = #{isDel}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from sys_apply_config where id = #{id} - - - - delete from sys_apply_config where id in - - #{id} - - - - \ No newline at end of file From d8ce658341ea3d29aae2e76ed06b4312e4d33d2e Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Wed, 23 Jul 2025 18:19:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?BIM=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yanzhu/manage/domain/ProProjectInfo.java | 13 +++++++ .../manage/mapper/ProProjectInfoMapper.java | 16 +++++++++ .../mapper/manage/ProProjectInfoMapper.xml | 17 +++++++-- .../controller/ProProjectInfoController.java | 12 +++++++ .../service/IProProjectInfoService.java | 14 ++++++++ .../impl/ProProjectInfoServiceImpl.java | 24 ++++++++++++- .../src/api/manage/proProjectInfo.js | 20 +++++++++++ .../views/bim/bimModel/LocalCoordinates.vue | 4 +-- .../views/bim/bimModel/bimConfigDialog.vue | 35 +++++++++++++++++++ .../src/views/bim/bimModel/index.vue | 8 +++++ .../views/bim/bimModel/uploadModelDialog.vue | 5 +-- 11 files changed, 160 insertions(+), 8 deletions(-) create mode 100644 yanzhu-ui-vue3/src/views/bim/bimModel/bimConfigDialog.vue diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java index 7c73f3af..2f90d263 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java @@ -238,6 +238,19 @@ public class ProProjectInfo extends BaseEntity @Excel(name = "删除标识") private Long isDel; + /** + * BIM 设置 + */ + private String bimConfig; + + public String getBimConfig() { + return bimConfig; + } + + public void setBimConfig(String bimConfig) { + this.bimConfig = bimConfig; + } + private ProProjectInfoSetting setting; private List projectDeptsList; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java index 5f3ed6c2..11d857c0 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java @@ -91,4 +91,20 @@ public interface ProProjectInfoMapper * @param sysRoleDept */ public void insertProRoleDept(SysRoleDept sysRoleDept); + + /** + * 查询项目BIM信息 + * + * @param id 项目信息主键 + * @return 项目信息 + */ + public String getProjectBimConfig(Long id); + + /** + * 更新项目BIM信息 + * + * @param proProjectInfo 项目信息 + * @return 结果 + */ + public int updateProjectBimConfig(ProProjectInfo proProjectInfo); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index af45bfb8..0396b9f7 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -82,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id, pi.project_name, pi.project_code, pi.tech_leader,pi.tech_leader_phone,pi.province,pi.city,pi.district, - pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark + pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time + , pi.remark,pi.bim_config from pro_project_info pi left join sys_dept sd on sd.dept_id = pi.com_id @@ -123,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark, - pd.id pd_id,pd.dept_type pd_type,pd.dept_name pd_name,pd.dept_code pd_code,pd.leader pd_leader,pd.phone pd_phone, + pd.id pd_id,pd.dept_type pd_type,pd.dept_name pd_name,pd.dept_code pd_code,pd.leader pd_leader,pd.phone pd_phone,pi.bim_config ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane,ac.vendors_code from pro_project_info pi left join sys_dept sd on sd.dept_id = pi.com_id @@ -284,6 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + bim_config = #{bimConfig}, where id = #{id} @@ -396,7 +399,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, - pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark, + pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,pi.bim_config, ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane,cfg.vendors_code from pro_project_info pi left join pro_project_info_setting ps on pi.id=ps.project_id @@ -429,4 +432,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by psu.sort_by, pi.id desc + + + + update pro_project_info set bim_config = #{bimConfig} where id = #{id} + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java index 0a281988..fa246a97 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java @@ -151,4 +151,16 @@ public class ProProjectInfoController extends BaseController return getDataTable(list); } + @GetMapping("/getProjectBimConfig/{id}") + public AjaxResult getProjectBimConfig(@PathVariable("id") Long id) + { + return success(proProjectInfoService.getProjectBimConfig(id)); + } + + @PostMapping("/updateProjectBimConfig") + public AjaxResult updateProjectBimConfig(@RequestBody ProProjectInfo proProjectInfo) + { + return toAjax(proProjectInfoService.updateProjectBimConfig(proProjectInfo)); + } + } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java index 570ae9ef..46c2d510 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java @@ -77,4 +77,18 @@ public interface IProProjectInfoService * @return */ public List selectMyProjectList(com.yanzhu.manage.domain.ProProjectInfo proProjectInfo); + + /** + * 查询项目BIM信息 + * @param id + * @return + */ + String getProjectBimConfig(Long id); + + /** + * 更新项目BIM信息 + * @param proProjectInfo + * @return + */ + int updateProjectBimConfig(ProProjectInfo proProjectInfo); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index d041fe97..5989135c 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; * @date 2024-08-25 */ @Service -public class ProProjectInfoServiceImpl implements IProProjectInfoService +public class ProProjectInfoServiceImpl implements IProProjectInfoService { @Autowired private WxMaService wxMaService; @@ -100,6 +100,28 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService return proProjectInfoMapper.selectMyProjectList(proProjectInfo); } + /** + * 查询项目BIM信息 + * + * @param id 项目信息主键 + * @return 项目信息 + */ + @Override + public String getProjectBimConfig(Long id) { + return proProjectInfoMapper.getProjectBimConfig(id); + } + + /** + * 更新项目BIM信息 + * + * @param proProjectInfo 项目信息 + * @return 结果 + */ + @Override + public int updateProjectBimConfig(ProProjectInfo proProjectInfo) { + return proProjectInfoMapper.updateProjectBimConfig(proProjectInfo); + } + /** * 查询项目信息 * diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js index ea5b33f9..c31e11b4 100644 --- a/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js +++ b/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js @@ -50,4 +50,24 @@ export function delProProjectInfo(id) { url: '/manage/proProjectInfo/' + id, method: 'delete' }) +} + +// 获取项目BIM配置信息 +export function getProjectBimConfig(id){ + return request({ + url: '/manage/proProjectInfo/getProjectBimConfig/'+id, + method: 'get' + }) +} + +// 获取项目BIM配置信息 +export function updateProjectBimConfig(id,data){ + return request({ + url: '/manage/proProjectInfo/updateProjectBimConfig', + method: 'post', + data: { + id:id, + bimConfig:JSON.stringify(data) + } + }) } \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/LocalCoordinates.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/LocalCoordinates.vue index 12599e03..87946430 100644 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/LocalCoordinates.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/LocalCoordinates.vue @@ -42,8 +42,8 @@ export default { openStatus: 2, }, form: { - longitude: '108.88', - latitude: '34.2', + longitude: '34.2', + latitude: '108.88', }, formRules: { longitude: [{ required: true, message: '请输入经度值' }], diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/bimConfigDialog.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/bimConfigDialog.vue new file mode 100644 index 00000000..fdea77b5 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/bimConfigDialog.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue index 92da18b4..19b64f4e 100755 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/index.vue @@ -24,6 +24,7 @@ 绑定模型 上传模型 + BIM设置 @@ -101,6 +102,7 @@ + @@ -113,6 +115,7 @@ import { onMounted } from "vue"; import modelSelectDialog from "./modelSelectDialog.vue"; import uploadModelDialog from "./uploadModelDialog.vue"; import modelDialog from "./modelDialog2.vue"; +import bimConfigDialog from "./bimConfigDialog.vue"; import { fileSize } from "@/utils"; const { proxy } = getCurrentInstance(); const unitInfos = [ @@ -137,6 +140,7 @@ const title = ref(""); const selDlg = ref(); const uploadDlg = ref(); const mDlg = ref(); +const configDlg = ref(); const data = reactive({ form: {}, queryParams: { @@ -167,6 +171,10 @@ const data = reactive({ }); const { queryParams, form, rules } = toRefs(data); + +function doBimConfig(){ + configDlg.value.showDialog(); +} function showModel(row) { mDlg.value.showDialog(JSON.parse(row.gisJson)); } diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/uploadModelDialog.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/uploadModelDialog.vue index d8b68458..a4df966e 100644 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/uploadModelDialog.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/uploadModelDialog.vue @@ -398,8 +398,8 @@ export default { if (that.srs.split(":").length == 2) { let current = that.srs.split(":")[1].split(","); if (current.length == 2) { - _paras.longitude = (Math.PI / 180) * current[1]; - _paras.latitude = (Math.PI / 180) * current[0]; + _paras.longitude = (Math.PI / 180) * current[0]; + _paras.latitude = (Math.PI / 180) * current[1]; } } } @@ -437,6 +437,7 @@ export default { // _paras.draco = that.draco; // _paras.compressionLevel = values.compressionLevel; _paras.isLod = that.isLod; + _paras.srs = "" if (_paras.isLod) { _paras.lodNAryTreeXYZ = [ that.modelValue.xCount, From c2e66dd1ae81082d99f0e99da2738e2c27eeb64c Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Thu, 24 Jul 2025 18:25:45 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E5=BC=80=E5=8F=91BIM=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/bim/domain/BimModelInfo.java | 10 + .../com/yanzhu/manage/domain/ProPlan.java | 10 + .../yanzhu/manage/domain/ProPlanSchedule.java | 13 -- .../mapper/bim/BimModelInfoMapper.xml | 7 +- .../resources/mapper/manage/ProPlanMapper.xml | 59 +++++- .../mapper/manage/ProPlanScheduleMapper.xml | 7 +- .../mapper/manage/ProProjectInfoMapper.xml | 3 +- .../manage/controller/ProPlanController.java | 3 +- yanzhu-ui-vue3/src/api/manage/plan.js | 4 +- .../src/views/bim/bimSetting/HideFeature.vue | 130 ++++++++++++ .../views/bim/bimSetting/ModelFloorTree.vue | 80 +++++--- .../src/views/bim/bimSetting/MoveModel.vue | 164 +++++++++++++++ .../src/views/bim/bimSetting/index.vue | 186 ++++++++++++++---- .../src/views/manage/plan/index.vue | 162 ++++----------- .../src/views/manage/schedule/index.vue | 6 +- 15 files changed, 623 insertions(+), 221 deletions(-) create mode 100644 yanzhu-ui-vue3/src/views/bim/bimSetting/HideFeature.vue create mode 100644 yanzhu-ui-vue3/src/views/bim/bimSetting/MoveModel.vue diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java index 6cd7e264..fd5ab19e 100755 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java @@ -68,6 +68,16 @@ public class BimModelInfo extends BaseEntity private String projectName; private String deptName; + private String bimConfig; + + public String getBimConfig() { + return bimConfig; + } + + public void setBimConfig(String bimConfig) { + this.bimConfig = bimConfig; + } + public Double getUnit() { return unit; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java index 45e78405..1c5368d8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java @@ -97,6 +97,16 @@ public class ProPlan extends BaseEntity @Excel(name = "班组ID") private Long groupId; + private String noBim; + + public String getNoBim() { + return noBim; + } + + public void setNoBim(String noBim) { + this.noBim = noBim; + } + /** 班组名称 */ @Excel(name = "班组名称") private String groupName; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java index 9f54b4c8..ee411ce0 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java @@ -55,10 +55,6 @@ public class ProPlanSchedule extends BaseEntity @Excel(name = "任务名称") private String taskName; - /** BIM构建 */ - @Excel(name = "BIM构建") - private String bimId; - /** 进度百分比 */ @Excel(name = "进度百分比") private Long schedulePercent; @@ -184,15 +180,7 @@ public class ProPlanSchedule extends BaseEntity { return taskName; } - public void setBimId(String bimId) - { - this.bimId = bimId; - } - public String getBimId() - { - return bimId; - } public Double getTaskDuation() { return taskDuation; @@ -325,7 +313,6 @@ public class ProPlanSchedule extends BaseEntity .append("taskId", getTaskId()) .append("taskUniqueId", getTaskUniqueId()) .append("taskName", getTaskName()) - .append("bimId", getBimId()) .append("schedulePercent", getSchedulePercent()) .append("finishDate", getFinishDate()) .append("description", getDescription()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml index 69027f15..7802544f 100755 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml @@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sp.dept_name projectName, sd.dept_name com_name,pd.sub_dept_name dept_name,bmi.unit, bmi.dept_id, bmi.model_name, bmi.lightweightName, bmi.gis_json, bmi.model_status, bmi.model_type, - bmi.file_type, bmi.file_size, bmi.show_sand, bmi.status, bmi.remark, bmi.create_by, bmi.create_time, bmi.update_by, bmi.update_time,bmi.is_del + bmi.file_type, bmi.file_size, bmi.show_sand, bmi.status, bmi.remark, bmi.create_by, bmi.create_time, bmi.update_by, bmi.update_time,bmi.is_del,bmi.bim_config from bim_model_info bmi left join sys_dept sp on sp.dept_id = bmi.project_id left join sys_dept sd on sd.dept_id = bmi.com_id @@ -117,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" project_id = #{projectId}, dept_id = #{deptId}, model_name = #{modelName}, - lightweightName = #{lightweightName}, gis_json = #{gisJson}, model_status = #{modelStatus}, model_type = #{modelType}, @@ -132,8 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + bim_config = #{bimConfig}, - where model_id = #{modelId} + where lightweightName = #{lightweightName} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml index 1e8b24c5..1d8f1faa 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml @@ -38,10 +38,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select pp.id, pp.comid, pp.project_id, pp.task_id, pp.task_unique_id, pp.parent_id, pp.task_type, pp.task_outline_level, pp.task_name, pp.task_duation, pp.start_date, pp.finish_date, - pp.predecessors, pp.plan_start_date, pp.plan_finish_date, pp.bim_id, pp.operator, pp.operator_id, + pp.predecessors, pp.plan_start_date, pp.plan_finish_date, + + pp.bim_id, + + + + left(ifnull(pp.bim_id,''),10) bim_id, + + pp.operator, pp.operator_id, pp.group_id, pp.group_name, pp.schedule_node, pp.is_del, pp.create_by, pp.create_time, pp.update_by, pp.update_time, pp.remark, dp.`dept_name` comp_name,pi.`project_name`, CASE @@ -69,8 +77,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN pro_project_info pi ON pp.`project_id`=pi.`id` + + select pp.id, pp.comid, pp.project_id, pp.task_id, pp.task_unique_id, pp.parent_id, pp.task_type, + pp.task_outline_level, pp.task_name, pp.task_duation, pp.start_date, pp.finish_date, + pp.predecessors, pp.plan_start_date, pp.plan_finish_date, + + pp.bim_id, + + pp.operator, pp.operator_id, + pp.group_id, pp.group_name, pp.schedule_node, pp.is_del, pp.create_by, pp.create_time, pp.update_by, pp.update_time, pp.remark, + dp.`dept_name` comp_name,pi.`project_name`, + CASE + WHEN pp.start_date IS NULL THEN + 'wks' + WHEN pp.start_date IS NOT NULL + AND pp.finish_date IS NOT NULL + AND date(pp.plan_finish_date) = ]]> date(pp.finish_date) THEN + 'zcwc' + WHEN pp.start_date IS NOT NULL + AND pp.finish_date IS NOT NULL + AND date(pp.plan_finish_date) date(pp.finish_date) THEN + 'zhwc' + WHEN pp.start_date IS NOT NULL + AND pp.finish_date IS NULL + AND date(pp.plan_finish_date) = ]]> date(NOW()) THEN + 'zcjxz' + WHEN pp.start_date IS NOT NULL + AND pp.finish_date IS NULL + AND date(pp.plan_finish_date) date(NOW()) THEN + 'zhjxz' + END AS task_status + from pro_plan pp + LEFT JOIN sys_dept dp ON pp.`comid`=dp.`dept_id` + LEFT JOIN pro_project_info pi ON pp.`project_id`=pi.`id` + +