From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-common/src/main/java/com/java110/common/cmd/workflow/ListWorkflowCmd.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/ListRoomCmd.java b/service-common/src/main/java/com/java110/common/cmd/workflow/ListWorkflowCmd.java
similarity index 69%
rename from service-community/src/main/java/com/java110/community/cmd/room/ListRoomCmd.java
rename to service-common/src/main/java/com/java110/common/cmd/workflow/ListWorkflowCmd.java
index edde16e..dcba8bc 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/ListRoomCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/workflow/ListWorkflowCmd.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.java110.community.cmd.room;
+package com.java110.common.cmd.workflow;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
@@ -22,14 +22,14 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.RoomDto;
-import com.java110.intf.community.IRoomV1InnerServiceSMO;
-import com.java110.po.room.RoomPo;
+import com.java110.intf.common.IWorkflowV1InnerServiceSMO;
+import com.java110.po.workflow.WorkflowPo;
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.workflow.WorkflowDto;
import java.util.List;
import java.util.ArrayList;
import org.springframework.http.ResponseEntity;
@@ -40,20 +40,20 @@
/**
* 绫昏〃杩帮細鏌ヨ
- * 鏈嶅姟缂栫爜锛歳oom.listRoom
- * 璇锋眰璺姴锛�/app/room.ListRoom
- * add by 鍚村鏂� at 2021-09-14 14:28:56 mail: 928255095@qq.com
+ * 鏈嶅姟缂栫爜锛歸orkflow.listWorkflow
+ * 璇锋眰璺姴锛�/app/workflow.ListWorkflow
+ * add by 鍚村鏂� at 2021-09-18 13:35:13 mail: 928255095@qq.com
* open source address: https://gitee.com/wuxw7/MicroCommunity
* 瀹樼綉锛歨ttp://www.homecommunity.cn
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
-@Java110Cmd(serviceCode = "room.ListRoom")
-public class ListRoomCmd extends AbstractServiceCmdListener {
+@Java110Cmd(serviceCode = "workflow.listWorkflow")
+public class ListWorkflowCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(ListRoomCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListWorkflowCmd.class);
@Autowired
- private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
+ private IWorkflowV1InnerServiceSMO workflowV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -61,22 +61,21 @@
}
@Override
- @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
+ WorkflowDto workflowDto = BeanConvertUtil.covertBean(reqJson, WorkflowDto.class);
- int count = roomV1InnerServiceSMOImpl.queryRoomsCount(roomDto);
+ int count = workflowV1InnerServiceSMOImpl.queryWorkflowsCount(workflowDto);
- List<RoomDto> roomDtos = null;
+ List<WorkflowDto> workflowDtos = null;
if (count > 0) {
- roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
+ workflowDtos = workflowV1InnerServiceSMOImpl.queryWorkflows(workflowDto);
} else {
- roomDtos = new ArrayList<>();
+ workflowDtos = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, roomDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workflowDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0