From 2d9f375aa63d2eb16fb4849f23536542e27caa2f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 30 九月 2022 13:29:48 +0800
Subject: [PATCH] 优化代码
---
service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTaskCmd.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTaskCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTaskCmd.java
index ccffe4d..70edd80 100644
--- a/service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTaskCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTaskCmd.java
@@ -18,13 +18,16 @@
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.inspectionPlan.InspectionTaskDto;
-import com.java110.intf.community.IInspectionTaskV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.api.inspectionTask.ApiInspectionTaskDataVo;
+import com.java110.vo.api.inspectionTask.ApiInspectionTaskVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +36,6 @@
import java.util.ArrayList;
import java.util.List;
-
/**
* 绫昏〃杩帮細鏌ヨ
@@ -45,16 +47,18 @@
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
-@Java110Cmd(serviceCode = "inspectionTask.listInspectionTask")
-public class ListInspectionTaskCmd extends AbstractServiceCmdListener {
+@Java110Cmd(serviceCode = "inspectionTask.listInspectionTasks")
+public class ListInspectionTaskCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListInspectionTaskCmd.class);
+
@Autowired
- private IInspectionTaskV1InnerServiceSMO inspectionTaskV1InnerServiceSMOImpl;
+ private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
}
@Override
@@ -62,20 +66,33 @@
InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);
- int count = inspectionTaskV1InnerServiceSMOImpl.queryInspectionTasksCount(inspectionTaskDto);
-
- List<InspectionTaskDto> inspectionTaskDtos = null;
-
- if (count > 0) {
- inspectionTaskDtos = inspectionTaskV1InnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);
- } else {
- inspectionTaskDtos = new ArrayList<>();
+ if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
+ inspectionTaskDto.setStates(reqJson.getString("moreState").split(","));
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDtos);
+ //鏌ヨ褰撳ぉ宸℃浠诲姟鏍囪瘑
+ if (!StringUtil.isEmpty(reqJson.getString("isToday"))) {
+ inspectionTaskDto.setDayTask(reqJson.getString("isToday"));
+ }
+ int count = inspectionTaskInnerServiceSMOImpl.queryInspectionTasksCount(inspectionTaskDto);
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ List<ApiInspectionTaskDataVo> inspectionTasks = null;
+
+ if (count > 0) {
+ inspectionTasks = BeanConvertUtil.covertBeanList(inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto), ApiInspectionTaskDataVo.class);
+ } else {
+ inspectionTasks = new ArrayList<>();
+ }
+
+ ApiInspectionTaskVo apiInspectionTaskVo = new ApiInspectionTaskVo();
+
+ apiInspectionTaskVo.setTotal(count);
+ apiInspectionTaskVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
+ apiInspectionTaskVo.setInspectionTasks(inspectionTasks);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionTaskVo), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
+
}
}
--
Gitblit v1.8.0