314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

Browse Source
master
382696293@qq.com 2 years ago
parent d5358f4ec7 cd216a2d13
commit e12d7c4941
13 changed files with 691 additions and 165 deletions
Show Stats Download Patch File Download Diff File

49
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfo.java
Unescape Escape View File

@ -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<Long> machineArray = new ArrayList<Long>();
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())

69
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SiteInfoInstrument.java
Unescape Escape View File

@ -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();
}
}

29
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxScriptMessage.java
Unescape Escape View File

@ -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())

62
flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteInfoInstrumentMapper.java
Unescape Escape View File

@ -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<SiteInfoInstrument> 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);
}

79
flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoInstrumentMapper.xml
Unescape Escape View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.flossom.common.core.mapper.SiteInfoInstrumentMapper">
<resultMap type="SiteInfoInstrument" id="SiteInfoInstrumentResult">
<result property="id" column="id" />
<result property="siteId" column="site_id" />
<result property="instrumentId" column="instrument_id" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectSiteInfoInstrumentVo">
select id, site_id, instrument_id, create_by, create_time, update_by, update_time from site_info_instrument
</sql>
<select id="selectSiteInfoInstrumentList" parameterType="SiteInfoInstrument" resultMap="SiteInfoInstrumentResult">
<include refid="selectSiteInfoInstrumentVo"/>
<where>
<if test="siteId != null "> and site_id = #{siteId}</if>
<if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
</where>
</select>
<select id="selectSiteInfoInstrumentById" parameterType="Long" resultMap="SiteInfoInstrumentResult">
<include refid="selectSiteInfoInstrumentVo"/>
where id = #{id}
</select>
<insert id="insertSiteInfoInstrument" parameterType="SiteInfoInstrument">
insert into site_info_instrument
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="siteId != null">site_id,</if>
<if test="instrumentId != null">instrument_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="siteId != null">#{siteId},</if>
<if test="instrumentId != null">#{instrumentId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateSiteInfoInstrument" parameterType="SiteInfoInstrument">
update site_info_instrument
<trim prefix="SET" suffixOverrides=",">
<if test="siteId != null">site_id = #{siteId},</if>
<if test="instrumentId != null">instrument_id = #{instrumentId},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSiteInfoInstrumentById" parameterType="Long">
delete from site_info_instrument where id = #{id}
</delete>
<delete id="deleteSiteInfoInstrumentByIds" parameterType="String">
delete from site_info_instrument where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

22
flossom-common/flossom-common-core/src/main/resources/mapper/SiteInfoMapper.xml
Unescape Escape View File

