From f1aa196ca63b8c287c5af61214881259c13db69b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 11 九月 2019 15:48:05 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java | 111 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 39 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
index 2d22c64..f8dc34e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
@@ -2,7 +2,9 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -12,7 +14,11 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.AppVersionInfo;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
@@ -23,14 +29,19 @@
@Controller
@RequestMapping("admin/new/api/v1/clientParams")
public class SystemClientParamsAdminController {
-
-
+
@Resource
private SystemClientParamsService systemClientParamsService;
-
+
+ @Resource
+ private AppVersionService appVersionService;
+
+ @Resource
+ private BusinessSystemService businessSystemService;
/**
* 鍚庣鏌ヨ-鏂板悗鍙�
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -38,9 +49,9 @@
* @param systemId
* @param out
*/
- @RequestMapping(value="query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key,
- Long systemId, PrintWriter out) {
+ @RequestMapping(value = "query")
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long systemId,
+ PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -50,63 +61,84 @@
pageSize = Constant.PAGE_SIZE;
}
+ List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android");
+ Map<Integer, String> androidMapName = new HashMap<>();
+ for (AppVersionInfo version : versionList)
+ androidMapName.put(version.getVersionCode(), version.getVersion());
+
+ versionList = appVersionService.getAppVersionInfoListByPlatform("ios");
+ Map<Integer, String> iosMapName = new HashMap<>();
+ for (AppVersionInfo version : versionList)
+ iosMapName.put(version.getVersionCode(), version.getVersion());
+
+ BusinessSystem businessSystem = businessSystemService.getById(systemId);
+
try {
- List<SystemClientParams> list = systemClientParamsService.listQuery((pageIndex - 1) * pageSize, pageSize,
+ List<SystemClientParams> list = systemClientParamsService.listQuery((pageIndex - 1) * pageSize, pageSize,
key, systemId);
-
+
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
+ for (SystemClientParams params : list) {
+ if (businessSystem.getPlatform() == 1)
+ params.setVersion(androidMapName.get(params.getMinVersion()));
+ else
+ params.setVersion(iosMapName.get(params.getMinVersion()));
+ }
+
long count = systemClientParamsService.countQuery(key, systemId);
-
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
+
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
+
/**
* 鏂板
+ *
* @param callback
* @param special
* @param out
*/
@RequestMapping(value = "saveAdd")
public void saveAdd(String callback, SystemClientParams systemClientParams, String idArray, PrintWriter out) {
-
+
String key = systemClientParams.getKey();
String name = systemClientParams.getName();
String value = systemClientParams.getValue();
-
- if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name)
- || StringUtil.isNullOrEmpty(value) || StringUtil.isNullOrEmpty(idArray)) {
+
+ if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(value)
+ || StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍚嶇О銆乲ey銆乿alue銆佺郴缁熶笉鑳戒负绌�"));
return;
}
-
+
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺涓嶈兘涓虹┖"));
return;
}
-
+
try {
-
+
systemClientParamsService.saveAdd(systemClientParams, list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (Exception e) {
@@ -117,36 +149,36 @@
/**
* 淇敼
+ *
* @param callback
* @param special
* @param out
*/
@RequestMapping(value = "saveModify")
public void saveModify(String callback, SystemClientParams systemClientParams, PrintWriter out) {
-
+
String key = systemClientParams.getKey();
String name = systemClientParams.getName();
String value = systemClientParams.getValue();
-
- if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name)
- || StringUtil.isNullOrEmpty(value)) {
+
+ if (StringUtil.isNullOrEmpty(key) || StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(value)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍚嶇О銆乲ey銆乿alue涓嶈兘涓虹┖"));
return;
}
-
+
try {
-
- SystemClientParams resultObject= systemClientParamsService.selectByPrimaryKey(systemClientParams.getId());
+
+ SystemClientParams resultObject = systemClientParamsService.selectByPrimaryKey(systemClientParams.getId());
if (resultObject == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
+ return;
}
-
+
systemClientParams.setSystem(resultObject.getSystem());
systemClientParams.setUpdatetime(java.lang.System.currentTimeMillis());
-
+
systemClientParamsService.update(systemClientParams);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
} catch (Exception e) {
@@ -154,10 +186,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -172,15 +204,16 @@
}
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
+
systemClientParamsService.deleteBatchByPrimaryKey(list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
} catch (Exception e) {
--
Gitblit v1.8.0