Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

copy from service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.java
copy to service-common/src/main/java/com/java110/common/cmd/workflow/DeleteWorkflowCmd.java
File was copied from service-community/src/main/java/com/java110/community/cmd/room/DeleteRoomCmd.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,8 +22,8 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
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;
@@ -31,28 +31,27 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * 类表述：删除
 * 服务编码：room.deleteRoom
 * 请求路劲：/app/room.DeleteRoom
 * add by 吴学文 at 2021-09-14 14:28:56 mail: 928255095@qq.com
 * 服务编码：workflow.deleteWorkflow
 * 请求路劲：/app/workflow.DeleteWorkflow
 * 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.DeleteRoom")
public class DeleteRoomCmd extends AbstractServiceCmdListener {
    private static Logger logger = LoggerFactory.getLogger(DeleteRoomCmd.class);
@Java110Cmd(serviceCode = "workflow.deleteWorkflow")
public class DeleteWorkflowCmd extends AbstractServiceCmdListener {
  private static Logger logger = LoggerFactory.getLogger(DeleteWorkflowCmd.class);

    @Autowired
    private IRoomV1InnerServiceSMO roomV1InnerServiceSMOImpl;
    private IWorkflowV1InnerServiceSMO workflowV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "roomId", "roomId不能为空");
        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
        Assert.hasKeyAndValue(reqJson, "flowId", "flowId不能为空");
Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");

    }

@@ -60,8 +59,8 @@
    @Java110Transactional
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

        RoomPo roomPo = BeanConvertUtil.covertBean(reqJson, RoomPo.class);
        int flag = roomV1InnerServiceSMOImpl.deleteRoom(roomPo);
       WorkflowPo workflowPo = BeanConvertUtil.covertBean(reqJson, WorkflowPo.class);
        int flag = workflowV1InnerServiceSMOImpl.deleteWorkflow(workflowPo);

        if (flag < 1) {
            throw new CmdException("删除数据失败");