From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java | 428 ++++++++++++++++++++++++++---------------------------
1 files changed, 212 insertions(+), 216 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
index 8aa5a4b..f4e5c67 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
@@ -36,240 +36,236 @@
@RequestMapping("admin/new/api/v1/floatad")
public class FloatADAdminController {
- @Resource
- private FloatADService floatADervice;
+ @Resource
+ private FloatADService floatADervice;
- @Resource
- private JumpDetailV2Service jumpDetailV2Service;
-
- @Resource
- private AppVersionService appVersionService;
-
- @Resource
- private AdActivityVersionControlService adActivityVersionControlService;
-
-
+ @Resource
+ private AppVersionService appVersionService;
- /**
- * 淇濆瓨淇℃伅
- *
- * @param callback
- * @param special
- * @param out
- */
- @RequestMapping(value = "save")
- public void save(String callback, FloatAD floatAD, String jumpType, HttpServletRequest request,PrintWriter out) {
- try {
- // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
- if (request instanceof MultipartHttpServletRequest) {
- MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- floatADervice.saveObject(fileRequest.getFile("file"), floatAD, jumpType);
- }else{
- floatADervice.saveObject(null, floatAD, jumpType);
- }
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
- }
- }
+ @Resource
+ private AdActivityVersionControlService adActivityVersionControlService;
+ /**
+ * 淇濆瓨淇℃伅
+ *
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "save")
+ public void save(AdminAcceptData acceptData, String callback, FloatAD floatAD, String jumpType, HttpServletRequest request, PrintWriter out) {
+ try {
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ floatADervice.saveObject(fileRequest.getFile("file"), floatAD, jumpType);
+ } else {
+ floatADervice.saveObject(null, floatAD, jumpType);
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (FloatADException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
- /**
- * 淇敼鎺掑簭
- *
- * @param callback
- * @param goodsClass
- * @param out
- */
- @RequestMapping(value = "updateOrder")
- public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {
- try {
- floatADervice.updateOrder(id, moveType);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (FloatADException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
-
- /**
- * 淇敼鐘舵��
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "switchState")
- public void switchState(String callback, Long id, PrintWriter out) {
- try {
- floatADervice.switchState(id);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (FloatADException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
-
-
- /**
- * 鍒犻櫎
- *
- * @param callback
- * @param idArray
- * @param out
- */
- @RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
- try {
- if (StringUtil.isNullOrEmpty(idArray)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
- return;
- }
- Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
- }.getType());
+ /**
+ * 淇敼鎺掑簭
+ *
+ * @param acceptData
+ * @param callback
+ * @param id
+ * @param moveType
+ * @param out
+ */
+ @RequestMapping(value = "updateOrder")
+ public void updateOrder(AdminAcceptData acceptData, String callback, Long id, Integer moveType, PrintWriter out) {
+ try {
+ floatADervice.updateOrder(id, moveType);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (FloatADException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
- return;
- }
- int count = floatADervice.deleteByPrimaryKeyList(list);
+ /**
+ * 淇敼鐘舵��
+ *
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(AdminAcceptData acceptData, String callback, Long id, PrintWriter out) {
+ try {
+ floatADervice.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (FloatADException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
- e.printStackTrace();
- }
+ /**
+ * 鍒犻櫎
+ *
+ * @param callback
+ * @param idArray
+ * @param out
+ */
+ @RequestMapping(value = "delete")
+ public void delete(AdminAcceptData acceptData, String callback, String idArray, PrintWriter out) {
+ try {
+ if (StringUtil.isNullOrEmpty(idArray)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+ return;
+ }
- }
+ Gson gson = new Gson();
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
- /**
- * 鏌ヨ
- *
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param out
- */
- @RequestMapping(value = "query")
- public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- String version, String platform, PrintWriter out) {
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
+ return;
+ }
- if (pageIndex == null || pageIndex < 1) {
- pageIndex = 1;
- }
+ int count = floatADervice.deleteByPrimaryKeyList(list);
- pageSize =Integer.MAX_VALUE;
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
- try {
- List<FloatAD> list = floatADervice.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
- long count = floatADervice.countQuery(key, state);
-
- List<AppVersionInfo> versionList = null;
- if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
- versionList = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(version)) {
- AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
- if (appVersion != null)
- versionList.add(appVersion);
- } else {
- List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
- if (appVersionList != null) {
- versionList.addAll(appVersionList);
- }
- }
- }
-
- // 杩囨护
- if (versionList != null) {
- if (versionList.size() > 0) {
- List<Long> sourceIdList = new ArrayList<>();
- for (FloatAD floatAD : list) {
- sourceIdList.add(floatAD.getId());
- }
- List<Long> versionIdList = new ArrayList<>();
- for (AppVersionInfo versionInfo : versionList)
- versionIdList.add(versionInfo.getId());
- Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
- AdActivityType.floatAD, versionIdList);
- for (int i = 0; i < list.size(); i++) {
- if (!sets.contains(list.get(i).getId())) {
- list.remove(i--);
- }
- }
- count = list.size();
- } else {
- list.clear();
- count = 0;
- }
- }
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+ e.printStackTrace();
+ }
- int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+ }
- GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
- Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm").create();
+ /**
+ * 鏌ヨ
+ *
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param out
+ */
+ @RequestMapping(value = "query")
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ String version, String platform, PrintWriter out) {
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("result_list", gson.toJson(list));
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
-
- /**
- * 璁剧疆鐗堟湰
- *
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "setVersions")
- public void setVersions(String callback, Long id, String versions, PrintWriter out) {
- JSONArray versionArray = JSONArray.fromObject(versions);
- List<Long> versionIds = new ArrayList<>();
- for (int i = 0; i < versionArray.size(); i++) {
- Long version = versionArray.optLong(i);
- versionIds.add(version);
- }
- try {
- floatADervice.setVersions(id, versionIds);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
- }
- }
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
- @RequestMapping(value = "getVersions")
- public void getVersions(String callback, Long id, PrintWriter out) {
- List<AdActivityVersionControl> list = adActivityVersionControlService
- .listByTypeAndSourceId(AdActivityType.floatAD, id);
+ pageSize = Integer.MAX_VALUE;
- List<Long> versionList = new ArrayList<>();
- if (list != null)
- for (AdActivityVersionControl control : list)
- versionList.add(control.getVersion().getId());
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
- }
+ try {
+ List<FloatAD> list = floatADervice.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, acceptData.getSystem());
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+ long count = floatADervice.countQuery(key, state, acceptData.getSystem());
+
+ List<AppVersionInfo> versionList = null;
+ if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
+ versionList = new ArrayList<>();
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
+ if (appVersion != null)
+ versionList.add(appVersion);
+ } else {
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform, acceptData.getSystem());
+ if (appVersionList != null) {
+ versionList.addAll(appVersionList);
+ }
+ }
+ }
+
+ // 杩囨护
+ if (versionList != null) {
+ if (versionList.size() > 0) {
+ List<Long> sourceIdList = new ArrayList<>();
+ for (FloatAD floatAD : list) {
+ sourceIdList.add(floatAD.getId());
+ }
+ List<Long> versionIdList = new ArrayList<>();
+ for (AppVersionInfo versionInfo : versionList)
+ versionIdList.add(versionInfo.getId());
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ AdActivityType.floatAD, versionIdList);
+ for (int i = 0; i < list.size(); i++) {
+ if (!sets.contains(list.get(i).getId())) {
+ list.remove(i--);
+ }
+ }
+ count = list.size();
+ } else {
+ list.clear();
+ count = 0;
+ }
+ }
+
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd'T'HH:mm").create();
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", gson.toJson(list));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 璁剧疆鐗堟湰
+ *
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "setVersions")
+ public void setVersions(AdminAcceptData acceptData, String callback, Long id, String versions, PrintWriter out) {
+ JSONArray versionArray = JSONArray.fromObject(versions);
+ List<Long> versionIds = new ArrayList<>();
+ for (int i = 0; i < versionArray.size(); i++) {
+ Long version = versionArray.optLong(i);
+ versionIds.add(version);
+ }
+ try {
+ floatADervice.setVersions(id, versionIds);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(""));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
+ }
+ }
+
+ @RequestMapping(value = "getVersions")
+ public void getVersions(AdminAcceptData acceptData, String callback, Long id, PrintWriter out) {
+ List<AdActivityVersionControl> list = adActivityVersionControlService
+ .listByTypeAndSourceId(AdActivityType.floatAD, id);
+
+ List<Long> versionList = new ArrayList<>();
+ if (list != null)
+ for (AdActivityVersionControl control : list)
+ versionList.add(control.getVersion().getId());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
+ }
}
--
Gitblit v1.8.0