站点管理bug修复

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/SiteLogMapper.java

@@ -51,6 +51,8 @@ public interface SiteLogMapper {
      */
     public int deleteSiteLogById(Long id);
 
+    public int deleteBySiteId(Long siteId);
+
     /**
      * 批量删除站点管理日志记录
      *

flossom-common/flossom-common-core/src/main/resources/mapper/SiteLogMapper.xml

@@ -62,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from site_log where id = #{id}
     </delete>
 
+    <delete id="deleteBySiteId" parameterType="Long">
+        delete from site_log where site_id = #{siteId}
+    </delete>
+
     <delete id="deleteSiteLogByIds" parameterType="String">
         delete from site_log where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">

flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SiteInfoServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.flossom.common.core.domain.entity.*;
+import com.flossom.common.core.enums.SitePushTypeEnum;
 import com.flossom.common.core.mapper.*;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.core.utils.StringUtils;
@@ -40,6 +41,9 @@ public class SiteInfoServiceImpl implements ISiteInfoService
     private WxInstrumentMapper wxInstrumentMapper;
     @Autowired
     private SiteInfoInstrumentMapper siteInfoInstrumentMapper;
+    @Autowired
+    private SiteLogMapper siteLogMapper;
+
     /**
      * 查询站点管理
      *
@@ -447,6 +451,40 @@ public class SiteInfoServiceImpl implements ISiteInfoService
         List<SysTag> handlerWechatTagNew = Lists.newArrayList();
         List<SysTag> handlerCompanyTagNew = Lists.newArrayList();
         List<WxInstrument> wxInstrumentList = Lists.newArrayList();
+
+        SiteInfo oldSiteInfo = siteInfoMapper.selectSiteInfoById(siteInfo.getId());
+        // 修改 开启时间，清理弹窗推送记录
+        if (oldSiteInfo.getSiteStartTime() != siteInfo.getSiteStartTime()
+                || oldSiteInfo.getSiteEndTime() != siteInfo.getSiteEndTime() ) {
+            siteLogMapper.deleteBySiteId(siteInfo.getId());
+        }
+        // 修改 推送频率，清理弹窗推送记录
+        if(oldSiteInfo.getPushType() != siteInfo.getPushType()) {
+            siteLogMapper.deleteBySiteId(siteInfo.getId());
+        } else {
+            // 推送频率未改动，但是在自定义推送时，还需判断推送次数和推送日期是否修改
+            if(SitePushTypeEnum.CUSTOM.getCode() == siteInfo.getPushType()) {
+                if(oldSiteInfo.getPushNumber() != siteInfo.getPushNumber()) {
+                    siteLogMapper.deleteBySiteId(siteInfo.getId());
+                }
+                if(StringUtils.isNotBlank(oldSiteInfo.getPushTimer())) {
+                    List<Integer> oldPushTimer = Arrays.stream(oldSiteInfo.getPushTimer().split(","))
+                            .map(Integer::valueOf)
+                            .sorted()
+                            .collect(Collectors.toList());
+                    List<Integer> newPushTimer = Arrays.stream(siteInfo.getPushTimer().split(","))
+                            .map(Integer::valueOf)
+                            .sorted()
+                            .collect(Collectors.toList());
+                    if(!oldPushTimer.containsAll(newPushTimer) || !newPushTimer.containsAll(oldPushTimer)) {
+                        siteLogMapper.deleteBySiteId(siteInfo.getId());
+                    }
+                } else {
+                    siteLogMapper.deleteBySiteId(siteInfo.getId());
+                }
+            }
+        }
+
         this.commonHandler(siteInfo,showWechatTagNew,showCompanyTagNew,forbidWechatTagNew,forbidCompanyTagNew,channelListNew,handlerWechatTagNew,handlerCompanyTagNew,wxInstrumentList);
         // 删除关联关系
         siteInfoTagMapper.deleteSiteInfoTagBySiteId(siteInfo.getId());

flossom-ui/src/views/system/siteInfo/index.vue

@@ -283,6 +283,7 @@
 						:headers="upload.headers"
 						:action="upload.url"
 						:disabled="upload.isUploading"
+						:before-upload="handleBeforeUpload"
 						:on-progress="handleFileUploadProgress"
 						:on-success="handleFileSuccess"
 						drag
@@ -340,7 +341,7 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="推送次数" prop="pushType">
-					<el-radio-group v-model="form.pushType">
+					<el-radio-group v-model="form.pushType" @input="pushTypeChange">
 						<el-radio :label="1">永久一次</el-radio>
 						<el-radio :label="2">每次进入</el-radio>
 						<el-radio :label="3">自定义频次</el-radio>
@@ -623,6 +624,11 @@ export default {
 			chatTagOptions: [],
 			// 是否显示弹出层
 			open: false,
+      // 文件类型, 例如['png', 'jpg', 'jpeg']
+      fileType: {
+        type: Array,
+        default: () => ["jpg", "png"],
+      },
 			// 导入参数
 			upload: {
 				// 是否显示弹出层（用户导入）
@@ -930,6 +936,20 @@ export default {
 		handleFileUploadProgress(event, file, fileList) {
 			console.log('上传处理中==>file', JSON.stringify(file))
 		},
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      if (this.fileType) {
+        const fileName = file.name.split('.');
+        const fileExt = fileName[fileName.length - 1];
+        const isTypeOk = this.fileType.default().indexOf(fileExt) >= 0;
+        if (!isTypeOk) {
+          this.$modal.msgError(`文件格式不正确`);
+          return false;
+        }
+      }
+      return true;
+    },
 		// 文件上传成功处理
 		handleFileSuccess(response, file, fileList, item) {
 			console.log('上传后的结果==>', JSON.stringify(response))
@@ -970,6 +990,11 @@ export default {
 				`info_${new Date().getTime()}.xlsx`
 			)
 		},
+    pushTypeChange() {
+        this.form.pushTimerArray = null;
+        this.form.pushTimer = null;
+        this.form.pushNumber = 1;
+    }
 	},
 }
 </script>