From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 1724dc2..6f44ca0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -223,6 +223,13 @@
ehCacheCacheManager.getCacheManager().clearAll();
}
+
+ @RequestMapping(value = "removeRedisCache")
+ public void removeRedisCache(String key, PrintWriter out) {
+ redisManager.removeCommonString(key);
+ }
+
+
@RequestMapping(value = "testConfig")
public void getTestConfig(PrintWriter pw) {
pw.print(configService.get("test"));
@@ -243,10 +250,6 @@
}
}
- @RequestMapping(value = "insetDynamicInfoInvite")
- public void insetDynamicInfo(String content, String url,PrintWriter out) {
- dynamicInfoService.insertInviteMaterial(content, url, null, null);
- }
@RequestMapping(value = "insertShop")
@@ -307,7 +310,7 @@
}
for (int i = 0; i < list.size(); i++) {
- InviteMaterial invite = list.get(0);
+ InviteMaterial invite = list.get(i);
invite.setText(listTxt.get(i));
inviteMaterialService.insert(invite);
}
@@ -335,6 +338,7 @@
continue;
}
InviteMaterial inviteMaterial = new InviteMaterial();
+ inviteMaterial.setId(UUID.randomUUID().toString().replace("-", ""));
inviteMaterial.setState(0);
inviteMaterial.setPicture(fileUrl);
list.add(inviteMaterial);
@@ -359,7 +363,7 @@
}
for (int i = 0; i < list.size(); i++) {
- InviteMaterial invite = list.get(0);
+ InviteMaterial invite = list.get(i);
invite.setText(listTxt.get(i));
inviteMaterialService.insert(invite);
}
@@ -369,4 +373,38 @@
e.printStackTrace();
}
}
+
+
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ * @param out
+ */
+ @RequestMapping(value = "saveInvite")
+ public void saveInvite(InviteMaterial inviteMaterial, PrintWriter out) {
+ try {
+ inviteMaterial.setState(0);
+ inviteMaterialService.insert(inviteMaterial);
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ * @param out
+ */
+ @RequestMapping(value = "insertTimeInvite")
+ public void insertTimeInvite(PrintWriter out) {
+ try {
+ dynamicInfoService.insertTimeInvite();
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0