浏览代码

信息中心-敏感词

Aslee 2 年之前
父节点
当前提交
96c096b14a

+ 0 - 10
src/main/java/com/caimei/modules/baike/entity/CmBaikeProductFile.java

@@ -17,7 +17,6 @@ public class CmBaikeProductFile extends DataEntity<CmBaikeProductFile> {
 	private String fileName;			// 文件名称
 	private String ossName;			// oss名称
 	private String ossUrl;			// oss链接
-	private Date uploadTime;		//上传时间
 
 	public Integer getProductId() {
 		return productId;
@@ -50,15 +49,6 @@ public class CmBaikeProductFile extends DataEntity<CmBaikeProductFile> {
 	public void setOssName(String ossName) {
 		this.ossName = ossName;
 	}
-
-	public Date getUploadTime() {
-		return uploadTime;
-	}
-
-	public void setUploadTime(Date uploadTime) {
-		this.uploadTime = uploadTime;
-	}
-
 	public String getOssUrl() {
 		return ossUrl;
 	}

+ 0 - 1
src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -344,7 +344,6 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
 			productFile.setFileTitle(fileTitle);
 			productFile.setFileName(fileName);
 			productFile.setOssName(filePath);
-			productFile.setUploadTime(new Date());
 			cmBaikeProductDao.insertProductFile(productFile);
 			productFile.setOssUrl(url);
 			map.put("success", true);

+ 2 - 2
src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -131,7 +131,7 @@ public class CmBaikeProductController extends BaseController {
 		List<NewCmShop> shopList = cmBaikeProductDao.findShopList();
 		cmBaikeProduct.setShopList(shopList);
 		// 敏感词
-		String sensitiveWords = infoDao.getSensitiveWords();
+		String sensitiveWords = infoDao.getSensitiveWords(4);
 		model.addAttribute("cmBaikeProduct", cmBaikeProduct);
 		model.addAttribute("typeList", typeList);
 		model.addAttribute("commodityType", commodityType);
@@ -307,7 +307,7 @@ public class CmBaikeProductController extends BaseController {
 		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
 		model.addAttribute("typeList", typeList);
 		// 敏感词
-		String sensitiveWords = infoDao.getSensitiveWords();
+		String sensitiveWords = infoDao.getSensitiveWords(4);
 		model.addAttribute("sensitiveWords", sensitiveWords);
         return "modules/baikePage/auditBaikeProductPage";
 	}

+ 1 - 1
src/main/java/com/caimei/modules/info/dao/InfoDao.java

@@ -36,5 +36,5 @@ public interface InfoDao extends CrudDao<Info> {
 
     void offlineInfo(Integer id);
 
-    String getSensitiveWords();
+    String getSensitiveWords(Integer checkPoint);
 }

+ 2 - 2
src/main/java/com/caimei/modules/info/web/InfoController.java

@@ -138,7 +138,7 @@ public class InfoController extends BaseController {
 		InfoType infoType = new InfoType();
 		List<InfoType> typeList = infoTypeService.findList(infoType);
 		// 敏感词
-		String sensitiveWords = infoDao.getSensitiveWords();
+		String sensitiveWords = infoDao.getSensitiveWords(3);
 		model.addAttribute("typeList", typeList);
 		model.addAttribute("info", info);
 		model.addAttribute("ltype", ltype);
@@ -315,7 +315,7 @@ public class InfoController extends BaseController {
 		model.addAttribute("typeList", typeList);
 		model.addAttribute("info", info);
 		// 敏感词
-		String sensitiveWords = infoDao.getSensitiveWords();
+		String sensitiveWords = infoDao.getSensitiveWords(3);
 		model.addAttribute("sensitiveWords", sensitiveWords);
 		return "modules/info/auditInfoPage";
     }

+ 2 - 2
src/main/resources/mappings/modules/baike/CmBaikeProductMapper.xml

@@ -261,8 +261,8 @@
 	</insert>
 
 	<insert id="insertProductFile" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
-		insert into cm_baike_product_file(fileTitle, fileName, ossName, uploadTime)
-		values (#{fileTitle}, #{fileName}, #{ossName}, #{uploadTime})
+		insert into cm_baike_product_file(fileTitle, fileName, ossName)
+		values (#{fileTitle}, #{fileName}, #{ossName})
 	</insert>
 
 	<update id="update">

+ 4 - 1
src/main/resources/mappings/modules/info/InfoMapper.xml

@@ -155,7 +155,10 @@
     <select id="getSensitiveWords" resultType="java.lang.String">
 		select words
 		from cm_sensitive_words
-		where id = 1
+		where id = 1 and status = 1
+		<if test="checkPoint != null">
+			and checkPoints like concat('%',#{checkPoint},'%')
+		</if>
 	</select>
 
     <insert id="insert" parameterType="Info"  keyProperty="id" useGeneratedKeys="true">