Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -26,13 +26,15 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
        auditPassed,
		//审核不通过
        auditNotPassed,
        //已暂停
        stoped,
		//已删除
		delete
    }
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
	private Status status; // 状态（0-待审核 1-审核通过(启用) 2-审核不通过 3-已暂停）
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private Integer type; //类型

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -26,6 +26,8 @@ public class BaseRequestMapping {
     */
    public static class Saas extends Basic {
        public static final String PREFIX  = "/saas";
        public static final String SYSTEM_CONFIGURATION  = "/system_configuration";
        public static final String THEME_STYLE  = "/theme_style";
        public static final String AUDIT  = "/audit";
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -1,11 +1,10 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.base.util.ErrorCodeUtil;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.exception.code.BaseErrorCode;
@@ -44,7 +43,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    private ErrorCodeUtil errorCodeUtil;
    @PostMapping(value = BaseRequestMapping.Saas.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    @ApiOperation(value = "创建-基本信息")
    public Envelop create (
            @ApiParam(name = "saasDO", value = "Json数据", required = true)
            @RequestParam(value = "saasDO") SaasDO saasDO,
@@ -64,6 +63,17 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
        return success("创建成功");
    }
    @PostMapping(value = BaseRequestMapping.Saas.SYSTEM_CONFIGURATION, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建-系统配置")
    public Envelop createSystemConfig (
            @ApiParam(name = "saasDO", value = "Json数据", required = true)
            @RequestParam(value = "saasDO") SaasDO saasDO) throws Exception {
        saasService.saveSystemConfig(saasDO);
        return success("创建成功");
    }
    @PostMapping(value = BaseRequestMapping.Saas.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasService.java

@@ -3,6 +3,7 @@ package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.org.BaseOrgDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.dao.system.SystemDictDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.org.BaseOrgDO;
@@ -40,6 +41,9 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    private UserRoleDao userRoleDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    @Autowired
    private SystemDictDao systemDictDao;
    /**
     * 默认租户管理员角色code
@@ -74,6 +78,12 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        orgDOList.forEach(org->{
            org.setSaasid(saasId);
        });
        //字典配置（由于需要支持租户对字典的crud，目前考虑直接复制一套字典给租户单独使用）
        //保存数据
        saas.setStatus(SaasDO.Status.auditWait);
        saas = saasDao.save(saas);
@@ -84,6 +94,14 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
        return saas;
    }
    /**
     * 系统配置
     * @param saasDO
     */
    public void saveSystemConfig(SaasDO saasDO){
    }
    @Transactional
    public void delete(String ids) {
        for (String id : ids.split(",")) {