关注接口对接

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller/api/TokenPersonController.java

@@ -1,5 +1,6 @@
 package com.ydw.yunbuyer.web.pm.controller.api;
 
+import com.ydw.yunbuyer.common.utils.date.CreatedTools;
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
 import com.ydw.yunbuyer.web.pm.web.WebMsgTools;
 import io.swagger.annotations.Api;
@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.util.Random;
 
 @Api(tags = "Token获取")
 @RestController
@@ -15,20 +17,21 @@ import java.io.IOException;
 @RequestMapping("/api/token")
 public class TokenPersonController extends ProjBaseAction {
 
-	/**
-	 *
-	 * 获取token
-	 * @return
-	 */
-	@RequestMapping("/get_token")
-	public String get_token() {
-		String token = null;
-		try {
-			token = WebMsgTools.get_access_Token();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		result.put("token", token);
-		return result.toJSONString();
-	}
+    /**
+     * 获取token
+     *
+     * @return
+     */
+    @RequestMapping("/get_token")
+    public String get_token() {
+        String token = null;
+        try {
+            token = WebMsgTools.get_access_Token() + "@" + CreatedTools.getCreated();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        result.put("token", token);
+        return result.toJSONString();
+    }
+
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/ScheduledController.java

@@ -6,6 +6,8 @@ import java.util.*;
 import com.ydw.yunbuyer.web.pm.entity.t_pm_item_follow;
 import com.ydw.yunbuyer.web.pm.service.WxFollowService;
 import com.ydw.yunbuyer.web.pm.web.WebMsgTools;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -33,6 +35,7 @@ public class ScheduledController {
 	private static long SAME_DAY_END = 0L;//当天结束日期
 	private static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm"); //格式化
 	private static Map<String,List<Map<String, Object>>> SAME_DAY_MAP = new HashMap<>();//缓存数据
+	protected Logger logger = LoggerFactory.getLogger(ScheduledController.class);
 
 	@Autowired
 	private PmItemService pmItemService;
@@ -104,7 +107,9 @@ public class ScheduledController {
 			SAME_DAY_MAP = new HashMap<>();//更新数据
 			addSameDayMap(nowTime);
 		}
+
 		if (CollectionUtils.isEmpty(SAME_DAY_MAP)){
+			logger.info("缓存列表数量：为空");
 			return;
 		}
 		//3.查询数据 1.当前时间加30分钟查询数据 2.当前时间加10分钟查询数据
@@ -143,15 +148,20 @@ public class ScheduledController {
 	}
 
 	private void sendMsg(List<Map<String, Object>> list) {
+
 		if (CollectionUtils.isEmpty(list)){
+			logger.info("当前时间为空");
 			return;
 		}
+		logger.info("开始发送");
 		for (Map<String, Object> map:list) {
 			String open_id = String.valueOf(map.get("open_id"));
 			String pm_item_name = String.valueOf(map.get("pm_item_name"));
 			String time_opening = String.valueOf(map.get("time_opening"));
+			time_opening = formatter.format(Long.valueOf(time_opening));
 			WebMsgTools.sendAuctionStartReminderMessage(open_id,pm_item_name,time_opening);
 		}
+		logger.info("发送结束");
 	}
 
 	private static long getEndTime() {
@@ -163,9 +173,4 @@ public class ScheduledController {
 		return todayEnd.getTimeInMillis();
 	}
 
-	public static void main(String[] args) {
-		System.out.println(System.currentTimeMillis());
-		System.out.println(getEndTime());
-
-	}
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxFollowController.java

@@ -10,12 +10,15 @@ import com.ydw.yunbuyer.web.pm.service.WxFollowService;
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -32,28 +35,29 @@ public class WxFollowController extends ProjBaseAction {
     private PmItemService pmItemService;
 
     @ApiOperation("关注和取消")
-    @RequestMapping("/edit_pm_follow")
-    public String edit_pm_follow(String pm_item_id){
+    @GetMapping("/edit_pm_follow")
+    public String edit_pm_follow(@ApiParam(name = "pm_item_id",value = "商品id",required = true) String pm_item_id){
         if (StringUtils.isBlank(pm_item_id)){
             result.put("statuz",false);
-            result.put("message", "输入标的物id为空");
+            result.put("message", "输入商品id为空");
             return result.toJSONString();
         }
         t_pm_item t_pm_item = pmItemService.get(pm_item_id);
         if (t_pm_item == null ){
-            result.put("statuz",false);
-            result.put("message", "标的物不存在");
+            result.put("statu",false);
+            result.put("message", "商品不存在");
             return result.toJSONString();
         }
         if (t_pm_item.getTime_opening() <0 ){
             result.put("statuz",false);
-            result.put("message", "标的物开拍时间没设置");
+            result.put("message", "商品开拍时间没设置");
             return result.toJSONString();
         }
         JSONObject person = sessionWxService.getCurrentLoginPersion();
         String person_id = person.getString("kid");//用户id
         String open_id = person.getString("openid");//用户openid
         t_pm_item_follow pm_item_follow = wxFollowService.getPersonidAndPmid(person_id,pm_item_id);
+        int status = 0;
         if (pm_item_follow == null){
             t_pm_item_follow addParam = new t_pm_item_follow();
             addParam.setPerson_id(person_id);
@@ -63,20 +67,22 @@ public class WxFollowController extends ProjBaseAction {
             addParam.setStatus(0);
             addParam.setTime_opening(t_pm_item.getTime_opening());
             wxFollowService.add(addParam);
+            ScheduledController.initSameDayEnd(t_pm_item.getTime_opening());
         }else{
-            int status = pm_item_follow.getStatus() == 0? -100 : 0; //转换关注状态
+            status = pm_item_follow.getStatus() == 0? -100 : 0; //转换关注状态
             pm_item_follow.setStatus(status);
             pm_item_follow.setEditd(CreatedTools.getCreated());
             pm_item_follow.setEdit_count(pm_item_follow.getEdit_count()+1);
             wxFollowService.update(pm_item_follow);
         }
         result.put("statuz",true);
+        result.put("attentionState",status);
         result.put("message", "操作成功");
         return result.toJSONString();
     }
 
-    @ApiOperation("查询用户关注的标的物")
-    @RequestMapping("/list_person_pm_follow")
+    @ApiOperation("查询用户关注的商品")
+    @GetMapping("/list_person_pm_follow")
     public String list_person_pm_follow() {
         JSONObject person = sessionWxService.getCurrentLoginPersion();
         String person_id = person.getString("kid");//用户id
@@ -85,4 +91,17 @@ public class WxFollowController extends ProjBaseAction {
         return result.toJSONString();
     }
 
+    @ApiOperation("刷新定时中的缓存关注数据")
+    @GetMapping("/init_follow")
+    public String init_follow(){
+        ScheduledController.initSameDayEnd(System.currentTimeMillis());
+        logger.info("操作成功");
+        result.put("message", "操作成功");
+        return result.toJSONString();
+    }
+
+    public static void main(String[] args) {
+
+    }
+
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmApiController.java

@@ -116,17 +116,17 @@ public class WxPmApiController extends ProjBaseAction {
 		List<Map<String, Object>> list1 = wxPmService.bidding_record(kid);
 
 		// 是否关注查询
-		JSONObject person = sessionWxService.getCurrentLoginPersion();
+/*		JSONObject person = sessionWxService.getCurrentLoginPersion();
 		String person_id = person.getString("kid");//用户id
 		t_pm_item_follow pm_follow = wxFollowService.getPersonidAndPmid(person_id, kid);
-		Boolean follow = pm_follow == null?false:pm_follow.getStatus()==0; //true 关注 false 没关注
+		int attentionState = pm_follow == null?-100:pm_follow.getStatus();*/
 
 		result.put("nowtime", System.currentTimeMillis());
 		result.put("imgarray", imgsrclist);
 		result.put("data", list);
 		result.put("record", list1);
 		result.put("statuz", true);
-		result.put("follow", follow); //true 关注 false 没关注
+//		result.put("attentionState", attentionState);
 		return result.toJSONString();
 	}
 

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -86,6 +86,9 @@ public class WxPmController extends ProjBaseAction {
 	@Autowired
 	private WxSubmitService wxSubmitService;
 
+	@Autowired
+	private WxFollowService wxFollowService;
+
 	public static final Map<String, List<Map<String, Object>>> count = new HashMap<String, List<Map<String, Object>>>();
 
 	/**
@@ -339,7 +342,7 @@ public class WxPmController extends ProjBaseAction {
 	 * @return
 	 */
 	@ApiOperation("详情页")
-	@RequestMapping("/select_list")
+	@GetMapping("/select_list")
 	public String select_list(String kid) {
 		if (ChkUtil.isNull(kid)) {
 			super.setTipMsg(false, "商品不存在", Tip.Type.error);
@@ -393,6 +396,11 @@ public class WxPmController extends ProjBaseAction {
 			if (ChkUtil.isNotNull(pm_offline_apply)) {
 				result.put("pm_offline_apply", pm_offline_apply);
 			}
+			// 是否关注查询
+			JSONObject person = sessionWxService.getCurrentLoginPersion();
+			String person_id = person.getString("kid");//用户id
+			t_pm_item_follow pm_follow = wxFollowService.getPersonidAndPmid(person_id, kid);
+			int attentionState = pm_follow == null?-100:pm_follow.getStatus();
 			// 竞价记录
 			List<Map<String, Object>> list1 = wxPmService.bidding_record(kid);
 			result.put("nowtime", System.currentTimeMillis());
@@ -400,6 +408,7 @@ public class WxPmController extends ProjBaseAction {
 			result.put("data", list);
 			result.put("record", list1);
 			result.put("statuz", true);
+			result.put("attentionState", attentionState);
 			return result.toJSONString();
 		}
 

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/web/WebMsgTools.java

@@ -1,9 +1,12 @@
 package com.ydw.yunbuyer.web.pm.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydw.yunbuyer.web.pm.controller_wxapp.ScheduledController;
 import com.ydw.yunbuyer.web.pm.entity.TemplateData;
 import com.ydw.yunbuyer.web.pm.entity.WxMssVo;
 import org.apache.http.client.ClientProtocolException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tmsps.ne4spring.utils.JsonUtil;
 
 import java.io.BufferedReader;
@@ -13,6 +16,7 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,12 +24,13 @@ import java.util.Random;
 
 public class WebMsgTools {
 	private static String subscribeMessageUrl = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN";
-
+	protected static Logger logger = LoggerFactory.getLogger(WebMsgTools.class);
 	/**
 	 *  拍卖开始提醒
 	 * @return
 	 */
 	public static String sendAuctionStartReminderMessage(String openId,String thing,String date){
+		logger.info("拍卖开始提醒发送参数：openId="+openId+" thing="+thing+" date="+date);
 		String url = null;
 		try {
 			url = subscribeMessageUrl.replace("ACCESS_TOKEN",get_access_Token());
@@ -55,6 +60,7 @@ public class WebMsgTools {
 	 * @return
 	 */
 	public static String sendAuctionSuccessNoticeMessage(String openId,String thing,String amount,String date,String number) throws IOException {
+		logger.info("拍卖成功通知发送参数：openId="+openId+" thing="+thing+" amount="+amount+" date="+date+" number="+number);
 		String url = subscribeMessageUrl.replace("ACCESS_TOKEN",get_access_Token());
 		WxMssVo wxMssVo = new WxMssVo();
 		wxMssVo.setTouser(openId);
@@ -147,20 +153,4 @@ public class WebMsgTools {
 		return result;
 	}
 
-	public static void main(String[] args) throws IOException {
-//		sendAuctionStartReminderMessage("oIQgR5QOJmf3gMCA2z8HyU9TaI5Q","cs","2022年01月05日");
-//		sendAuctionSuccessNoticeMessage("oIQgR5QOJmf3gMCA2z8HyU9TaI5Q","拍品名称","100","2022年01月05日","1");
-		int i = -1;
-		i >>>= 10;
-		System.out.println(i);
-		long l = -1;
-		l >>>= 10;
-		System.out.println(l);
-		short s = 1;
-		s >>= 10;
-		System.out.println(s);
-		byte b = 1;
-		b >>= 10;
-		System.out.println(b);
-	}
 }