Merge pull request '1' (#4) from cp into develop

develop
prxhap34i 3 months ago
commit 8dd54151d1

@ -1,4 +1,3 @@
package com.controller; package com.controller;
import java.io.File; import java.io.File;
@ -37,7 +36,7 @@ import com.alibaba.fastjson.*;
* *
* @author * @author
* @email * @email
*/ */
@RestController @RestController
@Controller @Controller
@RequestMapping("/yisheng") @RequestMapping("/yisheng")
@ -45,140 +44,134 @@ public class YishengController {
private static final Logger logger = LoggerFactory.getLogger(YishengController.class); private static final Logger logger = LoggerFactory.getLogger(YishengController.class);
@Autowired @Autowired
private YishengService yishengService; private YishengService yishengService; // 医生服务
@Autowired @Autowired
private TokenService tokenService; private TokenService tokenService; // token服务
@Autowired @Autowired
private DictionaryService dictionaryService; private DictionaryService dictionaryService; // 字典服务
//级联表service //级联表service
@Autowired @Autowired
private YonghuService yonghuService; private YonghuService yonghuService; // 用户服务
/** /**
* *
*/ */
@RequestMapping("/page") @RequestMapping("/page")
public R page(@RequestParam Map<String, Object> params, HttpServletRequest request){ public R page(@RequestParam Map<String, Object> params, HttpServletRequest request){
logger.debug("page方法:,,Controller:{},,params:{}",this.getClass().getName(),JSONObject.toJSONString(params)); logger.debug("page方法:,,Controller:{},,params:{}",this.getClass().getName(),JSONObject.toJSONString(params));
String role = String.valueOf(request.getSession().getAttribute("role")); String role = String.valueOf(request.getSession().getAttribute("role")); // 获取用户角色
if(false) if(false)
return R.error(511,"永不会进入"); return R.error(511,"永不会进入");
else if("用户".equals(role)) else if("用户".equals(role))
params.put("yonghuId",request.getSession().getAttribute("userId")); params.put("yonghuId",request.getSession().getAttribute("userId")); // 如果是用户角色添加用户ID参数
else if("医生".equals(role)) else if("医生".equals(role))
params.put("yishengId",request.getSession().getAttribute("userId")); params.put("yishengId",request.getSession().getAttribute("userId")); // 如果是医生角色添加医生ID参数
if(params.get("orderBy")==null || params.get("orderBy")==""){ if(params.get("orderBy")==null || params.get("orderBy")==""){
params.put("orderBy","id"); params.put("orderBy","id"); // 默认按ID排序
} }
PageUtils page = yishengService.queryPage(params); PageUtils page = yishengService.queryPage(params); // 分页查询
//字典表数据转换 //字典表数据转换
List<YishengView> list =(List<YishengView>)page.getList(); List<YishengView> list =(List<YishengView>)page.getList();
for(YishengView c:list){ for(YishengView c:list){
//修改对应字典表字段 //修改对应字典表字段
dictionaryService.dictionaryConvert(c, request); dictionaryService.dictionaryConvert(c, request); // 转换字典字段
} }
return R.ok().put("data", page); return R.ok().put("data", page); // 返回分页数据
} }
/** /**
* *
*/ */
@RequestMapping("/info/{id}") @RequestMapping("/info/{id}")
public R info(@PathVariable("id") Long id, HttpServletRequest request){ public R info(@PathVariable("id") Long id, HttpServletRequest request){
logger.debug("info方法:,,Controller:{},,id:{}",this.getClass().getName(),id); logger.debug("info方法:,,Controller:{},,id:{}",this.getClass().getName(),id);
YishengEntity yisheng = yishengService.selectById(id); YishengEntity yisheng = yishengService.selectById(id); // 根据ID查询医生
if(yisheng !=null){ if(yisheng !=null){
//entity转view //entity转view
YishengView view = new YishengView(); YishengView view = new YishengView();
BeanUtils.copyProperties( yisheng , view );//把实体数据重构到view中 BeanUtils.copyProperties( yisheng , view ); // 把实体数据重构到view中
//修改对应字典表字段 //修改对应字典表字段
dictionaryService.dictionaryConvert(view, request); dictionaryService.dictionaryConvert(view, request); // 转换字典字段
return R.ok().put("data", view); return R.ok().put("data", view); // 返回医生详情
}else { }else {
return R.error(511,"查不到数据"); return R.error(511,"查不到数据"); // 查询不到返回错误
} }
} }
/** /**
* *
*/ */
@RequestMapping("/save") @RequestMapping("/save")
public R save(@RequestBody YishengEntity yisheng, HttpServletRequest request){ public R save(@RequestBody YishengEntity yisheng, HttpServletRequest request){
logger.debug("save方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString()); logger.debug("save方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString());
String role = String.valueOf(request.getSession().getAttribute("role")); String role = String.valueOf(request.getSession().getAttribute("role")); // 获取用户角色
if(false) if(false)
return R.error(511,"永远不会进入"); return R.error(511,"永远不会进入");
// 构建查询条件:用户名或手机号
Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>() Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>()
.eq("username", yisheng.getUsername()) .eq("username", yisheng.getUsername())
.or() .or()
.eq("yisheng_phone", yisheng.getYishengPhone()) .eq("yisheng_phone", yisheng.getYishengPhone());
;
logger.info("sql语句:"+queryWrapper.getSqlSegment()); logger.info("sql语句:"+queryWrapper.getSqlSegment());
YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); // 查询是否已存在
if(yishengEntity==null){ if(yishengEntity==null){
yisheng.setCreateTime(new Date()); yisheng.setCreateTime(new Date()); // 设置创建时间
yisheng.setPassword("123456"); yisheng.setPassword("123456"); // 设置默认密码
yishengService.insert(yisheng); yishengService.insert(yisheng); // 插入新医生数据
return R.ok(); return R.ok(); // 返回成功
}else { }else {
return R.error(511,"账户或者联系方式已经被使用"); return R.error(511,"账户或者联系方式已经被使用"); // 已存在返回错误
} }
} }
/** /**
* *
*/ */
@RequestMapping("/update") @RequestMapping("/update")
public R update(@RequestBody YishengEntity yisheng, HttpServletRequest request){ public R update(@RequestBody YishengEntity yisheng, HttpServletRequest request){
logger.debug("update方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString()); logger.debug("update方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString());
String role = String.valueOf(request.getSession().getAttribute("role")); String role = String.valueOf(request.getSession().getAttribute("role")); // 获取用户角色
// if(false) // 构建查询条件排除当前ID查询用户名或手机号是否已被其他记录使用
// return R.error(511,"永远不会进入");
//根据字段查询是否有相同数据
Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>() Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>()
.notIn("id",yisheng.getId()) .notIn("id",yisheng.getId())
.andNew() .andNew()
.eq("username", yisheng.getUsername()) .eq("username", yisheng.getUsername())
.or() .or()
.eq("yisheng_phone", yisheng.getYishengPhone()) .eq("yisheng_phone", yisheng.getYishengPhone());
;
logger.info("sql语句:"+queryWrapper.getSqlSegment()); logger.info("sql语句:"+queryWrapper.getSqlSegment());
YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); // 查询是否冲突
if("".equals(yisheng.getYishengPhoto()) || "null".equals(yisheng.getYishengPhoto())){ if("".equals(yisheng.getYishengPhoto()) || "null".equals(yisheng.getYishengPhoto())){
yisheng.setYishengPhoto(null); yisheng.setYishengPhoto(null); // 处理空照片
} }
if(yishengEntity==null){ if(yishengEntity==null){
yishengService.updateById(yisheng);//根据id更新 yishengService.updateById(yisheng); // 根据id更新
return R.ok(); return R.ok(); // 返回成功
}else { }else {
return R.error(511,"账户或者联系方式已经被使用"); return R.error(511,"账户或者联系方式已经被使用"); // 冲突返回错误
} }
} }
/** /**
* *
*/ */
@RequestMapping("/delete") @RequestMapping("/delete")
public R delete(@RequestBody Integer[] ids){ public R delete(@RequestBody Integer[] ids){
logger.debug("delete:,,Controller:{},,ids:{}",this.getClass().getName(),ids.toString()); logger.debug("delete:,,Controller:{},,ids:{}",this.getClass().getName(),ids.toString());
yishengService.deleteBatchIds(Arrays.asList(ids)); yishengService.deleteBatchIds(Arrays.asList(ids)); // 批量删除
return R.ok(); return R.ok(); // 返回成功
} }
/** /**
* *
*/ */
@ -186,76 +179,62 @@ public class YishengController {
public R save( String fileName){ public R save( String fileName){
logger.debug("batchInsert方法:,,Controller:{},,fileName:{}",this.getClass().getName(),fileName); logger.debug("batchInsert方法:,,Controller:{},,fileName:{}",this.getClass().getName(),fileName);
try { try {
List<YishengEntity> yishengList = new ArrayList<>();//上传的东西 List<YishengEntity> yishengList = new ArrayList<>(); // 上传的数据列表
Map<String, List<String>> seachFields= new HashMap<>();//要查询的字段 Map<String, List<String>> seachFields= new HashMap<>(); // 要查询的字段
Date date = new Date(); Date date = new Date();
int lastIndexOf = fileName.lastIndexOf("."); int lastIndexOf = fileName.lastIndexOf(".");
if(lastIndexOf == -1){ if(lastIndexOf == -1){
return R.error(511,"该文件没有后缀"); return R.error(511,"该文件没有后缀"); // 文件后缀检查
}else{ }else{
String suffix = fileName.substring(lastIndexOf); String suffix = fileName.substring(lastIndexOf);
if(!".xls".equals(suffix)){ if(!".xls".equals(suffix)){
return R.error(511,"只支持后缀为xls的excel文件"); return R.error(511,"只支持后缀为xls的excel文件"); // 文件格式检查
}else{ }else{
URL resource = this.getClass().getClassLoader().getResource("static/upload/" + fileName);//获取文件路径 URL resource = this.getClass().getClassLoader().getResource("static/upload/" + fileName); // 获取文件路径
File file = new File(resource.getFile()); File file = new File(resource.getFile());
if(!file.exists()){ if(!file.exists()){
return R.error(511,"找不到上传文件,请联系管理员"); return R.error(511,"找不到上传文件,请联系管理员"); // 文件存在检查
}else{ }else{
List<List<String>> dataList = PoiUtil.poiImport(file.getPath());//读取xls文件 List<List<String>> dataList = PoiUtil.poiImport(file.getPath()); // 读取xls文件
dataList.remove(0);//删除第一行,因为第一行是提示 dataList.remove(0); // 删除第一行提示
for(List<String> data:dataList){ for(List<String> data:dataList){
//循环 //循环处理每行数据
YishengEntity yishengEntity = new YishengEntity(); YishengEntity yishengEntity = new YishengEntity();
// yishengEntity.setYishengUuidNumber(data.get(0)); //医生工号 要改的 // 这里注释掉的代码是字段映射示例实际使用时需要根据Excel列对应关系修改
// yishengEntity.setUsername(data.get(0)); //账户 要改的 yishengList.add(yishengEntity); // 添加到列表
// //yishengEntity.setPassword("123456");//密码
// yishengEntity.setYishengName(data.get(0)); //医生名称 要改的 // 把要查询是否重复的字段放入map中
// yishengEntity.setYishengTypes(Integer.valueOf(data.get(0))); //科室 要改的 // 医生工号
// yishengEntity.setZhiweiTypes(Integer.valueOf(data.get(0))); //职位 要改的 if(seachFields.containsKey("yishengUuidNumber")){
// yishengEntity.setYishengZhichneg(data.get(0)); //职称 要改的 List<String> yishengUuidNumber = seachFields.get("yishengUuidNumber");
// yishengEntity.setYishengPhoto("");//照片 yishengUuidNumber.add(data.get(0)); // 要改的
// yishengEntity.setYishengPhone(data.get(0)); //联系方式 要改的 }else{
// yishengEntity.setYishengGuahao(data.get(0)); //挂号须知 要改的 List<String> yishengUuidNumber = new ArrayList<>();
// yishengEntity.setYishengEmail(data.get(0)); //邮箱 要改的 yishengUuidNumber.add(data.get(0)); // 要改的
// yishengEntity.setYishengNewMoney(data.get(0)); //挂号价格 要改的 seachFields.put("yishengUuidNumber",yishengUuidNumber);
// yishengEntity.setYishengContent("");//照片 }
// yishengEntity.setCreateTime(date);//时间 // 账户
yishengList.add(yishengEntity); if(seachFields.containsKey("username")){
List<String> username = seachFields.get("username");
username.add(data.get(0)); // 要改的
//把要查询是否重复的字段放入map中 }else{
//医生工号 List<String> username = new ArrayList<>();
if(seachFields.containsKey("yishengUuidNumber")){ username.add(data.get(0)); // 要改的
List<String> yishengUuidNumber = seachFields.get("yishengUuidNumber"); seachFields.put("username",username);
yishengUuidNumber.add(data.get(0));//要改的 }
}else{ // 联系方式
List<String> yishengUuidNumber = new ArrayList<>(); if(seachFields.containsKey("yishengPhone")){
yishengUuidNumber.add(data.get(0));//要改的 List<String> yishengPhone = seachFields.get("yishengPhone");
seachFields.put("yishengUuidNumber",yishengUuidNumber); yishengPhone.add(data.get(0)); // 要改的
} }else{
//账户 List<String> yishengPhone = new ArrayList<>();
if(seachFields.containsKey("username")){ yishengPhone.add(data.get(0)); // 要改的
List<String> username = seachFields.get("username"); seachFields.put("yishengPhone",yishengPhone);
username.add(data.get(0));//要改的 }
}else{
List<String> username = new ArrayList<>();
username.add(data.get(0));//要改的
seachFields.put("username",username);
}
//联系方式
if(seachFields.containsKey("yishengPhone")){
List<String> yishengPhone = seachFields.get("yishengPhone");
yishengPhone.add(data.get(0));//要改的
}else{
List<String> yishengPhone = new ArrayList<>();
yishengPhone.add(data.get(0));//要改的
seachFields.put("yishengPhone",yishengPhone);
}
} }
//查询是否重复 // 查询是否重复
//医生工号 // 医生工号
List<YishengEntity> yishengEntities_yishengUuidNumber = yishengService.selectList(new EntityWrapper<YishengEntity>().in("yisheng_uuid_number", seachFields.get("yishengUuidNumber"))); List<YishengEntity> yishengEntities_yishengUuidNumber = yishengService.selectList(new EntityWrapper<YishengEntity>().in("yisheng_uuid_number", seachFields.get("yishengUuidNumber")));
if(yishengEntities_yishengUuidNumber.size() >0 ){ if(yishengEntities_yishengUuidNumber.size() >0 ){
ArrayList<String> repeatFields = new ArrayList<>(); ArrayList<String> repeatFields = new ArrayList<>();
@ -264,7 +243,7 @@ public class YishengController {
} }
return R.error(511,"数据库的该表中的 [医生工号] 字段已经存在 存在数据为:"+repeatFields.toString()); return R.error(511,"数据库的该表中的 [医生工号] 字段已经存在 存在数据为:"+repeatFields.toString());
} }
//账户 // 账户
List<YishengEntity> yishengEntities_username = yishengService.selectList(new EntityWrapper<YishengEntity>().in("username", seachFields.get("username"))); List<YishengEntity> yishengEntities_username = yishengService.selectList(new EntityWrapper<YishengEntity>().in("username", seachFields.get("username")));
if(yishengEntities_username.size() >0 ){ if(yishengEntities_username.size() >0 ){
ArrayList<String> repeatFields = new ArrayList<>(); ArrayList<String> repeatFields = new ArrayList<>();
@ -273,7 +252,7 @@ public class YishengController {
} }
return R.error(511,"数据库的该表中的 [账户] 字段已经存在 存在数据为:"+repeatFields.toString()); return R.error(511,"数据库的该表中的 [账户] 字段已经存在 存在数据为:"+repeatFields.toString());
} }
//联系方式 // 联系方式
List<YishengEntity> yishengEntities_yishengPhone = yishengService.selectList(new EntityWrapper<YishengEntity>().in("yisheng_phone", seachFields.get("yishengPhone"))); List<YishengEntity> yishengEntities_yishengPhone = yishengService.selectList(new EntityWrapper<YishengEntity>().in("yisheng_phone", seachFields.get("yishengPhone")));
if(yishengEntities_yishengPhone.size() >0 ){ if(yishengEntities_yishengPhone.size() >0 ){
ArrayList<String> repeatFields = new ArrayList<>(); ArrayList<String> repeatFields = new ArrayList<>();
@ -282,60 +261,53 @@ public class YishengController {
} }
return R.error(511,"数据库的该表中的 [联系方式] 字段已经存在 存在数据为:"+repeatFields.toString()); return R.error(511,"数据库的该表中的 [联系方式] 字段已经存在 存在数据为:"+repeatFields.toString());
} }
yishengService.insertBatch(yishengList); yishengService.insertBatch(yishengList); // 批量插入
return R.ok(); return R.ok();
} }
} }
} }
}catch (Exception e){ }catch (Exception e){
return R.error(511,"批量插入数据异常,请联系管理员"); return R.error(511,"批量插入数据异常,请联系管理员"); // 异常处理
} }
} }
/** /**
* *
*/ */
@IgnoreAuth @IgnoreAuth
@RequestMapping(value = "/login") @RequestMapping(value = "/login")
public R login(String username, String password, String captcha, HttpServletRequest request) { public R login(String username, String password, String captcha, HttpServletRequest request) {
YishengEntity yisheng = yishengService.selectOne(new EntityWrapper<YishengEntity>().eq("username", username)); YishengEntity yisheng = yishengService.selectOne(new EntityWrapper<YishengEntity>().eq("username", username)); // 根据用户名查询
if(yisheng==null || !yisheng.getPassword().equals(password)) if(yisheng==null || !yisheng.getPassword().equals(password))
return R.error("账号或密码不正确"); return R.error("账号或密码不正确"); // 验证账号密码
// // 获取监听器中的字典表 String token = tokenService.generateToken(yisheng.getId(),username, "yisheng", "医生"); // 生成token
// ServletContext servletContext = ContextLoader.getCurrentWebApplicationContext().getServletContext();
// Map<String, Map<Integer, String>> dictionaryMap= (Map<String, Map<Integer, String>>) servletContext.getAttribute("dictionaryMap");
// Map<Integer, String> role_types = dictionaryMap.get("role_types");
// role_types.get(.getRoleTypes());
String token = tokenService.generateToken(yisheng.getId(),username, "yisheng", "医生");
R r = R.ok(); R r = R.ok();
r.put("token", token); r.put("token", token); // 返回token
r.put("role","医生"); r.put("role","医生"); // 返回角色
r.put("username",yisheng.getYishengName()); r.put("username",yisheng.getYishengName()); // 返回医生姓名
r.put("tableName","yisheng"); r.put("tableName","yisheng"); // 返回表名
r.put("userId",yisheng.getId()); r.put("userId",yisheng.getId()); // 返回用户ID
return r; return r;
} }
/** /**
* *
*/ */
@IgnoreAuth @IgnoreAuth
@PostMapping(value = "/register") @PostMapping(value = "/register")
public R register(@RequestBody YishengEntity yisheng){ public R register(@RequestBody YishengEntity yisheng){
// ValidatorUtils.validateEntity(user); // 构建查询条件:用户名或手机号
Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>() Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>()
.eq("username", yisheng.getUsername()) .eq("username", yisheng.getUsername())
.or() .or()
.eq("yisheng_phone", yisheng.getYishengPhone()) .eq("yisheng_phone", yisheng.getYishengPhone());
; YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); // 查询是否已存在
YishengEntity yishengEntity = yishengService.selectOne(queryWrapper);
if(yishengEntity != null) if(yishengEntity != null)
return R.error("账户或者联系方式已经被使用"); return R.error("账户或者联系方式已经被使用"); // 已存在返回错误
yisheng.setYishengNewMoney(0.0); yisheng.setYishengNewMoney(0.0); // 设置初始金额
yisheng.setCreateTime(new Date()); yisheng.setCreateTime(new Date()); // 设置创建时间
yishengService.insert(yisheng); yishengService.insert(yisheng); // 插入新医生
return R.ok(); return R.ok(); // 返回成功
} }
/** /**
@ -344,69 +316,63 @@ public class YishengController {
@GetMapping(value = "/resetPassword") @GetMapping(value = "/resetPassword")
public R resetPassword(Integer id){ public R resetPassword(Integer id){
YishengEntity yisheng = new YishengEntity(); YishengEntity yisheng = new YishengEntity();
yisheng.setPassword("123456"); yisheng.setPassword("123456"); // 重置为默认密码
yisheng.setId(id); yisheng.setId(id);
yishengService.updateById(yisheng); yishengService.updateById(yisheng); // 更新密码
return R.ok(); return R.ok(); // 返回成功
} }
/** /**
* *
*/ */
@IgnoreAuth @IgnoreAuth
@RequestMapping(value = "/resetPass") @RequestMapping(value = "/resetPass")
public R resetPass(String username, HttpServletRequest request) { public R resetPass(String username, HttpServletRequest request) {
YishengEntity yisheng = yishengService.selectOne(new EntityWrapper<YishengEntity>().eq("username", username)); YishengEntity yisheng = yishengService.selectOne(new EntityWrapper<YishengEntity>().eq("username", username)); // 根据用户名查询
if(yisheng!=null){ if(yisheng!=null){
yisheng.setPassword("123456"); yisheng.setPassword("123456"); // 重置为默认密码
boolean b = yishengService.updateById(yisheng); boolean b = yishengService.updateById(yisheng); // 更新密码
if(!b){ if(!b){
return R.error(); return R.error(); // 更新失败
} }
}else{ }else{
return R.error("账号不存在"); return R.error("账号不存在"); // 账号不存在
} }
return R.ok(); return R.ok(); // 返回成功
} }
/** /**
* session * session
*/ */
@RequestMapping("/session") @RequestMapping("/session")
public R getCurrYisheng(HttpServletRequest request){ public R getCurrYisheng(HttpServletRequest request){
Integer id = (Integer)request.getSession().getAttribute("userId"); Integer id = (Integer)request.getSession().getAttribute("userId"); // 获取session中的用户ID
YishengEntity yisheng = yishengService.selectById(id); YishengEntity yisheng = yishengService.selectById(id); // 查询用户信息
if(yisheng !=null){ if(yisheng !=null){
//entity转view //entity转view
YishengView view = new YishengView(); YishengView view = new YishengView();
BeanUtils.copyProperties( yisheng , view );//把实体数据重构到view中 BeanUtils.copyProperties( yisheng , view ); // 复制属性到view
//修改对应字典表字段 //修改对应字典表字段
dictionaryService.dictionaryConvert(view, request); dictionaryService.dictionaryConvert(view, request); // 转换字典字段
return R.ok().put("data", view); return R.ok().put("data", view); // 返回用户信息
}else { }else {
return R.error(511,"查不到数据"); return R.error(511,"查不到数据"); // 查询不到返回错误
} }
} }
/** /**
* 退 * 退
*/ */
@GetMapping(value = "logout") @GetMapping(value = "logout")
public R logout(HttpServletRequest request) { public R logout(HttpServletRequest request) {
request.getSession().invalidate(); request.getSession().invalidate(); // 使session失效
return R.ok("退出成功"); return R.ok("退出成功"); // 返回退出成功
} }
/** /**
* *
*/ */
@IgnoreAuth @IgnoreAuth
@RequestMapping("/list") @RequestMapping("/list")
public R list(@RequestParam Map<String, Object> params, HttpServletRequest request){ public R list(@RequestParam Map<String, Object> params, HttpServletRequest request){
@ -416,60 +382,55 @@ public class YishengController {
if(StringUtil.isEmpty(String.valueOf(params.get("orderBy")))){ if(StringUtil.isEmpty(String.valueOf(params.get("orderBy")))){
params.put("orderBy","id"); params.put("orderBy","id");
} }
PageUtils page = yishengService.queryPage(params); PageUtils page = yishengService.queryPage(params); // 分页查询
//字典表数据转换 //字典表数据转换
List<YishengView> list =(List<YishengView>)page.getList(); List<YishengView> list =(List<YishengView>)page.getList();
for(YishengView c:list) for(YishengView c:list)
dictionaryService.dictionaryConvert(c, request); //修改对应字典表字段 dictionaryService.dictionaryConvert(c, request); // 转换字典字段
return R.ok().put("data", page); return R.ok().put("data", page); // 返回分页数据
} }
/** /**
* *
*/ */
@RequestMapping("/detail/{id}") @RequestMapping("/detail/{id}")
public R detail(@PathVariable("id") Long id, HttpServletRequest request){ public R detail(@PathVariable("id") Long id, HttpServletRequest request){
logger.debug("detail方法:,,Controller:{},,id:{}",this.getClass().getName(),id); logger.debug("detail方法:,,Controller:{},,id:{}",this.getClass().getName(),id);
YishengEntity yisheng = yishengService.selectById(id); YishengEntity yisheng = yishengService.selectById(id); // 根据ID查询
if(yisheng !=null){ if(yisheng !=null){
//entity转view
YishengView view = new YishengView();
//entity转view BeanUtils.copyProperties( yisheng , view ); // 复制属性到view
YishengView view = new YishengView();
BeanUtils.copyProperties( yisheng , view );//把实体数据重构到view中
//修改对应字典表字段 //修改对应字典表字段
dictionaryService.dictionaryConvert(view, request); dictionaryService.dictionaryConvert(view, request); // 转换字典字段
return R.ok().put("data", view); return R.ok().put("data", view); // 返回详情
}else { }else {
return R.error(511,"查不到数据"); return R.error(511,"查不到数据"); // 查询不到返回错误
} }
} }
/** /**
* *
*/ */
@RequestMapping("/add") @RequestMapping("/add")
public R add(@RequestBody YishengEntity yisheng, HttpServletRequest request){ public R add(@RequestBody YishengEntity yisheng, HttpServletRequest request){
logger.debug("add方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString()); logger.debug("add方法:,,Controller:{},,yisheng:{}",this.getClass().getName(),yisheng.toString());
// 构建查询条件:用户名或手机号
Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>() Wrapper<YishengEntity> queryWrapper = new EntityWrapper<YishengEntity>()
.eq("username", yisheng.getUsername()) .eq("username", yisheng.getUsername())
.or() .or()
.eq("yisheng_phone", yisheng.getYishengPhone()) .eq("yisheng_phone", yisheng.getYishengPhone());
;
logger.info("sql语句:"+queryWrapper.getSqlSegment()); logger.info("sql语句:"+queryWrapper.getSqlSegment());
YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); YishengEntity yishengEntity = yishengService.selectOne(queryWrapper); // 查询是否已存在
if(yishengEntity==null){ if(yishengEntity==null){
yisheng.setCreateTime(new Date()); yisheng.setCreateTime(new Date()); // 设置创建时间
yisheng.setPassword("123456"); yisheng.setPassword("123456"); // 设置默认密码
yishengService.insert(yisheng); yishengService.insert(yisheng); // 插入新医生
return R.ok(); return R.ok(); // 返回成功
}else { }else {
return R.error(511,"账户或者联系方式已经被使用"); return R.error(511,"账户或者联系方式已经被使用"); // 已存在返回错误
} }
} }
}
}

