diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java index 4edda78..aff47fb 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java @@ -127,11 +127,11 @@ public class SiteInfo extends BaseEntity /** 仪器名称 */ @Excel(name = "仪器名称") - private String machineName; + private String instrumentName; /** 仪器ID */ @Excel(name = "仪器ID") - private String machineId; + private String instrumentId; private List machineArray = new ArrayList(); private String handlerCompanyTagId; @@ -382,24 +382,41 @@ public class SiteInfo extends BaseEntity { return channelId; } - public void setMachineName(String machineName) - { - this.machineName = machineName; + + public String getInstrumentName() { + return instrumentName; } - public String getMachineName() - { - return machineName; + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; } - public void setMachineId(String machineId) - { - this.machineId = machineId; + + public String getInstrumentId() { + return instrumentId; } - public String getMachineId() - { - return machineId; + public void setInstrumentId(String instrumentId) { + this.instrumentId = instrumentId; } + + // public void setMachineName(String machineName) +// { +// this.machineName = machineName; +// } +// +// public String getMachineName() +// { +// return machineName; +// } +// public void setMachineId(String machineId) +// { +// this.machineId = machineId; +// } +// +// public String getMachineId() +// { +// return machineId; +// } public void setUserType(Integer userType) { this.userType = userType; @@ -651,8 +668,8 @@ public class SiteInfo extends BaseEntity .append("forbidCompanyTagId", getForbidCompanyTagId()) .append("channelName", getChannelName()) .append("channelId", getChannelId()) - .append("machineName", getMachineName()) - .append("machineId", getMachineId()) +// .append("machineName", getMachineName()) +// .append("machineId", getMachineId()) .append("userType", getUserType()) .append("operate", getOperate()) .append("signNumber", getSignNumber()) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoInstrument.java new file mode 100644 index 0000000..b7eacc3 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoInstrument.java @@ -0,0 +1,69 @@ +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; + +/** + * 站点仪器关联对象 site_info_instrument + * + * @author flossom + * @date 2024-01-08 + */ +public class SiteInfoInstrument extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 站点id */ + @Excel(name = "站点id") + private Long siteId; + + /** 仪器ID */ + @Excel(name = "仪器ID") + private Long instrumentId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setSiteId(Long siteId) + { + this.siteId = siteId; + } + + public Long getSiteId() + { + return siteId; + } + public void setInstrumentId(Long instrumentId) + { + this.instrumentId = instrumentId; + } + + public Long getInstrumentId() + { + return instrumentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("siteId", getSiteId()) + .append("instrumentId", getInstrumentId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptMessage.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptMessage.java index 57c5f20..2c7c6fb 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptMessage.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptMessage.java @@ -28,11 +28,11 @@ public class WxScriptMessage extends BaseEntity /** 仪器ID */ @Excel(name = "仪器ID") - private Long machineId; + private Long instrumentId; /** 仪器名字 */ @Excel(name = "仪器名字") - private String machineName; + private String instrumentName; /** 消息内容 */ @Excel(name = "消息内容") @@ -97,24 +97,23 @@ public class WxScriptMessage extends BaseEntity { return messageTitle; } - public void setMachineId(Long machineId) - { - this.machineId = machineId; + + public Long getInstrumentId() { + return instrumentId; } - public Long getMachineId() - { - return machineId; + public void setInstrumentId(Long instrumentId) { + this.instrumentId = instrumentId; } - public void setMachineName(String machineName) - { - this.machineName = machineName; + + public String getInstrumentName() { + return instrumentName; } - public String getMachineName() - { - return machineName; + public void setInstrumentName(String instrumentName) { + this.instrumentName = instrumentName; } + public void setMessageContent(String messageContent) { this.messageContent = messageContent; @@ -203,8 +202,6 @@ public class WxScriptMessage extends BaseEntity .append("id", getId()) .append("messageType", getMessageType()) .append("messageTitle", getMessageTitle()) - .append("machineId", getMachineId()) - .append("machineName", getMachineName()) .append("messageContent", getMessageContent()) .append("status", getStatus()) .append("type", getType()) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoInstrumentMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoInstrumentMapper.java new file mode 100644 index 0000000..fc4bd65 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoInstrumentMapper.java @@ -0,0 +1,62 @@ +package com.flossom.common.core.mapper; + +import com.flossom.common.core.domain.entity.SiteInfoInstrument; + +import java.util.List; + +/** + * 站点仪器关联Mapper接口 + * + * @author flossom + * @date 2024-01-08 + */ +public interface SiteInfoInstrumentMapper +{ + /** + * 查询站点仪器关联 + * + * @param id 站点仪器关联主键 + * @return 站点仪器关联 + */ + public SiteInfoInstrument selectSiteInfoInstrumentById(Long id); + + /** + * 查询站点仪器关联列表 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 站点仪器关联集合 + */ + public List selectSiteInfoInstrumentList(SiteInfoInstrument siteInfoInstrument); + + /** + * 新增站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + public int insertSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument); + + /** + * 修改站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + public int updateSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument); + + /** + * 删除站点仪器关联 + * + * @param id 站点仪器关联主键 + * @return 结果 + */ + public int deleteSiteInfoInstrumentById(Long id); + + /** + * 批量删除站点仪器关联 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSiteInfoInstrumentByIds(Long[] ids); +} diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoInstrumentMapper.xml new file mode 100644 index 0000000..3ae1d91 --- /dev/null +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoInstrumentMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + select id, site_id, instrument_id, create_by, create_time, update_by, update_time from site_info_instrument + + + + + + + + insert into site_info_instrument + + id, + site_id, + instrument_id, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{siteId}, + #{instrumentId}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update site_info_instrument + + site_id = #{siteId}, + instrument_id = #{instrumentId}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from site_info_instrument where id = #{id} + + + + delete from site_info_instrument where id in + + #{id} + + + diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml index 3ee5691..7fee971 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml @@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, site_type, site_name, file_url, site_start_time, site_end_time, user_register_start_time, user_register_end_time, open_type, push_type, push_number, push_timer, show_wechat_tag, show_wechat_tag_id, show_company_tag, show_company_tag_id, forbid_wechat_tag, forbid_wechat_tag_id, forbid_company_tag, handler_company_tag, handler_company_tag_id, handler_wechat_tag_id, handler_wechat_tag, forbid_company_tag_id, channel_name, channel_id, machine_name, machine_id, user_type, operate, sign_number, order_number, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, create_by, create_time, update_by, update_time from site_info + select id, site_type, site_name, file_url, site_start_time, site_end_time, user_register_start_time, user_register_end_time, open_type, push_type, push_number, push_timer, show_wechat_tag, show_wechat_tag_id, show_company_tag, show_company_tag_id, forbid_wechat_tag, forbid_wechat_tag_id, forbid_company_tag, handler_company_tag, handler_company_tag_id, handler_wechat_tag_id, handler_wechat_tag, forbid_company_tag_id, channel_name, channel_id, instrument_name, instrument_id, user_type, operate, sign_number, order_number, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, create_by, create_time, update_by, update_time from site_info @@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and message_type = #{messageType} and message_title = #{messageTitle} - and machine_id = #{machineId} - and machine_name like concat('%', #{machineName}, '%') + and instrument_id = #{instrumentId} + and instrument_name like concat('%', #{instrumentName}, '%') and message_content = #{messageContent} and status = #{status} and type = #{type} @@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id, message_type, message_title, - machine_id, - machine_name, + instrument_id, + instrument_name, message_content, status, type, @@ -80,8 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, #{messageType}, #{messageTitle}, - #{machineId}, - #{machineName}, + #{instrumentId}, + #{instrumentName}, #{messageContent}, #{status}, #{type}, @@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" message_type = #{messageType}, message_title = #{messageTitle}, - machine_id = #{machineId}, - machine_name = #{machineName}, + instrument_id = #{instrumentId}, + instrument_name = #{instrumentName}, message_content = #{messageContent}, status = #{status}, type = #{type}, diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoInstrumentService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoInstrumentService.java new file mode 100644 index 0000000..73dd6ca --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoInstrumentService.java @@ -0,0 +1,62 @@ +package com.flossom.system.service; + +import com.flossom.common.core.domain.entity.SiteInfoInstrument; + +import java.util.List; + +/** + * 站点仪器关联Service接口 + * + * @author flossom + * @date 2024-01-08 + */ +public interface ISiteInfoInstrumentService +{ + /** + * 查询站点仪器关联 + * + * @param id 站点仪器关联主键 + * @return 站点仪器关联 + */ + public SiteInfoInstrument selectSiteInfoInstrumentById(Long id); + + /** + * 查询站点仪器关联列表 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 站点仪器关联集合 + */ + public List selectSiteInfoInstrumentList(SiteInfoInstrument siteInfoInstrument); + + /** + * 新增站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + public int insertSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument); + + /** + * 修改站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + public int updateSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument); + + /** + * 批量删除站点仪器关联 + * + * @param ids 需要删除的站点仪器关联主键集合 + * @return 结果 + */ + public int deleteSiteInfoInstrumentByIds(Long[] ids); + + /** + * 删除站点仪器关联信息 + * + * @param id 站点仪器关联主键 + * @return 结果 + */ + public int deleteSiteInfoInstrumentById(Long id); +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoInstrumentServiceImpl.java new file mode 100644 index 0000000..aade223 --- /dev/null +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoInstrumentServiceImpl.java @@ -0,0 +1,97 @@ +package com.flossom.system.service.impl; + +import java.util.List; + +import com.flossom.common.core.domain.entity.SiteInfoInstrument; +import com.flossom.common.core.mapper.SiteInfoInstrumentMapper; +import com.flossom.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.flossom.system.service.ISiteInfoInstrumentService; + +/** + * 站点仪器关联Service业务层处理 + * + * @author flossom + * @date 2024-01-08 + */ +@Service +public class SiteInfoInstrumentServiceImpl implements ISiteInfoInstrumentService +{ + @Autowired + private SiteInfoInstrumentMapper siteInfoInstrumentMapper; + + /** + * 查询站点仪器关联 + * + * @param id 站点仪器关联主键 + * @return 站点仪器关联 + */ + @Override + public SiteInfoInstrument selectSiteInfoInstrumentById(Long id) + { + return siteInfoInstrumentMapper.selectSiteInfoInstrumentById(id); + } + + /** + * 查询站点仪器关联列表 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 站点仪器关联 + */ + @Override + public List selectSiteInfoInstrumentList(SiteInfoInstrument siteInfoInstrument) + { + return siteInfoInstrumentMapper.selectSiteInfoInstrumentList(siteInfoInstrument); + } + + /** + * 新增站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + @Override + public int insertSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument) + { + siteInfoInstrument.setCreateTime(DateUtils.getNowDate()); + return siteInfoInstrumentMapper.insertSiteInfoInstrument(siteInfoInstrument); + } + + /** + * 修改站点仪器关联 + * + * @param siteInfoInstrument 站点仪器关联 + * @return 结果 + */ + @Override + public int updateSiteInfoInstrument(SiteInfoInstrument siteInfoInstrument) + { + siteInfoInstrument.setUpdateTime(DateUtils.getNowDate()); + return siteInfoInstrumentMapper.updateSiteInfoInstrument(siteInfoInstrument); + } + + /** + * 批量删除站点仪器关联 + * + * @param ids 需要删除的站点仪器关联主键 + * @return 结果 + */ + @Override + public int deleteSiteInfoInstrumentByIds(Long[] ids) + { + return siteInfoInstrumentMapper.deleteSiteInfoInstrumentByIds(ids); + } + + /** + * 删除站点仪器关联信息 + * + * @param id 站点仪器关联主键 + * @return 结果 + */ + @Override + public int deleteSiteInfoInstrumentById(Long id) + { + return siteInfoInstrumentMapper.deleteSiteInfoInstrumentById(id); + } +} diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java index 038e682..1c80799 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java @@ -36,6 +36,10 @@ public class SiteInfoServiceImpl implements ISiteInfoService private SiteInfoTagMapper siteInfoTagMapper; @Autowired private SiteInfoChannelMapper siteInfoChannelMapper; + @Autowired + private WxInstrumentMapper wxInstrumentMapper; + @Autowired + private SiteInfoInstrumentMapper siteInfoInstrumentMapper; /** * 查询站点管理 * @@ -87,10 +91,14 @@ public class SiteInfoServiceImpl implements ISiteInfoService } // 处理渠道展示 if (StringUtils.isNotEmpty(siteInfo.getChannelId())) { - List channelLisn = Arrays.asList(siteInfo.getChannelId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList()); - siteInfo.setChannelArray(channelLisn); + List channelList = Arrays.asList(siteInfo.getChannelId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList()); + siteInfo.setChannelArray(channelList); + } + // 处理仪器展示 + if (StringUtils.isNotEmpty(siteInfo.getInstrumentId())) { + List instrumentList = Arrays.asList(siteInfo.getInstrumentId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList()); + siteInfo.setMachineArray(instrumentList); } - return siteInfo; } @@ -124,18 +132,19 @@ public class SiteInfoServiceImpl implements ISiteInfoService List handlerWechatTagNew = Lists.newArrayList(); List handlerCompanyTagNew = Lists.newArrayList(); List channelListNew = Lists.newArrayList(); - this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew); + List wxInstrumentsListNew = Lists.newArrayList(); + this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentsListNew); // 开始保存关联关系 int i = siteInfoMapper.insertSiteInfo(siteInfo); - this.commonHandlerRelation(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew); + this.commonHandlerRelation(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentsListNew); return i; } // 新增、更新统一处理关联关系 - private void commonHandlerRelation(SiteInfo siteInfo,List showWechatTagNew,List showCompanyTagNew,List forbidWechatTagNew,List forbidCompanyTagNew,List channelListNew,List handlerWechatTagNew,List handlerCompanyTagNew){ + private void commonHandlerRelation(SiteInfo siteInfo,List showWechatTagNew,List showCompanyTagNew,List forbidWechatTagNew,List forbidCompanyTagNew,List channelListNew,List handlerWechatTagNew,List handlerCompanyTagNew, List wxInstrumentsListNew){ // 保存可见小程序标签关联关系 for (SysTag tag: showWechatTagNew) { SiteInfoTag infoTag = new SiteInfoTag(); @@ -206,9 +215,18 @@ public class SiteInfoServiceImpl implements ISiteInfoService infoTag.setCreateTime(DateUtils.getNowDate()); siteInfoTagMapper.insertSiteInfoTag(infoTag); } + // 保存仪器关联信息 + for (WxInstrument wxInstrument: wxInstrumentsListNew) { + SiteInfoInstrument infoInstrument = new SiteInfoInstrument(); + infoInstrument.setInstrumentId(wxInstrument.getId()); + infoInstrument.setSiteId(siteInfo.getId()); + infoInstrument.setCreateBy(SecurityUtils.getUsername()); + infoInstrument.setCreateTime(DateUtils.getNowDate()); + siteInfoInstrumentMapper.insertSiteInfoInstrument(infoInstrument); + } } // 新增、更新统一调用汇总 - private void commonHandler(SiteInfo siteInfo,List showWechatTagNew,List showCompanyTagNew,List forbidWechatTagNew,List forbidCompanyTagNew,List channelListNew,List handlerWechatTagNew,List handlerCompanyTagNew){ + private void commonHandler(SiteInfo siteInfo,List showWechatTagNew,List showCompanyTagNew,List forbidWechatTagNew,List forbidCompanyTagNew,List channelListNew,List handlerWechatTagNew,List handlerCompanyTagNew,List wxInstrumentsListNew){ // 如果是自定义频次，则需要保存推送时间 周一到周日 if (!CollectionUtils.isEmpty(siteInfo.getPushTimerArray())) { siteInfo.setPushTimer(StringUtils.join(siteInfo.getPushTimerArray(),",")); @@ -336,6 +354,23 @@ public class SiteInfoServiceImpl implements ISiteInfoService String ids = StringUtils.join(resultList, ","); siteInfo.setChannelId(ids); } + // 保存仪器信息 + if (!CollectionUtils.isEmpty(siteInfo.getMachineArray())) { + List machineArray = siteInfo.getMachineArray(); + for(long instrumentId : machineArray) { + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(instrumentId); + if (Objects.nonNull(wxInstrument)) { + wxInstrumentsListNew.add(wxInstrument); + } + } + } + if (!CollectionUtils.isEmpty(wxInstrumentsListNew)) { + String channelNames = wxInstrumentsListNew.stream().map(WxInstrument::getName).collect(Collectors.joining(",")); + siteInfo.setInstrumentName(channelNames); + List resultList = wxInstrumentsListNew.stream().map(WxInstrument::getId).collect(Collectors.toList()); + String ids = StringUtils.join(resultList, ","); + siteInfo.setInstrumentId(ids); + } } /** @@ -359,6 +394,8 @@ public class SiteInfoServiceImpl implements ISiteInfoService siteInfo.setShowWechatTag(""); siteInfo.setShowCompanyTagId(""); siteInfo.setShowCompanyTag(""); + siteInfo.setInstrumentId(""); + siteInfo.setInstrumentName(""); List showWechatTagNew = Lists.newArrayList(); List showCompanyTagNew = Lists.newArrayList(); List forbidWechatTagNew = Lists.newArrayList(); @@ -366,12 +403,13 @@ public class SiteInfoServiceImpl implements ISiteInfoService List channelListNew = Lists.newArrayList(); List handlerWechatTagNew = Lists.newArrayList(); List handlerCompanyTagNew = Lists.newArrayList(); - this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew); + List wxInstrumentList = Lists.newArrayList(); + this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentList); // 删除关联关系 siteInfoTagMapper.deleteSiteInfoTagBySiteId(siteInfo.getId()); // 保存新的关联关系 - this.commonHandlerRelation(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew); + this.commonHandlerRelation(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentList); return siteInfoMapper.updateSiteInfo(siteInfo); } diff --git a/flossom-ui/src/views/system/scriptMessage/index.vue b/flossom-ui/src/views/system/scriptMessage/index.vue index f075886..908ad77 100644 --- a/flossom-ui/src/views/system/scriptMessage/index.vue +++ b/flossom-ui/src/views/system/scriptMessage/index.vue @@ -9,17 +9,17 @@ - + - + - + - + @@ -219,11 +219,17 @@ - - - - - + + + + + + @@ -293,11 +299,14 @@