From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java | 393 ++++++++++----------------------------------------------
1 files changed, 71 insertions(+), 322 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 c07828c..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,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,308 +9,39 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin;
-import com.yeshi.fanli.entity.bus.help.AppPageNotification;
-import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;
-import com.yeshi.fanli.entity.system.CustomerContent;
-import com.yeshi.fanli.entity.system.CustomerName;
-import com.yeshi.fanli.entity.system.System;
+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.service.inter.config.SystemService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.Utils;
-
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/clientParams")
public class SystemClientParamsAdminController {
-
-
+
@Resource
private SystemClientParamsService systemClientParamsService;
-
+
@Resource
- private SystemService systemService;
-
-// @InitBinder("oscp")
-// public void initBinder1(WebDataBinder binder) {
-// binder.setFieldDefaultPrefix("oscp.");
-// }
-// @InitBinder("nscp")
-// public void initBinder2(WebDataBinder binder) {
-// binder.setFieldDefaultPrefix("nscp.");
-// }
-
- @RequestMapping(value="getSystemClientParamsList",method=RequestMethod.POST)
- public void getSystemClientParamsList(int pageIndex,String platform,String packages,String key,PrintWriter out){
-
- platform=Utils.getMap().get(platform);
-
- System system = systemService.getSystem(platform, packages);
-
- List<SystemClientParamsAdmin> clientParamsList = systemClientParamsService.getAdminList(system,key);
- int count =clientParamsList.size();
- int totalPage = count % Constant.PAGE_SIZE == 0 ? count
- / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
- PageEntity pe = new PageEntity(pageIndex,count, count,
- totalPage);
- Map<String, String> map = new HashMap<String, String>();
- map.put("platform", platform);
- map.put("packages", packages);
- map.put("key", key);
- pe.setParams(map);
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- List<System> systemList = systemService.getSystems();
- data.put("systemList", systemList);
- data.put("clientParamsList", clientParamsList);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
-
- @RequestMapping(value="getSystemClientParams",method=RequestMethod.POST)
- public void getSystemClientParams(SystemClientParams scp,PrintWriter out){
- SystemClientParamsAdmin scpa = systemClientParamsService.getSystemClientParamsAdmin(scp);
- out.append(JsonUtil.loadTrueResult(scpa));
- }
-
- @RequestMapping(value="addSystemClientParamsList",method=RequestMethod.POST)
- public void addSystemClientParamsList(@RequestBody List<SystemClientParams> scps,PrintWriter out){
- List<System> list = new ArrayList<System>();
- for (SystemClientParams scp : scps) {
- System system = scp.getSystem();
- int platformInt = system.getPlatform();
- String packages = system.getPackageName();
- String platform = Utils.getMap().get(String.valueOf(platformInt));
- System find = systemService.getSystem(platform, packages);
- if(find != null){
- list.add(find);
- }
- }
- try {
- systemClientParamsService.addSystemClientParamsList(scps.get(0),list);
- out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult(e.getMessage()));
- }
- }
-
- @RequestMapping(value="setSystemClientParamsSystem",method=RequestMethod.POST)
- public void setSystemClientParamsSystem(SystemClientParams scp,String type,String platform,String packages,PrintWriter out){
- platform = Utils.getMap().get(platform);
- System system = systemService.getSystem(platform, packages);
- if(system==null){
- out.append(JsonUtil.loadFalseResult("绯荤粺涓嶈兘涓虹┖"));
- return;
- }
- if(Constant.DEL.equals(type)){
- systemClientParamsService.deleteSystemClientParams(scp,system);
- }else{
- systemClientParamsService.addSystemClientParams(scp,system);
- }
- out.print(JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- }
-
- @RequestMapping(value="deleteSystemClientParams",method=RequestMethod.POST)
- public void deleteSystemClientParams(@RequestBody List<SystemClientParams> scps,PrintWriter out){
- for (SystemClientParams scp : scps) {
- systemClientParamsService.deleteSystemClientParams(scp);
- }
- out.append(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
- @RequestMapping(value="updateSystemClientParams",method=RequestMethod.POST)
- public void updateSystemClientParams(@RequestBody List<SystemClientParams> scps,PrintWriter out){
- SystemClientParams oscp = scps.get(0);
- SystemClientParams nscp = scps.get(1);
- systemClientParamsService.update(oscp,nscp);
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鑾峰彇甯姪涓績鍒楄〃绛夊叾浠栧垪琛�
- * @author mawurui
- * createTime 2018骞�4鏈�8鏃� 涓嬪崍3:30:33
- * @param pageIndex
- * @param key
- * @param out
- */
- @RequestMapping(value="getHelpList",method=RequestMethod.POST)
- public void getHelpList(int pageIndex, String key, PrintWriter out, int type) {
- //鏌ヨ鍒楄〃鎬绘暟
- Integer totalCount = systemClientParamsService.getCount(type);
- int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount
- / Constant.PAGE_SIZE : totalCount / Constant.PAGE_SIZE + 1;
- PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount,
- totalPage);
- Map<String, String> map = new HashMap<String, String>();
- map.put("key", key);
- pageEntity.setParams(map);
- //鍒嗛〉鏌ヨ鎵�鏈夐棶棰�
- List<CustomerName> customerNameList = systemClientParamsService.customerNameList(pageIndex-1, key, type);
-
- JSONObject data=new JSONObject();
- data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity));
- data.put("customerNameList", JsonUtil.getSimpleGsonWithDate().toJson(customerNameList));
- out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
-
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鍒犻櫎甯姪涓績绛夊叾浠栧垪琛紙鐪熷垹闄わ級
- * @author mawurui
- * createTime 2018骞�3鏈�29鏃� 涓嬪崍6:22:21
- * @param ids
- * @param out
- */
- @RequestMapping(value="deleteHelp",method=RequestMethod.POST)
- public void deleteHelp(long[] ids, PrintWriter out){
- for (long id : ids) {
- systemClientParamsService.deleteHelp(id);
- }
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鏌ヨ甯姪涓績绛夊叾浠栧垪琛ㄨ鎯�(椤甸潰鍙嶆樉)
- * @author mawurui
- * createTime 2018骞�4鏈�8鏃� 涓嬪崍5:26:36
- * @param id
- * @param out
- */
- @RequestMapping(value="getHelpCenter",method=RequestMethod.POST)
- public void getHelpCenter(int type, PrintWriter out) {
- CustomerName customerName = systemClientParamsService.getHelpCenter(type);
- JSONObject data = new JSONObject();
- data.put("customerName", GsonUtil.toDFJson(customerName));
- out.print(JsonUtil.loadTrueResult(0, data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鏍规嵁涓�绾ч棶棰樺悕绉版煡璇簩绾ч棶棰樺垪琛�
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓婂崍9:05:28
- * @param pageIndex
- * @param key
- * @param out
- * @param type
- */
- @RequestMapping(value="getSecondProblemList",method=RequestMethod.POST)
- public void getSecondProblemList(int pageIndex, String key, PrintWriter out, long id) {
- //鏌ヨ鍒楄〃鎬绘暟
- Integer totalCount = systemClientParamsService.getProblemCount(id);
- int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount
- / Constant.PAGE_SIZE : totalCount / Constant.PAGE_SIZE + 1;
- PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount,
- totalPage);
- Map<String, String> map = new HashMap<String, String>();
- map.put("key", key);
- pageEntity.setParams(map);
- //鍒嗛〉鏌ヨ鎵�鏈夐棶棰�
- List<CustomerContent> getSecondProblemList = systemClientParamsService.getSecondProblemList(pageIndex-1, key, id);
-
- JSONObject data=new JSONObject();
- data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity));
- data.put("getSecondProblemList", JsonUtil.getSimpleGsonWithDate().toJson(getSecondProblemList));
- out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
-
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鍒犻櫎浜岀骇闂鍒楄〃锛堢湡鍒犻櫎锛�
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓婂崍9:47:12
- * @param ids
- * @param out
- */
- @RequestMapping(value="deleteSecondProblem",method=RequestMethod.POST)
- public void deleteSecondProblem(long[] ids, PrintWriter out){
- for (long id : ids) {
- systemClientParamsService.deleteSecondProblem(id);
- }
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
-
- /**
- *
- * 鏂规硶璇存槑: 鏌ョ湅鍥炵瓟璇︽儏(椤甸潰鍙嶆樉)
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓婂崍11:05:04
- * @param id
- * @param out
- */
- @RequestMapping(value="answerDetail",method=RequestMethod.POST)
- public void getCustomerContent(long id, PrintWriter out) {
- CustomerContent customerContent = systemClientParamsService.getCustomerContent(id);
- JSONObject data = new JSONObject();
- data.put("customerContent", GsonUtil.toDFJson(customerContent));
- out.print(JsonUtil.loadTrueResult(0, data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 淇敼鍥炵瓟鍐呭
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓婂崍11:25:19
- * @param InviteGetMoney
- * @param out
- */
- @RequestMapping(value="/updateAnswerDetail", method=RequestMethod.POST)
- public void updateAnswerDetail(CustomerContent customerContent , PrintWriter out) {
- systemClientParamsService.updateAnswerDetail(customerContent);
- out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 娣诲姞涓�绾ч棶棰樿彍鍗�
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓嬪崍12:11:08
- * @param CustomerName
- */
- @RequestMapping(value="/addFirstMenu", method=RequestMethod.POST)
- public void addFirstMenu(CustomerName CustomerName, PrintWriter out, int type) {
- systemClientParamsService.addFirstMenu(CustomerName, type);
- out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 娣诲姞浜岀骇鑿滃崟
- * @author mawurui
- * createTime 2018骞�4鏈�9鏃� 涓嬪崍12:17:51
- * @param CustomerName
- * @param out
- * @param type
- */
- @RequestMapping(value="/addSecondMenu", method=RequestMethod.POST)
- public void addSecondMenu(CustomerContent customerContent, PrintWriter out, long cnId) {
- systemClientParamsService.addSecondMenu(customerContent, cnId);
- out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
- }
-
+ private AppVersionService appVersionService;
+
+ @Resource
+ private BusinessSystemService businessSystemService;
/**
* 鍚庣鏌ヨ-鏂板悗鍙�
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -319,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;
@@ -331,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) {
@@ -398,39 +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 {
-
- List<SystemClientParams> list =
- systemClientParamsService.getById(systemClientParams.getId());
- if (list == null || list.size() == 0) {
+
+ SystemClientParams resultObject = systemClientParamsService.selectByPrimaryKey(systemClientParams.getId());
+ if (resultObject == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
+ return;
}
-
- SystemClientParams resultObject = list.get(0);
-
+
systemClientParams.setSystem(resultObject.getSystem());
systemClientParams.setUpdatetime(java.lang.System.currentTimeMillis());
-
+
systemClientParamsService.update(systemClientParams);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
} catch (Exception e) {
@@ -438,10 +186,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -456,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