From 42411e4a26461229c6bca6e89ca55e98a80f5a4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 18:08:17 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java | 170 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
index 3109545..247c1e1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5StrategyPictureController.java
@@ -1,85 +1,85 @@
-package com.yeshi.fanli.controller.h5;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.xcx.StrategyPicture;
-import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.user.StrategyPictureService;
-import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.JsonUtil;
-
-import net.sf.json.JSONArray;
-
-@Controller
-@RequestMapping("api/h5/v1/strategy")
-public class H5StrategyPictureController {
-
- @Resource
- private StrategyPictureService strategtPictureService;
-
- @Resource
- private ConfigService configService;
-
- /**
- *
- * 鏂规硶璇存槑: 鏀荤暐鍥剧墖
- *
- * @author mawurui createTime 2018骞�5鏈�25鏃� 涓嬪崍3:51:19
- * @param id
- * @param out
- */
- @RequestMapping(value = "strategyPicture", method = RequestMethod.GET)
- public void strategyPicture(String callback, Long id, PrintWriter out) {
- if (id != null && !id.equals("")) {
- String strategyPictureString = strategtPictureService.strategyPictureList(id);
- if (strategyPictureString == null || strategyPictureString.equals("")) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄤ笌id鍖归厤鐨勫浘鐗�")));
- }
-
- JSONArray pictureArray = new JSONArray();
- for (String strategyPicture : strategyPictureString.split(",")) {
- pictureArray.add(strategyPicture);
- }
-
- if (!StringUtil.isNullOrEmpty(callback))
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(pictureArray)));
- else
- out.print(JsonUtil.loadTrueResult(pictureArray));
- } else {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("id涓嶈兘涓虹┖")));
- }
- }
-
- @RequestMapping(value = "getStrategyPictureList")
- public void strategyPicture(String callback, AcceptData acceptData, PrintWriter out) {
- List<StrategyPicture> list = strategtPictureService.getStrategyPictureListCache();
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- if (StringUtil.isNullOrEmpty(callback)) {
- List<StrategyPicture> newList = new ArrayList<StrategyPicture>();
- newList.addAll(list);
- if (acceptData != null && "ios".equalsIgnoreCase(acceptData.getPlatform())
- && !StringUtil.isNullOrEmpty(acceptData.getVersion())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
- for (int i = 0; i < newList.size(); i++) {
- if (newList.get(i).getTitle().contains("璧氶挶")) {
- newList.remove(i);
- i--;
- }
- }
- out.print(JsonUtil.loadTrueResult(gson.toJson(newList)));
- } else
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(list))));
- }
-
-}
+package com.yeshi.fanli.controller.h5;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.xcx.StrategyPicture;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.user.StrategyPictureService;
+import com.yeshi.fanli.util.StringUtil;
+import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONArray;
+
+@Controller
+@RequestMapping("api/h5/v1/strategy")
+public class H5StrategyPictureController {
+
+ @Resource
+ private StrategyPictureService strategtPictureService;
+
+ @Resource
+ private ConfigService configService;
+
+ /**
+ *
+ * 鏂规硶璇存槑: 鏀荤暐鍥剧墖
+ *
+ * @author mawurui createTime 2018骞�5鏈�25鏃� 涓嬪崍3:51:19
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "strategyPicture", method = RequestMethod.GET)
+ public void strategyPicture(String callback, Long id, PrintWriter out) {
+ if (id != null && !id.equals("")) {
+ String strategyPictureString = strategtPictureService.strategyPictureList(id);
+ if (strategyPictureString == null || strategyPictureString.equals("")) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄤ笌id鍖归厤鐨勫浘鐗�")));
+ }
+
+ JSONArray pictureArray = new JSONArray();
+ for (String strategyPicture : strategyPictureString.split(",")) {
+ pictureArray.add(strategyPicture);
+ }
+
+ if (!StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(pictureArray)));
+ else
+ out.print(JsonUtil.loadTrueResult(pictureArray));
+ } else {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("id涓嶈兘涓虹┖")));
+ }
+ }
+
+ @RequestMapping(value = "getStrategyPictureList")
+ public void strategyPicture(String callback, AcceptData acceptData, PrintWriter out) {
+ List<StrategyPicture> list = strategtPictureService.getTextStrategyPictureListCache();
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ if (StringUtil.isNullOrEmpty(callback)) {
+ List<StrategyPicture> newList = new ArrayList<StrategyPicture>();
+ newList.addAll(list);
+ if (acceptData != null && "ios".equalsIgnoreCase(acceptData.getPlatform())
+ && !StringUtil.isNullOrEmpty(acceptData.getVersion())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()))
+ for (int i = 0; i < newList.size(); i++) {
+ if (newList.get(i).getTitle().contains("璧氶挶")) {
+ newList.remove(i);
+ i--;
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(gson.toJson(newList)));
+ } else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(list))));
+ }
+
+}
--
Gitblit v1.8.0