Fix: 修复重复添加、添加指纹字段

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/marketing/MarketingReport.java

@@ -42,6 +42,12 @@ public class MarketingReport extends Model<MarketingReport> {
 	@Schema(description = "域名")
 	private String domain;
 
+	/**
+	 * 浏览器指纹
+	 */
+	@Schema(description = "浏览器指纹")
+	private String fingerprint;
+
 	/**
 	 * 流量的原始来源
 	 */

pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/marketing/MarketingReportVO.java

@@ -25,6 +25,12 @@ public class MarketingReportVO {
 	@Schema(description = "域名")
 	private String domain;
 
+	/**
+	 * 浏览器指纹
+	 */
+	@Schema(description = "浏览器指纹")
+	private String fingerprint;
+
 	/**
 	 * 流量的原始来源
 	 */

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MarketingConfigController.java

@@ -1,8 +1,11 @@
 package com.pig4cloud.pig.admin.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pig4cloud.pig.admin.api.entity.marketing.MarketingConfigDomain;
 import com.pig4cloud.pig.admin.api.vo.marketing.*;
+import com.pig4cloud.pig.admin.service.MarketingConfigDomainService;
 import com.pig4cloud.pig.admin.service.MarketingConfigService;
 import com.pig4cloud.pig.common.core.util.R;
 import com.pig4cloud.pig.common.security.annotation.Inner;
@@ -32,6 +35,8 @@ public class MarketingConfigController {
 
 	private final MarketingConfigService configService;
 
+	private final MarketingConfigDomainService domainService;
+
 	/**
 	 * 分页查询营销配置列表
 	 * @param reqVo 分页参数对象
@@ -68,6 +73,11 @@ public class MarketingConfigController {
 	@PostMapping("/save")
 	@Operation(summary = "保存/更新营销配置")
 	public R saveMarketingConfig(@Valid @RequestBody SaveMarketingConfigVO reqVo) {
+		// 先查询域名是否存在
+		MarketingConfigDomain domain = domainService.getOne(new QueryWrapper<MarketingConfigDomain>().eq("domain", reqVo.getDomain()));
+		if (domain != null && !domain.getId().equals(reqVo.getId())){
+			return R.failed("域名已存在");
+		}
 		if (reqVo.getId() == null){
 			// 新增
 			Long id = configService.addMarketingConfig(reqVo);

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/MarketingConfigServiceImpl.java

@@ -248,12 +248,7 @@ public class MarketingConfigServiceImpl implements MarketingConfigService {
 	public HashMap<String,Object> saveMarketingReport(MarketingReportVO reqVo, HttpServletRequest request) {
 
 		// 获取客户端IP地址
-		String ip = null;
-		try {
-			ip = getIp(request);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+		String ip = getIp(request);
 
 		MarketingReport marketingReport = new MarketingReport();
 		BeanUtils.copyProperties(reqVo, marketingReport);