From 9e78bd583ce340dbcc1c79c371032e42926cd29c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 三月 2019 09:09:31 +0800
Subject: [PATCH] 删除MaskKeyDao
---
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 212 -----------------------------------------------------
1 files changed, 0 insertions(+), 212 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
index ae2181e..3f20249 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -1,12 +1,9 @@
package com.yeshi.fanli.controller.client;
-import java.io.IOException;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -15,11 +12,8 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
import com.taobao.api.ApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -31,7 +25,6 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.service.MaskKeyService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
import com.yeshi.fanli.service.inter.goods.RecommendReplyService;
@@ -40,7 +33,6 @@
import com.yeshi.fanli.service.inter.user.DynamicRecommendService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.GsonUtil;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -66,9 +58,6 @@
@Resource
private UserInfoService userInfoService;
-
- @Resource
- private MaskKeyService maskKeyService;
@Resource
private ConfigService configService;
@@ -263,167 +252,6 @@
}
/**
- * 鍙戝竷鎴戠殑鎺ㄨ崘
- *
- * @param acceptData
- * @param dynamicRecommend
- * 鎺ㄨ崘淇℃伅
- * @param files
- * 涓婁紶鐨勫浘鐗�
- * @param out
- */
- @RequestMapping(value = "makePublic", method = RequestMethod.POST)
- public void makePublic(AcceptData acceptData, DynamicRecommend dynamicRecommend, String order,
- @RequestParam(value = "files", required = false) CommonsMultipartFile[] files, PrintWriter out) {
- if (dynamicRecommend == null) {
- out.print(JsonUtil.loadFalseResult("dynamicRecommend涓嶈兘涓虹┖"));
- return;
- }
- if (dynamicRecommend.getUserInfo() == null) {
- out.print(JsonUtil.loadFalseResult("uid涓嶈兘涓虹┖"));
- return;
- }
- if (dynamicRecommend.getReason() == null || "".equals(dynamicRecommend.getReason().trim())) {
- out.print(JsonUtil.loadFalseResult("鎺ㄨ崘鐞嗙敱涓嶈兘涓虹┖"));
- return;
- }
- if (dynamicRecommend.getUrl() == null || "".equals(dynamicRecommend.getUrl().trim())) {
- out.print(JsonUtil.loadFalseResult("url涓嶈兘涓虹┖"));
- return;
- }
- if (dynamicRecommend.getAuctionId() == null) {
- out.print(JsonUtil.loadFalseResult("鍟嗗搧ID涓嶈兘涓虹┖"));
- return;
- }
- if ((dynamicRecommend.getuPicUrl() == null || "".equals(dynamicRecommend.getuPicUrl().trim()))
- && files == null) {
- out.print(JsonUtil.loadFalseResult("璇烽�夋嫨涓�寮犲浘鐗�"));
- return;
- }
- String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";
-
- Pattern p = Pattern.compile(URL_REGEX);
- Matcher matcher = p.matcher(dynamicRecommend.getUrl());
- if (!matcher.find()) {
- out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
- return;
- }
- String url = matcher.group();
- dynamicRecommend.setUrl(url);
- if (files != null) {
- COSManager cosManager = COSManager.getInstance();
- String paths = "";
- for (CommonsMultipartFile file : files) {
- try {
- String filename = file.getOriginalFilename();
- int index = filename.lastIndexOf(".");
- String type = filename.substring(index);
- String filePath = cosManager
- .uploadFile(file.getInputStream(), UUID.randomUUID().toString().replace("-", "") + type)
- .getUrl();
- paths += "," + filePath;
- } catch (IOException e) {
- e.printStackTrace();
- out.println(JsonUtil.loadFalseResult("涓婁紶鍥剧墖澶辫触"));
- return;
- }
- }
- paths = paths.replaceFirst(",", "");
- String getuPicUrl = dynamicRecommend.getuPicUrl();
- if (getuPicUrl != null) {
- getuPicUrl = getuPicUrl.replaceAll(",", "");
- }
- if (getuPicUrl == null || "".equals(getuPicUrl.trim())) {
- dynamicRecommend.setuPicUrl(paths);
- } else {
-
- // int i = getuPicUrl.lastIndexOf(",");
- String[] split = paths.split(",");
- int orderBy = 1;
- if (!StringUtil.isNullOrEmpty(order)) {
- orderBy = Integer.parseInt(order);
- }
- List<String> list = new ArrayList<String>();
- for (String pic : split) {
- if (!"".equals(pic.trim()))
- list.add(pic);
- }
- list.add(orderBy - 1, getuPicUrl);
- String pics = "";
- int ii = 0;
- for (String pic : list) {
- if (ii == 0) {
- pics = pic;
- } else {
- pics += "," + pic;
- }
- ii++;
- }
- dynamicRecommend.setuPicUrl(pics);
- // if(i==-1 || (i>0 && i==getuPicUrl.length()-1)){
- // }else{
- // dynamicRecommend.setuPicUrl(getuPicUrl+","+paths);
- // }
-
- }
- } else {
- String uPicUrl = dynamicRecommend.getuPicUrl();
- int lastIndex = uPicUrl.lastIndexOf(",");
- if (lastIndex > 0) {
- uPicUrl = uPicUrl.substring(0, lastIndex);
- dynamicRecommend.setuPicUrl(uPicUrl);
- }
- }
- TaoBaoGoodsBrief taoBaoGoodsBrief = null;
- taoBaoGoodsBrief = TaoBaoUtil.isAlimama(dynamicRecommend.getAuctionId());
- if (taoBaoGoodsBrief == null) {
- taoBaoGoodsBrief = TaoBaoUtil.parsePhoneTmAndTb(dynamicRecommend.getAuctionId());
- dynamicRecommend.setHongbao(new BigDecimal(0));
- } else {
- SearchFilter filter = new SearchFilter();
- filter.setKey(String.format(TaoBaoUtil.TB_URL, dynamicRecommend.getAuctionId()));
- TaoBaoSearchResult search = TaoBaoUtil.search(filter);
- List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = search.getTaoBaoGoodsBriefs();
- if (taoBaoGoodsBriefs.size() == 0) {
- out.println(JsonUtil.loadFalseResult("鍙戝竷澶辫触,鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- taoBaoGoodsBrief = taoBaoGoodsBriefs.get(0);
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
-
- BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
- BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
- BigDecimal tkp = proportion.divide(BigDecimal.valueOf(100))
- .multiply(tkRate.divide(BigDecimal.valueOf(100)));
- BigDecimal hongbao = MoneyBigDecimalUtil.mul(zkPrice, tkp);
- dynamicRecommend.setHongbao(hongbao);
- }
- String title = taoBaoGoodsBrief.getTitle();
- int type = taoBaoGoodsBrief.getUserType();
- dynamicRecommend.setGname(title);
- dynamicRecommend.setZkPrice(taoBaoGoodsBrief.getZkPrice());
- dynamicRecommend.setgPicUrl(taoBaoGoodsBrief.getPictUrl());
- dynamicRecommend.setType(0);
- dynamicRecommend.setCreatetime(System.currentTimeMillis());
- if (type == 0) { // tb
- dynamicRecommend.setGoodsType(1); // tb
- } else {
- dynamicRecommend.setGoodsType(2); // 澶╃尗
- }
- String reason = dynamicRecommend.getReason();
- reason = maskKeyService.maskAction(reason);
- dynamicRecommend.setReason(reason);
- long makePublic = dynamicRecommendService.makePublic(dynamicRecommend);
- if (makePublic > 0) {
- JSONObject data = new JSONObject();
- data.put("auctionId", makePublic);
- out.println(JsonUtil.loadTrueResult(data));
- } else {
- out.println(JsonUtil.loadFalseResult("鍙戝竷澶辫触"));
- }
- }
-
- /**
* 鑾峰彇鎺ㄨ崘鍟嗗搧鍒楄〃
*
* @param page
@@ -531,46 +359,6 @@
data.put("count", count);
data.put("recommendReplys", GsonUtil.toJsonByUserAp(recommendReplys));
out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- * 璇勪环
- *
- * @param drid
- * 鎺ㄨ崘id
- * @param uid
- * 鐢ㄦ埛id
- * @param content
- * 璇勪环鍐呭
- * @param out
- */
- @RequestMapping(value = "replys", method = RequestMethod.POST)
- public void replys(AcceptData acceptData, long drid, long uid, String content, PrintWriter out) {
-
- if (uid == 0) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛"));
- return;
- }
- List<UserInfo> userList = userInfoService.getUserListByUid(uid);
-
- if (userList.size() == 0) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛"));
- return;
- }
- UserInfo userInfo = userList.get(0);
- content = maskKeyService.maskAction(content);
- int state = recommendReplyService.replys(drid, userInfo, content);
- if (state == 0) {
- JSONObject data = new JSONObject();
- data.put("user", JsonUtil.getApiCommonGson().toJson(userInfo));
- out.print(JsonUtil.loadTrueResult(data));
- } else if (state == 1) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鐢ㄦ埛"));
- return;
- } else if (state == 2) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鎺ㄨ崘"));
- return;
- }
}
/**
--
Gitblit v1.8.0