From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/communitySettingKey/ListCommunitySettingKeyCmd.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 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 a6505d5..4839449 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
@@ -17,25 +17,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
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.core.factory.GenerateCodeFactory;
+import com.java110.dto.communitySettingKey.CommunitySettingKeyDto;
import com.java110.intf.community.ICommunitySettingKeyV1InnerServiceSMO;
-import com.java110.po.communitySettingKey.CommunitySettingKeyPo;
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.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.communitySettingKey.CommunitySettingKeyDto;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
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;
+
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -49,9 +46,9 @@
* // 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);
+ private static Logger logger = LoggerFactory.getLogger(ListCommunitySettingKeyCmd.class);
@Autowired
private ICommunitySettingKeyV1InnerServiceSMO communitySettingKeyV1InnerServiceSMOImpl;
@@ -63,22 +60,25 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- CommunitySettingKeyDto communitySettingKeyDto = BeanConvertUtil.covertBean(reqJson, CommunitySettingKeyDto.class);
+ CommunitySettingKeyDto communitySettingKeyDto = BeanConvertUtil.covertBean(reqJson, CommunitySettingKeyDto.class);
- int count = communitySettingKeyV1InnerServiceSMOImpl.queryCommunitySettingKeysCount(communitySettingKeyDto);
+ int count = communitySettingKeyV1InnerServiceSMOImpl.queryCommunitySettingKeysCount(communitySettingKeyDto);
- List<CommunitySettingKeyDto> communitySettingKeyDtos = null;
+ List<CommunitySettingKeyDto> communitySettingKeyDtos = null;
- if (count > 0) {
- communitySettingKeyDtos = communitySettingKeyV1InnerServiceSMOImpl.queryCommunitySettingKeys(communitySettingKeyDto);
- } else {
- communitySettingKeyDtos = new ArrayList<>();
- }
+ if (count > 0) {
+ communitySettingKeyDtos = communitySettingKeyV1InnerServiceSMOImpl.queryCommunitySettingKeys(communitySettingKeyDto);
+ } else {
+ communitySettingKeyDtos = new ArrayList<>();
+ }
+ if (!reqJson.containsKey("row")) {
+ reqJson.put("row", 10);
+ }
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, communitySettingKeyDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, communitySettingKeyDtos);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
- cmdDataFlowContext.setResponseEntity(responseEntity);
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0