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

houruijun

2020-08-21 cdf8f1e691531a6fb1c3462d0ad70df7f68c0047

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

 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/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;
                        }
                    }
                }
            }
@@ -465,8 +467,9 @@
                    sysRoleUser.setRoleId(CommonConstant.HOSPITAL_DOCTOR_ID);
                    QueryWrapper queryWrapper = new QueryWrapper();
                    queryWrapper.eq("user_id", adminId);
                    queryWrapper.eq("role_id", CommonConstant.HOSPITAL_ADMIN_ID);
                    int update = sysUserRoleMapper.update(sysRoleUser, queryWrapper);
//                    queryWrapper.eq("role_id", CommonConstant.HOSPITAL_ADMIN_ID);
                    int delete = sysUserRoleMapper.delete(queryWrapper);
                    int update = sysUserRoleMapper.insert(sysRoleUser);
                    //现将操作人员设为非管理角色
                    sysDoctor.setIsAdminUser(false);
                    if (baseMapper.updateById(sysDoctor) > 0) {
@@ -480,8 +483,9 @@
                                sysRoleUser.setRoleId(CommonConstant.HOSPITAL_ADMIN_ID);
                                queryWrapper = new QueryWrapper();
                                queryWrapper.eq("user_id", sysDoctor.getUserId());
                                queryWrapper.eq("role_id", CommonConstant.HOSPITAL_DOCTOR_ID);
                                sysUserRoleMapper.update(sysRoleUser, queryWrapper);
//                                queryWrapper.eq("role_id", CommonConstant.HOSPITAL_DOCTOR_ID);
                                sysUserRoleMapper.delete(queryWrapper);
                                sysUserRoleMapper.insert(sysRoleUser);
                                sysDoctor.setIsAdminUser(true);
                                if (baseMapper.updateById(sysDoctor) > 0) {
                                    return ResultBody.ok().data(true).msg("管理员设置成功！");

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -466,8 +466,8 @@

    @Override
    public ResultBody findCountByMap(Map<String, Object> map) {
        map.put("enable", 1);
        map.put("is_del", 0);
        map.put("enable",1);
        map.put("isDel",0);
        Integer integer = baseMapper.selectCountByMap(map);
        return ResultBody.ok().data(integer);
    }

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -36,6 +36,9 @@
    </sql>
    <sql id="where_map">
        <where>
            <if test="u.isDel != null">
                and t.is_del = #{u.isDel}
            </if>
            <if test="u.id != null and u.id != ''">
                and t.id like concat('%', #{u.id}, '%')
            </if>

 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-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/';


 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html

@@ -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');