researchField 单列化

teacher-pojo/src/main/java/com/example/dto/TeacherDTO.java

@@ -1,7 +1,6 @@
 package com.example.dto;
 
 import com.example.entity.Patent;
-import com.example.entity.ResearchFiled;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -20,7 +19,9 @@ public class TeacherDTO implements Serializable {
 
     private String undergradauteCourse;
 
-    private List<ResearchFiled> researchFiled;
+//    private List<ResearchFiled> researchFiled;
+
+    private String researchField;
 
     private List<Patent> patent;
 

teacher-pojo/src/main/java/com/example/entity/ResearchFiled.java

@@ -1,21 +0,0 @@
-package com.example.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResearchFiled implements Serializable {
-
-    private Long id;
-
-    private Long teacherId;
-
-    private String information;
-}

teacher-pojo/src/main/java/com/example/entity/Teacher.java

@@ -26,7 +26,9 @@ public class Teacher implements Serializable {
 
     private String undergradauteCourse;
 
-    private List<ResearchFiled> researchFiled;
+    private String researchField;
+
+//    private List<ResearchFiled> researchFiled;
 
     private List<Patent> patent;
 

teacher-pojo/src/main/java/com/example/vo/TeacherVO.java

@@ -1,7 +1,6 @@
 package com.example.vo;
 
 import com.example.entity.Patent;
-import com.example.entity.ResearchFiled;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -28,7 +27,9 @@ public class TeacherVO implements Serializable {
 
     private String undergradauteCourse;
 
-    private List<ResearchFiled> researchFiled;
+    private String researchField;
+
+//    private List<ResearchFiled> researchFiled;
 
     private List<Patent> patent;
 

teacher-serve/src/main/java/com/example/controller/teacher/TeacherController.java

@@ -42,6 +42,7 @@ public class TeacherController {
         teacherService.updateTeacher(teacherDTO,id);
         return Result.success();
     }
+
     @GetMapping("/{id}")
     @ApiOperation(value = "根据id删除老师信息")
     public Result<TeacherVO> getById(@PathVariable Long id){

teacher-serve/src/main/java/com/example/mapper/TeacherMapper.java

@@ -1,7 +1,6 @@
 package com.example.mapper;
 
 import com.example.entity.Patent;
-import com.example.entity.ResearchFiled;
 import com.example.entity.Teacher;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,12 +17,6 @@ public interface TeacherMapper {
      */
     void saveTeacher(Teacher teacher);
 
-    /**
-     * 插入研究领域信息
-     * @param researchFiled
-     */
-    void saveReasearch(@Param("researchFiled") List<ResearchFiled> researchFiled);
-
     /**
      * 插入专利信息
      * @param patents
@@ -36,23 +29,12 @@ public interface TeacherMapper {
      */
     void updateTeacher(Teacher teacher);
 
-    /**
-     * 根据id删除研究领域
-     * @param id
-     */
-    void deleteReasearch(Long id);
-
     /**
      * 根据id删除专利
      * @param id
      */
     void deletePatents(Long id);
-    /**
-     * 根据id查询老师研究领域
-     * @param id
-     */
-    @Select("select * from teacherteam_system.research_filed where teacher_id=#{id}")
-    List<ResearchFiled> getResearch(Long id);
+
     /**
      * 根据id查询老师专利
      * @param id

teacher-serve/src/main/java/com/example/service/impl/TeacherServiceImpl.java

@@ -3,7 +3,6 @@ package com.example.service.impl;
 import com.example.context.BaseContext;
 import com.example.dto.TeacherDTO;
 import com.example.entity.Patent;
-import com.example.entity.ResearchFiled;
 import com.example.entity.Teacher;
 import com.example.mapper.TeacherMapper;
 import com.example.service.TeacherService;
@@ -31,19 +30,11 @@ public class TeacherServiceImpl implements TeacherService {
         teacher.setId(BaseContext.getCurrentId());
         teacherMapper.saveTeacher(teacher);
         //向研究领域插入n条数据
-        List<ResearchFiled> researchFiled = teacher.getResearchFiled();
-        if (researchFiled != null && researchFiled.size() > 0) {
-            researchFiled.forEach(researchFiled1 -> {
-                researchFiled1.setTeacherId(teacher.getId());
-            });
-            teacherMapper.saveReasearch(researchFiled);
-        }
+//        List<ResearchFiled> researchFiled = teacher.getResearchFiled();
         //向专利插入n条数据
         List<Patent> patents = teacher.getPatent();
-        if (patents != null && patents.size() > 0) {
-            patents.forEach(patents1 -> {
-                patents1.setTeacherId(teacher.getId());
-            });
+        if (patents != null && !patents.isEmpty()) {
+            patents.forEach(patents1 -> patents1.setTeacherId(teacher.getId()));
             teacherMapper.savePatent(patents);
         }
     }
@@ -53,24 +44,12 @@ public class TeacherServiceImpl implements TeacherService {
         Teacher teacher = new Teacher();
         BeanUtils.copyProperties(teacherDTO, teacher);
         teacher.setId(id);
-        teacherMapper.updateTeacher(teacher);
-        //向研究领域插入n条数据
-        teacherMapper.deleteReasearch(teacher.getId());
-        List<ResearchFiled> researchFiled = teacher.getResearchFiled();
-        if (researchFiled != null && researchFiled.size() > 0) {
-            researchFiled.forEach(researchFiled1 -> {
-                researchFiled1.setTeacherId(teacher.getId());
-            });
 
-            teacherMapper.saveReasearch(researchFiled);
-        }
         //向专利插入n条数据
         teacherMapper.deletePatents(teacher.getId());
         List<Patent> patents = teacher.getPatent();
-        if (patents != null && patents.size() > 0) {
-            patents.forEach(patents1 -> {
-                patents1.setTeacherId(teacher.getId());
-            });
+        if (patents != null && !patents.isEmpty()) {
+            patents.forEach(patents1 -> patents1.setTeacherId(teacher.getId()));
 
             teacherMapper.savePatent(patents);
         }
@@ -83,15 +62,12 @@ public class TeacherServiceImpl implements TeacherService {
      */
     @Override
     public TeacherVO getById(Long id) {
-        //查询研究领域
-        List<ResearchFiled> researchFileds = teacherMapper.getResearch(id);
         //查询专利
         List<Patent> patents = teacherMapper.getPatent(id);
         //查询老师信息
         Teacher teacher = teacherMapper.getTeacher(id);
         TeacherVO teacherVO = new TeacherVO();
         BeanUtils.copyProperties(teacher, teacherVO);
-        teacherVO.setResearchFiled(researchFileds);
         teacherVO.setPatent(patents);
         return teacherVO;
     }

teacher-serve/src/main/resources/mapper/TeacherMapper.xml

@@ -8,12 +8,7 @@
         VALUES
             (#{id},#{name},#{profile},#{image},#{gradauteCourse},#{undergradauteCourse},#{email},#{phoneNumber})
     </insert>
-    <insert id="saveReasearch">
-        insert into teacherteam_system.research_filed(teacher_id,information)values
-        <foreach collection="researchFiled" item="re" separator=",">
-            (#{re.teacherId},#{re.information})
-        </foreach>
-    </insert>
+
     <insert id="savePatent">
         insert into teacherteam_system.patent(patent_num, authorization_num, certificate_num, date, teacher_id)
         values
@@ -29,6 +24,7 @@
                 #{pa.teacherId})
         </foreach>
     </insert>
+
     <update id="updateTeacher">
             update teacherteam_system.teacher
             <set>
@@ -53,15 +49,13 @@
                 <if test="phoneNumber != null">
                     phone_number= #{phoneNumber},
                 </if>
+                <if test="researchField != null">
+                    research_field = #{researchField}
+                </if>
             </set>
         where id = #{id}
     </update>
 
-    <delete id="deleteReasearch">
-        delete from teacherteam_system.research_filed
-        where teacher_id = #{id}
-    </delete>
-
     <delete id="deletePatents">
         delete from teacherteam_system.patent
         where teacher_id = #{id}