getByKeyword

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

@@ -237,4 +237,14 @@ public class BookController {
         return Result.success(new PageInfo<>( bookService.searchByMajor(majorType,name)));
     }
 
+    @ApiOperation("综合查询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("getByKeyword")
+    public Result<PageInfo<BookEntity>> getByKeyword(@RequestParam("major") String major,@RequestParam("keyword") String keyword,@RequestParam("type") Integer type,Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(bookService.findByKeyword(major,keyword,type)));
+    }
+
 }

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

@@ -165,5 +165,14 @@ public class CardController {
         return Result.success(new PageInfo<>( cardService.findByName1(cardName)));
     }
 
+    @ApiOperation("综合查询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("getByKeyword")
+    public Result<PageInfo<CardEntity>> getByKeyword(@RequestParam("major") String major,@RequestParam("keyword") String keyword,@RequestParam("type") Integer type,Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(cardService.findByKeyword(major,keyword,type)));
+    }
 
 }

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

@@ -194,4 +194,14 @@ public class FaultController {
         return Result.success(new PageInfo<>( faultService.findByName1(faultName)));
     }
 
+    @ApiOperation("综合查询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("getByKeyword")
+    public Result<PageInfo<FaultEntity>> getByKeyword(@RequestParam("major") String major,@RequestParam("keyword") String keyword,@RequestParam("type") Integer type,Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(faultService.findByKeyword(major,keyword,type)));
+    }
+
 }

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

@@ -146,4 +146,14 @@ public class ManuelController {
         return Result.success(new PageInfo<>(manuelService.getAllManuel()));
     }
 
+    @ApiOperation("综合查询")
+    @ApiResponses({
+            @ApiResponse(code = 0, message = "成功")
+    })
+    @GetMapping("getByKeyword")
+    public Result<PageInfo<ManuelEntity>> getByKeyword(@RequestParam("major") String major,@RequestParam("keyword") String keyword,@RequestParam("type") Integer type,Integer page, Integer size){
+        PageHelper.startPage(page, size, "id desc");
+        return Result.success(new PageInfo<>(manuelService.findByKeyword(major,keyword,type)));
+    }
+
 }

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

@@ -15,4 +15,9 @@ public interface BookDao extends Mapper<BookEntity> {
     Integer getCount();
 
     List<BookEntity> findByName(@Param("book_name") String name);
+
+    List<BookEntity> findByMultiple(@Param("major") String major,@Param("name") String name);
+    List<BookEntity> findByBookName(@Param("major") String major,@Param("name") String name);
+    List<BookEntity> findByAuthor(@Param("major") String major,@Param("name") String name);
+
 }

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

@@ -15,4 +15,7 @@ public interface CardDao extends Mapper<CardEntity> {
     Integer getCount();
 
     List<CardEntity> findByName(@Param("card_name") String name);
+
+    List<CardEntity> findByCardName(@Param("major") String major,@Param("name") String name);
+
 }

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

@@ -15,4 +15,8 @@ public interface FaultDao extends Mapper<FaultEntity> {
     Integer getCount();
 
     List<FaultEntity> findByName(@Param("fault_name") String name);
+
+    List<FaultEntity> findByMultiple(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByBookName(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByFaultName(@Param("major") String major,@Param("name") String name);
 }

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

@@ -15,4 +15,6 @@ public interface ManuelDao extends Mapper<ManuelEntity> {
     Integer getCount();
 
     List<ManuelEntity> findByName(@Param("manuel_name") String name);
+
+    List<ManuelEntity> findByManuelName(@Param("major") String major,@Param("name") String name);
 }

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -213,7 +214,15 @@ public class BookService {
             return getAllBook();
     }
 
-
+    public List<BookEntity> findByKeyword(String major,String name,Integer type) {
+        List<BookEntity> lst =  new ArrayList<>();
+        switch (type){
+            case 0:lst = bookDao.findByMultiple( major,"%" + name + "%");break;//全部查询
+            case 1:lst = bookDao.findByBookName(major,"%" + name + "%");break;//教材名称
+            case 2:lst = bookDao.findByAuthor(major,"%" + name + "%");break;//作者
+        }
+        return lst;
+    }
 
 
 }

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

@@ -1,12 +1,20 @@
 package com.zglc.fm.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.zglc.fm.base.Result;
 import com.zglc.fm.dao.master.CardDao;
 import com.zglc.fm.entity.CardEntity;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import tk.mybatis.mapper.entity.Example;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -132,6 +140,14 @@ public class CardService {
     }
 
 
+    public List<CardEntity> findByKeyword(String major,String name,Integer type) {
+        List<CardEntity> lst =  new ArrayList<>();
+        switch (type){
+            case 1:lst = cardDao.findByCardName(major,"%" + name + "%");break;//卡片名称
+        }
+        return lst;
+    }
+
 
 
 }

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -207,4 +208,14 @@ public class FaultService {
         return faultDao.findByName("%" + name + "%");
     }
 
+    public List<FaultEntity> findByKeyword(String major,String name,Integer type) {
+        List<FaultEntity> lst =  new ArrayList<>();
+        switch (type){
+            case 0:lst = faultDao.findByMultiple( major,"%" + name + "%");break;//全部查询
+            case 1:lst = faultDao.findByBookName(major,"%" + name + "%");break;//教材名称
+            case 2:lst = faultDao.findByFaultName(major,"%" + name + "%");break;//案例名称
+        }
+        return lst;
+    }
+
 }

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

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -107,4 +108,12 @@ public class ManuelService {
         return manuelDao.selectByExample(example);
     }
 
+    public List<ManuelEntity> findByKeyword(String major,String name,Integer type) {
+        List<ManuelEntity> lst =  new ArrayList<>();
+        switch (type){
+            case 1:lst = manuelDao.findByManuelName(major,"%" + name + "%");break;//手册名称
+        }
+        return lst;
+    }
+
 }

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

@@ -43,7 +43,25 @@
 
     <select id="findByName" parameterType="String" resultMap="bookMap">
         select * from t_book where book_name
-        like #{book_name}
+        like #{name}
+    </select>
+
+    <select id="findByBookName" parameterType="String" resultMap="bookMap">
+        select * from t_book where book_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByAuthor" parameterType="String" resultMap="bookMap">
+        select * from t_book where author
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByMultiple" parameterType="String" resultMap="bookMap">
+            select *  from t_book where  (book_name like #{name} and major_type = #{major})
+            or  (author like #{name} and major_type = #{major})
+
     </select>
 
 </mapper>

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

@@ -40,4 +40,10 @@
         like #{card_name}
     </select>
 
+    <select id="findByCardName" parameterType="String" resultMap="cardMap">
+        select * from t_card where card_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
 </mapper>

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

@@ -46,4 +46,22 @@
         like #{fault_name}
     </select>
 
+    <select id="findByBookName" parameterType="String" resultMap="faultMap">
+        select * from t_fault where book_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByFaultName" parameterType="String" resultMap="faultMap">
+        select * from t_fault where fault_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
+    <select id="findByMultiple" 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})
+
+    </select>
+
 </mapper>

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

@@ -27,17 +27,15 @@
         where id > 1
     </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="manuelMap">
         select id,manuel_name,aircraft_type,major_type,description,file_path,input_time,remarks from t_manuel where manuel_name
         like #{manuel_name}
     </select>
 
+    <select id="findByManuelName" parameterType="String" resultMap="manuelMap">
+        select * from t_manuel where manuel_name
+        like #{name}
+        and major_type = #{major}
+    </select>
+
 </mapper>

src/main/resources/static/admin/UbookSee.html

@@ -95,6 +95,22 @@
         <a target="_blank " href="UbookBullet.html"> {{d.book_name}}</a>
 
     </script>
+    <script>
+        $(function() {
+            let funcfile_path = '';
+            var params = window.location.href.split("?");
+            if (params.length > 1) {
+                values = params[1].split("=");
+                if (values[1].length > 13) {
+                    funcfile_path = decodeURI(values[1]);
+                }
+            }
+            if (funcfile_path !== '') {
+                $("#box").attr('src', "../other/pdfjs/web/viewer.html?file=" + urlBase + funcfile_path + "&page=12&top=150&zoom=1.5");
+            }
+
+        });
+    </script>
 
 </body>
 

src/main/resources/static/admin/Uoutline-edit.html

@@ -47,12 +47,7 @@
         }
         if (funcfile_path !== '')
         {
-
-            //$("#box").attr('src', urlBase + funcfile_path);
-            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=\\" +  funcfile_path);
-            layui.use("form", function() {
-                layui.form.render();
-            });
+            $("#box").attr('src',"../other/pdfjs/web/viewer.html?file=" + urlBase+ funcfile_path+"&page=12&top=150&zoom=1.5");
         }
 
     });

src/main/resources/static/admin/js/UbookSee.js

@@ -17,7 +17,7 @@ $(function() {
 
 
     $("#file_path").val(funcfile_path);
-    $("#box").attr('src', urlBase + funcfile_path);
+
 
 
 

src/main/resources/static/admin/js/Uoutline.js

@@ -132,7 +132,6 @@ $(function() {
                 // console.log(data.file_path)
                 var data = obj.data.file_path
                 flie = urlBase + data
-                console.log(flie)
                 sessionStorage.setItem("url", flie)
             } else if (obj.event === "delete") {
                 // console.log(data)

src/main/resources/static/other/js/functions.js

@@ -1,6 +1,6 @@
 //var urlBase = window.location.origin + "/";
 
-//var urlBase = "http://180.76.52.24:11083/"; //网络版
+// var urlBase = "http://180.76.52.24:11083/"; //网络版
  var urlBase = "http://127.0.0.1:11083/"; //本地版
 
 function loginout() {

src/main/resources/static/other/pdfjs/web/cmaps/LICENSE

@@ -0,0 +1,36 @@
+%%Copyright: -----------------------------------------------------------
+%%Copyright: Copyright 1990-2009 Adobe Systems Incorporated.
+%%Copyright: All rights reserved.
+%%Copyright:
+%%Copyright: Redistribution and use in source and binary forms, with or
+%%Copyright: without modification, are permitted provided that the
+%%Copyright: following conditions are met:
+%%Copyright:
+%%Copyright: Redistributions of source code must retain the above
+%%Copyright: copyright notice, this list of conditions and the following
+%%Copyright: disclaimer.
+%%Copyright:
+%%Copyright: Redistributions in binary form must reproduce the above
+%%Copyright: copyright notice, this list of conditions and the following
+%%Copyright: disclaimer in the documentation and/or other materials
+%%Copyright: provided with the distribution. 
+%%Copyright:
+%%Copyright: Neither the name of Adobe Systems Incorporated nor the names
+%%Copyright: of its contributors may be used to endorse or promote
+%%Copyright: products derived from this software without specific prior
+%%Copyright: written permission. 
+%%Copyright:
+%%Copyright: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+%%Copyright: CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+%%Copyright: INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+%%Copyright: MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+%%Copyright: DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+%%Copyright: CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+%%Copyright: SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+%%Copyright: NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+%%Copyright: LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+%%Copyright: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+%%Copyright: CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+%%Copyright: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+%%Copyright: SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%%Copyright: -----------------------------------------------------------