jiangjiazhi / regional-platform

Commit f2579fbd863a2e33de88c228917cf7a002dc48a5

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

追访

Showing 3 changed files with 62 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BasicConfigResult.java

...	...	@@ -99,6 +99,21 @@
99	99	}
100	100
101	101	/**
	102	+ * 根据区域id查询所有数据
	103	+ *
	104	+ * @return 返回结果
	105	+ */
	106	+ @RequestMapping(method = RequestMethod.GET, value = "/basicConfigByArea")
	107	+ @ResponseBody
	108	+ public BaseListResponse basicConfigByArea(BasicConfigQueryRequest basicConfigQueryRequest) {
	109	+ if (null == basicConfigQueryRequest.getParentId()) {
	110	+ basicConfigQueryRequest.setParentId("0");
	111	+ }
	112	+ basicConfigQueryRequest.setLimit(9999);
	113	+ return basicConfigFacade.basicConfigByArea(basicConfigQueryRequest);
	114	+ }
	115	+
	116	+ /**
102	117	* 批量增加基础项配置
103	118	*
104	119	* @param basicConfigRequests 批量增加请求

...	...	@@ -160,7 +160,7 @@
160	160	}
161	161	}
162	162
163		- public synchronized static void sortBasicConfig(BasicConfig basicConfig) {
	163	+ public synchronized static void sortBasicConfig(BasicConfig basicConfig) {
164	164	if (CollectionUtils.isNotEmpty(basicConfig.getBasicConfigs())) {
165	165	for (BasicConfig bs : basicConfig.getBasicConfigs()) {
166	166	if (CollectionUtils.isNotEmpty(bs.getBasicConfigs())) {
...	...	@@ -438,7 +438,7 @@
438	438	return basicConfigs1;
439	439	}
440	440
441		- public String queryBaseInfoByStr(List baseIds){
	441	+ public String queryBaseInfoByStr(List baseIds) {
442	442	StringBuffer subStr = new StringBuffer();
443	443
444	444	if (CollectionUtils.isNotEmpty(baseIds)) {
445	445
446	446
...	...	@@ -449,19 +449,19 @@
449	449	basicConfigQuery.setId(String.valueOf(obj));
450	450	List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
451	451	if (CollectionUtils.isNotEmpty(datas)) {
452		- subStr.append(datas.get(0).getName()+",");
	452	+ subStr.append(datas.get(0).getName() + ",");
453	453	}
454	454	}
455	455	}
456	456	}
457		- if(subStr.toString().endsWith(",")){
458		- return subStr.toString().substring(0,subStr.toString().length()-1);
459		- }else{
	457	+ if (subStr.toString().endsWith(",")) {
	458	+ return subStr.toString().substring(0, subStr.toString().length() - 1);
	459	+ } else {
460	460	return subStr.toString();
461	461	}
462	462	}
463	463
464		- public List<Map> queryBaseInfoByMap(List baseIds){
	464	+ public List<Map> queryBaseInfoByMap(List baseIds) {
465	465	List<Map> baseMaps = new ArrayList<>();
466	466	if (CollectionUtils.isNotEmpty(baseIds)) {
467	467	for (Object obj : baseIds) {
...	...	@@ -493,6 +493,34 @@
493	493	data.add(map);
494	494	}
495	495	return list;
	496	+ }
	497	+
	498	+ public BaseListResponse basicConfigByArea(BasicConfigQueryRequest basicConfigQueryRequest) {
	499	+
	500	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	501	+ basicConfigQuery.setNeed("1");
	502	+ basicConfigQuery.setId(basicConfigQueryRequest.getId());
	503	+ basicConfigQuery.setPage(basicConfigQueryRequest.getPage());
	504	+ basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit());
	505	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	506	+ basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId());
	507	+ List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
	508	+ for (BasicConfig bs : data) {
	509	+ basicConfigByArea(bs);
	510	+ }
	511	+
	512	+ return new BaseListResponse().setData(buildResult(data)).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(basicConfigQuery.getPageInfo());
	513	+ }
	514	+
	515	+ public void basicConfigByArea(BasicConfig bas) {
	516	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	517	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	518	+ basicConfigQuery.setParentId(bas.getId());
	519	+ List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery);
	520	+ bas.setBasicConfigs(data);
	521	+ for (BasicConfig bs : data) {
	522	+ basicConfigByArea(bs);
	523	+ }
496	524	}
497	525	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.base.IBasicResultConvert;
4	4	import com.lyms.platform.pojo.BasicConfig;
5	5
	6	+import java.util.ArrayList;
6	7	import java.util.List;
7	8
8	9	public class BasicConfigResult implements IBasicResultConvert<BasicConfigResult,BasicConfig> {
...	...	@@ -18,6 +19,16 @@
18	19
19	20	private List leastUse;
20	21
	22	+ private List<BasicConfig> basicConfigs = new ArrayList<>();
	23	+
	24	+ public List<BasicConfig> getBasicConfigs() {
	25	+ return basicConfigs;
	26	+ }
	27	+
	28	+ public void setBasicConfigs(List<BasicConfig> basicConfigs) {
	29	+ this.basicConfigs = basicConfigs;
	30	+ }
	31	+
21	32	public String getParentName() {
22	33	return parentName;
23	34	}
...	...	@@ -102,6 +113,7 @@
102	113	setName(destModel.getName());
103	114	setParentId(destModel.getParentId());
104	115	setWeight(destModel.getWeight());
	116	+ setBasicConfigs(destModel.getBasicConfigs());
105	117	return this;
106	118	}
107	119	}