forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory.java
@@ -3,6 +3,7 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.sms.feign.SmsChuangLanService; import feign.hystrix.FallbackFactory; import org.springframework.stereotype.Component; import java.util.Map; @@ -14,6 +15,7 @@ * @CreateDate: Created in 2020/2/27 22:05 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ @Component public class SmsChuangLanServiceFallbackFactory implements FallbackFactory<SmsChuangLanService> { @Override public SmsChuangLanService create(Throwable throwable) { kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java
@@ -5,7 +5,10 @@ import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.vo.ConsumptionRequest; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @Slf4j @Component public class ConsumptionServiceFallbackFactory implements FallbackFactory<ConsumptionService> { @Override public ConsumptionService create(Throwable throwable) { kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java
@@ -4,9 +4,12 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.oprationcenter.feign.DiagnosticService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Map; @Slf4j @Component public class DiagnosticServiceFallbackFactory implements FallbackFactory<DiagnosticService> { @Override public DiagnosticService create(Throwable throwable) { kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
@@ -3,9 +3,12 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.oprationcenter.feign.ProductOrderService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Map; @Slf4j @Component public class ProductOrderFallbackFactory implements FallbackFactory<ProductOrderService> { @Override public ProductOrderService create(Throwable throwable) { kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
@@ -1,15 +1,16 @@ package com.kidgrow.oprationcenter.feign.fallback; import com.kidgrow.common.model.PageResult; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysRole; import com.kidgrow.oprationcenter.feign.RoleOrganizationService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.List; import java.util.Map; @Slf4j @Component public class RoleOrganizationServiceFallbackFactory implements FallbackFactory<RoleOrganizationService> { @Override public RoleOrganizationService create(Throwable throwable) { kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/pom.xml
@@ -28,7 +28,7 @@ </dependency> <dependency> <groupId>com.kidgrow</groupId> <artifactId>kidgrow-plugin-sms-api</artifactId> <artifactId>kidgrow-filecenter-api</artifactId> </dependency> <dependency> <groupId>com.kidgrow</groupId> kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -330,22 +330,24 @@ /** * 限制管理员只有一个 */ if (sysDoctor.getRoles().contains(CommonConstant.HOSPITAL_ADMIN_ID)) { //查询一个部门下的所有医生 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("is_del", 0); wrapper.eq("enabled", 1); wrapper.eq("department_id", sysDoctor.getDepartmentId()); List<SysDoctor> doctoerList = this.baseMapper.selectList(wrapper); if (doctoerList.size() > 0) { //查询role——user List<Long> collect = doctoerList.stream().map(e -> e.getUserId()).collect(Collectors.toList()); wrapper = new QueryWrapper(); wrapper.in("user_id", collect); List<SysRoleUser> list = this.sysUserRoleMapper.selectList(wrapper); for (SysRoleUser sysRoleUser : list) { if (sysRoleUser.getRoleId().equals(CommonConstant.HOSPITAL_ADMIN_ID)) { flag = true; if (sysDoctor.getDoctorType() != 2) { if (sysDoctor.getRoles().contains(CommonConstant.HOSPITAL_ADMIN_ID)) { //查询一个部门下的所有医生 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("is_del", 0); wrapper.eq("enabled", 1); wrapper.eq("department_id", sysDoctor.getDepartmentId()); List<SysDoctor> doctoerList = this.baseMapper.selectList(wrapper); if (doctoerList.size() > 0) { //查询role——user List<Long> collect = doctoerList.stream().map(e -> e.getUserId()).collect(Collectors.toList()); wrapper = new QueryWrapper(); wrapper.in("user_id", collect); List<SysRoleUser> list = this.sysUserRoleMapper.selectList(wrapper); for (SysRoleUser sysRoleUser : list) { if (sysRoleUser.getRoleId().equals(CommonConstant.HOSPITAL_ADMIN_ID)) { flag = true; } } } } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -97,10 +97,9 @@ @Override public LoginAppUser findByUsername(String username) { SysUser sysUser = this.selectByUsername(username); if(sysUser==null){ if (sysUser == null) { return null; } else { } else { return getLoginAppUser(sysUser); } } @@ -120,25 +119,22 @@ /** * 获取登录用户的一系列信息 hrj 06-04修改 * * @param sysUser * @param sysUserNew * @return */ @Override public LoginAppUser getLoginAppUser(SysUser sysUser) { public LoginAppUser getLoginAppUser(SysUser sysUserNew) { LoginAppUser loginAppUser = new LoginAppUser(); SysUser sysUserNew = this.baseMapper.selectById(sysUser); SysUser sysUser = this.baseMapper.selectById(sysUserNew); if (sysUser != null) { //返回的数据为什么要把密码也返回？清空!! loginAppUser.setPassword(""); loginAppUser.setNewPassword(""); loginAppUser.setOldPassword(""); BeanUtils.copyProperties(sysUser, loginAppUser); //获取用户所属组织机构列表 loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth()); loginAppUser.setDefaultAuth(sysUser.getDefaultAuth()); List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId()); //设置组织机构集合 loginAppUser.setOrganizations(sysOrganizations); if (sysOrganizations != null) { loginAppUser.setOrganizations(sysOrganizations); } List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId()); // 设置角色 loginAppUser.setRoles(sysRoles); @@ -153,15 +149,13 @@ loginAppUser.setPermissions(permissions); } } //是否医院管理员 com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId()); if (sysDoctor.getIsAdminUser() != null) { loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser()); } //医院信息 只有H端要返回的信息 if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) { DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId()); //医院信息 DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId()); if (doctorUserAllVo != null) { loginAppUser.setDoctorUserAllVO(doctorUserAllVo); //是否医院管理员 loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser()); } } return loginAppUser; @@ -723,8 +717,7 @@ if (d) { userRegVo.setDepartmentId(sysDepartment.getId()); //自动充入系统指定的试用套餐 if(!saveProductDetail(sysHospital.getId(),sysDepartment.getId(),sysHospital.getHospitalName(),sysDepartment.getDepartmentName())) { if (!saveProductDetail(sysHospital.getId(), sysDepartment.getId(), sysHospital.getHospitalName(), sysDepartment.getDepartmentName())) { isSuccess = false; expMsg = "套餐充值失败"; } @@ -743,6 +736,7 @@ //业务执行中途出错 if (isReg && !isSuccess) { //注册过程失败 return ResultBody.failed(expMsg); } if (!isReg && departmetAccountsCount(userRegVo.getDepartmentId()) < 1) { @@ -903,22 +897,23 @@ /** * feign客户端调用写入试用套餐 * * @param hospitalId * @param departmentId * @param hospitalName * @param departmentName * @return */ private boolean saveProductDetail(Long hospitalId,Long departmentId,String hospitalName,String departmentName) { Map<String,Object> params=new HashMap<String,Object>(); params.put("hospitalId",hospitalId); params.put("departmentId",departmentId); params.put("hospitalName",hospitalName); params.put("departmentName",departmentName); ResultBody resultBody= productOrderService.saveProductDetail(params); return (boolean)resultBody.getData(); private boolean saveProductDetail(Long hospitalId, Long departmentId, String hospitalName, String departmentName) { Map<String, Object> params = new HashMap<String, Object>(); params.put("hospitalId", hospitalId); params.put("departmentId", departmentId); params.put("hospitalName", hospitalName); params.put("departmentName", departmentName); ResultBody resultBody = productOrderService.saveProductDetail(params); return (boolean) resultBody.getData(); } /** * 获取医院科室下的所有H端有效的医生 * @@ -967,20 +962,18 @@ if (sysDepartment == null) { return 0; } else { Long sysHospitalId=HospitalIdByDepartmentId(depatmentId); if (sysHospitalId>0) { Long sysHospitalId = HospitalIdByDepartmentId(depatmentId); if (sysHospitalId > 0) { List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysHospitalId, depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID); if (hospitalDoctorListVos != null) { int doctorCount = hospitalDoctorListVos.size(); int accountCount = sysDepartment.getAccountsCount().intValue(); int liveCount=accountCount - doctorCount; int liveCount = accountCount - doctorCount; return liveCount; } else { return 0; } } else { } else { return 0; } } @@ -1077,8 +1070,8 @@ QueryWrapper<SysDoctor> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", id); List<SysDoctor> sysDoctors = sysDoctorMapper.selectList(queryWrapper); if(!sysDoctors.isEmpty()){ sysDoctors.forEach(e->{ if (!sysDoctors.isEmpty()) { sysDoctors.forEach(e -> { e.setIsDel(true); sysDoctorMapper.updateById(e); }); kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
@@ -116,6 +116,11 @@ <artifactId>spring-cloud-starter-openfeign</artifactId> <!-- <optional>true</optional>--> </dependency> <dependency> <groupId>io.github.openfeign</groupId> <artifactId>feign-okhttp</artifactId> <version>10.1.0</version> </dependency> <!-- hystrix断路器 --> <dependency> <groupId>org.springframework.cloud</groupId> kidgrow-config/src/main/resources/application.properties
@@ -16,19 +16,27 @@ ##### feign\u914D\u7F6E feign.sentinel.enabled=true feign.hystrix.enabled=false #\u542F\u52A8\u7194\u65AD\u673A\u5236 feign.hystrix.enabled=true #\u542F\u7528OkHttp \u66FF\u6362 URLConnection feign.okhttp.enabled=true #\u542F\u7528\u66FF\u6362JDK\u539F\u751FURLConnection feign.httpclient.enabled=false feign.httpclient.max-connections=1000 feign.httpclient.max-connections-per-route=100 feign.client.config.feignName.connectTimeout=30000 feign.client.config.feignName.readTimeout=30000 feign.client.config.default.connect-timeout=20000 feign.client.config.default.read-timeout=20000 ## \u5F00\u542FFeign\u8BF7\u6C42\u54CD\u5E94\u538B\u7F29 feign.compression.request.enabled=true feign.compression.response.enabled=true ## \u914D\u7F6E\u538B\u7F29\u6587\u6863\u7C7B\u578B\u53CA\u6700\u5C0F\u538B\u7F29\u7684\u6587\u6863\u5927\u5C0F feign.compression.request.mime-types=text/xml,application/xml,application/json feign.compression.request.min-request-size=2048 feign.compression.request.min-request-size=2048 # hystrix.command.default.execution.timeout.enabled: false #\u8D85\u65F6\u65F6\u957F hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 10000 ##### Redis\u914D\u7F6E # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 kidgrow-plugin/kidgrow-plugin-sms/kidgrow-plugin-sms-api/src/main/java/com/kidgrow/sms/feign/fallback/SmsChuangLanServiceFallbackFactory.java
@@ -3,6 +3,8 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.sms.feign.SmsChuangLanService; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.Map; @@ -14,6 +16,8 @@ * @CreateDate: Created in 2020/2/27 22:05 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> */ @Slf4j @Component public class SmsChuangLanServiceFallbackFactory implements FallbackFactory<SmsChuangLanService> { @Override public SmsChuangLanService create(Throwable throwable) { kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -272,7 +272,7 @@ /api-uaa/validata/** urlPermission: #是否开启url级别权限 enable: false enable: true #配置只进行登录认证，不进行url权限认证的api ignoreUrls: > /api-user/menus/current, kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,7 +1,8 @@ // var my_api_server_url = 'http://zuul.kidgrow.com/'; var my_api_server_url = 'http://192.168.2.240:8888/'; // var my_api_server_url = 'http://127.0.0.1:8888/'; // var my_api_server_url = 'http://uat-zuul.kidgrow.cloud/'; // var my_api_server_url = 'http://192.168.2.240:8888/'; var my_api_server_url = 'http://127.0.0.1:8888/'; // var my_api_server_url = 'http://192.168.2.240:8888/'; // var my_api_server_url = 'http://uat.zuul.kidgrow.cloud/'; // var my_api_server_url = 'https://zuul.kidgrow.cloud/'; //var my_api_server_url = 'http://123.57.164.62:8888/';
@@ -56,7 +56,7 @@ <div class="layui-inline"> <label class="layui-form-label">Email</label> <div class="layui-input-block" style="width: 150px;"> <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email" <input name="doctorEmail" type="text" class="layui-input" maxlength="50" lay-verify="required|email" required /> </div> </div> @@ -280,6 +280,7 @@ // 表单提交事件 form.on('submit(user-form-submit)', function (data) { debugger data.field.hospitalId = $("#hospitalId").val(); if (data.field.roleId != null && data.field.roleId != "") { data.field.roles = data.field.roleId.split(','); @@ -340,11 +341,12 @@ } } } } data.field.roleId = null; data.field.roles.forEach(element => { data.field.roles.forEach(element => { element = "" + element }); } data.field.roleId = null; layer.load(2); admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) { layer.closeAll('loading');
