新增接口：判断用户名是否管理员，获取指定医院的所有有效套餐的读片总量

houruijun

2020-06-15 e72354e510075bf40b388c591af15efd8d2244b0

新增接口：判断用户名是否管理员，获取指定医院的所有有效套餐的读片总量

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java

@@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -96,7 +97,7 @@
    }

    /**
     * 统计用户套餐使用情况
     * 统计用户所有套餐剩余
     * @param hospitalId
     * @param departmentId
     * @return
@@ -108,16 +109,25 @@
            Map<String,Object> selectMap=new HashMap<>();
            selectMap.put("hospitalId",hospitalId);
            List<ProductOrderJoinDetail>  productOrderDetailList=productOrderDetailService.findAllList(selectMap);
            Long userAICount=0l;
            if (productOrderDetailList.size()>0) {
                //
                //包含共享的数据
                List<ProductOrderJoinDetail> productOrderJoinDetailListShare=productOrderDetailList.stream().filter(f->f.getIsShare()).collect(Collectors.toList());
                //科室私有的数据
                List<ProductOrderJoinDetail> productOrderJoinDetailsListDep=productOrderDetailList.stream().filter((f->departmentId.equals(f.getDepartmentId())&&f.getIsShare()==false)).collect(Collectors.toList());
                //本医院可共享的读片总量
                Long shareCount=productOrderJoinDetailListShare.stream().collect(Collectors.summingLong(ProductOrderJoinDetail::getAilightCount));
                //本科室私有读片总量
                Long depCount=productOrderJoinDetailsListDep.stream().collect(Collectors.summingLong(ProductOrderJoinDetail::getAilightCount));
                //可用的总量
                userAICount=shareCount+depCount;
            }
            return null;
            return ResultBody.ok().data(userAICount);
        }
        else
        {
            return ResultBody.failed("医院和科室数据有误！");
        }

    }

    /**

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -146,33 +146,21 @@
        <where>
            <!--查询条件自行添加-->
            DE.is_del=0 and DE.ailight_count>0 and DE.pro_begintime &lt;=now() and DE.pro_endtime >=now() and DE.enabled=1
            <if test="p.recordCount != null and p.recordCount !=''">
                and DE.record_count > #{p.recordCount}
            </if>
            <if test="p.hospitalId != null and p.hospitalId !=''">
                and DE.hospital_id = #{p.hospitalId}
                and PRO.hospital_id = #{p.hospitalId}
            </if>
        </where>
    </sql>
    <!--查询产品的购买记录-->
    <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
        SELECT
        DE.id,
        DE.ailight_count,
        DE.order_id,
        DE.pro_name,
        DE.record_count,
        DE.is_share,
        DE.pro_begintime,
        DE.pro_endtime,
        DE.pro_id,
        DE.create_time,
        DE.is_del,
        DE.enabled,
        PRO.hospital_Id,
        PRO.hospital_name,
        PRO.department_id,
        PRO.department_name,
        DE.pro_type
        FROM
        product_order_detail DE

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java

@@ -127,6 +127,14 @@
    }

    /**
     * 查询用户的套餐剩余量
     */
    @ApiOperation(value = "查询")
    @GetMapping("/biUserNowProduct")
    public ResultBody biUserNowProduct(@RequestParam long hospitalId, Long departmentId) {
        return productOrderRecordService.biUserNowProduct(hospitalId,departmentId);
    }
    /**
     * 查询
     */
    @ApiOperation(value = "查询")

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysDoctorMapper.java

@@ -31,4 +31,10 @@
     * @return SysDoctor对象
     */
    SysDoctor findByObject(@Param("p") SysDoctor sysDoctor);
    /**
     * 查询账户名是否管理员
     * @param userName
     * @return SysDoctor
     */
    SysDoctor userIsAdmin(String userName);
}

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

@@ -50,5 +50,11 @@
     * @return
     */
    ResultBody setAdminDoctor(Map<String, Object> map);
    /**
     * H端检查用户名是否管理员
     * @param userName
     * @return
     */
    ResultBody userIsAdmin(String userName);
}


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

@@ -5,6 +5,7 @@
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.mapper.SysDoctorMapper;
@@ -288,4 +289,26 @@
            return ResultBody.failed("业务参数有误！").data(false);
        }
    }

    /**
     * 判断用户名是否管理员
     * @param userName
     * @return
     */
    @Override
    public ResultBody userIsAdmin(String userName) {
        if (StringUtils.isNotBlank(userName)) {
            SysDoctor sysDoctor= baseMapper.userIsAdmin(userName);
            if (sysDoctor != null) {
                return ResultBody.ok().data(sysDoctor.getIsAdminUser());
            }
            else
            {
                return ResultBody.failed().data(false);
            }
        }else
        {
            return ResultBody.failed("用户名不能为空！").data(false);
        }
    }
}

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

@@ -101,8 +101,8 @@
    }

    /**
     *
     * 获取登录用户的一系列信息 hrj 06-04修改
     *
     * @param sysUser
     * @return
     */
@@ -234,8 +234,7 @@
        baseMapper.updateById(user);
        if (isdefault){
            return ResultBody.ok().msg("密码重置成功！").data(newPassword);
        }
        else{
        } else {
            return ResultBody.ok().msg("密码修改成功！").data(true);
        }
    }
@@ -447,6 +446,7 @@

    /**
     * 通过手机号  修改密码
     *
     * @param map
     * @return
     */