@ -21,397 +21,443 @@ import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.enums.IdType;
/** /**
* *
* Serializable 便
* *
* @author * @author
* @email * @email
*/ */
@TableName("yisheng") @TableName("yisheng") // 表明该实体类对应数据库中的表名为 "yisheng"
public class YishengEntity<T> implements Serializable { public class YishengEntity<T> implements Serializable {
// 序列化版本号,用于保证序列化和反序列化过程中对象版本的一致性
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
*
* YishengEntity
*/
public YishengEntity() {
public YishengEntity() { }
}
public YishengEntity(T t) {
try {
BeanUtils.copyProperties(this, t);
} catch (IllegalAccessException | InvocationTargetException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
/**
*
* t YishengEntity
*
* @param t
*/
public YishengEntity(T t) {
try {
// 使用 BeanUtils 工具类将对象 t 的属性复制到当前对象
BeanUtils.copyProperties(this, t);
} catch (IllegalAccessException | InvocationTargetException e) {
// 若复制属性过程中出现异常,打印异常堆栈信息
e.printStackTrace();
}
}
/** /**
* *
*
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO) // 表示该字段为主键,且采用自增方式生成
@TableField(value = "id") @TableField(value = "id") // 表明该属性对应数据库表中的字段名为 "id"
private Integer id; private Integer id;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_uuid_number") @TableField(value = "yisheng_uuid_number") // 表明该属性对应数据库表中的字段名为 "yisheng_uuid_number"
private String yishengUuidNumber; private String yishengUuidNumber;
/** /**
* *
* 使
*/ */
@TableField(value = "username") @TableField(value = "username") // 表明该属性对应数据库表中的字段名为 "username"
private String username; private String username;
/** /**
* *
* 使
*/ */
@TableField(value = "password") @TableField(value = "password") // 表明该属性对应数据库表中的字段名为 "password"
private String password; private String password;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_name") @TableField(value = "yisheng_name") // 表明该属性对应数据库表中的字段名为 "yisheng_name"
private String yishengName; private String yishengName;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_types") @TableField(value = "yisheng_types") // 表明该属性对应数据库表中的字段名为 "yisheng_types"
private Integer yishengTypes; private Integer yishengTypes;
/** /**
* *
*
*/ */
@TableField(value = "zhiwei_types") @TableField(value = "zhiwei_types") // 表明该属性对应数据库表中的字段名为 "zhiwei_types"
private Integer zhiweiTypes; private Integer zhiweiTypes;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_zhichneg") @TableField(value = "yisheng_zhichneg") // 表明该属性对应数据库表中的字段名为 "yisheng_zhichneg"
private String yishengZhichneg; private String yishengZhichneg;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_photo") @TableField(value = "yisheng_photo") // 表明该属性对应数据库表中的字段名为 "yisheng_photo"
private String yishengPhoto; private String yishengPhoto;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_phone") @TableField(value = "yisheng_phone") // 表明该属性对应数据库表中的字段名为 "yisheng_phone"
private String yishengPhone; private String yishengPhone;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_guahao") @TableField(value = "yisheng_guahao") // 表明该属性对应数据库表中的字段名为 "yisheng_guahao"
private String yishengGuahao; private String yishengGuahao;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_email") @TableField(value = "yisheng_email") // 表明该属性对应数据库表中的字段名为 "yisheng_email"
private String yishengEmail; private String yishengEmail;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_new_money") @TableField(value = "yisheng_new_money") // 表明该属性对应数据库表中的字段名为 "yisheng_new_money"
private Double yishengNewMoney; private Double yishengNewMoney;
/** /**
* *
*
*/ */
@TableField(value = "yisheng_content") @TableField(value = "yisheng_content") // 表明该属性对应数据库表中的字段名为 "yisheng_content"
private String yishengContent; private String yishengContent;
/** /**
* *
*
*/ */
@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") // 用于将日期格式化为指定格式,方便前端展示
@DateTimeFormat @DateTimeFormat // 用于将前端传递的日期字符串解析为 Date 类型
@TableField(value = "create_time",fill = FieldFill.INSERT) @TableField(value = "create_time",fill = FieldFill.INSERT) // 表明该属性对应数据库表中的字段名为 "create_time",且在插入数据时自动填充
private Date createTime; private Date createTime;
/** /**
* *
*/ *
* @return
*/
public Integer getId() { public Integer getId() {
return id; return id;
} }
/** /**
* *
*/ *
* @param id
*/
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengUuidNumber() { public String getYishengUuidNumber() {
return yishengUuidNumber; return yishengUuidNumber;
} }
/** /**
* *
*/ *
* @param yishengUuidNumber
*/
public void setYishengUuidNumber(String yishengUuidNumber) { public void setYishengUuidNumber(String yishengUuidNumber) {
this.yishengUuidNumber = yishengUuidNumber; this.yishengUuidNumber = yishengUuidNumber;
} }
/** /**
* *
*/ *
* @return
*/
public String getUsername() { public String getUsername() {
return username; return username;
} }
/** /**
* *
*/ *
* @param username
*/
public void setUsername(String username) { public void setUsername(String username) {
this.username = username; this.username = username;
} }
/** /**
* *
*/ *
* @return
*/
public String getPassword() { public String getPassword() {
return password; return password;
} }
/** /**
* *
*/ *
* @param password
*/
public void setPassword(String password) { public void setPassword(String password) {
this.password = password; this.password = password;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengName() { public String getYishengName() {
return yishengName; return yishengName;
} }
/** /**
* *
*/ *
* @param yishengName
*/
public void setYishengName(String yishengName) { public void setYishengName(String yishengName) {
this.yishengName = yishengName; this.yishengName = yishengName;
} }
/** /**
* *
*/ *
* @return
*/
public Integer getYishengTypes() { public Integer getYishengTypes() {
return yishengTypes; return yishengTypes;
} }
/** /**
* *
*/ *
* @param yishengTypes
*/
public void setYishengTypes(Integer yishengTypes) { public void setYishengTypes(Integer yishengTypes) {
this.yishengTypes = yishengTypes; this.yishengTypes = yishengTypes;
} }
/** /**
* *
*/ *
* @return
*/
public Integer getZhiweiTypes() { public Integer getZhiweiTypes() {
return zhiweiTypes; return zhiweiTypes;
} }
/** /**
* *
*/ *
* @param zhiweiTypes
*/
public void setZhiweiTypes(Integer zhiweiTypes) { public void setZhiweiTypes(Integer zhiweiTypes) {
this.zhiweiTypes = zhiweiTypes; this.zhiweiTypes = zhiweiTypes;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengZhichneg() { public String getYishengZhichneg() {
return yishengZhichneg; return yishengZhichneg;
} }
/** /**
* *
*/ *
* @param yishengZhichneg
*/
public void setYishengZhichneg(String yishengZhichneg) { public void setYishengZhichneg(String yishengZhichneg) {
this.yishengZhichneg = yishengZhichneg; this.yishengZhichneg = yishengZhichneg;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengPhoto() { public String getYishengPhoto() {
return yishengPhoto; return yishengPhoto;
} }
/** /**
* *
*/ *
* @param yishengPhoto
*/
public void setYishengPhoto(String yishengPhoto) { public void setYishengPhoto(String yishengPhoto) {
this.yishengPhoto = yishengPhoto; this.yishengPhoto = yishengPhoto;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengPhone() { public String getYishengPhone() {
return yishengPhone; return yishengPhone;
} }
/** /**
* *
*/ *
* @param yishengPhone
*/
public void setYishengPhone(String yishengPhone) { public void setYishengPhone(String yishengPhone) {
this.yishengPhone = yishengPhone; this.yishengPhone = yishengPhone;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengGuahao() { public String getYishengGuahao() {
return yishengGuahao; return yishengGuahao;
} }
/** /**
* *
*/ *
* @param yishengGuahao
*/
public void setYishengGuahao(String yishengGuahao) { public void setYishengGuahao(String yishengGuahao) {
this.yishengGuahao = yishengGuahao; this.yishengGuahao = yishengGuahao;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengEmail() { public String getYishengEmail() {
return yishengEmail; return yishengEmail;
} }
/** /**
* *
*/ *
* @param yishengEmail
*/
public void setYishengEmail(String yishengEmail) { public void setYishengEmail(String yishengEmail) {
this.yishengEmail = yishengEmail; this.yishengEmail = yishengEmail;
} }
/** /**
* *
*/ *
* @return
*/
public Double getYishengNewMoney() { public Double getYishengNewMoney() {
return yishengNewMoney; return yishengNewMoney;
} }
/** /**
* *
*/ *
* @param yishengNewMoney
*/
public void setYishengNewMoney(Double yishengNewMoney) { public void setYishengNewMoney(Double yishengNewMoney) {
this.yishengNewMoney = yishengNewMoney; this.yishengNewMoney = yishengNewMoney;
} }
/** /**
* *
*/ *
* @return
*/
public String getYishengContent() { public String getYishengContent() {
return yishengContent; return yishengContent;
} }
/** /**
* *
*/ *
* @param yishengContent
*/
public void setYishengContent(String yishengContent) { public void setYishengContent(String yishengContent) {
this.yishengContent = yishengContent; this.yishengContent = yishengContent;
} }
/** /**
* *
*/ *
* @return
*/
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/** /**
* *
*/ *
* @param createTime
*/
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* toString
* 便
*
* @return
*/
@Override @Override
public String toString() { public String toString() {
return "Yisheng{" + return "Yisheng{" +
"id=" + id + "id=" + id +
", yishengUuidNumber=" + yishengUuidNumber + ", yishengUuidNumber=" + yishengUuidNumber +
", username=" + username + ", username=" + username +
", password=" + password + ", password=" + password +
", yishengName=" + yishengName + ", yishengName=" + yishengName +
", yishengTypes=" + yishengTypes + ", yishengTypes=" + yishengTypes +
", zhiweiTypes=" + zhiweiTypes + ", zhiweiTypes=" + zhiweiTypes +
", yishengZhichneg=" + yishengZhichneg + ", yishengZhichneg=" + yishengZhichneg +
", yishengPhoto=" + yishengPhoto + ", yishengPhoto=" + yishengPhoto +
", yishengPhone=" + yishengPhone + ", yishengPhone=" + yishengPhone +
", yishengGuahao=" + yishengGuahao + ", yishengGuahao=" + yishengGuahao +
", yishengEmail=" + yishengEmail + ", yishengEmail=" + yishengEmail +
", yishengNewMoney=" + yishengNewMoney + ", yishengNewMoney=" + yishengNewMoney +
", yishengContent=" + yishengContent + ", yishengContent=" + yishengContent +
", createTime=" + createTime + ", createTime=" + createTime +
"}"; "}";
} }
} }

@ -8,7 +8,6 @@ import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
/** /**
* *
* *
@ -16,312 +15,194 @@ import java.io.Serializable;
* ModelAndView model * ModelAndView model
*/ */
public class YishengModel implements Serializable { public class YishengModel implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L; // 序列化版本UID用于版本控制
/** /**
* *
*/ */
private Integer id; private Integer id;
/** /**
* *
*/ */
private String yishengUuidNumber; private String yishengUuidNumber;
/** /**
* *
*/ */
private String username; private String username;
/** /**
* *
*/ */
private String password; private String password;
/** /**
* *
*/ */
private String yishengName; private String yishengName;
/** /**
* *
* 使Integer
*/ */
private Integer yishengTypes; private Integer yishengTypes;
/** /**
* *
* 使Integer
*/ */
private Integer zhiweiTypes; private Integer zhiweiTypes;
/** /**
* *
*/ */
private String yishengZhichneg; private String yishengZhichneg;
/** /**
* *
* URL
*/ */
private String yishengPhoto; private String yishengPhoto;
/** /**
* *
*/ */
private String yishengPhone; private String yishengPhone;
/** /**
* *
*
*/ */
private String yishengGuahao; private String yishengGuahao;
/** /**
* *
*/ */
private String yishengEmail; private String yishengEmail;
/** /**
* *
*/ */
private Double yishengNewMoney; private Double yishengNewMoney;
/** /**
* *
*
*/ */
private String yishengContent; private String yishengContent;
/** /**
* show1 show2 photoShow * show1 show2 photoShow
* 使@JsonFormat@DateTimeFormat
*/ */
@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
@DateTimeFormat @DateTimeFormat
private Date createTime; private Date createTime;
/** /**
* * ID
*/ * @return ID
*/
public Integer getId() { public Integer getId() {
return id; return id;
} }
/** /**
* * ID
*/ * @param id ID
*/
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
/** /**
* *
*/ * @return
*/
public String getYishengUuidNumber() { public String getYishengUuidNumber() {
return yishengUuidNumber; return yishengUuidNumber;
} }
/** /**
* *
*/ * @param yishengUuidNumber
*/
public void setYishengUuidNumber(String yishengUuidNumber) { public void setYishengUuidNumber(String yishengUuidNumber) {
this.yishengUuidNumber = yishengUuidNumber; this.yishengUuidNumber = yishengUuidNumber;
} }
/** /**
* *
*/ * @return
*/
public String getUsername() { public String getUsername() {
return username; return username;
} }
/** /**
* *
*/ * @param username
*/
public void setUsername(String username) { public void setUsername(String username) {
this.username = username; this.username = username;
} }
/** /**
* *
*/ * @return
*/
public String getPassword() { public String getPassword() {
return password; return password;
} }
/** /**
* *
*/ * @param password
*/
public void setPassword(String password) { public void setPassword(String password) {
this.password = password; this.password = password;
} }
/** /**
* *
*/ * @return
*/
public String getYishengName() { public String getYishengName() {
return yishengName; return yishengName;
} }
/** /**
* *
*/ * @param yishengName
*/
public void setYishengName(String yishengName) { public void setYishengName(String yishengName) {
this.yishengName = yishengName; this.yishengName = yishengName;
} }
/** /**
* *
*/ * @return
*/
public Integer getYishengTypes() { public Integer getYishengTypes() {
return yishengTypes; return yishengTypes;
} }
/** /**
* *
*/ * @param yishengTypes
*/
public void setYishengTypes(Integer yishengTypes) { public void setYishengTypes(Integer yishengTypes) {
this.yishengTypes = yishengTypes; this.yishengTypes = yishengTypes;
} }
/** /**
* *
*/ * @return
*/
public Integer getZhiweiTypes() { public Integer getZhiweiTypes() {
return zhiweiTypes; return zhiweiTypes;
} }
/**
/** *
*
*/
public void setZhiweiTypes(Integer zhiweiTypes) {
this.zhiweiTypes = zhiweiTypes;
}
/**
*
*/
public String getYishengZhichneg() {
return yishengZhichneg;
}
/**
*
*/
public void setYishengZhichneg(String yishengZhichneg) {
this.yishengZhichneg = yishengZhichneg;
}
/**
*
*/
public String getYishengPhoto() {
return yishengPhoto;
}
/**
*
*/
public void setYishengPhoto(String yishengPhoto) {
this.yishengPhoto = yishengPhoto;
}
/**
*
*/
public String getYishengPhone() {
return yishengPhone;
}
/**
*
*/
public void setYishengPhone(String yishengPhone) {
this.yishengPhone = yishengPhone;
}
/**
*
*/
public String getYishengGuahao() {
return yishengGuahao;
}
/**
*
*/
public void setYishengGuahao(String yishengGuahao) {
this.yishengGuahao = yishengGuahao;
}
/**
*
*/
public String getYishengEmail() {
return yishengEmail;
}
/**
*
*/
public void setYishengEmail(String yishengEmail) {
this.yishengEmail = yishengEmail;
}
/**
*
*/
public Double getYishengNewMoney() {
return yishengNewMoney;
}
/**
*
*/
public void setYishengNewMoney(Double yishengNewMoney) {
this.yishengNewMoney = yishengNewMoney;
}
/**
*
*/
public String getYishengContent() {
return yishengContent;
}
/**
*
*/
public void setYishengContent(String yishengContent) {
this.yishengContent = yishengContent;
}
/**
* show1 show2 photoShow
*/
public Date getCreateTime() {
return createTime;
}
/**
* show1 show2 photoShow
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
Loading…
Cancel
Save