feats

pom.xml

@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.yunzhi</groupId>
-	<artifactId>serivce-template</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>demo</name>
+	<artifactId>medical-plat</artifactId>
+	<version>0.0.1</version>
+	<name>medical-plat</name>
 	<description>Demo project for Spring Boot</description>
 
 	<properties>

src/main/java/com/yunzhi/demo/controller/TaMedicalLogController.java

@@ -9,6 +9,7 @@ import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.service.ITaPersonService;
 import com.yunzhi.demo.service.ITaStudentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +43,9 @@ public class TaMedicalLogController extends BaseController {
     @Autowired
     public ITaStudentService iTaStudentService;
 
+    @Autowired
+    public ITaPersonService iTaPersonService;
+
     @GetMapping("/ma/medical-log")
     @ApiOperation(value="我的就诊记录", notes = "我的就诊记录", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean maMedicalList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -84,7 +88,7 @@ public class TaMedicalLogController extends BaseController {
      * @param taMedicalLog 实体对象
      * @return
      */
-    @RequestMapping(value="/taMedicalLog",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/medicalLog",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taMedicalLogAdd(@ApiParam("保存内容") @RequestBody TaMedicalLog taMedicalLog) throws Exception {
 
@@ -96,23 +100,24 @@ public class TaMedicalLogController extends BaseController {
         }
 
         TaStudent taStudent = iTaStudentService.getByStudentNo(schoolId, studentNo);
-
-
-        if (iTaMedicalLogService.save(taMedicalLog)){
-            return ResponseBean.success(taMedicalLog);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (null == taStudent) {
+            taStudent = new TaStudent();
+            taStudent.setStudentNo(studentNo);
+            taStudent.setSchoolId(schoolId);
+            taStudent.setSpecialtyId(taMedicalLog.getSpecialtyId());
+            taStudent.setName(taMedicalLog.getName());
+            taStudent.setSex(taMedicalLog.getSex());
+            taStudent.setPhone(taMedicalLog.getPhone());
+            // 映射人员
+            TaPerson taPerson = iTaPersonService.getByPhone(taStudent.getPhone());
+            if (null != taPerson) {
+                taStudent.setPersonId(taPerson.getPersonId());
+            }
+
+            iTaStudentService.save(taStudent);
         }
-    }
 
-    /**
-     * 保存对象
-     * @param taMedicalLog 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/medicalLog",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean medicalLogAdd(@ApiParam("保存内容") @RequestBody TaMedicalLog taMedicalLog) throws Exception{
+        taMedicalLog.setStudentId(taStudent.getStudentId());
 
         if (iTaMedicalLogService.save(taMedicalLog)){
             return ResponseBean.success(taMedicalLog);
@@ -121,38 +126,6 @@ public class TaMedicalLogController extends BaseController {
         }
     }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taMedicalLog/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taMedicalLogDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaMedicalLogService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taMedicalLog 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taMedicalLog/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taMedicalLogUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaMedicalLog taMedicalLog) throws Exception{
-
-        if (iTaMedicalLogService.updateById(taMedicalLog)){
-            return ResponseBean.success(iTaMedicalLogService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
     /**
      * 根据id查询对象
      * @param id  实体ID

src/main/java/com/yunzhi/demo/controller/WxMaController.java

@@ -6,8 +6,10 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.yunzhi.demo.common.*;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPersonData;
+import com.yunzhi.demo.entity.TaStudent;
 import com.yunzhi.demo.service.ITaPersonDataService;
 import com.yunzhi.demo.service.ITaPersonService;
+import com.yunzhi.demo.service.ITaStudentService;
 import com.yunzhi.demo.vo.WxMaAuthParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +35,9 @@ public class WxMaController extends BaseController {
     @Autowired
     ITaPersonDataService iTaPersonDataService;
 
+    @Autowired
+    ITaStudentService iTaStudentService;
+
     @PostMapping("/login")
     @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean login(@ApiParam("登录参数") @RequestParam String code) throws Exception {
@@ -50,6 +55,10 @@ public class WxMaController extends BaseController {
             iTaPersonDataService.save(taPersonData);
         }
 
+        // 查询学生
+        TaStudent taStudent = iTaStudentService.getByPersonId(taPerson.getPersonId());
+        taPerson.setStudent(taStudent);
+
         Map<String, Object> tokenClaims = new HashMap<>();
         tokenClaims.put("userId", taPerson.getPersonId());
 //        tokenClaims.put("sessionKey", info.getSessionKey());
@@ -102,6 +111,13 @@ public class WxMaController extends BaseController {
         taPerson.setPhone(phoneNoInfo.getPhoneNumber());
         iTaPersonService.updateById(taPerson);
 
+        // 查询学生
+        TaStudent taStudent = iTaStudentService.getByPhone(taPerson.getPhone());
+        if (null != taStudent) {
+            taStudent.setPersonId(taPerson.getPersonId());
+            iTaStudentService.updateById(taStudent);
+        }
+
         return ResponseBean.success(taPerson);
     }
 

src/main/java/com/yunzhi/demo/entity/TaMedicalLog.java

@@ -58,7 +58,7 @@ public class TaMedicalLog implements Serializable {
 
     @ApiModelProperty(value = "性别")
     @TableField(exist = false)
-    private String sex;
+    private Integer sex;
 
     @ApiModelProperty(value = "学校ID")
     @TableField(exist = false)
@@ -84,4 +84,8 @@ public class TaMedicalLog implements Serializable {
     @TableField(exist = false)
     private String studentNo;
 
+    @ApiModelProperty(value = "手机号")
+    @TableField(exist = false)
+    private String phone;
+
 }

src/main/java/com/yunzhi/demo/service/ITaPersonService.java

@@ -24,4 +24,6 @@ public interface ITaPersonService extends IService<TaPerson> {
     IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc);
 
     IPage<TaPerson> getStudentInfoPagedBy(IPage<TaPerson> pg, String name, String schoolId, String specialtyId, String phone, String studentId);
+
+    TaPerson getByPhone(String phone);
 }

src/main/java/com/yunzhi/demo/service/impl/TaPersonServiceImpl.java

@@ -55,6 +55,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentId);
     }
 
+    @Override
+    public TaPerson getByPhone(String phone) {
+        if (StringUtils.isEmpty(phone)) {
+            return null;
+        }
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+                .eq("phone", phone)
+                .gt("status", Constants.STATUS_DELETED);
+        return getOne(queryWrapper);
+    }
+
     private String getDBFieldBy(String name) {
         if (StringUtils.isEmpty(name)) {
             return null;

src/main/resources/application-prod.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8822
 ###
 spring:
   servlet: