Merge remote-tracking branch 'origin/dev' into dev

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 screen-manage/src/main/java/com/moral/api/controller/AccountController.java

@@ -1,11 +1,11 @@
package com.moral.api.controller;

import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.form.account.AccountDeleteForm;
import com.moral.api.pojo.form.account.AccountInsertForm;
import com.moral.api.pojo.form.account.AccountQueryForm;
import com.moral.api.pojo.form.account.AccountUpdateForm;
import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;
import com.moral.api.pojo.form.account.*;
import com.moral.api.pojo.form.accountRole.AccountRoleUpdateForm;
import com.moral.api.pojo.vo.account.AccountQueryVO;
import com.moral.api.service.ManageAccountRoleService;
import com.moral.api.service.ManageAccountService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -23,6 +23,8 @@
public class AccountController {
    @Autowired
    ManageAccountService accountService;
    @Autowired
    ManageAccountRoleService manageAccountRoleService;

    @PostMapping("insert")
    public ResultMessage insert(@RequestBody AccountInsertForm form) {
@@ -92,4 +94,18 @@
        return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
    }

    @PostMapping("updateRole")
    public ResultMessage updateRole(@RequestBody AccountRoleUpdateForm form){

        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        //处理更新业务
        AccountRoleDTO dto = manageAccountRoleService.updateAccountRole(form);

        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
    }

}