@@ -503,6 +503,7 @@

    /**
     * 通过手机号 注册验证
     *
     * @param map
     * @return
     */
@@ -525,6 +526,7 @@

    /**
     * 通过手机号修改 手机号
     *
     * @param map
     * @return
     */
@@ -592,6 +594,7 @@

    /**
     * 根据userid获取用户其它信息
     *
     * @param userId
     * @return
     */
@@ -602,8 +605,10 @@
        }
        return ResultBody.ok().data(null);
    }

    /**
     * H端用户注册  管理员添加用户
     *
     * @param userRegVo
     * @return
     */
@@ -658,19 +663,13 @@
                    boolean d=departmentService.save(sysDepartment);
                    if (!d) {
                        return ResultBody.failed("科室数据写入失败");
                    }
                    else
                    {
                    } else {
                        userRegVo.setDepartmentId(sysDepartment.getId());
                    }
                }
                else
                {
                } else {
                    return ResultBody.failed("医院数据写入失败");
                }
            }
            else
            {
            } else {
                return ResultBody.failed("组织数据写入失败");
            }
        }
@@ -684,8 +683,7 @@
            sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
            sysUser.setDefaultAuth(true);
            userRegVo.setPassword(defaultPassWord);
        }
        else {
        } else {
            sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
            sysUser.setDefaultAuth(false);
        }
@@ -694,17 +692,14 @@
        sysUser.setEnabled(true);
        if (StringUtils.isNotBlank(userRegVo.getType())) {
            sysUser.setType(userRegVo.getType());
        }
        else
        {
        } else {
            sysUser.setType(UserType.DOCTOR.name());
        }
        sysUser.setHAdminUser(false);
        sysUser.setOpenId(userRegVo.getOpenId());
        sysUser.setDel(false);
        boolean u=this.save(sysUser);
        if(u)
        {
        if (u) {
            //写入职务数据
            if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
                //检查医生职务是否存在
@@ -718,9 +713,7 @@
                            break;
                        }
                    }
                }
                else
                {
                } else {
                    //创建字典数据
                    SysDictionaries sysDictionaries=new SysDictionaries();
                    sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
@@ -755,44 +748,41 @@
            if (sysDoctorMapper.insert(sysDoctor)==1) {
                sysUser.setPassword(userRegVo.getPassword());
                return ResultBody.ok(200,"注册成功").data(sysUser);
            }
            else
            {
            } else {
                return ResultBody.failed("医生数据写入失败");
            }
        }
        else
        {
        } else {
            return ResultBody.failed("用户数据写入失败");
        }
    }

    /**
     * 检查手机号是否已经注册 true存在  false不存在
     *
     * @param phone
     * @return
     */
    private boolean phoneIsUsed(String phone)
    {
    private boolean phoneIsUsed(String phone) {
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("mobile", phone);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
        return (sysUsers.size()>0);
    }

    /**
     * 检查用户登录名是否已经注册 true存在  false不存在
     *
     * @param userName
     * @return
     */
    private boolean userNameIsUsed(String userName)
    {
    private boolean userNameIsUsed(String userName) {
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("username", userName);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
        return (sysUsers.size()>0);
    }
    public com.kidgrow.usercenter.model.SysDoctor findDoctorByUserId(Long userId)
    {

    public com.kidgrow.usercenter.model.SysDoctor findDoctorByUserId(Long userId) {
        Map<String, Object> doctorMap = new HashMap<>();
        doctorMap.put("user_id",userId);
        doctorMap.put("enabled",1);
@@ -804,4 +794,12 @@
        return new com.kidgrow.usercenter.model.SysDoctor();
    }

    public ResultBody userIsAdmin(String userName) {

        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("username", userName);
        List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);

        return null;
    }
}

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

@@ -112,4 +112,20 @@
        <include refid="where"/>
        order by id desc
    </select>

    <select id="userIsAdmin" parameterType="string" resultType="com.kidgrow.usercenter.model.SysDoctor">
        SELECT
        is_admin_user
        FROM
            sys_doctor
        WHERE
        user_id IN (
        SELECT
            id
        FROM
            sys_user
        WHERE
        username = #{userName}
        OR mobile = #{userName})
    </select>
</mapper>

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

@@ -72,7 +72,8 @@
        order by t.id desc
    </select>
    <select id="selectCountByMap" parameterType="map" resultType="integer">
        select count(*) from  sys_user t <include refid="where_map" />
        select count(*) from sys_user t
        <include refid="where_map"/>
    </select>

    <select id="findAppointUsers" parameterType="integer" resultType="com.kidgrow.common.model.SysUser">
@@ -97,6 +98,7 @@
                'opration')
            </if>
    </select>

    <select  id="findDoctorUserAllData"  resultType="com.kidgrow.common.model.DoctorUserAll">
        SELECT sysuser.id,
        sysdoctor.doctor_name,

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java

@@ -71,6 +71,14 @@
        return ResultBody.ok().data(model).msg("查询成功");
    }
    /**
     * 判断用户名是否管理员
     */
    @ApiOperation(value = "判断用户名是否管理员")
    @GetMapping("/userName")
    public ResultBody findById(@RequestParam String userName) {
        return sysDoctorService.userIsAdmin(userName);
    }
    /**
     * 根据 Map 查询
     */
    @ApiOperation(value = "查询")