Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 service-common/src/main/java/com/java110/common/cmd/workflow/ListWorkflowCmd.java

File was renamed from service-community/src/main/java/com/java110/community/cmd/room/ListRoomCmd.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 @@

/**
 * 类表述：查询
 * 服务编码：room.listRoom
 * 请求路劲：/app/room.ListRoom
 * add by 吴学文 at 2021-09-14 14:28:56 mail: 928255095@qq.com
 * 服务编码：workflow.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
 * 官网：http://www.homecommunity.cn
 * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
 * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释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);