From 3b3afc545c2044c2262aaa38b76ccc48f35ef365 Mon Sep 17 00:00:00 2001 From: elliott <382696293@qq.com> Date: Thu, 1 Feb 2024 16:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=B9=E9=80=A0=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E7=BB=84=E5=90=88=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flossom/common/core/domain/SysFile.java | 10 + .../common/core/domain/entity/WxMode.java | 30 + .../core/domain/entity/WxModeCombineInfo.java | 106 +++ .../core/domain/entity/WxModeOpenSource.java | 121 ++++ .../core/domain/entity/WxModeServiceInfo.java | 124 ++++ .../core/mapper/WxModeCombineInfoMapper.java | 69 ++ .../core/mapper/WxModeOpenSourceMapper.java | 70 ++ .../core/mapper/WxModeServiceInfoMapper.java | 69 ++ .../mapper/WxModeCombineInfoMapper.xml | 86 +++ .../mapper/WxModeOpenSourceMapper.xml | 94 +++ .../mapper/WxModeServiceInfoMapper.xml | 90 +++ .../file/controller/SysFileController.java | 3 +- .../WxModeOpenSourceController.java | 106 +++ .../service/IWxModeCombineInfoService.java | 62 ++ .../service/IWxModeOpenSourceService.java | 62 ++ .../service/IWxModeServiceInfoService.java | 62 ++ .../impl/WxModeCombineInfoServiceImpl.java | 96 +++ .../impl/WxModeOpenSourceServiceImpl.java | 96 +++ .../service/impl/WxModeServiceImpl.java | 120 +++- .../impl/WxModeServiceInfoServiceImpl.java | 96 +++ flossom-ui/src/api/system/mode.js | 10 + flossom-ui/src/api/system/modeOpenSource.js | 44 ++ flossom-ui/src/views/system/firing/index.vue | 2 +- flossom-ui/src/views/system/mode/index.vue | 617 ++++++++++++++---- 24 files changed, 2096 insertions(+), 149 deletions(-) create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeOpenSource.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeServiceInfo.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeCombineInfoMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeOpenSourceMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeServiceInfoMapper.java create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml create mode 100644 flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeOpenSourceController.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeCombineInfoService.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeOpenSourceService.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeServiceInfoService.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeCombineInfoServiceImpl.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeOpenSourceServiceImpl.java create mode 100644 flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceInfoServiceImpl.java create mode 100644 flossom-ui/src/api/system/modeOpenSource.js diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java index bccd2aa..7ccfffb 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java @@ -22,6 +22,8 @@ public class SysFile private int index; + private String condition; + public String getName() { return name; @@ -50,6 +52,14 @@ public class SysFile this.index = index; } + public String getCondition() { + return condition; + } + + public void setCondition(String condition) { + this.condition = condition; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java index 155a709..7b93c79 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java @@ -85,6 +85,12 @@ public class WxMode extends BaseEntity private String lockCompanyTag; + // 弹出弹窗实体类 + private List openSourceData; + // 服务实体类 + private List serviceData; + // 组合实体类 + private List combineData; private List lockWechatTagArray = new ArrayList(); @@ -259,6 +265,30 @@ public class WxMode extends BaseEntity this.lockCompanyTagArray = lockCompanyTagArray; } + public List getOpenSourceData() { + return openSourceData; + } + + public void setOpenSourceData(List openSourceData) { + this.openSourceData = openSourceData; + } + + public List getServiceData() { + return serviceData; + } + + public void setServiceData(List serviceData) { + this.serviceData = serviceData; + } + + public List getCombineData() { + return combineData; + } + + public void setCombineData(List combineData) { + this.combineData = combineData; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java new file mode 100644 index 0000000..b322d01 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeCombineInfo.java @@ -0,0 +1,106 @@ +package com.flossom.common.core.domain.entity; + +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; + +/** + * 模式组合对象 wx_mode_combine_info + * + * @author flossom + * @date 2024-02-01 + */ +public class WxModeCombineInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 关联模式ID */ + @Excel(name = "关联模式ID") + private Long modeId; + + /** 组合时间 */ + @Excel(name = "组合时间") + private Integer combine; + + /** 使用技术ID */ + @Excel(name = "使用技术ID") + private String technologyInfo; + + /** 功效内容 */ + @Excel(name = "功效内容") + private String effectContent; + + private List technologyArray; + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setModeId(Long modeId) + { + this.modeId = modeId; + } + + public Long getModeId() + { + return modeId; + } + public void setCombine(Integer combine) + { + this.combine = combine; + } + + public Integer getCombine() + { + return combine; + } + public void setTechnologyInfo(String technologyInfo) + { + this.technologyInfo = technologyInfo; + } + + public String getTechnologyInfo() + { + return technologyInfo; + } + public void setEffectContent(String effectContent) + { + this.effectContent = effectContent; + } + + public String getEffectContent() + { + return effectContent; + } + + public List getTechnologyArray() { + return technologyArray; + } + + public void setTechnologyArray(List technologyArray) { + this.technologyArray = technologyArray; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("modeId", getModeId()) + .append("combine", getCombine()) + .append("technologyInfo", getTechnologyInfo()) + .append("effectContent", getEffectContent()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeOpenSource.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeOpenSource.java new file mode 100644 index 0000000..ec18ccb --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeOpenSource.java @@ -0,0 +1,121 @@ +package com.flossom.common.core.domain.entity; + +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * IOT仪器弹出视频对象 wx_mode_open_source + * + * @author flossom + * @date 2024-01-29 + */ +public class WxModeOpenSource extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** $column.columnComment */ + private Long modeId; + + + /** 弹出标题 */ + @Excel(name = "弹出标题") + private String openTitle; + + /** 弹出媒体URL */ + @Excel(name = "弹出媒体URL") + private String openSourceUrl; + + /** 文件名字 */ + @Excel(name = "文件名字") + private String openSourceName; + + /** 文件后缀 */ + @Excel(name = "文件后缀") + private String openSourceSuffix; + + /** 提示内容 */ + @Excel(name = "提示内容") + private String openContent; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOpenTitle(String openTitle) + { + this.openTitle = openTitle; + } + + public String getOpenTitle() + { + return openTitle; + } + public void setOpenSourceUrl(String openSourceUrl) + { + this.openSourceUrl = openSourceUrl; + } + + public String getOpenSourceUrl() + { + return openSourceUrl; + } + public void setOpenSourceName(String openSourceName) + { + this.openSourceName = openSourceName; + } + + public String getOpenSourceName() + { + return openSourceName; + } + public void setOpenSourceSuffix(String openSourceSuffix) + { + this.openSourceSuffix = openSourceSuffix; + } + + public String getOpenSourceSuffix() + { + return openSourceSuffix; + } + public void setOpenContent(String openContent) + { + this.openContent = openContent; + } + + public String getOpenContent() + { + return openContent; + } + + public Long getModeId() { + return modeId; + } + + public void setModeId(Long modeId) { + this.modeId = modeId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("openTitle", getOpenTitle()) + .append("openSourceUrl", getOpenSourceUrl()) + .append("openSourceName", getOpenSourceName()) + .append("openSourceSuffix", getOpenSourceSuffix()) + .append("openContent", getOpenContent()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeServiceInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeServiceInfo.java new file mode 100644 index 0000000..8dddc0f --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxModeServiceInfo.java @@ -0,0 +1,124 @@ +package com.flossom.common.core.domain.entity; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.flossom.common.core.annotation.Excel; +import com.flossom.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 模式服务对象 wx_mode_service_info + * + * @author flossom + * @date 2024-02-01 + */ +public class WxModeServiceInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 模式ID */ + private Long modeId; + + /** 服务开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "服务开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date serviceStartTime; + + /** 服务结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "服务结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date serviceEndTime; + + /** 启动图片资源 */ + @Excel(name = "启动图片资源") + private String startSource; + + /** 暂停图片资源 */ + @Excel(name = "暂停图片资源") + private String stopSource; + + + // 上传的时间集合 + private List startTimeArray; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setServiceStartTime(Date serviceStartTime) + { + this.serviceStartTime = serviceStartTime; + } + + public Date getServiceStartTime() + { + return serviceStartTime; + } + public void setServiceEndTime(Date serviceEndTime) + { + this.serviceEndTime = serviceEndTime; + } + + public Date getServiceEndTime() + { + return serviceEndTime; + } + public void setStartSource(String startSource) + { + this.startSource = startSource; + } + + public String getStartSource() + { + return startSource; + } + public void setStopSource(String stopSource) + { + this.stopSource = stopSource; + } + + public String getStopSource() + { + return stopSource; + } + + public List getStartTimeArray() { + return startTimeArray; + } + + public void setStartTimeArray(List startTimeArray) { + this.startTimeArray = startTimeArray; + } + + public Long getModeId() { + return modeId; + } + + public void setModeId(Long modeId) { + this.modeId = modeId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("serviceStartTime", getServiceStartTime()) + .append("serviceEndTime", getServiceEndTime()) + .append("startSource", getStartSource()) + .append("stopSource", getStopSource()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeCombineInfoMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeCombineInfoMapper.java new file mode 100644 index 0000000..03c2512 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeCombineInfoMapper.java @@ -0,0 +1,69 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxModeCombineInfo; + +import java.util.List; + +/** + * 模式组合Mapper接口 + * + * @author flossom + * @date 2024-02-01 + */ +public interface WxModeCombineInfoMapper +{ + /** + * 查询模式组合 + * + * @param id 模式组合主键 + * @return 模式组合 + */ + public WxModeCombineInfo selectWxModeCombineInfoById(Long id); + + /** + * 查询模式组合列表 + * + * @param wxModeCombineInfo 模式组合 + * @return 模式组合集合 + */ + public List selectWxModeCombineInfoList(WxModeCombineInfo wxModeCombineInfo); + + /** + * 新增模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + public int insertWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo); + + /** + * 修改模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + public int updateWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo); + + /** + * 删除模式组合 + * + * @param id 模式组合主键 + * @return 结果 + */ + public int deleteWxModeCombineInfoById(Long id); + + /** + * 批量删除模式组合 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxModeCombineInfoByIds(Long[] ids); + /** + * 删除模式组合 + * + * @param modeId 模式组合主键 + * @return 结果 + */ + public int deleteWxModeCombineInfoByModeId(Long modeId); +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeOpenSourceMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeOpenSourceMapper.java new file mode 100644 index 0000000..8240dce --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeOpenSourceMapper.java @@ -0,0 +1,70 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxModeOpenSource; + +import java.util.List; + +/** + * IOT仪器弹出视频Mapper接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface WxModeOpenSourceMapper +{ + /** + * 查询IOT仪器弹出视频 + * + * @param id IOT仪器弹出视频主键 + * @return IOT仪器弹出视频 + */ + public WxModeOpenSource selectWxModeOpenSourceById(Long id); + + /** + * 查询IOT仪器弹出视频列表 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return IOT仪器弹出视频集合 + */ + public List selectWxModeOpenSourceList(WxModeOpenSource wxModeOpenSource); + + /** + * 新增IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + public int insertWxModeOpenSource(WxModeOpenSource wxModeOpenSource); + + /** + * 修改IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + public int updateWxModeOpenSource(WxModeOpenSource wxModeOpenSource); + + /** + * 删除IOT仪器弹出视频 + * + * @param id IOT仪器弹出视频主键 + * @return 结果 + */ + public int deleteWxModeOpenSourceById(Long id); + + /** + * 批量删除IOT仪器弹出视频 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxModeOpenSourceByIds(Long[] ids); + /** + * 删除IOT仪器弹出视频 + * + * @param modeId 模式ID + * @return 结果 + */ + public int deleteWxModeOpenSourceByModeId(Long modeId); + +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeServiceInfoMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeServiceInfoMapper.java new file mode 100644 index 0000000..242b788 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxModeServiceInfoMapper.java @@ -0,0 +1,69 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.WxModeServiceInfo; + +import java.util.List; + +/** + * 模式服务Mapper接口 + * + * @author flossom + * @date 2024-02-01 + */ +public interface WxModeServiceInfoMapper +{ + /** + * 查询模式服务 + * + * @param id 模式服务主键 + * @return 模式服务 + */ + public WxModeServiceInfo selectWxModeServiceInfoById(Long id); + + /** + * 查询模式服务列表 + * + * @param wxModeServiceInfo 模式服务 + * @return 模式服务集合 + */ + public List selectWxModeServiceInfoList(WxModeServiceInfo wxModeServiceInfo); + + /** + * 新增模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + public int insertWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo); + + /** + * 修改模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + public int updateWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo); + + /** + * 删除模式服务 + * + * @param id 模式服务主键 + * @return 结果 + */ + public int deleteWxModeServiceInfoById(Long id); + + /** + * 批量删除模式服务 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWxModeServiceInfoByIds(Long[] ids); + /** + * 删除模式服务 + * + * @param modeId 模式服务主键 + * @return 结果 + */ + public int deleteWxModeServiceInfoByModeId(Long modeId); +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml new file mode 100644 index 0000000..19711f9 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeCombineInfoMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + select id, mode_id, combine, technology_info, effect_content, create_time, create_by from wx_mode_combine_info + + + + + + + + insert into wx_mode_combine_info + + id, + mode_id, + combine, + technology_info, + effect_content, + create_time, + create_by, + + + #{id}, + #{modeId}, + #{combine}, + #{technologyInfo}, + #{effectContent}, + #{createTime}, + #{createBy}, + + + + + update wx_mode_combine_info + + mode_id = #{modeId}, + combine = #{combine}, + technology_info = #{technologyInfo}, + effect_content = #{effectContent}, + create_time = #{createTime}, + create_by = #{createBy}, + + where id = #{id} + + + + delete from wx_mode_combine_info where id = #{id} + + + + delete from wx_mode_combine_info where mode_id = #{modeId} + + + + + delete from wx_mode_combine_info where id in + + #{id} + + + diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml new file mode 100644 index 0000000..9e80329 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeOpenSourceMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + select id, mode_id,open_title, open_source_url, open_source_name, open_source_suffix, open_content, create_time, create_by from wx_mode_open_source + + + + + + + + insert into wx_mode_open_source + + id, + mode_id, + open_title, + open_source_url, + open_source_name, + open_source_suffix, + open_content, + create_time, + create_by, + + + #{id}, + #{modeId}, + #{openTitle}, + #{openSourceUrl}, + #{openSourceName}, + #{openSourceSuffix}, + #{openContent}, + #{createTime}, + #{createBy}, + + + + + update wx_mode_open_source + + mode_id = #{modeId}, + open_title = #{openTitle}, + open_source_url = #{openSourceUrl}, + open_source_name = #{openSourceName}, + open_source_suffix = #{openSourceSuffix}, + open_content = #{openContent}, + create_time = #{createTime}, + create_by = #{createBy}, + + where id = #{id} + + + + delete from wx_mode_open_source where id = #{id} + + + + delete from wx_mode_open_source where mode_id = #{modId} + + + delete from wx_mode_open_source where id in + + #{id} + + + diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml new file mode 100644 index 0000000..d801593 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxModeServiceInfoMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + select id,mode_id, service_start_time, service_end_time, start_source, stop_source, create_time, create_by from wx_mode_service_info + + + + + + + + insert into wx_mode_service_info + + mode_id, + service_start_time, + service_end_time, + start_source, + stop_source, + create_time, + create_by, + + + #{modeId}, + #{serviceStartTime}, + #{serviceEndTime}, + #{startSource}, + #{stopSource}, + #{createTime}, + #{createBy}, + + + + + update wx_mode_service_info + + mode_id = #{modeId}, + service_start_time = #{serviceStartTime}, + service_end_time = #{serviceEndTime}, + start_source = #{startSource}, + stop_source = #{stopSource}, + create_time = #{createTime}, + create_by = #{createBy}, + + where id = #{id} + + + + delete from wx_mode_service_info where id = #{id} + + + + + delete from wx_mode_service_info where mode_id = #{modeId} + + + + + delete from wx_mode_service_info where id in + + #{id} + + + diff --git a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java index 5832909..75cfe5c 100644 --- a/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java +++ b/flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java @@ -54,7 +54,7 @@ public class SysFileController * 文件上传请求 */ @PostMapping("upload/else") - public R upload(MultipartFile file, int index) + public R upload(MultipartFile file, int index, String condition) { try { @@ -65,6 +65,7 @@ public class SysFileController sysFile.setName(FileUtils.getName(url)); sysFile.setUrl(url); sysFile.setIndex(index); + sysFile.setCondition(condition); return R.ok(sysFile); } catch (Exception e) diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeOpenSourceController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeOpenSourceController.java new file mode 100644 index 0000000..03cc96f --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxModeOpenSourceController.java @@ -0,0 +1,106 @@ +package com.flossom.system.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.flossom.common.core.domain.entity.WxModeOpenSource; +import com.flossom.common.core.utils.poi.ExcelUtil; +import com.flossom.common.core.web.controller.BaseController; +import com.flossom.common.core.web.domain.AjaxResult; +import com.flossom.common.core.web.page.TableDataInfo; +import com.flossom.common.log.annotation.Log; +import com.flossom.common.log.enums.BusinessType; +import com.flossom.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.flossom.system.service.IWxModeOpenSourceService; + +/** + * IOT仪器弹出视频Controller + * + * @author flossom + * @date 2024-01-29 + */ +@RestController +@RequestMapping("/modeOpenSource") +public class WxModeOpenSourceController extends BaseController +{ + @Autowired + private IWxModeOpenSourceService wxModeOpenSourceService; + + /** + * 查询IOT仪器弹出视频列表 + */ + @RequiresPermissions("system:modeOpenSource:list") + @GetMapping("/list") + public TableDataInfo list(WxModeOpenSource wxModeOpenSource) + { + startPage(); + List list = wxModeOpenSourceService.selectWxModeOpenSourceList(wxModeOpenSource); + return getDataTable(list); + } + + /** + * 导出IOT仪器弹出视频列表 + */ + @RequiresPermissions("system:modeOpenSource:export") + @Log(title = "IOT仪器弹出视频", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WxModeOpenSource wxModeOpenSource) + { + List list = wxModeOpenSourceService.selectWxModeOpenSourceList(wxModeOpenSource); + ExcelUtil util = new ExcelUtil(WxModeOpenSource.class); + util.exportExcel(response, list, "IOT仪器弹出视频数据"); + } + + /** + * 获取IOT仪器弹出视频详细信息 + */ + @RequiresPermissions("system:modeOpenSource:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(wxModeOpenSourceService.selectWxModeOpenSourceById(id)); + } + + /** + * 新增IOT仪器弹出视频 + */ + @RequiresPermissions("system:modeOpenSource:add") + @Log(title = "IOT仪器弹出视频", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WxModeOpenSource wxModeOpenSource) + { + return toAjax(wxModeOpenSourceService.insertWxModeOpenSource(wxModeOpenSource)); + } + + /** + * 修改IOT仪器弹出视频 + */ + @RequiresPermissions("system:modeOpenSource:edit") + @Log(title = "IOT仪器弹出视频", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WxModeOpenSource wxModeOpenSource) + { + return toAjax(wxModeOpenSourceService.updateWxModeOpenSource(wxModeOpenSource)); + } + + /** + * 删除IOT仪器弹出视频 + */ + @RequiresPermissions("system:modeOpenSource:remove") + @Log(title = "IOT仪器弹出视频", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(wxModeOpenSourceService.deleteWxModeOpenSourceByIds(ids)); + } +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeCombineInfoService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeCombineInfoService.java new file mode 100644 index 0000000..f698852 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeCombineInfoService.java @@ -0,0 +1,62 @@ +package com.flossom.system.service; + +import com.flossom.common.core.domain.entity.WxModeCombineInfo; + +import java.util.List; + +/** + * 模式组合Service接口 + * + * @author flossom + * @date 2024-02-01 + */ +public interface IWxModeCombineInfoService +{ + /** + * 查询模式组合 + * + * @param id 模式组合主键 + * @return 模式组合 + */ + public WxModeCombineInfo selectWxModeCombineInfoById(Long id); + + /** + * 查询模式组合列表 + * + * @param wxModeCombineInfo 模式组合 + * @return 模式组合集合 + */ + public List selectWxModeCombineInfoList(WxModeCombineInfo wxModeCombineInfo); + + /** + * 新增模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + public int insertWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo); + + /** + * 修改模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + public int updateWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo); + + /** + * 批量删除模式组合 + * + * @param ids 需要删除的模式组合主键集合 + * @return 结果 + */ + public int deleteWxModeCombineInfoByIds(Long[] ids); + + /** + * 删除模式组合信息 + * + * @param id 模式组合主键 + * @return 结果 + */ + public int deleteWxModeCombineInfoById(Long id); +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeOpenSourceService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeOpenSourceService.java new file mode 100644 index 0000000..291303b --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeOpenSourceService.java @@ -0,0 +1,62 @@ +package com.flossom.system.service; + +import com.flossom.common.core.domain.entity.WxModeOpenSource; + +import java.util.List; + +/** + * IOT仪器弹出视频Service接口 + * + * @author flossom + * @date 2024-01-29 + */ +public interface IWxModeOpenSourceService +{ + /** + * 查询IOT仪器弹出视频 + * + * @param id IOT仪器弹出视频主键 + * @return IOT仪器弹出视频 + */ + public WxModeOpenSource selectWxModeOpenSourceById(Long id); + + /** + * 查询IOT仪器弹出视频列表 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return IOT仪器弹出视频集合 + */ + public List selectWxModeOpenSourceList(WxModeOpenSource wxModeOpenSource); + + /** + * 新增IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + public int insertWxModeOpenSource(WxModeOpenSource wxModeOpenSource); + + /** + * 修改IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + public int updateWxModeOpenSource(WxModeOpenSource wxModeOpenSource); + + /** + * 批量删除IOT仪器弹出视频 + * + * @param ids 需要删除的IOT仪器弹出视频主键集合 + * @return 结果 + */ + public int deleteWxModeOpenSourceByIds(Long[] ids); + + /** + * 删除IOT仪器弹出视频信息 + * + * @param id IOT仪器弹出视频主键 + * @return 结果 + */ + public int deleteWxModeOpenSourceById(Long id); +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeServiceInfoService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeServiceInfoService.java new file mode 100644 index 0000000..263e1c0 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxModeServiceInfoService.java @@ -0,0 +1,62 @@ +package com.flossom.system.service; + +import com.flossom.common.core.domain.entity.WxModeServiceInfo; + +import java.util.List; + +/** + * 模式服务Service接口 + * + * @author flossom + * @date 2024-02-01 + */ +public interface IWxModeServiceInfoService +{ + /** + * 查询模式服务 + * + * @param id 模式服务主键 + * @return 模式服务 + */ + public WxModeServiceInfo selectWxModeServiceInfoById(Long id); + + /** + * 查询模式服务列表 + * + * @param wxModeServiceInfo 模式服务 + * @return 模式服务集合 + */ + public List selectWxModeServiceInfoList(WxModeServiceInfo wxModeServiceInfo); + + /** + * 新增模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + public int insertWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo); + + /** + * 修改模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + public int updateWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo); + + /** + * 批量删除模式服务 + * + * @param ids 需要删除的模式服务主键集合 + * @return 结果 + */ + public int deleteWxModeServiceInfoByIds(Long[] ids); + + /** + * 删除模式服务信息 + * + * @param id 模式服务主键 + * @return 结果 + */ + public int deleteWxModeServiceInfoById(Long id); +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeCombineInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeCombineInfoServiceImpl.java new file mode 100644 index 0000000..81d518a --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeCombineInfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.flossom.system.service.impl; + +import java.util.List; + +import com.flossom.common.core.domain.entity.WxModeCombineInfo; +import com.flossom.common.core.mapper.WxModeCombineInfoMapper; +import com.flossom.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.flossom.system.service.IWxModeCombineInfoService; + +/** + * 模式组合Service业务层处理 + * + * @author flossom + * @date 2024-02-01 + */ +@Service +public class WxModeCombineInfoServiceImpl implements IWxModeCombineInfoService +{ + @Autowired + private WxModeCombineInfoMapper wxModeCombineInfoMapper; + + /** + * 查询模式组合 + * + * @param id 模式组合主键 + * @return 模式组合 + */ + @Override + public WxModeCombineInfo selectWxModeCombineInfoById(Long id) + { + return wxModeCombineInfoMapper.selectWxModeCombineInfoById(id); + } + + /** + * 查询模式组合列表 + * + * @param wxModeCombineInfo 模式组合 + * @return 模式组合 + */ + @Override + public List selectWxModeCombineInfoList(WxModeCombineInfo wxModeCombineInfo) + { + return wxModeCombineInfoMapper.selectWxModeCombineInfoList(wxModeCombineInfo); + } + + /** + * 新增模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + @Override + public int insertWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo) + { + wxModeCombineInfo.setCreateTime(DateUtils.getNowDate()); + return wxModeCombineInfoMapper.insertWxModeCombineInfo(wxModeCombineInfo); + } + + /** + * 修改模式组合 + * + * @param wxModeCombineInfo 模式组合 + * @return 结果 + */ + @Override + public int updateWxModeCombineInfo(WxModeCombineInfo wxModeCombineInfo) + { + return wxModeCombineInfoMapper.updateWxModeCombineInfo(wxModeCombineInfo); + } + + /** + * 批量删除模式组合 + * + * @param ids 需要删除的模式组合主键 + * @return 结果 + */ + @Override + public int deleteWxModeCombineInfoByIds(Long[] ids) + { + return wxModeCombineInfoMapper.deleteWxModeCombineInfoByIds(ids); + } + + /** + * 删除模式组合信息 + * + * @param id 模式组合主键 + * @return 结果 + */ + @Override + public int deleteWxModeCombineInfoById(Long id) + { + return wxModeCombineInfoMapper.deleteWxModeCombineInfoById(id); + } +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeOpenSourceServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeOpenSourceServiceImpl.java new file mode 100644 index 0000000..d09573e --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeOpenSourceServiceImpl.java @@ -0,0 +1,96 @@ +package com.flossom.system.service.impl; + +import java.util.List; + +import com.flossom.common.core.domain.entity.WxModeOpenSource; +import com.flossom.common.core.mapper.WxModeOpenSourceMapper; +import com.flossom.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.flossom.system.service.IWxModeOpenSourceService; + +/** + * IOT仪器弹出视频Service业务层处理 + * + * @author flossom + * @date 2024-01-29 + */ +@Service +public class WxModeOpenSourceServiceImpl implements IWxModeOpenSourceService +{ + @Autowired + private WxModeOpenSourceMapper wxModeOpenSourceMapper; + + /** + * 查询IOT仪器弹出视频 + * + * @param id IOT仪器弹出视频主键 + * @return IOT仪器弹出视频 + */ + @Override + public WxModeOpenSource selectWxModeOpenSourceById(Long id) + { + return wxModeOpenSourceMapper.selectWxModeOpenSourceById(id); + } + + /** + * 查询IOT仪器弹出视频列表 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return IOT仪器弹出视频 + */ + @Override + public List selectWxModeOpenSourceList(WxModeOpenSource wxModeOpenSource) + { + return wxModeOpenSourceMapper.selectWxModeOpenSourceList(wxModeOpenSource); + } + + /** + * 新增IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + @Override + public int insertWxModeOpenSource(WxModeOpenSource wxModeOpenSource) + { + wxModeOpenSource.setCreateTime(DateUtils.getNowDate()); + return wxModeOpenSourceMapper.insertWxModeOpenSource(wxModeOpenSource); + } + + /** + * 修改IOT仪器弹出视频 + * + * @param wxModeOpenSource IOT仪器弹出视频 + * @return 结果 + */ + @Override + public int updateWxModeOpenSource(WxModeOpenSource wxModeOpenSource) + { + return wxModeOpenSourceMapper.updateWxModeOpenSource(wxModeOpenSource); + } + + /** + * 批量删除IOT仪器弹出视频 + * + * @param ids 需要删除的IOT仪器弹出视频主键 + * @return 结果 + */ + @Override + public int deleteWxModeOpenSourceByIds(Long[] ids) + { + return wxModeOpenSourceMapper.deleteWxModeOpenSourceByIds(ids); + } + + /** + * 删除IOT仪器弹出视频信息 + * + * @param id IOT仪器弹出视频主键 + * @return 结果 + */ + @Override + public int deleteWxModeOpenSourceById(Long id) + { + return wxModeOpenSourceMapper.deleteWxModeOpenSourceById(id); + } +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java index 4c6e697..fdb7c38 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceImpl.java @@ -1,15 +1,17 @@ package com.flossom.system.service.impl; +import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; import com.alibaba.nacos.common.utils.CollectionUtils; -import com.flossom.common.core.domain.entity.WxMode; -import com.flossom.common.core.domain.entity.WxModeTag; +import com.flossom.common.core.domain.entity.*; import com.flossom.common.core.enums.TagTypeStatusEnum; -import com.flossom.common.core.mapper.WxModeMapper; -import com.flossom.common.core.mapper.WxModeTagMapper; +import com.flossom.common.core.mapper.*; import com.flossom.common.core.utils.DateUtils; +import com.flossom.common.core.utils.StringUtils; +import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.flossom.system.service.IWxModeService; @@ -27,6 +29,12 @@ public class WxModeServiceImpl implements IWxModeService private WxModeMapper wxModeMapper; @Autowired private WxModeTagMapper wxModeTagMapper; + @Autowired + private WxModeOpenSourceMapper wxModeOpenSourceMapper; + @Autowired + private WxModeServiceInfoMapper wxModeServiceInfoMapper; + @Autowired + private WxModeCombineInfoMapper wxModeCombineInfoMapper; /** * 查询模式列 * @@ -53,6 +61,35 @@ public class WxModeServiceImpl implements IWxModeService wxMode.setLockCompanyTagArray(companyIds); } } + WxModeOpenSource openSource = new WxModeOpenSource(); + openSource.setModeId(id); + List wxModeOpenSources = wxModeOpenSourceMapper.selectWxModeOpenSourceList(openSource); + wxMode.setOpenSourceData(wxModeOpenSources); + + // 获取服务内容 + WxModeServiceInfo serviceInfo = new WxModeServiceInfo(); + serviceInfo.setModeId(id); + List wxModeServiceInfos = wxModeServiceInfoMapper.selectWxModeServiceInfoList(serviceInfo); + for (WxModeServiceInfo wxModeServiceInfo: wxModeServiceInfos) { + List queryDate = Lists.newArrayList(); + queryDate.add(wxModeServiceInfo.getServiceStartTime()); + queryDate.add(wxModeServiceInfo.getServiceEndTime()); + wxModeServiceInfo.setStartTimeArray(queryDate); + } + wxMode.setServiceData(wxModeServiceInfos); + + // 获取组合内容 + WxModeCombineInfo modeCombineInfo = new WxModeCombineInfo(); + modeCombineInfo.setModeId(id); + List wxModeCombineInfos = wxModeCombineInfoMapper.selectWxModeCombineInfoList(modeCombineInfo); + for(WxModeCombineInfo wxModeCombineInfo:wxModeCombineInfos) { + String technologyInfo = wxModeCombineInfo.getTechnologyInfo(); + if (StringUtils.isNotEmpty(technologyInfo)) { + List technologyList = Arrays.asList(technologyInfo.split(",")).stream().map(String::valueOf).collect(Collectors.toList()); + wxModeCombineInfo.setTechnologyArray(technologyList); + } + } + wxMode.setCombineData(wxModeCombineInfos); return wxMode; } @@ -103,6 +140,40 @@ public class WxModeServiceImpl implements IWxModeService wxModeTagMapper.insertWxModeTag(modeTag); } } + // 插入弹出资源数据 + if (CollectionUtils.isNotEmpty(wxMode.getOpenSourceData())) { + List openSourceData = wxMode.getOpenSourceData(); + for(WxModeOpenSource openSource: openSourceData) { + openSource.setCreateTime(DateUtils.getNowDate()); + openSource.setModeId(wxMode.getId()); + wxModeOpenSourceMapper.insertWxModeOpenSource(openSource); + } + } + // 插入服务时间内容 + if (CollectionUtils.isNotEmpty(wxMode.getServiceData())) { + List serviceData = wxMode.getServiceData(); + for (WxModeServiceInfo wxModeServiceInfo: serviceData) { + wxModeServiceInfo.setModeId(wxMode.getId()); + wxModeServiceInfo.setCreateTime(DateUtils.getNowDate()); + List startTimeArray = wxModeServiceInfo.getStartTimeArray(); + wxModeServiceInfo.setServiceStartTime(startTimeArray.get(0)); + wxModeServiceInfo.setServiceEndTime(startTimeArray.get(1)); + wxModeServiceInfoMapper.insertWxModeServiceInfo(wxModeServiceInfo); + } + } + // 插入组合数据 + if(CollectionUtils.isNotEmpty(wxMode.getCombineData())) { + List combineData = wxMode.getCombineData(); + for (WxModeCombineInfo wxModeCombineInfo: combineData) { + wxModeCombineInfo.setModeId(wxMode.getId()); + wxModeCombineInfo.setCreateTime(DateUtils.getNowDate()); + if (CollectionUtils.isNotEmpty(wxModeCombineInfo.getTechnologyArray())) { + String keys = wxModeCombineInfo.getTechnologyArray().stream().map(String::valueOf).collect(Collectors.joining(",")); + wxModeCombineInfo.setTechnologyInfo(keys); + } + wxModeCombineInfoMapper.insertWxModeCombineInfo(wxModeCombineInfo); + } + } return i; } @@ -118,7 +189,12 @@ public class WxModeServiceImpl implements IWxModeService wxMode.setUpdateTime(DateUtils.getNowDate()); // 先删除关联关系 wxModeTagMapper.deleteWxModeTagByModeId(wxMode.getId()); - + // 删除关联弹窗视频 + wxModeOpenSourceMapper.deleteWxModeOpenSourceByModeId(wxMode.getId()); + // 删除服务关系 + wxModeServiceInfoMapper.deleteWxModeServiceInfoByModeId(wxMode.getId()); + // 删除组合关系 + wxModeCombineInfoMapper.deleteWxModeCombineInfoByModeId(wxMode.getId()); // 插入企微关联关系 if (CollectionUtils.isNotEmpty(wxMode.getLockCompanyTagArray())) { List lockCompanyTagArray = wxMode.getLockCompanyTagArray(); @@ -143,6 +219,40 @@ public class WxModeServiceImpl implements IWxModeService wxModeTagMapper.insertWxModeTag(modeTag); } } + // 插入弹出资源数据 + if (CollectionUtils.isNotEmpty(wxMode.getOpenSourceData())) { + List openSourceData = wxMode.getOpenSourceData(); + for(WxModeOpenSource openSource: openSourceData) { + openSource.setCreateTime(DateUtils.getNowDate()); + openSource.setModeId(wxMode.getId()); + wxModeOpenSourceMapper.insertWxModeOpenSource(openSource); + } + } + // 插入服务时间已经内容 + if (CollectionUtils.isNotEmpty(wxMode.getServiceData())) { + List serviceData = wxMode.getServiceData(); + for (WxModeServiceInfo wxModeServiceInfo: serviceData) { + wxModeServiceInfo.setModeId(wxMode.getId()); + wxModeServiceInfo.setCreateTime(DateUtils.getNowDate()); + List startTimeArray = wxModeServiceInfo.getStartTimeArray(); + wxModeServiceInfo.setServiceStartTime(startTimeArray.get(0)); + wxModeServiceInfo.setServiceEndTime(startTimeArray.get(1)); + wxModeServiceInfoMapper.insertWxModeServiceInfo(wxModeServiceInfo); + } + } + // 插入组合数据 + if(CollectionUtils.isNotEmpty(wxMode.getCombineData())) { + List combineData = wxMode.getCombineData(); + for (WxModeCombineInfo wxModeCombineInfo: combineData) { + wxModeCombineInfo.setModeId(wxMode.getId()); + wxModeCombineInfo.setCreateTime(DateUtils.getNowDate()); + if (CollectionUtils.isNotEmpty(wxModeCombineInfo.getTechnologyArray())) { + String keys = wxModeCombineInfo.getTechnologyArray().stream().map(String::valueOf).collect(Collectors.joining(",")); + wxModeCombineInfo.setTechnologyInfo(keys); + } + wxModeCombineInfoMapper.insertWxModeCombineInfo(wxModeCombineInfo); + } + } return wxModeMapper.updateWxMode(wxMode); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceInfoServiceImpl.java new file mode 100644 index 0000000..8e26365 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxModeServiceInfoServiceImpl.java @@ -0,0 +1,96 @@ +package com.flossom.system.service.impl; + +import java.util.List; + +import com.flossom.common.core.domain.entity.WxModeServiceInfo; +import com.flossom.common.core.mapper.WxModeServiceInfoMapper; +import com.flossom.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.flossom.system.service.IWxModeServiceInfoService; + +/** + * 模式服务Service业务层处理 + * + * @author flossom + * @date 2024-02-01 + */ +@Service +public class WxModeServiceInfoServiceImpl implements IWxModeServiceInfoService +{ + @Autowired + private WxModeServiceInfoMapper wxModeServiceInfoMapper; + + /** + * 查询模式服务 + * + * @param id 模式服务主键 + * @return 模式服务 + */ + @Override + public WxModeServiceInfo selectWxModeServiceInfoById(Long id) + { + return wxModeServiceInfoMapper.selectWxModeServiceInfoById(id); + } + + /** + * 查询模式服务列表 + * + * @param wxModeServiceInfo 模式服务 + * @return 模式服务 + */ + @Override + public List selectWxModeServiceInfoList(WxModeServiceInfo wxModeServiceInfo) + { + return wxModeServiceInfoMapper.selectWxModeServiceInfoList(wxModeServiceInfo); + } + + /** + * 新增模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + @Override + public int insertWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo) + { + wxModeServiceInfo.setCreateTime(DateUtils.getNowDate()); + return wxModeServiceInfoMapper.insertWxModeServiceInfo(wxModeServiceInfo); + } + + /** + * 修改模式服务 + * + * @param wxModeServiceInfo 模式服务 + * @return 结果 + */ + @Override + public int updateWxModeServiceInfo(WxModeServiceInfo wxModeServiceInfo) + { + return wxModeServiceInfoMapper.updateWxModeServiceInfo(wxModeServiceInfo); + } + + /** + * 批量删除模式服务 + * + * @param ids 需要删除的模式服务主键 + * @return 结果 + */ + @Override + public int deleteWxModeServiceInfoByIds(Long[] ids) + { + return wxModeServiceInfoMapper.deleteWxModeServiceInfoByIds(ids); + } + + /** + * 删除模式服务信息 + * + * @param id 模式服务主键 + * @return 结果 + */ + @Override + public int deleteWxModeServiceInfoById(Long id) + { + return wxModeServiceInfoMapper.deleteWxModeServiceInfoById(id); + } +} diff --git a/flossom-ui/src/api/system/mode.js b/flossom-ui/src/api/system/mode.js index 1b343b7..fad6e19 100644 --- a/flossom-ui/src/api/system/mode.js +++ b/flossom-ui/src/api/system/mode.js @@ -9,6 +9,16 @@ export function listMode(query) { }) } +// 查询模式所有数据 +export function listModeAll(query) { + return request({ + url: '/system/mode/listAll', + method: 'get', + params: query + }) +} + + // 查询模式列详细 export function getMode(id) { return request({ diff --git a/flossom-ui/src/api/system/modeOpenSource.js b/flossom-ui/src/api/system/modeOpenSource.js new file mode 100644 index 0000000..1d16e70 --- /dev/null +++ b/flossom-ui/src/api/system/modeOpenSource.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询IOT仪器弹出视频列表 +export function listSource(query) { + return request({ + url: '/system/modeOpenSource/list', + method: 'get', + params: query + }) +} + +// 查询IOT仪器弹出视频详细 +export function getSource(id) { + return request({ + url: '/system/modeOpenSource/' + id, + method: 'get' + }) +} + +// 新增IOT仪器弹出视频 +export function addSource(data) { + return request({ + url: '/system/modeOpenSource', + method: 'post', + data: data + }) +} + +// 修改IOT仪器弹出视频 +export function updateSource(data) { + return request({ + url: '/system/modeOpenSource', + method: 'put', + data: data + }) +} + +// 删除IOT仪器弹出视频 +export function delSource(id) { + return request({ + url: '/system/modeOpenSource/' + id, + method: 'delete' + }) +} diff --git a/flossom-ui/src/views/system/firing/index.vue b/flossom-ui/src/views/system/firing/index.vue index a99bc7a..f156af7 100644 --- a/flossom-ui/src/views/system/firing/index.vue +++ b/flossom-ui/src/views/system/firing/index.vue @@ -48,7 +48,7 @@ ref="upload" :limit="1" accept=".jpg, .png, .jpeg" - :data="{index:index}" + :data="{index:index,condition: index+''}" :headers="upload.headers" :action="upload.url+'/else'" :disabled="upload.isUploading" diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue index c41b82d..1547d32 100644 --- a/flossom-ui/src/views/system/mode/index.vue +++ b/flossom-ui/src/views/system/mode/index.vue @@ -1,100 +1,5 @@