业务模块角色功能

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorRoleInfoDO.java

@@ -37,6 +37,11 @@ public class BaseDoctorRoleInfoDO extends IntegerIdentityEntity {
	 */
	private String del;
	/**
	 * 角色说明
	 */
	private String description;
	@Column(name = "saasid")
    public String getSaasid() {
@@ -70,6 +75,12 @@ public class BaseDoctorRoleInfoDO extends IntegerIdentityEntity {
        this.del = del;
    }
    @Column(name = "description")
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/BaseRoleModuleDO.java

@@ -1,75 +0,0 @@
package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 业务模块角色实体
 * 
 * @author litaohong on  2018年10月23日
 *
 */
@Entity
@Table(name = "base_role_module")
public class BaseRoleModuleDO extends IntegerIdentityEntity {
    /**
	 * 角色标识
	 */
	private String code;
    /**
	 * 角色名称
	 */
	private String name;
    /**
	 * 业务模块id，多个用逗号分割
	 */
	private String moduleId;
    /**
	 * 状态，0失效，1有效
	 */
	private String del;
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "module_id")
    public String getModuleId() {
        return moduleId;
    }
    public void setModuleId(String moduleId) {
        this.moduleId = moduleId;
    }
	@Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

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

@@ -22,11 +22,11 @@
//    private String functionId;
//
//    @Column(name = "saas_id", nullable = false, length = 50)
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamDO.java

@@ -52,11 +52,11 @@ public class BaseTeamDO extends UuidIdentityEntityWithOperator {
     */
    private String del;
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    @Column(name = "org_code")
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
@@ -83,7 +83,7 @@ public class BaseTeamDO extends UuidIdentityEntityWithOperator {
        return leaderCode;
    }
    public void setLeaderCode(String leaderId) {
    public void setLeaderCode(String leaderCode) {
        this.leaderCode = leaderCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamMemberDO.java

@@ -38,7 +38,7 @@ public class BaseTeamMemberDO extends UuidIdentityEntityWithOperator {
    private String del;
	@Column(name = "team_id")
	@Column(name = "team_code")
    public String getTeamCode() {
        return teamCode;
    }
@@ -54,7 +54,7 @@ public class BaseTeamMemberDO extends UuidIdentityEntityWithOperator {
        this.orgCode = orgCode;
    }
	@Column(name = "doctor_id")
	@Column(name = "doctor_code")
    public String getDoctorCode() {
        return doctorCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientLabelDO.java

@@ -30,11 +30,11 @@
//    private String del;//1：有效；0：删除',
//
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientLabelInfoDO.java

@@ -28,11 +28,11 @@
//    private String teamCode;//团队code',
//
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistArticleDO.java

@@ -28,11 +28,11 @@
//    private String article;//文章
//
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistConsultDO.java

@@ -35,11 +35,11 @@
//    private String content;//咨询内容
//
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistDO.java

@@ -34,11 +34,11 @@
//    private String del;//1：有效；0：删除
//
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

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

@@ -163,6 +163,7 @@ public class BaseRequestMapping {
        public static final String resetPwd = "/resetPwd";
        public static final String queryOne = "/queryOne";
        public static final String orgTreeInfo = "/orgTreeInfo";
        public static final String userInfoList = "/userInfoList";
        public static final String lockOrUnlock = "/lockOrUnlock";
    }
@@ -422,6 +423,7 @@ public class BaseRequestMapping {
     */
    public static class BaseDoctorRoleInfo extends Basic {
        public static final String PREFIX  = "/baseDoctorRoleInfo";
        public static final String enableOrDis  = "/enableOrDis";
    }
/**
     * 医生模块角色关联表
@@ -496,6 +498,8 @@ public class BaseRequestMapping {
        public static final String queryMemberList  = "/queryMemberList";
        public static final String queryOne  = "/getTeamById";
        public static final String getTeamTree  = "/getTeamTree";
        public static final String teamInfoList  = "/teamInfoList";
        public static final String enableOrDis  = "/enableOrDis";
    }
@@ -637,12 +641,6 @@ public class BaseRequestMapping {
    public static class MqMessageSubscriber extends Basic {
        public static final String PREFIX  = "/mq_message_subscriber";
    }
    /**
     * 业务模块角色
     */
    public static class BaseRoleModule extends Basic {
        public static final String PREFIX  = "/baseRoleModule";
    }
    /**
     * 功能菜单角色

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/doctor/BaseDoctorRoleInfoVO.java

@@ -24,27 +24,32 @@ public class BaseDoctorRoleInfoVO extends IntegerIdentityVO{
    /**
	 * saasid,不同租户各自医生的业务模块角色信息独立
	 */
	@ApiModelProperty(value = "saasid,不同租户各自医生的业务模块角色信息独立", example = "模块1")
	@ApiModelProperty(value = "saasid,不同租户各自医生的业务模块角色信息独立", example = "参考租户")
    private String saasid;
    /**
	 * 角色code
	 */
	@ApiModelProperty(value = "角色code", example = "模块1")
	@ApiModelProperty(value = "角色code", example = "")
    private String code;
    /**
	 * 角色名称：全科医生、专科医生、健康管理师、管理员等
	 */
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "模块1")
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "")
    private String name;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "")
    private String del;
    /**
     * 角色说明
     */
    @ApiModelProperty(value = "角色说明", example = "")
    private String description;
    public String getSaasid() {
        return saasid;
@@ -75,4 +80,11 @@ public class BaseDoctorRoleInfoVO extends IntegerIdentityVO{
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/role/BaseRoleModuleVO.java

@@ -1,78 +0,0 @@
package com.yihu.jw.restmodel.base.role;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
 * 
 * 业务模块角色vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年10月23日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseRoleModuleVO", description = "业务模块角色")
public class BaseRoleModuleVO extends IntegerIdentityVO{
    /**
	 * 角色标识
	 */
	@ApiModelProperty(value = "角色标识", example = "模块1")
    private String code;
    /**
	 * 角色名称
	 */
	@ApiModelProperty(value = "角色名称", example = "模块1")
    private String name;
    /**
	 * 业务模块id，多个用逗号分割
	 */
	@ApiModelProperty(value = "业务模块id，多个用逗号分割", example = "模块1")
    private String moduleId;
    /**
	 * 状态，0失效，1有效
	 */
	@ApiModelProperty(value = "状态，0失效，1有效", example = "模块1")
    private String del;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getModuleId() {
        return moduleId;
    }
    public void setModuleId(String moduleId) {
        this.moduleId = moduleId;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasModuleFunctionVO.java

@@ -22,11 +22,11 @@
//    @ApiModelProperty(value = "功能ID", example = "402303ee656498890sd24s9ad2wa00sd")
//    private String functionId;
//
//    public String getOrgCode() {
//    public String getLeaderCode() {
//        return saasId;
//    }
//
//    public void setOrgCode(String saasId) {
//    public void setLeaderCode(String saasId) {
//        this.saasId = saasId;
//    }
//

svr/svr-base/doc/es/服务包执行日志记录索引.txt

@@ -15,7 +15,7 @@ POST http://172.19.103.68:9200/base_service_package_log/base_service_package_log
                "type": "string",
                "index": "not_analyzed"
            },
			"orgCode": {
			"leaderCode": {
				"type": "string",
				"index": "not_analyzed"
			},"sevicePackageId": {
@@ -57,7 +57,7 @@ POST http://172.19.103.68:9200/base_service_package_log/base_service_package_log
字段说明：
"id": code
"createTime": 时间
"orgCode": saasid
"leaderCode": saasid
"sevicePackageId": 服务包id
"sevicePackageDetailId": 服务包明细id
"userCode": 医生或者患者code

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseModuleRoleDao.java

@@ -2,8 +2,11 @@ package com.yihu.jw.base.dao.doctor;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Set;
/**
 * 
@@ -18,4 +21,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @since 1.
 */
public interface BaseModuleRoleDao extends PagingAndSortingRepository<BaseModuleRoleDO, Integer>, JpaSpecificationExecutor<BaseModuleRoleDO>  {
    @Query("select id from BaseModuleRoleDO where id = ?1")
    Set<Object> findModuleIdList(Integer id);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/BaseRoleModuleDao.java

@@ -1,21 +0,0 @@
package com.yihu.jw.base.dao.role;
import com.yihu.jw.entity.base.role.BaseRoleModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 业务模块角色 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年10月23日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseRoleModuleDao extends PagingAndSortingRepository<BaseRoleModuleDO, Integer>, JpaSpecificationExecutor<BaseRoleModuleDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/team/BaseTeamMemberDao.java

@@ -24,8 +24,8 @@ import java.util.Set;
 */
public interface BaseTeamMemberDao extends PagingAndSortingRepository<BaseTeamMemberDO, String>, JpaSpecificationExecutor<BaseTeamMemberDO>  {
    @Query("select doc.name,doc.idcard,doc.id from BaseDoctorDO doc where doc.id in (select team.doctorCode from BaseTeamMemberDO team where team.orgCode = ?1 and team.teamCode = ?2)")
    List<Map<String,Object>> getTeamMemberList();
    @Query("select doc.name as name,doc.idcard as idcard ,doc.id as doctorCode from BaseDoctorDO doc where doc.id in (select team.doctorCode from BaseTeamMemberDO team where team.teamCode = ?1)")
    List<Map<String,Object>> getTeamMemberList(String teamCode);
    @Query("select id from BaseTeamMemberDO where teamCode = ?1")
    Set<Object> findIdListByTeamCode(String teamCode);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseDoctorRoleInfoEndpoint.java

@@ -1,6 +1,8 @@
package com.yihu.jw.base.endpoint.doctor;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.doctor.BaseDoctorRoleInfoService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleInfoDO;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorRoleInfoVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -15,64 +17,64 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 业务模块角色字典（给医生用的）控制器
*
* @version
* <pre>
 * 业务模块角色字典（给医生用的）控制器
 *
 * @version <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年10月25日 	Created
 *
 * </pre>
* @since 1.
*/
 * @since 1.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.PREFIX)
@Api(value = "业务模块角色字典（给医生用的）管理", description = "业务模块角色字典（给医生用的）管理服务接口", tags = {"wlyy基础服务 - 业务模块角色字典（给医生用的）管理服务接口"})
public class BaseDoctorRoleInfoEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseDoctorRoleInfoService baseDoctorRoleInfoService;
    @Autowired
    private BaseDoctorRoleInfoService baseDoctorRoleInfoService;
@PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseDoctorRoleInfoVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseDoctorRoleInfoDO baseDoctorRoleInfo = toEntity(jsonData, BaseDoctorRoleInfoDO.class);
    baseDoctorRoleInfo = baseDoctorRoleInfoService.save(baseDoctorRoleInfo);
    return success(baseDoctorRoleInfo, BaseDoctorRoleInfoVO.class);
    @PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam(value = "jsonData", required = true)  String jsonData )throws Exception {
        JSONObject jsonObject = baseDoctorRoleInfoService.createRoleInfo(jsonData,getUserAgent());
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseDoctorRoleInfoService.delete(ids.split(","));
    return success("删除成功");
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        baseDoctorRoleInfoService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseDoctorRoleInfoVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseDoctorRoleInfoDO baseDoctorRoleInfo = toEntity(jsonData, BaseDoctorRoleInfoDO.class);
        if (null == baseDoctorRoleInfo.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseDoctorRoleInfo = baseDoctorRoleInfoService.save(baseDoctorRoleInfo);
        return success(baseDoctorRoleInfo, BaseDoctorRoleInfoVO.class);
    public Envelop update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam(value = "filters", required = true)  String jsonData ) throws Exception {
        JSONObject jsonObject = baseDoctorRoleInfoService.updateRoleInfo(jsonData);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
        @GetMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseDoctorRoleInfoVO> page (
    @GetMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.PAGE)
    @ApiOperation(value = "获取角色信息列表分页")
    public PageEnvelop<BaseDoctorRoleInfoVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -83,22 +85,57 @@ public ObjEnvelop<BaseDoctorRoleInfoVO> create (
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseDoctorRoleInfoDO> baseDoctorRoleInfos = baseDoctorRoleInfoService.search(fields, filters, sorts, page, size);
                int count = (int)baseDoctorRoleInfoService.getCount(filters);
                return success(baseDoctorRoleInfos, count, page, size, BaseDoctorRoleInfoVO.class);
         }
        List<BaseDoctorRoleInfoDO> baseDoctorRoleInfos = baseDoctorRoleInfoService.search(fields, filters, sorts, page, size);
        int count = (int) baseDoctorRoleInfoService.getCount(filters);
        return success(baseDoctorRoleInfos, count, page, size, BaseDoctorRoleInfoVO.class);
    }
         @GetMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseDoctorRoleInfoVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseDoctorRoleInfoDO> baseDoctorRoleInfos = baseDoctorRoleInfoService.search(fields, filters, sorts);
                  return success(baseDoctorRoleInfos, BaseDoctorRoleInfoVO.class);
         }
    @GetMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.LIST)
    @ApiOperation(value = "获取角色信息列表，无分页")
    public ListEnvelop<BaseDoctorRoleInfoVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<BaseDoctorRoleInfoDO> baseDoctorRoleInfos = baseDoctorRoleInfoService.search(fields, filters, sorts);
        return success(baseDoctorRoleInfos, BaseDoctorRoleInfoVO.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseTeam.queryOne)
    @ApiOperation(value = "查询某一个角色")
    public Envelop getTeamById(
            @ApiParam(name = "roleId", value = "根据角色标识查询某一个角色信息")
            @RequestParam(value = "roleId", required = true) Integer roleId) throws Exception {
        JSONObject team = baseDoctorRoleInfoService.getOneRoleInfo(roleId);
        if (team.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(team.getString("msg"));
        }
        return success(team.getJSONObject("msg"));
    }
    /**
     * 生效或失效某个角色
     *
     * @param id
     * @param status
     * @return
     * @throws Exception
     */
    @PostMapping(value = BaseRequestMapping.BaseDoctorRoleInfo.enableOrDis)
    @ApiOperation(value = "生效或失效某个角色")
    public Envelop enableOrDisableOrg(
            @ApiParam(name = "id", value = "角色Id")
            @RequestParam(value = "id", required = true) Integer id,
            @ApiParam(name = "status", value = "生效或失效标识")
            @RequestParam(value = "status", required = true) String status) throws Exception {
        JSONObject jsonObject = baseDoctorRoleInfoService.enableOrDisable(id, status);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
 }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/BaseRoleModuleEndpoint.java

@@ -1,104 +0,0 @@
package com.yihu.jw.base.endpoint.role;
import com.yihu.jw.base.service.role.BaseRoleModuleService;
import com.yihu.jw.entity.base.role.BaseRoleModuleDO;
import com.yihu.jw.restmodel.base.role.BaseRoleModuleVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 业务模块角色控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年10月23日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseRoleModule.PREFIX)
@Api(value = "业务模块角色管理", description = "业务模块角色管理服务接口", tags = {"wlyy基础服务 - 业务模块角色管理服务接口"})
public class BaseRoleModuleEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseRoleModuleService baseRoleModuleService;
@PostMapping(value = BaseRequestMapping.BaseRoleModule.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseRoleModuleVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseRoleModuleDO baseRoleModule = toEntity(jsonData, BaseRoleModuleDO.class);
    baseRoleModule = baseRoleModuleService.save(baseRoleModule);
    return success(baseRoleModule, BaseRoleModuleVO.class);
    }
    @PostMapping(value = BaseRequestMapping.BaseRoleModule.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseRoleModuleService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseRoleModule.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseRoleModuleVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseRoleModuleDO baseRoleModule = toEntity(jsonData, BaseRoleModuleDO.class);
        if (null == baseRoleModule.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        baseRoleModule = baseRoleModuleService.save(baseRoleModule);
        return success(baseRoleModule, BaseRoleModuleVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseRoleModule.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseRoleModuleVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseRoleModuleDO> baseRoleModules = baseRoleModuleService.search(fields, filters, sorts, page, size);
                int count = (int)baseRoleModuleService.getCount(filters);
                return success(baseRoleModules, count, page, size, BaseRoleModuleVO.class);
         }
         @GetMapping(value = BaseRequestMapping.BaseRoleModule.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseRoleModuleVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseRoleModuleDO> baseRoleModules = baseRoleModuleService.search(fields, filters, sorts);
                  return success(baseRoleModules, BaseRoleModuleVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/team/BaseTeamEndpoint.java

@@ -43,7 +43,7 @@ public class BaseTeamEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "创建团队")
    public Envelop create(
            @ApiParam(name = " jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
            @RequestParam(value = "jsonData")  String jsonData) throws Exception {
        String msg = baseTeamService.createTeam(jsonData);
        if (StringUtils.equalsIgnoreCase(ConstantUtils.SUCCESS, msg)) {
            return success(msg);
@@ -72,73 +72,110 @@ public class BaseTeamEndpoint extends EnvelopRestEndpoint {
        return success(jsonObject.getString("msg"));
    }
        @GetMapping(value = BaseRequestMapping.BaseTeam.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseTeamVO> page (
                @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
                @RequestParam(value = "fields", required = false) String fields,
                @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
                @RequestParam(value = "filters", required = false) String filters,
                @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
                @RequestParam(value = "sorts", required = false) String sorts,
        @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
        @RequestParam(value = "page") int page,
        @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
        @RequestParam(value = "size") int size) throws Exception {
            List<BaseTeamDO> baseTeams = baseTeamService.search(fields, filters, sorts, page, size);
            int count = (int) baseTeamService.getCount(filters);
            return success(baseTeams, count, page, size, BaseTeamVO.class);
        }
    @GetMapping(value = BaseRequestMapping.BaseTeam.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<BaseTeamVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<BaseTeamDO> baseTeams = baseTeamService.search(fields, filters, sorts, page, size);
        int count = (int) baseTeamService.getCount(filters);
        return success(baseTeams, count, page, size, BaseTeamVO.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseTeam.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<BaseTeamVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<BaseTeamDO> baseTeams = baseTeamService.search(fields, filters, sorts);
        return success(baseTeams, BaseTeamVO.class);
    }
        @GetMapping(value = BaseRequestMapping.BaseTeam.LIST)
        @ApiOperation(value = "获取列表")
        public ListEnvelop<BaseTeamVO> list (
                @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
                @RequestParam(value = "fields", required = false) String fields,
                @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
                @RequestParam(value = "filters", required = false) String filters,
                @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
                @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
            List<BaseTeamDO> baseTeams = baseTeamService.search(fields, filters, sorts);
            return success(baseTeams, BaseTeamVO.class);
    @GetMapping(value = BaseRequestMapping.BaseTeam.queryMemberList)
    @ApiOperation(value = "查看团队成员列表")
    public Envelop getTeamMemberList(
            @ApiParam(name = "teamCode", value = "团队标识")
            @RequestParam(value = "teamCode", required = true) String teamCode) throws Exception {
        JSONObject baseTeams = baseTeamService.getTeamMemberList(teamCode);
        if (baseTeams.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(baseTeams.getString("msg"));
        }
        return success(baseTeams.getJSONArray("msg"));
    }
    @GetMapping(value = BaseRequestMapping.BaseTeam.queryOne)
    @ApiOperation(value = "查询某一个团队")
    public Envelop getTeamById(
            @ApiParam(name = "teamCode", value = "根据团队标识查询某一个团队信息")
            @RequestParam(value = "teamCode", required = true) String teamId) throws Exception {
        JSONObject team = baseTeamService.getTeamById(teamId);
        if (team.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(team.getString("msg"));
        }
        return success(team.getJSONObject("msg"));
    }
         @GetMapping(value = BaseRequestMapping.BaseTeam.queryMemberList)
         @ApiOperation(value = "查看团队成员列表")
         public Envelop getTeamMemberList (
             @ApiParam(name = "orgCode", value = "机构标识")
             @RequestParam(value = "orgCode", required = true) String orgCode,
             @ApiParam(name = "teamCode", value = "团队标识")
             @RequestParam(value = "teamCode", required = true) String teamCode) throws Exception {
             JSONObject baseTeams = baseTeamService.getTeamMemberList(orgCode, teamCode);
             if (baseTeams.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                 return failed(baseTeams.getString("msg"));
             }
            return success(baseTeams.getJSONArray("msg"));
         }
    @GetMapping(value = BaseRequestMapping.BaseTeam.getTeamTree)
    @ApiOperation(value = "团队机构/科室/医生树形结构")
    public Envelop generateOneOrgDeptDoctorTree(
            @ApiParam(name = "jsonData", value = "json,包含团队机构，团队机构名称，已勾选的医生")
            @RequestParam(value = "jsonData", required = true) String jsonData) throws Exception {
        JSONObject team = baseTeamService.generateOneOrgDeptDoctorTree(jsonData);
        if (team.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(team.getString("msg"));
        }
        return success(team.getJSONArray("msg"));
    }
         @GetMapping(value = BaseRequestMapping.BaseTeam.queryOne)
         @ApiOperation(value = "查询某一个团队")
         public Envelop getTeamById (
             @ApiParam(name = "teamCode", value = "根据团队标识查询某一个团队信息")
             @RequestParam(value = "teamCode", required = true) String teamId) throws Exception {
             JSONObject team = baseTeamService.getTeamById(teamId);
             if (team.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                 return failed(team.getString("msg"));
             }
             return success(team.getJSONObject("msg"));
         }
    @PostMapping(value = BaseRequestMapping.BaseTeam.teamInfoList)
    @ApiOperation(value = "获取团队信息列表")
    public PageEnvelop queryBaseOrgInfolist(
            @ApiParam(name = "teamName", value = "团队名称")
            @RequestParam(value = "teamName", required = false) String teamName,
            @ApiParam(name = "orgCode", value = "机构代码")
            @RequestParam(value = "orgCode", required = false) String orgCode,
            @ApiParam(name = "status", value = "状态")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = baseTeamService.getTeamInfoList(teamName, orgCode, status, page, size,getUserAgent());
        return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);
    }
         @GetMapping(value = BaseRequestMapping.BaseTeam.getTeamTree)
         @ApiOperation(value = "团队机构/科室/医生树形结构")
         public Envelop generateOneOrgDeptDoctorTree (
             @ApiParam(name = "jsonData", value = "json,包含团队机构，团队机构名称，已勾选的医生")
             @RequestParam(value = "jsonData", required = true) String jsonData) throws Exception {
             JSONObject team = baseTeamService.generateOneOrgDeptDoctorTree(jsonData);
             if (team.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
                 return failed(team.getString("msg"));
             }
             return success(team.getJSONArray("msg"));
         }
    /**
     * 生效或失效某个团队
     *
     * @param id
     * @param status
     * @return
     * @throws Exception
     */
    @PostMapping(value = BaseRequestMapping.BaseTeam.enableOrDis)
    @ApiOperation(value = "生效或失效某个团队")
    public Envelop enableOrDisableOrg(
            @ApiParam(name = "id", value = "团队标识")
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "status", value = "生效或失效标识")
            @RequestParam(value = "status", required = true) String status) throws Exception {
        JSONObject jsonObject =  baseTeamService.enableOrDis(id, status);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -33,11 +33,11 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private UserService userService;
    @PostMapping(value = BaseRequestMapping.User.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.User.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject =  userService.createUser(jsonData);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
@@ -54,11 +54,11 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.User.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.User.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
            @ApiParam(name = " jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        JSONObject jsonObject =  userService.updateUser(jsonData);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
@@ -170,6 +170,31 @@ public class UserEndpoint extends EnvelopRestEndpoint {
        return success(jsonObject.get("msg"));
    }
    /**
     * 获取用户信息列表
     *
     * @param saasid
     * @return
     * @throws Exception
     */
    @GetMapping(value = BaseRequestMapping.User.userInfoList)
    @ApiOperation(value = "获取用户信息列表")
    public PageEnvelop userInfoList(
            @ApiParam(name = "realName", value = "realName")
            @RequestParam(value = "realName", required = false) String realName,
            @ApiParam(name = "saasid", value = "saasid")
            @RequestParam(value = "saasid", required = false) String saasid,
            @ApiParam(name = "roleCode", value = "roleCode")
            @RequestParam(value = "roleCode", required = false) String roleCode,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = userService.userInfoList(realName,saasid, roleCode,page,size);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    /**
     * 生效或失效某个用户
     *

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleInfoService.java

@@ -1,9 +1,41 @@
package com.yihu.jw.base.service.doctor;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.doctor.BaseDoctorRoleInfoDao;
import com.yihu.jw.base.dao.doctor.BaseModuleRoleDao;
import com.yihu.jw.base.dao.role.BaseRoleMenuDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.service.org.BaseOrgSaasService;
import com.yihu.jw.base.service.org.BaseOrgUserService;
import com.yihu.jw.base.service.org.OrgTree;
import com.yihu.jw.base.service.org.OrgTreeService;
import com.yihu.jw.base.service.role.BaseRoleMenuService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleInfoDO;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import com.yihu.jw.entity.base.org.BaseOrgUserDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import org.apache.commons.collections.map.HashedMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.*;
/**
 * 
@@ -19,4 +51,206 @@ import org.springframework.stereotype.Service;
 */
@Service
public class BaseDoctorRoleInfoService extends BaseJpaService<BaseDoctorRoleInfoDO, BaseDoctorRoleInfoDao> {
    @Autowired
    private BaseDoctorRoleInfoDao baseDoctorRoleInfoDao;
    @Autowired
    private SaasDao saasDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private BaseModuleRoleService baseModuleRoleService;
    @Value("${configDefault.saasId}")
    private String defaultSaasId;
    /**
     * 创建角色信息
     *
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public JSONObject createRoleInfo(String jsonData,JSONObject userAgent) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(jsonData)) {
            result.put("msg", "parameter jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject role = jsonObject.getJSONObject("role");
        JSONArray module = jsonObject.getJSONArray("module");
        if (null == role || CollectionUtils.isEmpty(module) ) {
            result.put("msg", "parameter role or module of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //组装角色信息
        BaseDoctorRoleInfoDO roleInfoDO = null;
        try {
            roleInfoDO = objectMapper.readValue(role.toJSONString(), BaseDoctorRoleInfoDO.class);
        } catch (IOException e) {
            result.put("msg", "convert role jsonObject to BaseDoctorRoleInfoDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        roleInfoDO.setCode(randomString(30));
        this.save(roleInfoDO);
        //组装角色与模块的关联关系
        List<BaseModuleRoleDO> moduleRoleDOList = new ArrayList<>();
        BaseModuleRoleDO moduleRoleDO = null;
        for (Object obj : module) {
            try {
                moduleRoleDO = objectMapper.readValue(obj.toString(), BaseModuleRoleDO.class);
                moduleRoleDO.setRoleCode(roleInfoDO.getCode());
                moduleRoleDOList.add(moduleRoleDO);
            } catch (IOException e) {
                result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
                result.put("response", ConstantUtils.FAIL);
                return result;
            }
        }
        baseModuleRoleService.batchInsert(moduleRoleDOList);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", moduleRoleDO);
        return result;
    }
    /**
     * 修改角色
     *
     * @param jsonData
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public JSONObject updateRoleInfo(String jsonData) {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(jsonData)) {
            result.put("msg", "parameter jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject role = jsonObject.getJSONObject("role");
        JSONArray module = jsonObject.getJSONArray("module");
        if (null == role || CollectionUtils.isEmpty(module) ) {
            result.put("msg", "parameter role or module of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //修改角色信息
        BaseDoctorRoleInfoDO roleInfoDO = null;
        BaseDoctorRoleInfoDO oldRoleInfo = null;
        try {
            roleInfoDO = objectMapper.readValue(role.toJSONString(), BaseDoctorRoleInfoDO.class);
        } catch (IOException e) {
            result.put("msg", "convert user jsonObject to UserDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        try {
            oldRoleInfo = baseDoctorRoleInfoDao.findOne(roleInfoDO.getId());
        } catch (Exception e) {
            result.put("msg", "not role exist for id:" + roleInfoDO.getId());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        roleInfoDO.setCode(oldRoleInfo.getCode());
        roleInfoDO.setSaasid(oldRoleInfo.getSaasid());
        this.save(roleInfoDO);
        //修改角色与模块关联关系
        Set<Object> roleIdList = baseModuleRoleService.findModuleIdList(roleInfoDO.getId());
        BaseModuleRoleDO moduleRoleDO = null;
        try {
            for (Object obj : module) {
                moduleRoleDO = objectMapper.readValue(obj.toString(), BaseModuleRoleDO.class);
                moduleRoleDO.setRoleCode(roleInfoDO.getCode());
                if (roleIdList.contains(moduleRoleDO.getId())) {
                    roleIdList.remove(moduleRoleDO.getId());
                }
                baseModuleRoleService.save(moduleRoleDO);
            }
        } catch (IOException e) {
            result.put("msg", "convert module jsonObject to BaseModuleRoleDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        // 表示没有删除，只有修改
        if (roleIdList.size() > 0) {
            baseModuleRoleService.delete(roleIdList.toArray());
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", roleInfoDO);
        return result;
    }
    /**
     * 获取单个角色信息
     * @param roleId 角色id
     * @return
     */
    public JSONObject getOneRoleInfo(Integer roleId) throws Exception{
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(roleId)){
            result.put("msg","parameter roleId is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        //角色基本信息
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.findOne(roleId);
        if(null == roleInfoDO){
            result.put("msg","Role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",roleInfoDO);
        return result;
    }
    /**
     * 生效或失效单个角色
     * @param roleId
     * @param del
     * @return
     */
    public JSONObject enableOrDisable(Integer roleId,String del){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(roleId) || StringUtils.isEmpty(del)){
            result.put("msg","parameter id or del is null");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseDoctorRoleInfoDO roleInfoDO = baseDoctorRoleInfoDao.findOne(roleId);
        if( null == roleInfoDO ){
            result.put("msg","role not exist for id:" + roleId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        roleInfoDO.setDel(del);
        this.save(roleInfoDO);
        result.put("response",ConstantUtils.SUCCESS);
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -114,8 +114,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        }
        //医生归属业务模块角色信息
        String[] paramNames = {"doctorCode","del"};
        Object[] paramValue = {doctorId,"1"};
        String[] paramNames = {"doctorCode"};
        Object[] paramValue = {doctorId};
        List<BaseDoctorRoleDO> roleList = baseDoctorRoleService.findByFields(paramNames,paramValue);
        if(CollectionUtils.isEmpty(roleList)){
            result.put("msg","doctor role not exist for id:" + doctorId);
@@ -475,7 +475,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        }
        result.put("response", ConstantUtils.SUCCESS);
        // 不同医院职务可以相同
        result.put("msg", objectMapper.readValue(orgTreeService.makeTree(orgTreeList,true),JSONArray.class));
        result.put("msg", objectMapper.readValue(orgTreeService.makeTree(orgTreeList,true,false),JSONArray.class));
        return result;
    }
@@ -557,7 +557,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        }
        result.put("response", ConstantUtils.SUCCESS);
        //不同医院科室可以相同
        result.put("msg",objectMapper.readValue(orgTreeService.makeTree(orgTreeList,true),JSONArray.class));
        result.put("msg",objectMapper.readValue(orgTreeService.makeTree(orgTreeList,true,false),JSONArray.class));
        return result;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseModuleRoleService.java

@@ -3,8 +3,14 @@ package com.yihu.jw.base.service.doctor;
import com.yihu.jw.base.dao.doctor.BaseModuleRoleDao;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.xml.ws.Action;
import java.util.HashSet;
import java.util.Set;
/**
 * 
 * 业务模块与业务模块角色关联信息服务service
@@ -19,4 +25,23 @@ import org.springframework.stereotype.Service;
 */
@Service
public class BaseModuleRoleService extends BaseJpaService<BaseModuleRoleDO, BaseModuleRoleDao> {
    @Autowired
    private BaseModuleRoleDao baseModuleRoleDao;
    /**
     * 根据角色id获取角色对应的模块Id列表
     *
     * @param roleId
     * @return
     */
    public Set<Object> findModuleIdList(Integer roleId) {
        Set<Object> result = new HashSet<>();
        if (null == roleId) {
            return result;
        }
        return baseModuleRoleDao.findModuleIdList(roleId);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/OrgTree.java

@@ -61,6 +61,11 @@ public class OrgTree extends IntegerIdentityEntity implements TreeNode {
        return this.parentCode;
    }
    @Override
    public Integer extractLevel() {
        return this.level;
    }
    @Override
    public Integer extractOrderNum() {
        return null;

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/OrgTreeService.java

@@ -188,7 +188,7 @@ public class OrgTreeService extends BaseJpaService<OrgTree, OrgTreeDao> {
     * 构建树形结构
     * @return
     */
    public String makeTree(List<OrgTree> orgTreeList,boolean isAllowedRepeat){
    public String makeTree(List<OrgTree> orgTreeList,boolean isAllowedRepeat,boolean showLevel){
        List<TreeNode> treeNodes = new ArrayList<>();
        treeNodes.addAll(orgTreeList);
        SimpleTree tree = new SimpleTree(treeNodes,isAllowedRepeat);
@@ -197,7 +197,9 @@ public class OrgTreeService extends BaseJpaService<OrgTree, OrgTreeDao> {
        filter.getExcludes().add("parent");
        filter.getExcludes().add("allChildren");
        filter.getExcludes().add("orderNum");
        filter.getExcludes().add("level");
        if(!showLevel){
            filter.getExcludes().add("level");
        }
        return JSONObject.toJSONString(treeNode, filter);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/tree/SimpleTreeNode.java

@@ -36,6 +36,7 @@ public class SimpleTreeNode {
        this.nodeName = obj.extractNodeName();
        this.parentNodeId = obj.extractNodeParentId();
        this.checked = obj.extractChecked();
        this.level = obj.extractLevel();
    }
    public void addChild(SimpleTreeNode treeNode){
        this.children.add(treeNode);

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/tree/TreeNode.java

@@ -5,5 +5,6 @@ public interface TreeNode {
    String extractNodeName();
    String extractNodeParentId();
    Integer extractOrderNum();
    Integer extractLevel();
    boolean extractChecked();
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/BaseRoleModuleService.java

@@ -1,22 +0,0 @@
package com.yihu.jw.base.service.role;
import com.yihu.jw.base.dao.role.BaseRoleModuleDao;
import com.yihu.jw.entity.base.role.BaseRoleModuleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 业务模块角色服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年10月23日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseRoleModuleService extends BaseJpaService<BaseRoleModuleDO, BaseRoleModuleDao> {
}

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

@@ -459,7 +459,7 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
//        List<DictHospitalDeptDO> hospitalDeptDOList = new ArrayList<>(dictHospitalDeptDOList.size());
//        dictHospitalDeptDOList.forEach(dict->{
//            DictHospitalDeptDO deptDO = new DictHospitalDeptDO();
//            deptDO.setOrgCode(saasId);
//            deptDO.setLeaderCode(saasId);
//            deptDO.setName(dict.getName());
//            deptDO.setCode(dict.getCode());
//            deptDO.setCreateTime(new Date());

svr/svr-base/src/main/java/com/yihu/jw/base/service/team/BaseTeamService.java

@@ -8,6 +8,7 @@ import com.yihu.jw.base.dao.team.BaseTeamMemberDao;
import com.yihu.jw.base.service.dict.DictHospitalDeptService;
import com.yihu.jw.base.service.doctor.BaseDoctorService;
import com.yihu.jw.base.service.org.OrgTree;
import com.yihu.jw.base.service.org.OrgTreeService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
@@ -17,6 +18,7 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,10 +58,10 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
    private ObjectMapper objectMapper;
    @Autowired
    private BaseDoctorService baseDoctorService;
    private DictHospitalDeptService dictHospitalDeptService;
    @Autowired
    private DictHospitalDeptService dictHospitalDeptService;
    private OrgTreeService orgTreeService;
    /**
     * 新增团队
@@ -153,18 +155,17 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
    /**
     * 查看团队成员 （姓名，身份证）
     * @param orgCode
     * @param teamCode
     * @param teamId
     * @return
     */
    public JSONObject getTeamMemberList(String orgCode,String teamCode) throws Exception {
    public JSONObject getTeamMemberList(String teamId) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(orgCode) || StringUtils.isEmpty(teamCode)){
            result.put("msg","parameter orgCode or orgCode is null");
        if(StringUtils.isEmpty(teamId)){
            result.put("msg","parameter teamId is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        List<Map<String,Object>> list = baseTeamMemberDao.getTeamMemberList();
        List<Map<String,Object>> list = baseTeamMemberDao.getTeamMemberList(teamId);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
@@ -218,6 +219,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
        orgTree.setParentCode("");
        orgTree.setCode(orgCode);
        orgTree.setName(orgName);
        orgTree.setLevel(1);
        orgTreeList.add(orgTree);
@@ -228,6 +230,7 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
            deptTree.setParentCode(orgCode);
            deptTree.setCode(one.getCode());
            deptTree.setName(one.getName());
            deptTree.setLevel(2);
            orgTreeList.add(deptTree);
        });
@@ -267,18 +270,110 @@ public class BaseTeamService extends BaseJpaService<BaseTeamDO, BaseTeamDao> {
            deptTree.setParentCode(orgCode);
            deptTree.setCode(String.valueOf(deptDoctorMap.get(key).get("deptCode")));
            deptTree.setName(String.valueOf(deptDoctorMap.get(key).get("deptName")));
            deptTree.setLevel(2);
            OrgTree doctorTree = new OrgTree();
            doctorTree.setParentCode(String.valueOf(deptDoctorMap.get(key).get("deptCode")));
            doctorTree.setCode(String.valueOf(deptDoctorMap.get(key).get("doctorCode")));
            doctorTree.setName(String.valueOf(deptDoctorMap.get(key).get("doctorName")));
            doctorTree.setLevel(3);
            orgTreeList.add(deptTree);
            orgTreeList.add(doctorTree);
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg",objectMapper.readValue(baseDoctorService.makeTree(orgTreeList,false),JSONArray.class));
        result.put("msg",objectMapper.readValue(orgTreeService.makeTree(orgTreeList,false,true),JSONArray.class));
        return result;
    }
    /**
     * 团队信息列表
     * @param teamName
     * @param orgCode
     * @param status
     * @param page
     * @param size
     * @return
     * @throws Exception
     */
    public JSONObject getTeamInfoList(String teamName,String orgCode,String status,int page,int size,JSONObject userAgent) throws Exception {
        JSONObject result = new JSONObject();
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;
        String teamNameValue = null == teamName ? "" : teamName;
        String orgCodeValue = null == orgCode ? "" : orgCode;
        String statusValue = null == status ? "" : status;
        String sql = " " +
                "SELECT " +
                "  team.id as teamId, " +
                "  team.name as name, " +
                "  case team.del when 0 then '已失效' when 1 then '生效中' end status, " +
                "  org.name as orgName " +
                "FROM " +
                "  base_team team, " +
                "  base_org org " +
                "WHERE " +
                "  team.org_code = org.code " +
                "  and (team.name like '{teamName}' or '' ='{teamName}') " +
                "  and (team.org_code = '{orgCode}' or '' = '{orgCode}') " +
                "  and ( team.del = '{status}' or '' = '{status}') " +
                " ORDER BY team.create_time DESC " +
                " limit {start},{end} ";
        String finalSql = sql
                .replace("{teamName}","%" + teamNameValue + "%")
                .replace("{orgCode}",orgCodeValue)
                .replace("{status}",statusValue)
                .replace("{start}", String.valueOf(start))
                .replace("{end}", String.valueOf(end));
        String countSql = "SELECT " +
                "  count(team.id) " +
                "FROM " +
                "  base_team team, " +
                "  base_org org " +
                "WHERE " +
                "  team.org_code = org.code " +
                "  AND (team.name LIKE '{teamName}' OR '' = '{teamName}') " +
                "  AND (team.org_code = '{orgCode}' OR '' = '{orgCode}') " +
                "  AND (team.del = '{status}' OR '' = '{status}')";
        String finalCountSql = countSql
                .replace("{teamName}","%" + teamNameValue + "%")
                .replace("{orgCode}",orgCodeValue)
                .replace("{status}",statusValue);
        List<Map<String,Object>> list = jdbcTemplate.queryForList(finalSql);
        int count = jdbcTemplate.queryForObject(finalCountSql,Integer.class);
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    /**
     * 生效或失效单个团队
     * @param teamId
     * @param del
     * @return
     */
    public JSONObject enableOrDis(String teamId,String del){
        JSONObject result = new JSONObject();
        if(org.springframework.util.StringUtils.isEmpty(teamId) || org.springframework.util.StringUtils.isEmpty(del)){
            result.put("msg","teamId id or status is null");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        BaseTeamDO teamDO = baseTeamDao.findOne(teamId);
        if( null == teamDO ){
            result.put("msg","teamId not exist for id:" + teamId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        teamDO.setDel(del);
        this.save(teamDO);
        result.put("response",ConstantUtils.SUCCESS);
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -217,7 +217,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject user = jsonObject.getJSONObject("user");
        JSONArray org = jsonObject.getJSONArray("org");
        if (null == user || CollectionUtils.isEmpty(org)) {
        //归属租户为默认租户，表示用户为超级管理员，不需要机构
        if (null == user || CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
            result.put("msg", "parameter user or org of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
@@ -236,18 +237,20 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        //组装用户与机构的关联关系
        List<BaseOrgUserDO> orgList = new ArrayList<>();
        BaseOrgUserDO orgUserDO = null;
        for (Object obj : org) {
            try {
                orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
                orgUserDO.setUserId(userDO.getId());
                orgList.add(orgUserDO);
            } catch (IOException e) {
                result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
                result.put("response", ConstantUtils.FAIL);
                return result;
        if(!CollectionUtils.isEmpty(org)){
            for (Object obj : org) {
                try {
                    orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
                    orgUserDO.setUserId(userDO.getId());
                    orgList.add(orgUserDO);
                } catch (IOException e) {
                    result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
                    result.put("response", ConstantUtils.FAIL);
                    return result;
                }
            }
            baseOrgUserService.batchInsert(orgList);
        }
        baseOrgUserService.batchInsert(orgList);
        JSONObject returnMsg = new JSONObject();
        returnMsg.put("username",userDO.getUsername());
        returnMsg.put("password",userDO.getSalt());
@@ -273,7 +276,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject user = jsonObject.getJSONObject("user");
        JSONArray org = jsonObject.getJSONArray("org");
        if (null == user || CollectionUtils.isEmpty(org)) {
        if (null == user ||  CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
            result.put("msg", "parameter user or org of jsonData is null");
            result.put("response", ConstantUtils.FAIL);
            return result;
@@ -291,27 +294,29 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        }
        this.save(userDO);
        //修改用户机构关联关系
        Set<Object> roleIdList = baseOrgUserService.findIdListByUserId(userDO.getId());
        BaseOrgUserDO orgUserDO = null;
        try {
            for (Object obj : org) {
                orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
                orgUserDO.setUserId(userDO.getId());
                if(roleIdList.contains(orgUserDO.getId())){
                    roleIdList.remove(orgUserDO.getId());
        if (!CollectionUtils.isEmpty(org)) {
            //修改用户机构关联关系
            Set<Object> roleIdList = baseOrgUserService.findIdListByUserId(userDO.getId());
            BaseOrgUserDO orgUserDO = null;
            try {
                for (Object obj : org) {
                    orgUserDO = objectMapper.readValue(obj.toString(), BaseOrgUserDO.class);
                    orgUserDO.setUserId(userDO.getId());
                    if (roleIdList.contains(orgUserDO.getId())) {
                        roleIdList.remove(orgUserDO.getId());
                    }
                    orgUserDO.setUserId(userDO.getId());
                    baseOrgUserService.save(orgUserDO);
                }
                orgUserDO.setUserId(userDO.getId());
                baseOrgUserService.save(orgUserDO);
            } catch (IOException e) {
                result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
                result.put("response", ConstantUtils.FAIL);
                return result;
            }
            // 表示没有删除，只有修改
            if (roleIdList.size() > 0) {
                baseOrgUserService.delete(roleIdList.toArray());
            }
        } catch (IOException e) {
            result.put("msg", "convert org jsonObject to BaseOrgUserDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        // 表示没有删除，只有修改
        if (roleIdList.size() > 0) {
            baseOrgUserService.delete(roleIdList.toArray());
        }
        result.put("response", ConstantUtils.SUCCESS);
@@ -391,14 +396,13 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            orgList = jdbcTemplate.query(sql.toString().replace("{userId}",userId),new BeanPropertyRowMapper(OrgTree.class));*/
        }
        if(CollectionUtils.isEmpty(orgList)){
            result.put("msg","no org under this saasid:" + saasid);
            result.put("response", ConstantUtils.FAIL);
            return result;
        if(!CollectionUtils.isEmpty(orgList)){
            String tree = orgTreeService.makeTree(orgList,false,true);
            result.put("msg",objectMapper.readValue(tree,JSONArray.class));
        }else{
            result.put("msg",orgList);
        }
        String tree = orgTreeService.makeTree(orgList,false);
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg",objectMapper.readValue(tree,JSONArray.class));
        return result;
    }
@@ -461,4 +465,75 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        return result;
    }
    /**
     * 用户信息列表
     * @param name
     * @param saasid
     * @param roleCode
     * @param page
     * @param size
     * @return
     * @throws Exception
     */
    public JSONObject userInfoList(String name,String saasid,String roleCode,int page,int size) throws Exception {
        JSONObject result = new JSONObject();
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : page * size;
        String realName = null == name ? "" : name;
        String saasidValue = null == saasid ? "" : saasid;
        String roleCodeValue = null == roleCode ? "" : roleCode;
        String sql = "SELECT " +
                "  user.id as id, " +
                "  user.name as realName, " +
                "  user.username as username, " +
                "  case user.locked when 0 then '已失效' when 1 then '生效中' end status, " +
                "  user.mobile, " +
                "  saas.name as saasName, " +
                "  role.name as roleName " +
                " FROM " +
                "  base_user user, " +
                "  base_saas saas, " +
                "  base_role role " +
                " WHERE " +
                "  user.saas_id = saas.id " +
                "  AND " +
                "  user.role_code = role.code " +
                " and (user.name like '{realName}' or '' ='{realName}') " +
                "  and (saas.id = '{saasid}' or '' = '{saasid}') " +
                "  and ( user.role_code = '{roleCode}' or '' = '{roleCode}') " +
                " ORDER BY user.create_time DESC" +
                "  limit {start},{end} ";
        String finalSql = sql
                .replace("{realName}","%" + realName + "%")
                .replace("{saasid}",saasidValue)
                .replace("{roleCode}",roleCodeValue)
                .replace("{start}",String.valueOf(start))
                .replace("{end}",String.valueOf(end));
        String countSql = "SELECT " +
                "  count(user.id) " +
                "FROM " +
                "  base_user user, " +
                "  base_saas saas, " +
                "  base_role role " +
                "WHERE " +
                "  user.saas_id = saas.id " +
                "  AND " +
                "  user.role_code = role.code " +
                " and (user.name like '{realName}' or '' ='{realName}') " +
                "  and (saas.id = '{saasid}' or '' = '{saasid}') " +
                "  and ( user.role_code = '{roleCode}' or '' = '{roleCode}') ";
        String finalCountSql = countSql
                .replace("{realName}", "%" + realName + "%")
                .replace("{saasid}",  saasidValue )
                .replace("{roleCode}",  roleCodeValue );
        List<Map<String, Object>> list = jdbcTemplate.queryForList(finalSql);
        Integer count = jdbcTemplate.queryForObject(finalCountSql, Integer.class);
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/business/login/service/BaseLoginAccountService.java

@@ -31,7 +31,7 @@
//        if (StringUtils.isEmpty(baseLoginAccountDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseLoginAccountDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseLoginAccountDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.baseLoginAccountDao.save(baseLoginAccountDO);

svr/svr-base/src/main/java/com/yihu/jw/business/login/service/LoginService.java

@@ -62,7 +62,7 @@
//        //保存账户基础信息
//        BaseEmployDO employeeDO = new BaseEmployDO();
//        employeeDO.setId(UUID.randomUUID().toString().replaceAll("-", ""));
//        employeeDO.setOrgCode(saasId);
//        employeeDO.setLeaderCode(saasId);
//        employeeDO.setName(name);
//        employeeDO.setPyCode(ConvertToSpellUtils.changeToInitialPinYin(name));
//        employeeDO.setIdcard(idcard);

svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsService.java

@@ -106,7 +106,7 @@
//        SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
//        sms.setDeadline(s.parse(vc.getCreateTimeString()));
//        sms.setStatus(1);
//        sms.setOrgCode(saasId);
//        sms.setLeaderCode(saasId);
//        //5、 调用发送信息的接口
////        String result = httpClientUtil.post(smsHttpVo.getUrl(), buildSmsParams(sms.getContent(), mobile), "GBK");
////        JSONObject json = toJson(result);

svr/svr-base/src/main/java/com/yihu/jw/business/user/contorller/BaseMenuController.java

@@ -74,7 +74,7 @@
//    public Envelop getMenuListBySaasId(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
//        try{
//            BaseMenuDO baseMenuDO = toEntity(jsonData,BaseMenuDO.class);
//            return Envelop.getSuccess(BaseUserRequestMapping.BaseMenu.message_success_find,baseMenuService.findAllBySaasId(baseMenuDO.getOrgCode()));
//            return Envelop.getSuccess(BaseUserRequestMapping.BaseMenu.message_success_find,baseMenuService.findAllBySaasId(baseMenuDO.getLeaderCode()));
//        } catch (ApiException e){
//            return Envelop.getError(e.getMessage(), e.getErrorCode());
//        }
@@ -85,7 +85,7 @@
//    public Envelop deleteMenusBySaasId(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
//        try{
//            BaseMenuDO baseMenuDO = toEntity(jsonData,BaseMenuDO.class);
//            baseMenuService.deleteBaseMenusBySaasId(baseMenuDO.getOrgCode());
//            baseMenuService.deleteBaseMenusBySaasId(baseMenuDO.getLeaderCode());
//            return Envelop.getSuccess(BaseUserRequestMapping.BaseMenu.message_success_delete);
//        } catch (ApiException e){
//            return Envelop.getError(e.getMessage(), e.getErrorCode());

svr/svr-base/src/main/java/com/yihu/jw/business/user/contorller/BaseRoleController.java

@@ -78,7 +78,7 @@
////    public Envelop getOneRoleBySaasIdAndName(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
////        try{
////            BaseRoleDO baseRoleDO = toEntity(jsonData,BaseRoleDO.class);
////            return Envelop.getSuccess(BaseUserRequestMapping.BaseRole.message_success_find,baseRoleService.findBySaasIdAndName(baseRoleDO.getName(),baseRoleDO.getOrgCode()));
////            return Envelop.getSuccess(BaseUserRequestMapping.BaseRole.message_success_find,baseRoleService.findBySaasIdAndName(baseRoleDO.getName(),baseRoleDO.getLeaderCode()));
////        } catch (ApiException e){
////            return Envelop.getError(e.getMessage(), e.getErrorCode());
////        }
@@ -89,7 +89,7 @@
////    public Envelop getRoleListBySaasId(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
////        try{
////            BaseRoleDO baseRoleDO = toEntity(jsonData,BaseRoleDO.class);
////            return Envelop.getSuccessList(BaseUserRequestMapping.BaseRole.message_success_find,baseRoleService.findAllBySaasId(baseRoleDO.getOrgCode()));
////            return Envelop.getSuccessList(BaseUserRequestMapping.BaseRole.message_success_find,baseRoleService.findAllBySaasId(baseRoleDO.getLeaderCode()));
////        } catch (ApiException e){
////            return Envelop.getError(e.getMessage(), e.getErrorCode());
////        }
@@ -143,7 +143,7 @@
////    public Envelop deleteRolesBySaasId(@ApiParam(name = "json_data", value = "", defaultValue = "") @RequestBody String jsonData){
////        try{
////            BaseRoleDO baseRoleDO = toEntity(jsonData,BaseRoleDO.class);
////            baseRoleService.deleteBaseRolesBySaasId(baseRoleDO.getOrgCode());
////            baseRoleService.deleteBaseRolesBySaasId(baseRoleDO.getLeaderCode());
////            return Envelop.getSuccess(BaseUserRequestMapping.BaseRole.message_success_delete);
////        } catch (ApiException e){
////            return Envelop.getError(e.getMessage(), e.getErrorCode());

svr/svr-base/src/main/java/com/yihu/jw/business/user/service/BaseMenuService.java

@@ -33,7 +33,7 @@
//        if (StringUtils.isEmpty(baseMenuDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseMenuDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseMenuDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.baseMenuDao.save(baseMenuDO);
@@ -49,7 +49,7 @@
//        if (StringUtils.isEmpty(baseMenuDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseMenuDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseMenuDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.baseMenuDao.save(baseMenuDO);
@@ -96,7 +96,7 @@
//        if (StringUtils.isEmpty(baseMenuDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseMenuDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseMenuDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseMenu.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
//        }
//        baseMenuDO.setStatus(-1);

svr/svr-base/src/main/java/com/yihu/jw/business/user/service/BaseRoleService.java

@@ -32,7 +32,7 @@
//        if (StringUtils.isEmpty(baseRoleDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseRoleDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseRoleDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseRoleDO.getName())) {
@@ -51,7 +51,7 @@
//        if (StringUtils.isEmpty(baseRoleDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseRoleDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseRoleDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.baseRoleDao.save(baseRoleDO);
@@ -135,7 +135,7 @@
//        if (StringUtils.isEmpty(baseRoleDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(baseRoleDO.getOrgCode())) {
//        if (StringUtils.isEmpty(baseRoleDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseRole.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        baseRoleDO.setStatus(-1);

svr/svr-base/src/main/java/com/yihu/jw/business/user/service/EmployService.java

@@ -44,7 +44,7 @@
//        if (StringUtils.isEmpty(employeeDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(employeeDO.getOrgCode())) {
//        if (StringUtils.isEmpty(employeeDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.employDao.save(employeeDO);
@@ -61,7 +61,7 @@
//        if (StringUtils.isEmpty(employeeDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(employeeDO.getOrgCode())) {
//        if (StringUtils.isEmpty(employeeDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        return this.employDao.save(employeeDO);
@@ -144,7 +144,7 @@
//        if (StringUtils.isEmpty(employDO.getId())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_id_is_null, ExceptionCode.common_error_params_code);
//        }
//        if (StringUtils.isEmpty(employDO.getOrgCode())) {
//        if (StringUtils.isEmpty(employDO.getLeaderCode())) {
//            throw new ApiException(BaseUserRequestMapping.BaseEmploy.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
//        }
//        employDO.setStatus(-1);