Sfoglia il codice sorgente

添加教练员相关

小么熊🐻 1 anno fa
parent
commit
7409977126

+ 54 - 0
jsjp-admin/src/main/java/com/miaxis/app/controller/tms/CoachInfoController.java

@@ -0,0 +1,54 @@
+package com.miaxis.app.controller.tms;
+
+
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.tms.domain.CoachInfo;
+import com.miaxis.tms.dto.CoachInfoDTO;
+import com.miaxis.tms.dto.CoachInfoIdDTO;
+import com.miaxis.tms.service.ICoachInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 学员基本信息表 前端控制器
+ * </p>
+ *
+ * @since 2021-03-09
+ */
+@RestController
+@Api(tags = "【app-教练员】")
+@RequestMapping(Constants.OPEN_PREFIX + "/tms/coachInfo")
+public class CoachInfoController extends BaseController {
+
+    @Autowired
+    private ICoachInfoService coachInfoService;
+
+
+    /**
+     * 获取用户id获取详细信息
+     */
+    @GetMapping("/getCoachInfo")
+    @ApiOperation("获取教练员详细信息")
+    public Response<CoachInfo> getCoachInfo(CoachInfoIdDTO coaIdDto) {
+        return Response.success(coachInfoService.getCoachInfoById(coaIdDto));
+    }
+
+
+    /**
+     * 教练登录测试
+     */
+    @GetMapping("/getCoachInfoLogin")
+    @ApiOperation("教练登录测试")
+    public Response<CoachInfo> getCoachInfoLogin(CoachInfoDTO coaDto) {
+        return Response.success(coachInfoService.getCoachBylogin(coaDto));
+    }
+
+}
+

+ 3 - 5
jsjp-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysMenu;
 import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.domain.model.LoginBody;
 import com.miaxis.common.core.domain.model.LoginBodyNoCode;
 import com.miaxis.common.core.domain.model.LoginUser;
-import com.miaxis.common.enums.StudentLoginTypeEnum;
-import com.miaxis.common.utils.RandomNameUtils;
+import com.miaxis.common.enums.UserLoginTypeEnum;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.ServletUtils;
 import com.miaxis.feign.dto.WxResult;
