6

src/main/java/com/zglc/fm/controller/BookController.java

@@ -265,4 +265,14 @@ public class BookController {
         return Result.success(new PageInfo<>( bookService.listByAircraft(aircraftType)));
     }
 
+    @ApiOperation("按机型查找教材名")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("findByNameAircraft")
+    public Result<PageInfo<BookEntity>> findByNameAircraft(@RequestParam String aircraftType,@RequestParam String keyword,Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( bookService.findByNameAircraft(aircraftType,keyword)));
+    }
+
 }

src/main/java/com/zglc/fm/controller/CardController.java

@@ -196,4 +196,14 @@ public class CardController {
         return Result.success(new PageInfo<>( cardService.listByAircraft(aircraftType)));
     }
 
+    @ApiOperation("按机型查找卡片名")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("findByNameAircraft")
+    public Result<PageInfo<CardEntity>> findByNameAircraft(@RequestParam String aircraftType,@RequestParam String keyword,Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( cardService.findByNameAircraft(aircraftType,keyword)));
+    }
+
 }

src/main/java/com/zglc/fm/controller/FaultController.java

@@ -4,10 +4,7 @@ package com.zglc.fm.controller;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zglc.fm.base.Result;
-import com.zglc.fm.entity.DeleteEntity;
-import com.zglc.fm.entity.FaultEntity;
-import com.zglc.fm.entity.FaultFind;
-import com.zglc.fm.entity.aircraftStaEntity;
+import com.zglc.fm.entity.*;
 import com.zglc.fm.service.FaultService;
 import com.zglc.fm.utils.DocToPdf;
 import com.zglc.fm.utils.FileTool;
@@ -237,6 +234,26 @@ public class FaultController {
         return Result.success(new PageInfo<>(faultService.findByKeyword(faultFind)));
     }
 
+    @ApiOperation("综合查询新")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("getByKeyword1")
+    public Result<PageInfo<FaultEntity>> getByKeyword1(@RequestBody FaultFind1 faultFind1, Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(faultService.findByKeyword1(faultFind1)));
+    }
+
+    @ApiOperation("按故障时间查询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @PostMapping("getByFaultTime")
+    public Result<PageInfo<FaultEntity>> getByFaultTime(@RequestBody FaultFind2 faultFind2, Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(faultService.getByFaultTime(faultFind2)));
+    }
+
     @ApiOperation("故障案例按专业搜索案例名")
     @ApiResponses({
             @ApiResponse(code = 0, message = "成功")

src/main/java/com/zglc/fm/controller/ManuelController.java

@@ -168,4 +168,15 @@ public class ManuelController {
         return Result.success(new PageInfo<>( manuelService.listByAircraft(aircraftType)));
     }
 
+    @ApiOperation("按机型查找手册名")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("findByNameAircraft")
+    public Result<PageInfo<ManuelEntity>> findByNameAircraft(@RequestParam String aircraftType,@RequestParam String keyword,Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( manuelService.findByNameAircraft(aircraftType,keyword)));
+    }
+
+
 }

src/main/java/com/zglc/fm/controller/OutlineController.java

@@ -156,4 +156,14 @@ public class OutlineController {
         return Result.success(new PageInfo<>( outlineService.listByAircraft(aircraftType)));
     }
 
+    @ApiOperation("按机型查找大纲名")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("findByNameAircraft")
+    public Result<PageInfo<OutlineEntity>> findByNameAircraft(@RequestParam String aircraftType,@RequestParam String keyword,Integer page, Integer size) {
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>( outlineService.findByNameAircraft(aircraftType,keyword)));
+    }
+
 }

src/main/java/com/zglc/fm/dao/master/FaultDao.java

@@ -1,8 +1,6 @@
 package com.zglc.fm.dao.master;
 
-import com.zglc.fm.entity.FaultEntity;
-import com.zglc.fm.entity.FaultFind;
-import com.zglc.fm.entity.aircraftStaEntity;
+import com.zglc.fm.entity.*;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -32,4 +30,14 @@ public interface FaultDao extends Mapper<FaultEntity> {
     List<FaultEntity> findByDescription(@Param("aircraftType") String aircraftType,@Param("major") String major,@Param("name") String name);
     List<FaultEntity> findByFaultTime(FaultFind faultFind);
 
+    List<FaultEntity> findByMultiple1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByBookName1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByFaultName1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByAuthor1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByDepartment1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByDescription1(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByAircraft1(@Param("major") String major,@Param("name") String name);
+
+    List<FaultEntity> findByFaultTime1(FaultFind2 faultFind2);
+
 }

src/main/java/com/zglc/fm/entity/FaultFind1.java

@@ -0,0 +1,16 @@
+package com.zglc.fm.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class FaultFind1 {
+
+    private String major;
+
+    private String keyword;
+
+    private Integer type;
+
+}

src/main/java/com/zglc/fm/entity/FaultFind2.java

@@ -0,0 +1,15 @@
+package com.zglc.fm.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class FaultFind2 {
+
+    private String major;
+
+    private String beginTime;
+
+    private String finishTime;
+}

src/main/java/com/zglc/fm/service/BookService.java

@@ -246,5 +246,11 @@ public class BookService {
         return bookDao.selectByExample(example);
     }
 
-
+    public List<BookEntity> findByNameAircraft(String aircraftType,String keyword) {
+        Example example = new Example(BookEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("aircraft_type", aircraftType);
+        criteria.andLike("book_name", "%" + keyword + "%");
+        return bookDao.selectByExample(example);
+    }
 }

src/main/java/com/zglc/fm/service/CardService.java

@@ -164,4 +164,12 @@ public class CardService {
         return cardDao.selectByExample(example);
     }
 
+    public List<CardEntity> findByNameAircraft(String aircraftType,String keyword) {
+        Example example = new Example(CardEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("aircraft_type", aircraftType);
+        criteria.andLike("card_name", "%" + keyword + "%");
+        return cardDao.selectByExample(example);
+    }
+
 }

src/main/java/com/zglc/fm/service/FaultService.java

@@ -2,9 +2,7 @@ package com.zglc.fm.service;
 
 import com.zglc.fm.base.Result;
 import com.zglc.fm.dao.master.FaultDao;
-import com.zglc.fm.entity.FaultEntity;
-import com.zglc.fm.entity.aircraftStaEntity;
-import com.zglc.fm.entity.FaultFind;
+import com.zglc.fm.entity.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
@@ -246,11 +244,32 @@ public class FaultService {
             case 4:lst = faultDao.findByDepartment(faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//部门
             case 5:lst = faultDao.findByDescription(faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//描述
             case 6:lst = faultDao.findByFaultTime(faultFind);break;//故障时间
+        }
+        return lst;
+    }
 
+    public List<FaultEntity> findByKeyword1(FaultFind1 faultFind1) {
+        List<FaultEntity> lst =  new ArrayList<>();
+        switch (faultFind1.getType()){
+            case 0:lst = faultDao.findByMultiple1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//全部查询
+            case 1:lst = faultDao.findByBookName1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//教材名称
+            case 2:lst = faultDao.findByFaultName1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//案例名称
+            case 3:lst = faultDao.findByAuthor1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//作者名称
+            case 4:lst = faultDao.findByDepartment1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//部门
+            case 5:lst = faultDao.findByDescription1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//描述
+            case 6:lst = faultDao.findByAircraft1(faultFind1.getMajor(),"%" + faultFind1.getKeyword() + "%");break;//机型
         }
         return lst;
     }
 
+    public List<FaultEntity> getByFaultTime(FaultFind2 faultFind2) {
+        List<FaultEntity> lst =  new ArrayList<>();
+        lst = faultDao.findByFaultTime1(faultFind2);
+        return lst;
+    }
+
+
+
     public List<FaultEntity> searchByMajorKeyword(Integer type,String keyword,String major) {
         Example example = new Example(FaultEntity.class);
         Example.Criteria criteria = example.createCriteria();

src/main/java/com/zglc/fm/service/ManuelService.java

@@ -127,4 +127,12 @@ public class ManuelService {
         return manuelDao.selectByExample(example);
     }
 
+    public List<ManuelEntity> findByNameAircraft(String aircraftType,String keyword) {
+        Example example = new Example(ManuelEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("aircraft_type", aircraftType);
+        criteria.andLike("manuel_name", "%" + keyword + "%");
+        return manuelDao.selectByExample(example);
+    }
+
 }

src/main/java/com/zglc/fm/service/OutlineService.java

@@ -117,4 +117,12 @@ public class OutlineService {
         criteria.andEqualTo("aircraft_type", aircraftType);
         return outlineDao.selectByExample(example);
     }
+
+    public List<OutlineEntity> findByNameAircraft(String aircraftType,String keyword) {
+        Example example = new Example(OutlineEntity.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("aircraft_type", aircraftType);
+        criteria.andLike("outline_name", "%" + keyword + "%");
+        return outlineDao.selectByExample(example);
+    }
 }

src/main/resources/mapping/master/FaultDao.xml

@@ -47,14 +47,6 @@
         select aircraft_type,count(aircraft_type) as num from t_fault group by aircraft_type
     </select>
 
-<!--    <insert id="batchAdd" parameterType="java.util.List">-->
-<!--        <foreach collection="list" item="equ" separator=";">-->
-<!--            insert into t_equipment (equipment_type)-->
-<!--            SELECT #{equ.equipment_type}-->
-<!--            FROM DUAL WHERE NOT EXISTS (SELECT equipment_type FROM  t_equipment WHERE equipment_type = #{equ.equipment_type})-->
-<!--        </foreach>-->
-<!--    </insert>-->
-
     <select id="findByName" parameterType="String" resultMap="faultMap">
         select id,fault_name,fault_number,author,aircraft_type,major_type,description,file_path,input_time,fault_time,book_name,chapter,remarks from t_fault where fault_name
         like #{fault_name}
@@ -145,4 +137,66 @@
         </if>
     </select>
 
+    <select id="findByBookName1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where book_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByFaultName1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where fault_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByAuthor1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where author
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByDepartment1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where department
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByDescription1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where description
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByAircraft1" parameterType="String" resultMap="faultMap">
+        select * from t_fault where aircraft_type
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+
+    <select id="findByMultiple1" parameterType="String" resultMap="faultMap">
+        select *
+        from t_fault where
+            (book_name like #{name} and major_type = #{major})
+            or (fault_name like #{name} and major_type = #{major})
+            or (author like #{name} and major_type = #{major})
+            or (department like #{name} and major_type = #{major})
+            or (description like #{name} and major_type = #{major})
+            or (aircraft_type like #{name} and major_type = #{major})
+    </select>
+
+    <select id="findByFaultTime1" parameterType="com.zglc.fm.entity.FaultFind2" resultMap="faultMap">
+        select *
+        from t_fault where 1=1
+        <if test="major !=null">
+            and major_type = #{major}
+        </if>
+        <if test="beginTime != null">
+            and fault_time <![CDATA[>=]]> #{beginTime}
+        </if>
+        <if test="finishTime !=null">
+            and fault_time <![CDATA[<=]]> #{finishTime}
+        </if>
+    </select>
+
 </mapper>