@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="forbidCompanyTagId" column="forbid_company_tag_id" />
<result property="channelName" column="channel_name" />
<result property="channelId" column="channel_id" />
<result property="machineName" column="machine_name" />
<result property="machineId" column="machine_id" />
<result property="instrumentName" column="instrument_name" />
<result property="instrumentId" column="instrument_id" />
<result property="userType" column="user_type" />
<result property="operate" column="operate" />
<result property="signNumber" column="sign_number" />
@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSiteInfoVo">
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
</sql>
<select id="selectSiteInfoList" parameterType="SiteInfo" resultMap="SiteInfoResult">
@ -82,8 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="forbidCompanyTagId != null and forbidCompanyTagId != ''"> and forbid_company_tag_id = #{forbidCompanyTagId}</if>
<if test="channelName != null and channelName != ''"> and channel_name like concat('%', #{channelName}, '%')</if>
<if test="channelId != null and channelId != ''"> and channel_id = #{channelId}</if>
<if test="machineName != null and machineName != ''"> and machine_name like concat('%', #{machineName}, '%')</if>
<if test="machineId != null and machineId != ''"> and machine_id = #{machineId}</if>
<if test="instrumentName != null and instrumentName != ''"> and instrument_name like concat('%', #{instrumentName}, '%')</if>
<if test="instrumentId != null and instrumentId != ''"> and instrument_id = #{instrumentId}</if>
<if test="userType != null "> and user_type = #{userType}</if>
<if test="operate != null "> and operate = #{operate}</if>
<if test="signNumber != null "> and sign_number = #{signNumber}</if>
@ -132,8 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="forbidCompanyTagId != null">forbid_company_tag_id,</if>
<if test="channelName != null">channel_name,</if>
<if test="channelId != null">channel_id,</if>
<if test="machineName != null">machine_name,</if>
<if test="machineId != null">machine_id,</if>
<if test="instrumentName != null">instrument_name,</if>
<if test="instrumentId != null">instrument_id,</if>
<if test="userType != null">user_type,</if>
<if test="operate != null">operate,</if>
<if test="signNumber != null">sign_number,</if>
@ -176,8 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="forbidCompanyTagId != null">#{forbidCompanyTagId},</if>
<if test="channelName != null">#{channelName},</if>
<if test="channelId != null">#{channelId},</if>
<if test="machineName != null">#{machineName},</if>
<if test="machineId != null">#{machineId},</if>
<if test="instrumentName != null">#{instrumentName},</if>
<if test="instrumentId != null">#{instrumentId},</if>
<if test="userType != null">#{userType},</if>
<if test="operate != null">#{operate},</if>
<if test="signNumber != null">#{signNumber},</if>
@ -224,8 +224,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="forbidCompanyTagId != null">forbid_company_tag_id = #{forbidCompanyTagId},</if>
<if test="channelName != null">channel_name = #{channelName},</if>
<if test="channelId != null">channel_id = #{channelId},</if>
<if test="machineName != null">machine_name = #{machineName},</if>
<if test="machineId != null">machine_id = #{machineId},</if>
<if test="instrumentName != null">instrument_name = #{instrumentName},</if>
<if test="instrumentId != null">instrument_id = #{instrumentId},</if>
<if test="userType != null">user_type = #{userType},</if>
<if test="operate != null">operate = #{operate},</if>
<if test="signNumber != null">sign_number = #{signNumber},</if>

22
flossom-common/flossom-common-core/src/main/resources/mapper/WxScriptMessageMapper.xml
Unescape Escape View File

@ -8,8 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="messageType" column="message_type" />
<result property="messageTitle" column="message_title" />
<result property="machineId" column="machine_id" />
<result property="machineName" column="machine_name" />
<result property="instrumentId" column="instrument_id" />
<result property="instrumentName" column="instrument_name" />
<result property="messageContent" column="message_content" />
<result property="status" column="status" />
<result property="type" column="type" />
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWxScriptMessageVo">
select id, message_type, message_title, machine_id, machine_name, message_content, status, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, create_by, create_time, update_by, update_time from wx_script_message
select id, message_type, message_title, instrument_id, instrument_name, message_content, status, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, create_by, create_time, update_by, update_time from wx_script_message
</sql>
<select id="selectWxScriptMessageList" parameterType="WxScriptMessage" resultMap="WxScriptMessageResult">
@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="messageType != null "> and message_type = #{messageType}</if>
<if test="messageTitle != null and messageTitle != ''"> and message_title = #{messageTitle}</if>
<if test="machineId != null "> and machine_id = #{machineId}</if>
<if test="machineName != null and machineName != ''"> and machine_name like concat('%', #{machineName}, '%')</if>
<if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
<if test="instrumentName != null and instrumentName != ''"> and instrument_name like concat('%', #{instrumentName}, '%')</if>
<if test="messageContent != null and messageContent != ''"> and message_content = #{messageContent}</if>
<if test="status != null "> and status = #{status}</if>
<if test="type != null "> and type = #{type}</if>
@ -60,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">id,</if>
<if test="messageType != null">message_type,</if>
<if test="messageTitle != null">message_title,</if>
<if test="machineId != null">machine_id,</if>
<if test="machineName != null">machine_name,</if>
<if test="instrumentId != null">instrument_id,</if>
<if test="instrumentName != null">instrument_name,</if>
<if test="messageContent != null">message_content,</if>
<if test="status != null">status,</if>
<if test="type != null">type,</if>
@ -80,8 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="id != null">#{id},</if>
<if test="messageType != null">#{messageType},</if>
<if test="messageTitle != null">#{messageTitle},</if>
<if test="machineId != null">#{machineId},</if>
<if test="machineName != null">#{machineName},</if>
<if test="instrumentId != null">#{instrumentId},</if>
<if test="instrumentName != null">#{instrumentName},</if>
<if test="messageContent != null">#{messageContent},</if>
<if test="status != null">#{status},</if>
<if test="type != null">#{type},</if>
@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="messageType != null">message_type = #{messageType},</if>
<if test="messageTitle != null">message_title = #{messageTitle},</if>
<if test="machineId != null">machine_id = #{machineId},</if>
<if test="machineName != null">machine_name = #{machineName},</if>
<if test="instrumentId != null">instrument_id = #{instrumentId},</if>
<if test="instrumentName != null">instrument_name = #{instrumentName},</if>
<if test="messageContent != null">message_content = #{messageContent},</if>
<if test="status != null">status = #{status},</if>
<if test="type != null">type = #{type},</if>

62
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISiteInfoInstrumentService.java
Unescape Escape View File

@ -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<SiteInfoInstrument> 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);
}

97
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoInstrumentServiceImpl.java
Unescape Escape View File

@ -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<SiteInfoInstrument> 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);
}
}