@@ -110,7 +108,7 @@ public class SysLoginController
         // 生成令牌
         if (wxResult.getOpenid() != null){
             // 生成令牌
-            String token = loginService.login(wxResult.getOpenid(),null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
+            String token = loginService.login(wxResult.getOpenid(),null, UserLoginTypeEnum.OPENID_LOGIN.getCode());
             tokenDTO.setToken(token);
             return Response.success(tokenDTO) ;
         }
@@ -130,7 +128,7 @@ public class SysLoginController
     public Response<TokenDTO> getInfoTest(String jscode){
         TokenDTO tokenDTO = new TokenDTO();
             // 生成令牌
-        String token = loginService.login("oO7PJ5CPQJo62kZWA3uiUX2KG2s4",null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
+        String token = loginService.login("oO7PJ5CPQJo62kZWA3uiUX2KG2s4",null, UserLoginTypeEnum.OPENID_LOGIN.getCode());
         tokenDTO.setToken(token);
         return Response.success(tokenDTO) ;
 

+ 43 - 0
jsjp-admin/src/test/java/com/miaxis/test/CoachTest.java

@@ -0,0 +1,43 @@
+package com.miaxis.test;
+
+import com.miaxis.JsjpApplication;
+import com.miaxis.order.dto.QuerySchoolOrderListDTO;
+import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
+import com.miaxis.tms.domain.CoachInfo;
+import com.miaxis.tms.dto.CoachInfoIdDTO;
+import com.miaxis.tms.service.ICoachInfoService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@SpringBootTest(classes = JsjpApplication.class)
+@RunWith(SpringRunner.class)
+public class CoachTest {
+
+
+
+
+    @Autowired
+    private ICoachInfoService coachInfoService;
+
+
+    @Test
+    public void test()  {
+
+        CoachInfoIdDTO coachIdDto = new CoachInfoIdDTO();
+        coachIdDto.setCity("3501");
+        coachIdDto.setId(3501033734l);
+
+        CoachInfo coachInfo = coachInfoService.getCoachInfoById(coachIdDto);
+        System.out.println(coachInfo);
+
+    }
+
+
+
+}

+ 1 - 1
jsjp-admin/src/test/java/com/miaxis/test/Test4.java

@@ -57,7 +57,7 @@ public class Test4 {
 //        schPayLogService.saveSchPayLog(schPayLog);
 
 
-        GzptUserInfo userInfo = userInfoService.getInfoById(1l);
+        GzptUserInfo userInfo = userInfoService.getInfoById(90l);
         System.out.println(userInfo);
 
 

+ 1 - 1
jsjp-admin/src/test/java/com/miaxis/test/Test5.java

@@ -25,7 +25,7 @@ public class Test5 {
 
 
     @Test
-    public void test() throws Exception {
+    public void test() {
         QuerySchoolOrderListDTO schoolOrderListDTO = new QuerySchoolOrderListDTO();
         schoolOrderListDTO.setDqbh("3501");
         List<QuerySchoolOrderDetailedVo> list = orderInfoService.selectSchoolOrderDetailedExcel(schoolOrderListDTO);

+ 0 - 30
jsjp-common/src/main/java/com/miaxis/common/enums/StudentLoginTypeEnum.java

@@ -1,30 +0,0 @@
-package com.miaxis.common.enums;
-
-/**
- * 用户登录类型
- *
- * @author miaxis
- */
-public enum StudentLoginTypeEnum
-{
-   OPENID_LOGIN("1", "openid登录");
-
-    private final String code;
-    private final String info;
-
-    StudentLoginTypeEnum(String code, String info)
-    {
-        this.code = code;
-        this.info = info;
-    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public String getInfo()
-    {
-        return info;
-    }
-}

+ 29 - 0
jsjp-common/src/main/java/com/miaxis/common/enums/UserLoginTypeEnum.java

@@ -0,0 +1,29 @@
+package com.miaxis.common.enums;
+
+/**
+ * 用户登录类型
+ *
+ * @author miaxis
+ */
+public enum UserLoginTypeEnum {
+
+    OPENID_LOGIN("1", "openid登录"),
+    COACH_PW_LOGIN("2", "教练员密码登录"),
+    COACH_OPENID_LOGIN("3", "教练员Openid登录");
+
+    private final String code;
+    private final String info;
+
+    UserLoginTypeEnum(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}

+ 2 - 2
jsjp-framework/src/main/java/com/miaxis/framework/web/service/SysLoginService.java

@@ -3,7 +3,7 @@ package com.miaxis.framework.web.service;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.domain.model.LoginUser;
 import com.miaxis.common.core.redis.RedisCache;
-import com.miaxis.common.enums.StudentLoginTypeEnum;
+import com.miaxis.common.enums.UserLoginTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.exception.user.CaptchaException;
 import com.miaxis.common.exception.user.CaptchaExpireException;
@@ -98,7 +98,7 @@ public class SysLoginService
 
         ServletUtils.getRequest().setAttribute("loginType",loginType);
         // 用户验证
-        if (StudentLoginTypeEnum.OPENID_LOGIN.getCode().equals(loginType)){
+        if (UserLoginTypeEnum.OPENID_LOGIN.getCode().equals(loginType)){
             return authenticate(principal,new OpenIdAuthenticationToken(principal));
         }
         else{

+ 21 - 27
jsjp-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -3,7 +3,7 @@ package com.miaxis.framework.web.service;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.domain.model.LoginUser;
-import com.miaxis.common.enums.StudentLoginTypeEnum;
+import com.miaxis.common.enums.UserLoginTypeEnum;
 import com.miaxis.common.enums.UserStatusEnum;
 import com.miaxis.common.exception.BaseException;
 import com.miaxis.common.exception.CustomException;
@@ -27,8 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author miaxis
  */
 @Service
-public class UserDetailsServiceImpl implements UserDetailsService
-{
+public class UserDetailsServiceImpl implements UserDetailsService {
     private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
 
     @Autowired
@@ -46,50 +45,45 @@ public class UserDetailsServiceImpl implements UserDetailsService
     public UserDetails loadUserByUsername(String identification) throws UsernameNotFoundException {
         //获取登录类型
         String loginType = (String) ServletUtils.getRequest().getAttribute("loginType");
-        if (StringUtils.isEmpty(loginType)){
+        if (StringUtils.isEmpty(loginType)) {
             SysUser user = userService.selectUserByUserName(identification);
-            if (StringUtils.isNull(user))
-            {
+            if (StringUtils.isNull(user)) {
                 log.info("登录用户:{} 不存在.", identification);
                 throw new UsernameNotFoundException("登录用户:" + identification + " 不存在");
-            }
-            else if (UserStatusEnum.DELETED.getCode().equals(user.getDelFlag()))
-            {
+            } else if (UserStatusEnum.DELETED.getCode().equals(user.getDelFlag())) {
                 log.info("登录用户:{} 已被删除.", identification);
                 throw new BaseException("对不起,您的账号:" + identification + " 已被删除");
-            }
-            else if (UserStatusEnum.DISABLE.getCode().equals(user.getStatus()))
-            {
+            } else if (UserStatusEnum.DISABLE.getCode().equals(user.getStatus())) {
                 log.info("登录用户:{} 已被停用.", identification);
                 throw new BaseException("对不起,您的账号:" + identification + " 已停用");
             }
             return createLoginUser(user);
-        } else if (StudentLoginTypeEnum.OPENID_LOGIN.getCode().equals(loginType)){
-            {
-                UserInfo userInfo = userService.getStudentByOpenId(identification);
-                if (userInfo == null) {
-                    userInfo = new UserInfo();
-                    userInfo.setHeadImage(configService.selectConfigByKey("xcx_user_image"));
-                    userInfo.setNickName("用户未授权_"+RandomNameUtils.generateName());
-                    userInfo.setOpenid(identification);
-                    userService.saveUserInfo(userInfo);
-                }
-                return createLoginUser(userInfo);
+        } else if (UserLoginTypeEnum.OPENID_LOGIN.getCode().equals(loginType)) {
+            UserInfo userInfo = userService.getStudentByOpenId(identification);
+            if (userInfo == null) {
+                userInfo = new UserInfo();
+                userInfo.setHeadImage(configService.selectConfigByKey("xcx_user_image"));
+                userInfo.setNickName("用户未授权_" + RandomNameUtils.generateName());
+                userInfo.setOpenid(identification);
+                userService.saveUserInfo(userInfo);
             }
-        } else{
+            return createLoginUser(userInfo);
+        } else if (UserLoginTypeEnum.COACH_PW_LOGIN.getCode().equals(loginType)) {
+            //CoachInfo coachInfo = new
+
+            return null;
+        } else {
             throw new CustomException("登录类型不存在");
         }
 
 
-
     }
 
     private UserDetails createLoginUser(UserInfo student) {
         return new LoginUser(student);
     }
 
-    public UserDetails createLoginUser(SysUser user)
-    {
+    public UserDetails createLoginUser(SysUser user) {
         return new LoginUser(user, permissionService.getMenuPermission(user));
     }
 }

+ 263 - 0
jsjp-service/src/main/java/com/miaxis/tms/domain/CoachInfo.java

@@ -0,0 +1,263 @@
+package com.miaxis.tms.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户对象 user_info
+ *
+ * @author miaxis
+ * @date 2021-01-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tms_coach_info")
+@ApiModel(value = "CoachInfo", description = "教练对象 tms_coach_info")
+public class CoachInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "TCI_ID")
+    @ApiModelProperty(value = "教练Id")
+    private Long id;
+
+    @TableField("TCI_COACHNUM")
+    @ApiModelProperty(value = "教练全国统一编号")
+    private String coachNum;
+
+
+    /** 备案时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_RECORD_DATE")
+    @ApiModelProperty(value = "备案时间")
+    private Date recordDate;
+
+    /**
+     * 所属驾校内部ID
+     */
+    @TableField("TCI_SCHOOL_ID")
+    @ApiModelProperty(value = "所属驾校内部ID")
+    private Long schoolId;
+
+    @TableField("TCI_NAME")
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1:男性;2:女性)
+     */
+    @TableField("TCI_SEX")
+    @ApiModelProperty(value = "性别(1:男性;2:女性)")
+    private String sex;
+
+    /** 身份证号码 */
+    @TableField("TCI_IDCARD")
+    @ApiModelProperty(value = "身份证号")
+    private String idcard;
+
+    /** 手机号码 */
+    @TableField("TCI_MOBILE")
+    @ApiModelProperty(value = "手机号码")
+    private String mobile;
+
+    /** 联系地址 */
+    @TableField("TCI_ADDRESS")
+    @ApiModelProperty(value = "联系地址")
+    private String address;
+
+    /** 照片文件ID(成功上传的教练员头像文件ID) */
+    @TableField("TCI_PHOTO")
+    @ApiModelProperty(value = "照片文件ID(成功上传的教练员头像文件ID)")
+    private Long photo;
+
+    /** 指纹图片ID(成功上传的指纹图片ID) */
+    @TableField("TCI_FINGERPRINT")
+    @ApiModelProperty(value = "指纹图片ID(成功上传的指纹图片ID)")
+    private Long fingerPrint;
+
+
+    /** 指驾驶证号 */
+    @TableField("TCI_DRILICENCE")
+    @ApiModelProperty(value = "驾驶证号")
+    private Long drilicence;
+
+    /** 驾驶证初领日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_FSTDRILICDATE")
+    @ApiModelProperty(value = "驾驶证初领日期")
+    private Date fstdrilicDate;
+
+    /** 职业资格证号 */
+    @TableField("TCI_OCCUPATIONNO")
+    @ApiModelProperty(value = "职业资格证号")
+    private String occupationNo;
+
+    /** 职业资格等级(1:一级; 2:二级; 3:三级; 4:四级;) */
+    @TableField("TCI_OCCUPATIONLEVEL")
+    @ApiModelProperty(value = "职业资格等级(1:一级; 2:二级; 3:三级; 4:四级;)")
+    private String occupationLevel;
+
+    /** 准驾车型(下列编码单选:A1,A2,A3,B1,B2,C1,C2,C3,C4,C5,D,E,F,M,N,P) */
+    @TableField("TCI_DRIPERMITTED")
+    @ApiModelProperty(value = "准驾车型(下列编码单选:A1,A2,A3,B1,B2,C1,C2,C3,C4,C5,D,E,F,M,N,P)")
+    private String dripermitted;
+
+
+    /** 准教车型(下列编码单选:A1,A2,A3,B1,B2,C1,C2,C3,C4,C5,D,E,F,M,N,P) */
+    @TableField("TCI_TEACHPERMITTED")
+    @ApiModelProperty(value = "准教车型(下列编码单选:A1,A2,A3,B1,B2,C1,C2,C3,C4,C5,D,E,F,M,N,P)")
+    private String teachpermitted;
+
+
+    /** 供职状态(0:在职; 1:离职;) */
+    @TableField("TCI_EMPLOYSTATUS")
+    @ApiModelProperty(value = "供职状态(0:在职; 1:离职;)")
+    private String employStatus;
+
+
+    /** 入职日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_HIREDATE")
+    @ApiModelProperty(value = "入职日期")
+    private Date hireDate;
+
+    /** 离职日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_LEAVEDATE")
+    @ApiModelProperty(value = "离职日期")
+    private Date leaveDate;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_CREATE_DATE")
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    /** 创建人ID */
+    @TableField("TCI_CREATE_USER")
+    @ApiModelProperty(value = "创建人ID")
+    private Long createUser;
+
+    /** 创建人真实姓名 */
+    @TableField("TCI_CREATE_USER_NAME")
+    @ApiModelProperty(value = "创建人真实姓名")
+    private String createUserName;
+
+
+    /** 照片地址 */
+    @TableField("TCI_PHOTO_PATH")
+    @ApiModelProperty(value = "照片地址")
+    private String photoPath;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_UPDATE_DATE")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateDate;
+
+    /** 修改人ID */
+    @TableField("TCI_UPDATE_USER")
+    @ApiModelProperty(value = "修改人ID")
+    private Long updateUser;
+
+
+    /** 修改人真实姓名 */
+    @TableField("TCI_UPDATE_USER_NAME")
+    @ApiModelProperty(value = "修改人真实姓名")
+    private String updateUserName;
+
+    /** 证件类型 */
+    @TableField("TCI_CARD_TYPE")
+    @ApiModelProperty(value = "卡类型:1-ic卡,2-身份证")
+    private String cardType;
+
+
+
+
+    @TableField("TCI_CARD_ID")
+    @ApiModelProperty(value = "卡物理ID(身份证芯片号等)")
+    private String cardId;
+
+    @TableField("TCI_LOGOUT")
+    @ApiModelProperty(value = "状态 1 已注销 0 正常")
+    private String logout;
+
+    @TableField("TCI_SYNC")
+    @ApiModelProperty(value = "同步状态 1 已同步 0 未同步")
+    private String sync;
+
+    @TableField("TCI_SYNC_TIME")
+    @ApiModelProperty(value = "同步时间")
+    private Date syncTime;
+
+    @TableField("TCI_PASSWORD")
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @TableField("TCI_GROUP_ID")
+    @ApiModelProperty(value = "教练归属分组ID 便 于以后使用")
+    private Long groupId;
+
+    @TableField("TCI_LOCK_STATUS")
+    @ApiModelProperty(value = "锁定状态 0 未锁定 1 已锁定")
+    private String lockStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("TCI_LOCK_DATE")
+    @ApiModelProperty(value = "锁定时间/解锁时间")
+    private Date lockDate;
+
+    @TableField("TCI_PROTOCOL_PATH")
+    @ApiModelProperty(value = "协议保存地址")
+    private String protocolPath;
+
+    @TableField("TCI_AUDIT_STATUS")
+    @ApiModelProperty(value = "审核状态  0 待审核 1 审核通过 2 审核驳回")
+    private String auditStatus;
+
+    /**
+     * 教练类型 0 理论 1 实操 2 理论+实操--------------
+     * 旧1,实操  2,理论  3,实操+理论  4,模拟  5,实操+模拟  6,理论+模拟  7,实操+理论+模拟  8,科目鉴定
+     */
+    @TableField("TCI_TYPE")
+    @ApiModelProperty(value = "教练类型")
+    private String type;
+
+    @TableField("TCI_IS_ILLEGAL")
+    @ApiModelProperty(value = "增加毒、酒、醉等88号文件的判断(1:否;2:是)")
+    private String isIllegal;
+
+
+    @TableField("TCI_HEALTH_STATE")
+    @ApiModelProperty(value = "健康情况(1,健康;2,亚健康;3,疾病)")
+    private String healthState;
+
+    @TableField("TCI_ORIGO")
+    @ApiModelProperty(value = "籍贯")
+    private String origo;
+
+    /** 文化程度 0:无 1:博士 2:硕士 3:本科 4:大专 5:中专 6:高中 7:初中 8:小学 */
+    @TableField("TCI_EDUCATION_LEVEL")
+    @ApiModelProperty(value = "教育程度")
+    private String educationLevel;
+
+    @TableField("TCI_IS_AGREE")
+    @ApiModelProperty(value = "是否同意协议 0 不同意 1 已同意")
+    private Integer isAgree;
+
+
+
+
+
+
+}

+ 24 - 0
jsjp-service/src/main/java/com/miaxis/tms/dto/CoachInfoDTO.java

@@ -0,0 +1,24 @@
+package com.miaxis.tms.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class CoachInfoDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "登录账号")
+    private String idcard;
+
+    @ApiModelProperty(value = "登录密码")
+    private String password;
+
+    @ApiModelProperty(value = "地区编号")
+    private String city;
+
+
+
+}

+ 21 - 0
jsjp-service/src/main/java/com/miaxis/tms/dto/CoachInfoIdDTO.java

@@ -0,0 +1,21 @@
+package com.miaxis.tms.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class CoachInfoIdDTO implements Serializable {
+
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "地区编号")
+    private String city;
+
+
+
+}

+ 22 - 0
jsjp-service/src/main/java/com/miaxis/tms/mapper/CoachInfoMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.tms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.tms.domain.CoachInfo;
+import com.miaxis.tms.dto.CoachInfoDTO;
+import com.miaxis.tms.dto.CoachInfoIdDTO;
+
+/**
+ * <p>
+ * 学员基本信息表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface CoachInfoMapper extends BaseMapper<CoachInfo> {
+
+
+    CoachInfo getCoachInfoById(CoachInfoIdDTO coaDto);
+
+    CoachInfo getCoachBylogin(CoachInfoDTO coaDto);
+}

+ 30 - 0
jsjp-service/src/main/java/com/miaxis/tms/service/ICoachInfoService.java

@@ -0,0 +1,30 @@
+package com.miaxis.tms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
+import com.miaxis.newgzpt.dto.GzptUserInfoDTO;
+import com.miaxis.tms.domain.CoachInfo;
+import com.miaxis.tms.dto.CoachInfoDTO;
+import com.miaxis.tms.dto.CoachInfoIdDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 学员基本信息表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+public interface ICoachInfoService extends IService<CoachInfo> {
+
+
+
+    CoachInfo getCoachInfoById(CoachInfoIdDTO coaDto);
+
+
+    CoachInfo getCoachBylogin(CoachInfoDTO coaDto);
+
+
+}

+ 42 - 0
jsjp-service/src/main/java/com/miaxis/tms/service/impl/CoachInfoServiceImpl.java

@@ -0,0 +1,42 @@
+package com.miaxis.tms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.common.annotation.DataSource;
+import com.miaxis.common.enums.DataSourceTypeEnum;
+import com.miaxis.tms.domain.CoachInfo;
+import com.miaxis.tms.dto.CoachInfoDTO;
+import com.miaxis.tms.dto.CoachInfoIdDTO;
+import com.miaxis.tms.mapper.CoachInfoMapper;
+import com.miaxis.tms.service.ICoachInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 学员基本信息表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2021-03-09
+ */
+@Service
+@DataSource(value = DataSourceTypeEnum.NEWGZPT)
+public class CoachInfoServiceImpl extends ServiceImpl<CoachInfoMapper, CoachInfo> implements ICoachInfoService {
+
+
+    @Resource
+    CoachInfoMapper mapper;
+
+    @Override
+    public CoachInfo getCoachInfoById(CoachInfoIdDTO coaDto) {
+        return  mapper.getCoachInfoById(coaDto);
+    }
+
+    @Override
+    public CoachInfo getCoachBylogin(CoachInfoDTO coaDto) {
+        return mapper.getCoachBylogin(coaDto);
+    }
+
+
+}

+ 66 - 0
jsjp-service/src/main/resources/mapper/tms/CoachInfoMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.tms.mapper.CoachInfoMapper">
+
+    <!-- 定义结果映射 -->
+    <resultMap type="com.miaxis.tms.domain.CoachInfo" id="CoachInfoResultMap">
+        <id property="id" column="TCI_ID"/>
+        <result property="coachNum" column="TCI_COACHNUM"/>
+        <result property="recordDate" column="TCI_RECORD_DATE"/>
+        <result property="schoolId" column="TCI_SCHOOL_ID"/>
+        <result property="name" column="TCI_NAME"/>
+        <result property="sex" column="TCI_SEX"/>
+        <result property="idcard" column="TCI_IDCARD"/>
+        <result property="mobile" column="TCI_MOBILE"/>
+        <result property="address" column="TCI_ADDRESS"/>
+        <result property="photo" column="TCI_PHOTO"/>
+        <result property="fingerPrint" column="TCI_FINGERPRINT"/>
+        <result property="drilicence" column="TCI_DRILICENCE"/>
+        <result property="fstdrilicDate" column="TCI_FSTDRILICDATE"/>
+        <result property="occupationNo" column="TCI_OCCUPATIONNO"/>
+        <result property="occupationLevel" column="TCI_OCCUPATIONLEVEL"/>
+        <result property="dripermitted" column="TCI_DRIPERMITTED"/>
+        <result property="teachpermitted" column="TCI_TEACHPERMITTED"/>
+        <result property="employStatus" column="TCI_EMPLOYSTATUS"/>
+        <result property="hireDate" column="TCI_HIREDATE"/>
+        <result property="leaveDate" column="TCI_LEAVEDATE"/>
+        <result property="createDate" column="TCI_CREATE_DATE"/>
+        <result property="createUser" column="TCI_CREATE_USER"/>
+        <result property="createUserName" column="TCI_CREATE_USER_NAME"/>
+        <result property="photoPath" column="TCI_PHOTO_PATH"/>
+        <result property="updateDate" column="TCI_UPDATE_DATE"/>
+        <result property="updateUser" column="TCI_UPDATE_USER"/>
+        <result property="updateUserName" column="TCI_UPDATE_USER_NAME"/>
+        <result property="cardType" column="TCI_CARD_TYPE"/>
+        <result property="cardId" column="TCI_CARD_ID"/>
+        <result property="logout" column="TCI_LOGOUT"/>
+        <result property="sync" column="TCI_SYNC"/>
+        <result property="syncTime" column="TCI_SYNC_TIME"/>
+        <result property="password" column="TCI_PASSWORD"/>
+        <result property="groupId" column="TCI_GROUP_ID"/>
+        <result property="lockStatus" column="TCI_LOCK_STATUS"/>
+        <result property="lockDate" column="TCI_LOCK_DATE"/>
+        <result property="protocolPath" column="TCI_PROTOCOL_PATH"/>
+        <result property="auditStatus" column="TCI_AUDIT_STATUS"/>
+        <result property="type" column="TCI_TYPE"/>
+        <result property="isIllegal" column="TCI_IS_ILLEGAL"/>
+        <result property="healthState" column="TCI_HEALTH_STATE"/>
+        <result property="origo" column="TCI_ORIGO"/>
+        <result property="educationLevel" column="TCI_EDUCATION_LEVEL"/>
+        <result property="isAgree" column="TCI_IS_AGREE"/>
+    </resultMap>
+
+
+
+
+    <select id="getCoachInfoById"  parameterType="com.miaxis.tms.dto.CoachInfoIdDTO" resultMap="CoachInfoResultMap">
+        select * from tms_coach_info@TMS${city} where tci_id =#{id,jdbcType=NUMERIC}
+    </select>
+
+
+    <select id="getCoachBylogin" parameterType="com.miaxis.tms.dto.CoachInfoDTO" resultMap="CoachInfoResultMap">
+        select * from tms_coach_info@TMS${city} t where t.tci_id =
+                                             (select max(tci_id) from tms_coach_info@TMS${city} g where g.tci_idcard=#{idcard} and g.tci_password=#{password})
+    </select>
+
+</mapper>