优化代码

service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListAdminInspectionTasksCmd.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.community.cmd.inspectionTask;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspection.InspectionTaskDto;
+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.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;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述：查询
+ * 服务编码：inspectionTask.listInspectionTask
+ * 请求路劲：/app/inspectionTask.ListInspectionTask
+ * add by 吴学文 at 2022-03-16 09:35:12 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "inspectionTask.listAdminInspectionTasks")
+public class ListAdminInspectionTasksCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListAdminInspectionTasksCmd.class);
+
+    @Autowired
+    private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        super.validateAdmin(cmdDataFlowContext);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class);
+
+        if (reqJson.containsKey("moreState") && reqJson.getString("moreState").contains(",")) {
+            inspectionTaskDto.setStates(reqJson.getString("moreState").split(","));
+        }
+
+        //查询当天巡检任务标识
+        if (!StringUtil.isEmpty(reqJson.getString("isToday"))) {
+            inspectionTaskDto.setDayTask(reqJson.getString("isToday"));
+        }
+        int count = inspectionTaskInnerServiceSMOImpl.queryInspectionTasksCount(inspectionTaskDto);
+
+        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);
+
+    }
+}

service-community/src/main/java/com/java110/community/cmd/inspectionTask/ListInspectionTasksCmd.java

@@ -58,6 +58,7 @@ public class ListInspectionTasksCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        super.validateProperty(cmdDataFlowContext);
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
     }