From 5f83dbf4942e7f2e67963ae4ece013c22f091b72 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 09:18:26 +0800
Subject: [PATCH] 优化物品
---
service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java b/service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java
index 0642226..8e39c9a 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java
@@ -18,15 +18,18 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.communitySettingKey.CommunitySettingKeyDto;
+import com.java110.dto.community.CommunitySettingDto;
+import com.java110.dto.community.CommunitySettingKeyDto;
+import com.java110.intf.community.ICommunitySettingInnerServiceSMO;
import com.java110.intf.community.ICommunitySettingKeyV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -46,15 +49,20 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "communitySettingKey.listCommunitySettingKey")
-public class ListCommunitySettingKeyCmd extends AbstractServiceCmdListener {
+public class ListCommunitySettingKeyCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCommunitySettingKeyCmd.class);
@Autowired
private ICommunitySettingKeyV1InnerServiceSMO communitySettingKeyV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunitySettingInnerServiceSMO communitySettingInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
//super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
+ Assert.hasKeyAndValue(reqJson, "settingType", "鏈寘鍚被鍨�");
}
@Override
@@ -71,6 +79,10 @@
} else {
communitySettingKeyDtos = new ArrayList<>();
}
+
+ // todo 鍒峰叆 灏忓尯鍊�
+ computeKeyValue(communitySettingKeyDtos, reqJson.getString("communityId"), reqJson.getString("settingType"));
+
if (!reqJson.containsKey("row")) {
reqJson.put("row", 10);
}
@@ -81,4 +93,28 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void computeKeyValue(List<CommunitySettingKeyDto> communitySettingKeyDtos, String communityId, String settingType) {
+ if (communitySettingKeyDtos == null || communitySettingKeyDtos.size() < 1) {
+ return;
+ }
+
+ CommunitySettingDto communitySettingDto = new CommunitySettingDto();
+ communitySettingDto.setSettingType(settingType);
+ communitySettingDto.setCommunityId(communityId);
+ List<CommunitySettingDto> communitySettingDtos = communitySettingInnerServiceSMOImpl.queryCommunitySettings(communitySettingDto);
+ if (communitySettingDtos == null || communitySettingDtos.size() < 1) {
+ return;
+ }
+
+ for (CommunitySettingKeyDto communitySettingKeyDto : communitySettingKeyDtos) {
+ for (CommunitySettingDto tmpCommunitySettingDto : communitySettingDtos) {
+ if (!communitySettingKeyDto.getSettingKey().equals(tmpCommunitySettingDto.getSettingKey())) {
+ continue;
+ }
+ communitySettingKeyDto.setSettingValue(tmpCommunitySettingDto.getSettingValue());
+ }
+
+ }
+ }
}
--
Gitblit v1.8.0