66
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java
Unescape Escape View File

@ -36,6 +36,10 @@ public class SiteInfoServiceImpl implements ISiteInfoService
private SiteInfoTagMapper siteInfoTagMapper;
@Autowired
private SiteInfoChannelMapper siteInfoChannelMapper;
@Autowired
private WxInstrumentMapper wxInstrumentMapper;
@Autowired
private SiteInfoInstrumentMapper siteInfoInstrumentMapper;
/**
* 查询站点管理
*
@ -85,12 +89,26 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List<Long> showCompanyList = Arrays.asList(siteInfo.getShowCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setShowCompanyTagArray(showCompanyList);
}
// 处理弹窗活动小程序标签
if (StringUtils.isNotEmpty(siteInfo.getHandlerWechatTagId())){
List<Long> handlerWechatList = Arrays.asList(siteInfo.getHandlerWechatTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setHandlerWechatTagArray(handlerWechatList);
}
// 处理弹窗活动企微标签
if (StringUtils.isNotEmpty(siteInfo.getHandlerCompanyTagId())){
List<Long> handlerCompanyList = Arrays.asList(siteInfo.getHandlerCompanyTagId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setHandlerCompanyTagArray(handlerCompanyList);
}
// 处理渠道展示
if (StringUtils.isNotEmpty(siteInfo.getChannelId())) {
List<Long> channelLisn = Arrays.asList(siteInfo.getChannelId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setChannelArray(channelLisn);
List<Long> channelList = Arrays.asList(siteInfo.getChannelId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setChannelArray(channelList);
}
// 处理仪器展示
if (StringUtils.isNotEmpty(siteInfo.getInstrumentId())) {
List<Long> instrumentList = Arrays.asList(siteInfo.getInstrumentId().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
siteInfo.setMachineArray(instrumentList);
}
return siteInfo;
}
@ -124,18 +142,19 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List<SysTag> handlerWechatTagNew = Lists.newArrayList();
List<SysTag> handlerCompanyTagNew = Lists.newArrayList();
List<ActivityChannelInfo> channelListNew = Lists.newArrayList();
this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew);
List<WxInstrument> 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<SysTag> showWechatTagNew,List<SysTag> showCompanyTagNew,List<SysTag> forbidWechatTagNew,List<SysTag> forbidCompanyTagNew,List<ActivityChannelInfo> channelListNew,List<SysTag> handlerWechatTagNew,List<SysTag> handlerCompanyTagNew){
private void commonHandlerRelation(SiteInfo siteInfo,List<SysTag> showWechatTagNew,List<SysTag> showCompanyTagNew,List<SysTag> forbidWechatTagNew,List<SysTag> forbidCompanyTagNew,List<ActivityChannelInfo> channelListNew,List<SysTag> handlerWechatTagNew,List<SysTag> handlerCompanyTagNew, List<WxInstrument> wxInstrumentsListNew){
// 保存可见小程序标签关联关系
for (SysTag tag: showWechatTagNew) {
SiteInfoTag infoTag = new SiteInfoTag();
@ -206,9 +225,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<SysTag> showWechatTagNew,List<SysTag> showCompanyTagNew,List<SysTag> forbidWechatTagNew,List<SysTag> forbidCompanyTagNew,List<ActivityChannelInfo> channelListNew,List<SysTag> handlerWechatTagNew,List<SysTag> handlerCompanyTagNew){
private void commonHandler(SiteInfo siteInfo,List<SysTag> showWechatTagNew,List<SysTag> showCompanyTagNew,List<SysTag> forbidWechatTagNew,List<SysTag> forbidCompanyTagNew,List<ActivityChannelInfo> channelListNew,List<SysTag> handlerWechatTagNew,List<SysTag> handlerCompanyTagNew,List<WxInstrument> wxInstrumentsListNew){
// 如果是自定义频次，则需要保存推送时间 周一到周日
if (!CollectionUtils.isEmpty(siteInfo.getPushTimerArray())) {
siteInfo.setPushTimer(StringUtils.join(siteInfo.getPushTimerArray(),","));
@ -336,6 +364,23 @@ public class SiteInfoServiceImpl implements ISiteInfoService
String ids = StringUtils.join(resultList, ",");
siteInfo.setChannelId(ids);
}
// 保存仪器信息
if (!CollectionUtils.isEmpty(siteInfo.getMachineArray())) {
List<Long> 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<Long> resultList = wxInstrumentsListNew.stream().map(WxInstrument::getId).collect(Collectors.toList());
String ids = StringUtils.join(resultList, ",");
siteInfo.setInstrumentId(ids);
}
}
/**
@ -359,6 +404,8 @@ public class SiteInfoServiceImpl implements ISiteInfoService
siteInfo.setShowWechatTag("");
siteInfo.setShowCompanyTagId("");
siteInfo.setShowCompanyTag("");
siteInfo.setInstrumentId("");
siteInfo.setInstrumentName("");
List<SysTag> showWechatTagNew = Lists.newArrayList();
List<SysTag> showCompanyTagNew = Lists.newArrayList();
List<SysTag> forbidWechatTagNew = Lists.newArrayList();
@ -366,12 +413,13 @@ public class SiteInfoServiceImpl implements ISiteInfoService
List<ActivityChannelInfo> channelListNew = Lists.newArrayList();
List<SysTag> handlerWechatTagNew = Lists.newArrayList();
List<SysTag> handlerCompanyTagNew = Lists.newArrayList();
this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew);
List<WxInstrument> 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);
}

42
flossom-ui/src/views/system/scriptMessage/index.vue
Unescape Escape View File

@ -9,17 +9,17 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仪器ID" prop="machineId">-->
<!-- <el-form-item label="仪器ID" prop="instrumentId">-->
<!-- <el-input-->
<!-- v-model="queryParams.machineId"-->
<!-- v-model="queryParams.instrumentId"-->
<!-- placeholder="请输入仪器ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仪器名字" prop="machineName">-->
<!-- <el-form-item label="仪器名字" prop="instrumentName">-->
<!-- <el-input-->
<!-- v-model="queryParams.machineName"-->
<!-- v-model="queryParams.instrumentName"-->
<!-- placeholder="请输入仪器名字"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
@ -219,11 +219,17 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="仪器信息" prop="userType" v-if="form.messageType == 3">
<el-select v-model="form.machineId">
<el-option label="仪器1" :value="0" :key="0"></el-option>
<el-option label="仪器2" :value="1" :key="1"></el-option>
<el-option label="仪器3" :value="2" :key="2"></el-option>
<el-form-item label="仪器信息" prop="instrumentId" v-if="form.messageType == 3">
<el-select v-model="form.instrumentId">
<!-- <el-option label="仪器1" :value="0" :key="0"></el-option>-->
<!-- <el-option label="仪器2" :value="1" :key="1"></el-option>-->
<!-- <el-option label="仪器3" :value="2" :key="2"></el-option>-->
<el-option
v-for="instrument in instrumentList"
:key="instrument.id"
:label="instrument.name"
:value="instrument.id"
></el-option>
</el-select>
</el-form-item>
@ -293,11 +299,14 @@
<script>
import { listMessage, getMessage, delMessage, addMessage, updateMessage } from "@/api/system/scriptMessage";
import { listInstrument } from "@/api/system/instrument";
export default {
name: "Message",
data() {
return {
// 仪器表
instrumentList: [],
// 遮罩层
loading: true,
// 选中数组
@ -322,8 +331,8 @@ export default {
pageSize: 10,
messageType: null,
messageTitle: null,
machineId: null,
machineName: null,
instrumentId: null,
instrumentName: null,
messageContent: null,
status: null,
type: null,
@ -373,8 +382,15 @@ export default {
},
created() {
this.getList();
this.queryInstrumentList();
},
methods: {
// 查询仪器
queryInstrumentList(){
listInstrument(this.queryParams).then(response => {
this.instrumentList = response.rows;
});
},
/** 查询消息模版列表 */
getList() {
this.loading = true;
@ -395,8 +411,8 @@ export default {
id: null,
messageType: null,
messageTitle: null,
machineId: null,
machineName: null,
instrumentId: null,
instrumentName: null,
messageContent: null,
status: null,
type: null,

227
flossom-ui/src/views/system/siteCarouselInfo/index.vue
Unescape Escape View File

@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="弹窗状态" prop="operate">
<el-form-item label="轮播状态" prop="operate">
<el-select
v-model="queryParams.operate"
placeholder="请选择弹窗状态"
placeholder="请选择轮播图状态"
:style="{ width: '100%' }"
clearable
>
@ -13,32 +13,19 @@
<el-option label="关闭" value="2" />
</el-select>
</el-form-item>
<el-form-item label="弹窗类型" prop="openType">
<el-select
v-model="queryParams.openType"
placeholder="请选择弹窗类型"
:style="{ width: '100%' }"
clearable
>
<el-option label="全部" value="" />
<el-option label="首页" value="1" />
<el-option label="发现模块" value="2" />
<el-option label="我的模块" value="3" />
</el-select>
</el-form-item>
<el-form-item label="开启时间" prop="siteStartTime">
<el-date-picker clearable
v-model="queryParams.siteStartTime"
type="date"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开启开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="" prop="siteEndTime">
<el-date-picker clearable
v-model="queryParams.siteEndTime"
type="date"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开启结束时间">
</el-date-picker>
</el-form-item>
@ -105,7 +92,7 @@
</el-table-column>
<el-table-column label="轮播封面" align="center" prop="fileUrl" >
<template slot-scope="scope">
<el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px">
<el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px" :preview-src-list="[scope.row.fileUrl]">
<div slot="placeholder" class="image-slot"><span class="dot"></span>
</div>
</el-image>
@ -134,6 +121,13 @@
</el-table-column>
<el-table-column label="仪器" align="center" prop="machineName" />
<el-table-column label="打卡显示活动" align="center" prop="signNumber" />
<el-table-column label="用户类型" align="center" prop="userType" >
<template slot-scope="scope">
<span v-show="scope.row.userType == 0">全部</span>
<span v-show="scope.row.userType == 1">游客</span>
<span v-show="scope.row.userType == 2">会员</span>
</template>
</el-table-column>
<el-table-column label="跳转类型" align="center" prop="type" >
<template slot-scope="scope">
<span v-show="scope.row.type == 0">无跳转</span>
@ -144,6 +138,11 @@
<span v-show="scope.row.type == 5">导向视频号直播间</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -220,7 +219,7 @@
</el-upload>
</el-form-item>
<el-form-item label="标题" prop="siteName">
<el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" />
<el-input v-model="form.siteName" placeholder="请输入标题" style="width: 80%" maxlength="21" />
</el-form-item>
<el-form-item label="开启时间" prop="siteStartTime">
<el-date-picker
@ -244,40 +243,40 @@
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="弹窗类型" prop="openType">
<el-select v-model="form.openType">
<el-option label="首页" :value="1" :key="1"></el-option>
<el-option label="发现模块" :value="2" :key="2"></el-option>
<el-option label="活动模块" :value="3" :key="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="推送次数" prop="pushNumber">
<el-radio-group v-model="form.pushType">
<el-radio :label="1">永久一次</el-radio>
<el-radio :label="2">每次进入</el-radio>
<el-radio :label="3">自定义频次</el-radio>
</el-radio-group>
</el-form-item>
<el-row>
<el-col :span = "12">
<el-form-item label="每天" prop="pushNumber" v-if="form.pushType==3">
<el-input-number v-model="form.pushNumber" :min="1" :max="10" label="请选择多少次"></el-input-number>
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="推送时间" prop="pushTimer" v-if="form.pushType==3">
<el-select v-model="form.pushTimerArray" multiple placeholder="请选择" size="small">
<el-option label="星期一" :value="1" :key="1"></el-option>
<el-option label="星期二" :value="2" :key="2"></el-option>
<el-option label="星期三" :value="3" :key="3"></el-option>
<el-option label="星期四" :value="4" :key="4"></el-option>
<el-option label="星期五" :value="5" :key="5"></el-option>
<el-option label="星期六" :value="6" :key="6"></el-option>
<el-option label="星期日" :value="7" :key="7"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="弹窗类型" prop="openType">-->
<!-- <el-select v-model="form.openType">-->
<!-- <el-option label="首页" :value="1" :key="1"></el-option>-->
<!-- <el-option label="发现模块" :value="2" :key="2"></el-option>-->
<!-- <el-option label="活动模块" :value="3" :key="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="推送次数" prop="pushNumber">-->
<!-- <el-radio-group v-model="form.pushType">-->
<!-- <el-radio :label="1">永久一次</el-radio>-->
<!-- <el-radio :label="2">每次进入</el-radio>-->
<!-- <el-radio :label="3">自定义频次</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-row>-->
<!-- <el-col :span = "12">-->
<!-- <el-form-item label="每天" prop="pushNumber" v-if="form.pushType==3">-->
<!-- <el-input-number v-model="form.pushNumber" :min="1" :max="10" label="请选择多少次"></el-input-number>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span = "12">-->
<!-- <el-form-item label="推送时间" prop="pushTimer" v-if="form.pushType==3">-->
<!-- <el-select v-model="form.pushTimerArray" multiple placeholder="请选择" size="small">-->
<!-- <el-option label="星期一" :value="1" :key="1"></el-option>-->
<!-- <el-option label="星期二" :value="2" :key="2"></el-option>-->
<!-- <el-option label="星期三" :value="3" :key="3"></el-option>-->
<!-- <el-option label="星期四" :value="4" :key="4"></el-option>-->
<!-- <el-option label="星期五" :value="5" :key="5"></el-option>-->
<!-- <el-option label="星期六" :value="6" :key="6"></el-option>-->
<!-- <el-option label="星期日" :value="7" :key="7"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-form-item label="可见小程序标签" prop="showWechatTagId" label-width="120px">
<treeselect v-model="form.showWechatTagArray" :options="chatTagOptions" :multiple="true" :show-count="true" placeholder="请选择小程序标签" :disable-branch-nodes="true" />
</el-form-item>
@ -291,30 +290,30 @@
<treeselect v-model="form.forbidCompanyTagArray" :options="tagOptions" :multiple="true" :show-count="true" placeholder="请选择企微标签" :disable-branch-nodes="true" />
</el-form-item>
<el-row>
<el-col :span = "12">
<el-form-item label="所属渠道" prop="channelId">
<el-select v-model="form.channelArray" multiple placeholder="请选择">
<!-- <el-col :span = "12">-->
<!-- <el-form-item label="所属渠道" prop="channelId">-->
<!-- <el-select v-model="form.channelArray" multiple placeholder="请选择">-->
<!-- <el-option-->
<!-- v-for="item in channelList"-->
<!-- :key="item.id"-->
<!-- :label="item.channelName"-->
<!-- :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span = "24">
<el-form-item label="仪器" prop="channelId">
<el-select v-model="form.machineArray" multiple placeholder="请选择" style="width: 80%">
<el-option
v-for="item in channelList"
:key="item.id"
:label="item.channelName"
:value="item.id">
</el-option>
v-for="instrument in instrumentList"
:key="instrument.id"
:label="instrument.name"
:value="instrument.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span = "12">
<el-form-item label="仪器" prop="channelId">
<el-select v-model="form.machineArray" multiple placeholder="请选择">
<el-option
v-for="item in channelList"
:key="item.id"
:label="item.channelName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span = "12">
@ -412,12 +411,15 @@ import {getToken} from "@/utils/auth";
import { tagTreeSelect } from "@/api/system/wechatTab";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listInstrument } from "@/api/system/instrument";
export default {
name: "Info",
components: { Treeselect },
data() {
return {
// 仪器列表
instrumentList:[],
// 遮罩层
loading: true,
// opearte
@ -467,7 +469,7 @@ export default {
siteEndTime: null,
userRegisterStartTime: null,
userRegisterEndTime: null,
openType: null,
openType: "",
pushType: null,
pushNumber: null,
pushTimer: null,
@ -484,7 +486,7 @@ export default {
machineName: null,
machineId: null,
userType: null,
operate: null,
operate: "",
signNumber: null,
orderNumber: null,
type: null,
@ -499,14 +501,65 @@ export default {
form: {},
// 表单校验
rules: {
fileUrl: [
{ required: true, message: "弹窗封面不能为空", trigger: "blur" }
],
pushType: [
{ required: true, message: "推送频次不能为空", trigger: "blur" }
],
siteName: [
{ required: true, message: "标题不能为空", trigger: "blur" }
],
userType: [
{ required: true, message: "用户类型不能为空", trigger: "blur" }
],
orderNumber: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "跳转类型不能为空", trigger: "blur" }
],
link: [
{ required: true, message: "参数不能为空", trigger: "blur" }
],
redirectAppid: [
{ required: true, message: "APPID不能为空", trigger: "blur" }
],
linkParams: [
{ required: true, message: "跳转参数不能为空", trigger: "blur" }
],
redirectUrl: [
{ required: true, message: "页面链接不能为空", trigger: "blur" }
],
videoNo: [
{ required: true, message: "视频号ID不能为空", trigger: "blur" }
],
feedId: [
{ required: true, message: "视频号feedId不能为空", trigger: "blur" }
],
pushTimer: [
{ required: true, message: "自定义频次时间不能为空", trigger: "blur" }
],
pushNumber: [
{ required: true, message: "每天推送次数不能为空", trigger: "blur" }
],
}
};
},
created() {
this.queryParams.siteStartTime = this.dateUtil(new Date(new Date().toLocaleDateString()));
this.queryParams.siteEndTime = this.dateUtil(new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1));
this.getList();
this.getDeptTree();
this.queryInstrumentList();
},
methods: {
// 查询仪器
queryInstrumentList(){
listInstrument(this.queryParams).then(response => {
this.instrumentList = response.rows;
});
},
/** 查询站点管理列表 */
getList() {
this.form.fileUrl = 'http://127.0.0.1:9300/statics/2023/12/16/0c49191de1ed8f91b28d9c2b12556154_20231216154804A002.mp4'
@ -520,6 +573,16 @@ export default {
this.channelList = response.rows;
});
},
dateUtil(date){
// 获取年份、月份和日期
const year = date.getFullYear().toString(); // 四位数表示的年份
const months = (date.getMonth() + 1).toString().padStart(2, '0'); // 补零后的两位数表示的月份
const day = date.getDate().toString().padStart(2, '0'); // 补零后的两位数表示的日期
const hours = date.getHours().toString().padStart(2, '0'); // 补全两位数的小时
const minutes = date.getMinutes().toString().padStart(2, '0'); // 补全两位数的分钟
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`;
},
// 取消按钮
cancel() {
this.open = false;
@ -591,6 +654,8 @@ export default {
this.reset();
this.open = true;
this.title = "添加站点管理";
this.form.orderNumber = 1000;
this.form.userType = 2;
},
/** 修改按钮操作 */
handleUpdate(row, operate) {
@ -629,12 +694,16 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (!this.form.fileUrl) {
this.$modal.msgError("弹窗封面不能为空");
return;
}
// 处理时间
if(this.form.startTime.length > 0) {
if(this.form.startTime && this.form.startTime.length > 0) {
this.form.siteStartTime = this.form.startTime[0];
this.form.siteEndTime = this.form.startTime[1];
}
if(this.form.registerTime.length > 0) {
if(this.form.registerTime && this.form.registerTime.length > 0) {
this.form.userRegisterStartTime = this.form.registerTime[0];
this.form.userRegisterEndTime = this.form.registerTime[1];
}

30
flossom-ui/src/views/system/siteInfo/index.vue
Unescape Escape View File

@ -105,7 +105,7 @@
</el-table-column>
<el-table-column label="弹窗封面" align="center" prop="fileUrl" >
<template slot-scope="scope">
<el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px">
<el-image :src="scope.row.fileUrl" style="width: 60px;height: 80px" :preview-src-list="[scope.row.fileUrl]">
<div slot="placeholder" class="image-slot"><span class="dot"></span>
</div>
</el-image>
@ -312,11 +312,11 @@
<el-form-item label="仪器" prop="channelId">
<el-select v-model="form.machineArray" multiple placeholder="请选择">
<el-option
v-for="item in channelList"
:key="item.id"
:label="item.channelName"
:value="item.id">
</el-option>
v-for="instrument in instrumentList"
:key="instrument.id"
:label="instrument.name"
:value="instrument.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
@ -411,12 +411,15 @@ import {getToken} from "@/utils/auth";
import { tagTreeSelect } from "@/api/system/wechatTab";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listInstrument } from "@/api/system/instrument";
export default {
name: "Info",
components: { Treeselect },
data() {
return {
// 仪器列表
instrumentList:[],
// 遮罩层
loading: true,
// opearte
@ -480,8 +483,8 @@ export default {
forbidCompanyTagId: null,
channelName: null,
channelId: null,
machineName: null,
machineId: null,
instrumentName: null,
instrumentId: null,
userType: null,
operate: "",
signNumber: null,
@ -551,8 +554,15 @@ export default {
this.queryParams.siteEndTime = this.dateUtil(new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1));
this.getList();
this.getDeptTree();
this.queryInstrumentList();
},
methods: {
// 查询仪器
queryInstrumentList(){
listInstrument(this.queryParams).then(response => {
this.instrumentList = response.rows;
});
},
/** 查询站点管理列表 */
getList() {
this.form.fileUrl = 'http://127.0.0.1:9300/statics/2023/12/16/0c49191de1ed8f91b28d9c2b12556154_20231216154804A002.mp4'
@ -596,8 +606,8 @@ export default {
forbidCompanyTagId: null,
channelName: null,
channelId: null,
machineName: null,
machineId: null,
instrumentName: null,
instrumentId: null,
userType: null,
operate: null,
signNumber: null,

Write Preview
Loading…
Cancel
Save